summaryrefslogtreecommitdiffstats
path: root/gst/monoscope
diff options
context:
space:
mode:
authorChristian Schaller <uraeus@gnome.org>2004-12-07 10:32:11 +0000
committerChristian Schaller <uraeus@gnome.org>2004-12-07 10:32:11 +0000
commite08a835a4a9f27f21360f52b47b0b4fb0f2d4d1b (patch)
tree895b962879685b8cae2ade049f6b59f63781533e /gst/monoscope
parenta9d5e7b74fd8ba9531a42bacdd90ee76c5ef8fdb (diff)
fix licensing information for monoscope plugin
Original commit message from CVS: fix licensing information for monoscope plugin
Diffstat (limited to 'gst/monoscope')
-rw-r--r--gst/monoscope/README6
-rw-r--r--gst/monoscope/convolve.c28
-rw-r--r--gst/monoscope/convolve.h33
3 files changed, 41 insertions, 26 deletions
diff --git a/gst/monoscope/README b/gst/monoscope/README
index e15676d0..02911318 100644
--- a/gst/monoscope/README
+++ b/gst/monoscope/README
@@ -1,7 +1,11 @@
This is a visualization based on on the monoscope output plugin from
alsaplayer.
-The monoscope output plugin was written primarily by Ralph Loader.
+The monoscope convolution matching code was written by Ralph Loader.
+
+The monoscope.c and monoscope.h files are the only ones under the GPL,
+as opposed to the LGPL. We need to either rewrite these or get permission
+from the people involved to do so.
This implementation is taken from alsaplayer version 0.99.54, at
http://www.alsaplayer.org/
diff --git a/gst/monoscope/convolve.c b/gst/monoscope/convolve.c
index fc4f90b6..4d282148 100644
--- a/gst/monoscope/convolve.c
+++ b/gst/monoscope/convolve.c
@@ -2,21 +2,25 @@
*
* Copyright (C) 1999 Ralph Loader <suckfish@ihug.co.nz>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*
+ *
+ * Note: 7th December 2004: This file used to be licensed under the GPL,
+ * but we got permission from Ralp Loader to relicense it to LGPL.
+ *
* $Id$
*
*/
diff --git a/gst/monoscope/convolve.h b/gst/monoscope/convolve.h
index d9709edc..ff2b1e25 100644
--- a/gst/monoscope/convolve.h
+++ b/gst/monoscope/convolve.h
@@ -2,19 +2,26 @@
*
* Copyright (C) 1999 Ralph Loader <suckfish@ihug.co.nz>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ *
+ * Note: 7th December 2004: This file used to be licensed under the GPL,
+ * but we got permission from Ralp Loader to relicense it to LGPL.
+ *
+ *
*/
#ifndef CONVOLVE_H