From e08a835a4a9f27f21360f52b47b0b4fb0f2d4d1b Mon Sep 17 00:00:00 2001 From: Christian Schaller Date: Tue, 7 Dec 2004 10:32:11 +0000 Subject: [PATCH] fix licensing information for monoscope plugin Original commit message from CVS: fix licensing information for monoscope plugin --- ChangeLog | 6 ++++++ gst/monoscope/README | 6 +++++- gst/monoscope/convolve.c | 28 ++++++++++++++++------------ gst/monoscope/convolve.h | 33 ++++++++++++++++++++------------- 4 files changed, 47 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12c053a..4ea52df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-12-07 Christian Fredrik Kalager Schaller + + * gst/monoscope/README: Update information to be more correct + * gst/monoscope/convolve.c: Relicense to LGPL + * gst/monoscope/convolve.h: Relicense to LGPL + 2004-12-06 Arwed v. Merkatz * gst/mpegaudioparse/gstmpegaudioparse.c: (gst_mp3parse_chain): diff --git a/gst/monoscope/README b/gst/monoscope/README index e15676d..0291131 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 fc4f90b..4d28214 100644 --- a/gst/monoscope/convolve.c +++ b/gst/monoscope/convolve.c @@ -2,21 +2,25 @@ * * Copyright (C) 1999 Ralph Loader * - * 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 d9709ed..ff2b1e2 100644 --- a/gst/monoscope/convolve.h +++ b/gst/monoscope/convolve.h @@ -2,19 +2,26 @@ * * Copyright (C) 1999 Ralph Loader * - * 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 -- 2.7.4