Mercurial > audlegacy-plugins

changeset 1900:21508f1dca47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
author William Pitcock <nenolod@atheme.org>
date Wed, 26 Sep 2007 17:55:00 -0500
parents 5af55c925d6e (diff) 96da96b1bbeb (current diff)
children fa2a37d3f7a2 276d2a3d998e
files src/metronom/Makefile src/tonegen/Makefile src/vtx/Makefile src/wav/Makefile
diffstat 30 files changed, 490 insertions(+), 97 deletions(-) [+]
line wrap: on
line diff
--- a/src/amidi-plug/Makefile	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/amidi-plug/Makefile	Wed Sep 26 17:55:00 2007 -0500
@@ -1,7 +1,4 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
-
-OBJECTIVE_LIBS = libamidi-plug$(SHARED_SUFFIX)
+PLUGIN = amidi-plug$(PLUGIN_SUFFIX)
 SUBDIRS = pcfg $(AMIDIPLUG_BACKENDS)
 
 noinst_HEADERS = amidi-plug.h i_backend.h i_midi.h i_midievent.h \
@@ -12,19 +9,22 @@
                  amidi-plug-icon.xpm amidi-plug.logo.xpm \
                  amidi-plug.midiicon.xpm
 
-LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
+plugindir = audacious/$(INPUT_PLUGIN_DIR)
 
-LIBADD = $(GTK_LIBS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(GMODULE_LIBS) -lpthread ./pcfg/libpcfg.a
-SOURCES = amidi-plug.c i_vfslayer.c i_midi.c i_backend.c \
+SRCS = amidi-plug.c i_vfslayer.c i_midi.c i_backend.c \
           i_configure.c i_configure-ap.c i_configure-alsa.c \
           i_configure-fluidsynth.c i_configure-dummy.c \
           i_utils.c i_fileinfo.c
 
+include ../../buildsys.mk
+include ../../extra.mk
+
 OBJECTS = ${SOURCES:.c=.o}
 
-LIBDEP = ./pcfg/libpcfg.a
+EXT_DEPS = ./pcfg/libpcfg.a
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(GMODULE_CFLAGS) -DAMIDIPLUGBACKENDDIR=\"$(AMIDIPLUGBACKENDDIR)\" \
-          -I../../intl -I../..
+CFLAGS += $(PLUGIN_CFLAGS)
+CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(GMODULE_CFLAGS) $(MOWGLI_CFLAGS) \
+	-DAMIDIPLUGBACKENDDIR=\"$(AMIDIPLUGBACKENDDIR)\" -I../../intl -I../..
 
-include ../../mk/objective.mk
+LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(GMODULE_LIBS) -lpthread ./pcfg/libpcfg.a
--- a/src/amidi-plug/pcfg/Makefile	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/amidi-plug/pcfg/Makefile	Wed Sep 26 17:55:00 2007 -0500
@@ -1,14 +1,12 @@
-include ../../../mk/rules.mk
-include ../../../mk/init.mk
+SRCS = i_pcfg.c
+
+STATIC_LIB_NOINST = libpcfg.a
+
+include ../../../buildsys.mk
+include ../../../extra.mk
 
 noinst_HEADERS = i_pcfg.h
 
-CFLAGS += $(PICFLAGS) $(GLIB_CFLAGS) -I../../..
-
-OBJECTIVE_LIBS_NOINST = libpcfg.a
+CFLAGS += $(PLUGIN_CFLAGS)
+CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GLIB_CFLAGS) -I../../..
 
-SOURCES = i_pcfg.c
-
-OBJECTS = ${SOURCES:.c=.o}
-
-include ../../../mk/objective.mk
--- a/src/metronom/Makefile	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/metronom/Makefile	Wed Sep 26 17:55:00 2007 -0500
@@ -1,4 +1,5 @@
-PLUGIN = metronom${PLUGIN_SUFFIX}
+h
+LUGIN = metronom${PLUGIN_SUFFIX}
 SRCS = metronom.c
 
 plugindir = audacious/${INPUT_PLUGIN_DIR}
