# HG changeset patch
# User nenolod
# Date 1161743150 25200
# Node ID 5745352e0c8876c8b5898dc920bc4bfdf6a2556c
# Parent  6855fee890ff355c10df4534ed2c5646cd4b6da3
[svn] - hey, this compiles now. neat :P

diff -r 6855fee890ff -r 5745352e0c88 ChangeLog
--- a/ChangeLog	Tue Oct 24 19:13:48 2006 -0700
+++ b/ChangeLog	Tue Oct 24 19:25:50 2006 -0700
@@ -1,3 +1,12 @@
+2006-10-25 02:13:48 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [220]
+  - autoconf support for wavpack plugin
+  
+  trunk/configure.ac   |   24 ++++++++++++++++++++++++
+  trunk/mk/rules.mk.in |    2 ++
+  2 files changed, 26 insertions(+)
+
+
 2006-10-25 02:03:53 +0000  William Pitcock <nenolod@nenolod.net>
   revision [218]
   - wavpack input plugin -- under construction
diff -r 6855fee890ff -r 5745352e0c88 src/wavpack/Makefile
--- a/src/wavpack/Makefile	Tue Oct 24 19:13:48 2006 -0700
+++ b/src/wavpack/Makefile	Tue Oct 24 19:25:50 2006 -0700
@@ -7,9 +7,9 @@
 
 SOURCES = tags.cxx ui.cxx libwavpack.cxx
 
-LIBADD = -L/usr/local/lib
+LIBADD = -L/usr/local/lib $(WAVPACK_LIBS)
 
-CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../..
+CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(WAVPACK_CFLAGS) -I../../intl -I../..
 
 OBJECTS = ${SOURCES:.cxx=.o}
 
diff -r 6855fee890ff -r 5745352e0c88 src/wavpack/libwavpack.cxx
--- a/src/wavpack/libwavpack.cxx	Tue Oct 24 19:13:48 2006 -0700
+++ b/src/wavpack/libwavpack.cxx	Tue Oct 24 19:25:50 2006 -0700
@@ -6,6 +6,7 @@
 #include <wavpack/wputils.h>
 extern "C" {
 #include <audacious/plugin.h>
+#include <audacious/output.h>
 #include <audacious/configdb.h>
 #include <audacious/titlestring.h>
 #include <audacious/util.h>
@@ -14,7 +15,6 @@
 #include <gtk/gtk.h>
 #include <iconv.h>
 #include <math.h>
-#include "equalizer.h"
 #include "tags.h"
 #ifndef M_LN10
 #define M_LN10   2.3025850929940456840179914546843642
@@ -140,9 +140,11 @@
         for (int i = 0; i < num_samples * num_channels; i++) {
             output[i] = input[i];
         }
-        produce_audio(mod->output->get_output_time(), FMT_S16_LE, 
-		sample_rate, num_channels, output, 
-		num_samples * num_channels * sizeof(int16_t));
+        produce_audio(mod->output->output_time(), FMT_S16_LE, 
+		num_channels, 
+		num_samples * num_channels * sizeof(int16_t),
+		output,
+		NULL);
     }
 };
 
diff -r 6855fee890ff -r 5745352e0c88 src/wavpack/ui.cxx
--- a/src/wavpack/ui.cxx	Tue Oct 24 19:13:48 2006 -0700
+++ b/src/wavpack/ui.cxx	Tue Oct 24 19:25:50 2006 -0700
@@ -134,7 +134,7 @@
         GtkWidget *table, *bbox, *cancel_button;
         GtkWidget *save_button, *remove_button;
 
-        window = gtk_window_new(GTK_WINDOW_DIALOG);
+        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
         gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
         gtk_signal_connect(GTK_OBJECT(window), "destroy",
                            GTK_SIGNAL_FUNC(gtk_widget_destroyed), &window);
@@ -460,7 +460,7 @@
         return;
     }
 
-    wv_configurewin = gtk_window_new(GTK_WINDOW_DIALOG);
+    wv_configurewin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
     gtk_signal_connect(GTK_OBJECT(wv_configurewin), "destroy",
                        GTK_SIGNAL_FUNC(gtk_widget_destroyed),
                        &wv_configurewin);