@@ -6,6 +7,6 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${LIBMOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
--- a/src/modplug/Makefile	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/modplug/Makefile	Wed Sep 26 17:55:00 2007 -0500
@@ -53,4 +53,4 @@
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I.. -I../.. -I../../intl
 CFLAGS += ${PLUGIN_CFLAGS}
 CXXFLAGS += ${PLUGIN_CFLAGS}
-LIBS += ${MOWGLI_LIBS} ${DBUS_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
+LIBS += ${MOWGLI_LIBS} ${DBUS_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -lstdc++
--- a/src/paranormal/actuators.c	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/paranormal/actuators.c	Wed Sep 26 17:55:00 2007 -0500
@@ -1,3 +1,22 @@
+/*
+ * paranormal: iterated pipeline-driven visualization plugin
+ * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
+ * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.com>
+ *
+ * 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; under version 2 of the License.
+ *
+ * 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
+ */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
--- a/src/paranormal/actuators.h	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/paranormal/actuators.h	Wed Sep 26 17:55:00 2007 -0500
@@ -1,3 +1,22 @@
+/*
+ * paranormal: iterated pipeline-driven visualization plugin
+ * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
+ * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.com>
+ *
+ * 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; under version 2 of the License.
+ *
+ * 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
+ */
+
 /* FIXME: rename actuators to pn_actuators */
 /* FIXME: add a color type to the OPT_TYPE's */
 
--- a/src/paranormal/beatdetect.c	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/paranormal/beatdetect.c	Wed Sep 26 17:55:00 2007 -0500
@@ -1,3 +1,22 @@
+/*
+ * paranormal: iterated pipeline-driven visualization plugin
+ * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
+ * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.com>
+ *
+ * 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; under version 2 of the License.
+ *
+ * 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
+ */
+
 #include "paranormal.h"
 
 /*
--- a/src/paranormal/builtins.c	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/paranormal/builtins.c	Wed Sep 26 17:55:00 2007 -0500
@@ -1,3 +1,22 @@
+/*
+ * paranormal: iterated pipeline-driven visualization plugin
+ * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
+ * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.com>
+ *
+ * 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; under version 2 of the License.
+ *
+ * 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
+ */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
--- a/src/paranormal/cfg.c	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/paranormal/cfg.c	Wed Sep 26 17:55:00 2007 -0500
@@ -1,3 +1,22 @@
+/*
+ * paranormal: iterated pipeline-driven visualization plugin
+ * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
+ * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.com>
+ *
+ * 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; under version 2 of the License.
+ *
+ * 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
+ */
+
 /* FIXME: prevent the user from dragging something above the root
    actuator */
 
@@ -7,6 +26,8 @@
 #include <gtk/gtk.h>
 #include <audacious/configdb.h>
 
+#include <math.h>
+
 #include "paranormal.h"
 #include "actuators.h"
 #include "containers.h"
@@ -63,6 +84,18 @@
 				    ((GtkDestroyNotify) actuator_row_data_destroyed_cb));
 }
 
+static guchar
+gdk_colour_to_paranormal_colour(gint16 colour)
+{
+  return (guchar) (colour / 255);
+}
+
+static gint16
+paranormal_colour_to_gdk_colour(guchar colour)
+{
+  return (gint16) (colour * 255);
+}
+
 static void
 int_changed_cb (GtkSpinButton *sb, int *i)
 {
@@ -85,9 +118,15 @@
 }
 
 static void
-color_changed_cb (GtkSpinButton *sb, guchar *c)
+color_changed_cb (GtkColorButton *cb, struct pn_color *c)
 {
-  *c = gtk_spin_button_get_value_as_int (sb);
+  GdkColor colour;
+
+  gtk_color_button_get_color(cb, &colour);
+
+  c->r = gdk_colour_to_paranormal_colour(colour.red);
+  c->g = gdk_colour_to_paranormal_colour(colour.green);
+  c->b = gdk_colour_to_paranormal_colour(colour.blue);
 }
 
 static void
@@ -170,42 +209,18 @@
 	case OPT_TYPE_COLOR:
 	  {
 	    /* FIXME: add some color preview */
-	    GtkWidget *hbox;
-	    hbox = gtk_hbox_new (FALSE, 0);
-	    adj = gtk_adjustment_new (a->options[j].val.cval.r,
-				      0, 255,
-				      1, 2, 0);
-	    w = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1.0, 0);
-	    gtk_widget_show (w);
-	    gtk_signal_connect (GTK_OBJECT (w), "changed",
-			       GTK_SIGNAL_FUNC (color_changed_cb),
-			       &a->options[j].val.cval.r);
-	    gtk_tooltips_set_tip (actuator_tooltips, w,
+            GdkColor *colour = g_new0(GdkColor, 1);
+
+            colour->red = paranormal_colour_to_gdk_colour(a->options[j].val.cval.r);
+            colour->green = paranormal_colour_to_gdk_colour(a->options[j].val.cval.g);
+            colour->blue = paranormal_colour_to_gdk_colour(a->options[j].val.cval.b);
+
+            w = gtk_color_button_new_with_color(colour);
+	    g_signal_connect(G_OBJECT (w), "color-set",
+			       G_CALLBACK (color_changed_cb),
+			       &a->options[j].val.cval);
+	    gtk_tooltips_set_tip (actuator_tooltips, GTK_WIDGET(w),
 				  a->desc->option_descs[j].doc, NULL);
-	    gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);
-	    adj = gtk_adjustment_new (a->options[j].val.cval.g,
-				      0, 255,
-				      1, 2, 0);
-	    w = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1.0, 0);
-	    gtk_widget_show (w);
-	    gtk_signal_connect (GTK_OBJECT (w), "changed",
-			       GTK_SIGNAL_FUNC (color_changed_cb),
-			       &a->options[j].val.cval.g);
-	    gtk_tooltips_set_tip (actuator_tooltips, w,
-				  a->desc->option_descs[j].doc, NULL);
-	    gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 6);
-	    adj = gtk_adjustment_new (a->options[j].val.cval.b,
-				      0, 255,
-				      1, 2, 0);
-	    w = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1.0, 0);
-	    gtk_widget_show (w);
-	    gtk_signal_connect (GTK_OBJECT (w), "changed",
-			       GTK_SIGNAL_FUNC (color_changed_cb),
-			       &a->options[j].val.cval.b);
-	    gtk_tooltips_set_tip (actuator_tooltips, w,
-				  a->desc->option_descs[j].doc, NULL);
-	    gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);
-	    w = hbox;
 	  }
 	  break;	  
 	case OPT_TYPE_COLOR_INDEX:
@@ -486,7 +501,7 @@
     {
       /* The dialog */
       cfg_dialog = gtk_dialog_new ();
-      gtk_window_set_title (GTK_WINDOW (cfg_dialog), "Paranormal Visualization Studio - Editor (PNS " VERSION ")");
+      gtk_window_set_title (GTK_WINDOW (cfg_dialog), "Paranormal Visualization Studio - Editor");
       gtk_widget_set_usize (cfg_dialog, 530, 370);
       gtk_container_border_width (GTK_CONTAINER (cfg_dialog), 8);
       gtk_signal_connect_object (GTK_OBJECT (cfg_dialog), "delete-event",
@@ -541,7 +556,7 @@
 			0, 2, 0, 1,
 			GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0,
 			3, 3);
-      actuator_add_button = gtk_button_new_with_label ("Add");
+      actuator_add_button = gtk_button_new_from_stock(GTK_STOCK_ADD);
       gtk_widget_show (actuator_add_button);
       gtk_signal_connect (GTK_OBJECT (actuator_add_button), "clicked",
 			  GTK_SIGNAL_FUNC (add_actuator_cb), NULL);
@@ -549,7 +564,7 @@
 			0, 1, 1, 2,
 			GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0,
 			3, 3);
-      actuator_remove_button = gtk_button_new_with_label ("Remove");
+      actuator_remove_button = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
       gtk_widget_set_sensitive (actuator_remove_button, FALSE);
       gtk_widget_show (actuator_remove_button);
       gtk_signal_connect (GTK_OBJECT (actuator_remove_button), "clicked",
@@ -558,7 +573,7 @@
 			1, 2, 1, 2,
 			GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0,
 			3, 3);
-      button = gtk_button_new_with_label ("Load");
+      button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
       gtk_widget_show (button);
       gtk_signal_connect (GTK_OBJECT (button), "clicked",
 			  GTK_SIGNAL_FUNC (load_button_cb), NULL);
@@ -566,7 +581,7 @@
 			0, 1, 2, 3,
 			GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0,
 			3, 3);
-      button = gtk_button_new_with_label ("Save");
+      button = gtk_button_new_from_stock(GTK_STOCK_SAVE);
       gtk_widget_show (button);
       gtk_signal_connect (GTK_OBJECT (button), "clicked",
 			  GTK_SIGNAL_FUNC (save_button_cb), NULL);
@@ -609,23 +624,26 @@
       gtk_button_box_set_child_size (GTK_BUTTON_BOX (bbox), 64, 0);
       gtk_box_pack_start (GTK_BOX (GTK_DIALOG (cfg_dialog)->action_area),
 			  bbox, FALSE, FALSE, 0);
-      button = gtk_button_new_with_label ("OK");
+
+      button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
       gtk_widget_show (button);
       gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NORMAL);
       gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			  GTK_SIGNAL_FUNC (ok_button_cb), NULL);
+			  GTK_SIGNAL_FUNC (cancel_button_cb), NULL);
       gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
-      button = gtk_button_new_with_label ("Apply");
+
+      button = gtk_button_new_from_stock (GTK_STOCK_APPLY);
       gtk_widget_show (button);
       gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NORMAL);
       gtk_signal_connect (GTK_OBJECT (button), "clicked",
 			  GTK_SIGNAL_FUNC (apply_button_cb), NULL);
       gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
-      button = gtk_button_new_with_label ("Cancel");
+
+      button = gtk_button_new_from_stock (GTK_STOCK_OK);
       gtk_widget_show (button);
       gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NORMAL);
       gtk_signal_connect (GTK_OBJECT (button), "clicked",
-			  GTK_SIGNAL_FUNC (cancel_button_cb), NULL);
+			  GTK_SIGNAL_FUNC (ok_button_cb), NULL);
       gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
     }
 
--- a/src/paranormal/cmaps.c	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/paranormal/cmaps.c	Wed Sep 26 17:55:00 2007 -0500
@@ -1,3 +1,22 @@
+/*
+ * paranormal: iterated pipeline-driven visualization plugin
+ * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
+ * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.com>
+ *
+ * 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; under version 2 of the License.
+ *
+ * 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
+ */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
--- a/src/paranormal/containers.c	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/paranormal/containers.c	Wed Sep 26 17:55:00 2007 -0500
@@ -1,3 +1,22 @@
+/*
+ * paranormal: iterated pipeline-driven visualization plugin
+ * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
+ * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.com>
+ *
+ * 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; under version 2 of the License.
+ *
+ * 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
+ */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
--- a/src/paranormal/containers.h	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/paranormal/containers.h	Wed Sep 26 17:55:00 2007 -0500
@@ -1,5 +1,24 @@
-#ifndef _CONTAINERS_H
-#define _CONTAINERS_H
+/*
+ * paranormal: iterated pipeline-driven visualization plugin
+ * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
+ * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.com>
+ *
+ * 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; under version 2 of the License.
+ *
+ * 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
+ */
+
+#ifndef _PN_CONTAINERS_H
+#define _PN_CONTAINERS_H
 
 void container_add_actuator (struct pn_actuator *container, struct pn_actuator *a);
 void container_remove_actuator (struct pn_actuator *container, struct pn_actuator *a);
--- a/src/paranormal/drawing.c	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/paranormal/drawing.c	Wed Sep 26 17:55:00 2007 -0500
@@ -1,3 +1,22 @@
+/*
+ * paranormal: iterated pipeline-driven visualization plugin
+ * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
+ * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.com>
+ *
+ * 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; under version 2 of the License.
+ *
+ * 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
+ */
+
 #include <math.h>
 
 #include "paranormal.h"
--- a/src/paranormal/drawing.h	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/paranormal/drawing.h	Wed Sep 26 17:55:00 2007 -0500
@@ -1,3 +1,22 @@
+/*
+ * paranormal: iterated pipeline-driven visualization plugin
+ * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
+ * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.com>
+ *
+ * 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; under version 2 of the License.
+ *
+ * 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
+ */
+
 #include <glib.h>
 
 #ifndef PN_DRAWING_H
--- a/src/paranormal/freq.c	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/paranormal/freq.c	Wed Sep 26 17:55:00 2007 -0500
@@ -1,3 +1,22 @@
+/*
+ * paranormal: iterated pipeline-driven visualization plugin
+ * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
+ * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.com>
+ *
+ * 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; under version 2 of the License.
+ *
+ * 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
+ */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
--- a/src/paranormal/general.c	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/paranormal/general.c	Wed Sep 26 17:55:00 2007 -0500
@@ -1,3 +1,22 @@
+/*
+ * paranormal: iterated pipeline-driven visualization plugin
+ * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
+ * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.com>
+ *
+ * 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; under version 2 of the License.
+ *
+ * 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
+ */
+
 /* FIXME: what to name this file? */
 
 #ifdef HAVE_CONFIG_H
--- a/src/paranormal/misc.c	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/paranormal/misc.c	Wed Sep 26 17:55:00 2007 -0500
@@ -1,3 +1,22 @@
+/*
+ * paranormal: iterated pipeline-driven visualization plugin
+ * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
+ * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.com>
+ *
+ * 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; under version 2 of the License.
+ *
+ * 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
+ */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
--- a/src/paranormal/paranormal.c	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/paranormal/paranormal.c	Wed Sep 26 17:55:00 2007 -0500
@@ -1,4 +1,21 @@
-/* FIXME: add fullscreen / screenshots */
+/*
+ * paranormal: iterated pipeline-driven visualization plugin
+ * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
+ * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.com>
+ *
+ * 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; under version 2 of the License.
+ *
+ * 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
+ */
 
 #include <config.h>
 
@@ -131,7 +148,7 @@
   resize_video (1280, 1024);
 #endif
 
-  SDL_WM_SetCaption ("Paranormal Visualization Studio " VERSION, PACKAGE);
+  SDL_WM_SetCaption ("Paranormal Visualization Studio", PACKAGE);
 
   for(i=0; i<360; i++)
     {
--- a/src/paranormal/paranormal.h	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/paranormal/paranormal.h	Wed Sep 26 17:55:00 2007 -0500
@@ -1,3 +1,22 @@
+/*
+ * paranormal: iterated pipeline-driven visualization plugin
+ * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
+ * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.com>
+ *
+ * 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; under version 2 of the License.
+ *
+ * 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
+ */
+
 #ifndef _PARANORMAL_H
 #define _PARANORMAL_H
 
--- a/src/paranormal/plugin.c	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/paranormal/plugin.c	Wed Sep 26 17:55:00 2007 -0500
@@ -1,3 +1,22 @@
+/*
+ * paranormal: iterated pipeline-driven visualization plugin
+ * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
+ * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.com>
+ *
+ * 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; under version 2 of the License.
+ *
+ * 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
+ */
+
 /* FIXME: issues with not uniniting variables between
    enables?  I wasn't too careful about that, but it
    seems to work fine.  If there are problems perhaps
--- a/src/paranormal/pn_utils.h	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/paranormal/pn_utils.h	Wed Sep 26 17:55:00 2007 -0500
@@ -1,3 +1,22 @@
+/*
+ * paranormal: iterated pipeline-driven visualization plugin
+ * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
+ * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.com>
+ *
+ * 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; under version 2 of the License.
+ *
+ * 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
+ */
+
 #ifndef _PN_UTILS_H
 #define _PN_UTILS_H
 
--- a/src/paranormal/presets.c	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/paranormal/presets.c	Wed Sep 26 17:55:00 2007 -0500
@@ -1,3 +1,22 @@
+/*
+ * paranormal: iterated pipeline-driven visualization plugin
+ * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
+ * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.com>
+ *
+ * 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; under version 2 of the License.
+ *
+ * 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
+ */
+
 /* FIXME: add documentation support to preset files */
 /* FIXME: add multiple-presets-per-file support (maybe) */
 
--- a/src/paranormal/presets.h	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/paranormal/presets.h	Wed Sep 26 17:55:00 2007 -0500
@@ -1,3 +1,22 @@
+/*
+ * paranormal: iterated pipeline-driven visualization plugin
+ * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
+ * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.com>
+ *
+ * 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; under version 2 of the License.
+ *
+ * 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
+ */
+
 #ifndef _PRESETS_H
 #define _PRESETS_H
 
--- a/src/paranormal/wave.c	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/paranormal/wave.c	Wed Sep 26 17:55:00 2007 -0500
@@ -1,3 +1,22 @@
+/*
+ * paranormal: iterated pipeline-driven visualization plugin
+ * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
+ * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.com>
+ *
+ * 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; under version 2 of the License.
+ *
+ * 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
+ */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
--- a/src/paranormal/xform.c	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/paranormal/xform.c	Wed Sep 26 17:55:00 2007 -0500
@@ -1,3 +1,22 @@
+/*
+ * paranormal: iterated pipeline-driven visualization plugin
+ * Copyright (c) 2006, 2007 William Pitcock <nenolod@dereferenced.org>
+ * Portions copyright (c) 2001 Jamie Gennis <jgennis@mindspring.com>
+ *
+ * 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; under version 2 of the License.
+ *
+ * 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
+ */
+
 /* FIXME: allow for only using an xform on part of the img? */
 /* FIXME: perhaps combine these into a single vector field
    so that only 1 apply_xform needs to be done for as many
--- a/src/sun/Makefile	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/sun/Makefile	Wed Sep 26 17:55:00 2007 -0500
@@ -1,19 +1,17 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
-
-sunsources =	sun.c	    \
-		audio.c	    \
-		convert.c   \
-		mixer.c	    \
-		configure.c \
-		about.c
+SRCS =	sun.c	    \
+	audio.c	    \
+	convert.c   \
+	mixer.c	    \
+	configure.c \
+	about.c
 
-LIBDIR = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
-OBJECTIVE_LIBS = libsun$(SHARED_SUFFIX)
+PLUGIN = sun$(PLUGIN_SUFFIX)
+plugindir = audacious/$(OUTPUT_PLUGIN_DIR)
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
-LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
-SOURCES= $(sunsources)
-OBJECTS= ${SOURCES:.c=.o}
+include ../../buildsys.mk
+include ../../extra.mk
 
-include ../../mk/objective.mk
+CFLAGS += $(PLUGIN_CFLAGS)
+CPPFLAGS += $(PLUGIN_CPPFLAGS) $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
+LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
+
--- a/src/tonegen/Makefile	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/tonegen/Makefile	Wed Sep 26 17:55:00 2007 -0500
@@ -6,6 +6,8 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${LIBMOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../..
+
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../..
+
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
--- a/src/voice_removal/voice_removal.c	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/voice_removal/voice_removal.c	Wed Sep 26 17:55:00 2007 -0500
@@ -26,13 +26,11 @@
 
 #include "../../config.h"
 
-#define PLUGIN_NAME "voice_removal " PACKAGE_VERSION
-
 static int apply_effect (gpointer *d, gint length, AFormat afmt,
 			gint srate, gint nch);
 
 static EffectPlugin xmms_plugin = {
-	.description = PLUGIN_NAME,
+	.description = "Voice Removal Plugin",
 	.mod_samples = apply_effect,
 };
 
--- a/src/vtx/Makefile	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/vtx/Makefile	Wed Sep 26 17:55:00 2007 -0500
@@ -12,6 +12,6 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${LIBMOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../.. -I.
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../.. -I.
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
--- a/src/wav/Makefile	Wed Sep 26 15:02:18 2007 +0200
+++ b/src/wav/Makefile	Wed Sep 26 17:55:00 2007 -0500
@@ -7,6 +7,6 @@
 
 include ../../buildsys.mk
 
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../.. 
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${DBUS_CFLAGS} -I../../intl -I../.. 
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${MOWGLI_LIBS} ${SNDFILE_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}