Mercurial > audlegacy-plugins

changeset 2580:e623cf850e41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branch merge
author Tomasz Mon <desowin@gmail.com>
date Mon, 19 May 2008 18:07:28 +0200
parents 8fba3fbf1a0f (current diff) 09879415c666 (diff)
children 6a0755e8c1b3
files
diffstat 85 files changed, 63 insertions(+), 102 deletions(-) [+]
line wrap: on
line diff
--- a/src/CoreAudio/about.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/CoreAudio/about.c	Mon May 19 18:07:28 2008 +0200
@@ -16,7 +16,6 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 #include "coreaudio.h"
-#include <audacious/util.h>
 
 void osx_about(void)
 {
--- a/src/CoreAudio/audio.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/CoreAudio/audio.c	Mon May 19 18:07:28 2008 +0200
@@ -18,7 +18,6 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 #include "coreaudio.h"
-#include <audacious/util.h>
 #include <errno.h>
 #include <CoreAudio/CoreAudio.h>
 
--- a/src/OSS/about.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/OSS/about.c	Mon May 19 18:07:28 2008 +0200
@@ -25,7 +25,6 @@
 #include <audacious/i18n.h>
 #include <gtk/gtk.h>
 
-#include <audacious/util.h>
 
 
 void
--- a/src/OSS/audio.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/OSS/audio.c	Mon May 19 18:07:28 2008 +0200
@@ -22,7 +22,6 @@
 extern void close_mixer_device();
 
 #include <glib.h>
-#include <audacious/util.h>
 #include <string.h>
 
 #include <unistd.h>
--- a/src/OSS4/about.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/OSS4/about.c	Mon May 19 18:07:28 2008 +0200
@@ -28,7 +28,6 @@
 #include <audacious/i18n.h>
 #include <gtk/gtk.h>
 
-#include <audacious/util.h>
 
 
 void
--- a/src/OSS4/audio.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/OSS4/audio.c	Mon May 19 18:07:28 2008 +0200
@@ -22,7 +22,6 @@
 extern void close_mixer_device();
 
 #include <glib.h>
-#include <audacious/util.h>
 #include <string.h>
 
 #include <unistd.h>
--- a/src/aac/libmp4.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/aac/libmp4.c	Mon May 19 18:07:28 2008 +0200
@@ -8,9 +8,7 @@
 
 #include <audacious/plugin.h>
 #include <audacious/output.h>
-#include <audacious/util.h>
 #include <audacious/i18n.h>
-#include <audacious/strings.h>
 
 #define MP4_VERSION VERSION
 #define SBR_DEC
--- a/src/aac/mp4_utils.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/aac/mp4_utils.c	Mon May 19 18:07:28 2008 +0200
@@ -10,7 +10,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <audacious/plugin.h>
-#include <audacious/util.h>
 
 const char *mp4AudioNames[]=
   {
--- a/src/adplug/adplug-xmms.cc	Mon May 19 18:05:54 2008 +0200
+++ b/src/adplug/adplug-xmms.cc	Mon May 19 18:07:28 2008 +0200
@@ -34,7 +34,6 @@
 {
 #include <audacious/plugin.h>
 #include <audacious/output.h>
-#include <audacious/util.h>
 }
 
 
--- a/src/alac/plugin.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/alac/plugin.c	Mon May 19 18:07:28 2008 +0200
@@ -47,7 +47,6 @@
 
 #include <audacious/plugin.h>
 #include <audacious/output.h>
-#include <audacious/util.h>
 
 #include "demux.h"
 #include "decomp.h"
--- a/src/alsa/about.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/alsa/about.c	Mon May 19 18:07:28 2008 +0200
@@ -17,7 +17,6 @@
  */
 
 #include "alsa.h"
-#include <audacious/util.h>
 
 void alsa_about(void)
 {
--- a/src/alsa/alsa.h	Mon May 19 18:05:54 2008 +0200
+++ b/src/alsa/alsa.h	Mon May 19 18:07:28 2008 +0200
@@ -25,7 +25,6 @@
 
 #include "config.h"
 
-#include <audacious/util.h>
 #include <audacious/plugin.h>
 #include <audacious/i18n.h>
 
--- a/src/amidi-plug/i_configure.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/amidi-plug/i_configure.c	Mon May 19 18:07:28 2008 +0200
@@ -29,7 +29,6 @@
 #include "i_configure-dummy.h"
 #include "i_utils.h"
 #include <audacious/auddrct.h>
-#include <audacious/util.h>
 
 
 amidiplug_cfg_backend_t * amidiplug_cfg_backend;
--- a/src/aosd/aosd_trigger.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/aosd/aosd_trigger.c	Mon May 19 18:07:28 2008 +0200
@@ -25,7 +25,6 @@
 #include <glib.h>
 #include <audacious/i18n.h>
 #include <audacious/playlist.h>
-#include <audacious/strings.h>
 #include <audacious/hook.h>
 #include <audacious/auddrct.h>
 
--- a/src/arts/arts.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/arts/arts.c	Mon May 19 18:07:28 2008 +0200
@@ -10,7 +10,6 @@
  */
 
 #include "arts.h"
-#include <audacious/util.h>
 
 static void about(void)
 {
--- a/src/audiocompress/audacious-glue.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/audiocompress/audacious-glue.c	Mon May 19 18:07:28 2008 +0200
@@ -10,7 +10,6 @@
 #include <gtk/gtk.h>
 #include <audacious/i18n.h>
 #include <audacious/plugin.h>
-#include <audacious/util.h>
 
 #include "audiocompress_config.h"
 #include "compress.h"
@@ -37,6 +36,7 @@
 static void myPrefs(void);
 static int myModify(gpointer * data, gint length, AFormat fmt,
 		    gint srate, gint nch);
+static void myQueryFormat(AFormat * fmt, gint * rate, gint * nch);
 
 static int inited = 0;
 
@@ -48,6 +48,7 @@
 	.about = myAbout,
 	.configure = myPrefs,
 	.mod_samples = myModify,
+	.query_format = myQueryFormat,
 };
 
 EffectPlugin *audiocompress_eplist[] = { &xmms_plugin, NULL };
@@ -76,6 +77,14 @@
         inited = 0;
 }
 
+void myQueryFormat(AFormat * fmt, gint * rate, gint * nch)
+{
+	if ((*fmt != FMT_S16_NE) ||
+	    (*fmt != FMT_S16_LE && G_BYTE_ORDER == G_LITTLE_ENDIAN) ||
+	    (*fmt != FMT_S16_BE && G_BYTE_ORDER == G_BIG_ENDIAN))
+		*fmt = FMT_S16_NE;
+}
+
 int myModify(gpointer * data, gint length, AFormat fmt, gint srate, gint nch)
 {
 	if (fmt == FMT_S16_NE ||
--- a/src/blur_scope/blur_scope.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/blur_scope/blur_scope.c	Mon May 19 18:07:28 2008 +0200
@@ -26,7 +26,6 @@
 #include <gtk/gtk.h>
 #include <string.h>
 #include <audacious/plugin.h>
-#include <audacious/util.h>
 #include "blur_scope.h"
 #include "bscope_logo.xpm"
 
--- a/src/cdaudio-ng/cdaudio-ng.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/cdaudio-ng/cdaudio-ng.c	Mon May 19 18:07:28 2008 +0200
@@ -49,7 +49,6 @@
 #include <audacious/i18n.h>
 #include <audacious/output.h>
 #include <audacious/ui_plugin_menu.h>
-#include <audacious/util.h>
 
 #include "cdaudio-ng.h"
 #include "configure.h"
--- a/src/console/Audacious_Driver.cxx	Mon May 19 18:05:54 2008 +0200
+++ b/src/console/Audacious_Driver.cxx	Mon May 19 18:07:28 2008 +0200
@@ -13,7 +13,6 @@
 #include <gtk/gtk.h>
 extern "C" {
 #include <audacious/plugin.h>
-#include <audacious/util.h>
 #include <audacious/output.h>
 }
 #include <string.h>
--- a/src/crystalizer/crystalizer.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/crystalizer/crystalizer.c	Mon May 19 18:07:28 2008 +0200
@@ -21,19 +21,20 @@
 
 #include <gtk/gtk.h>
 #include <audacious/i18n.h>
-#include <audacious/util.h>
 #include <audacious/plugin.h>
 
 static void init(void);
 static void configure(void);
 static int mod_samples(gpointer *d, gint length, AFormat afmt, gint srate, gint nch);
+static void query_format(AFormat * fmt, gint * rate, gint * nch);
 
 EffectPlugin crystalizer_ep =
 {
 	.description = "Crystalizer", /* Description */
 	.init = init,
 	.configure = configure,
-	.mod_samples = mod_samples
+	.mod_samples = mod_samples,
+	.query_format = query_format
 };
 
 static GtkWidget *conf_dialog = NULL;
@@ -138,6 +139,14 @@
 	gtk_widget_show(conf_dialog);
 }
 
+static void query_format(AFormat * fmt, gint * rate, gint * nch)
+{
+	if (!(*fmt == FMT_S16_NE ||
+	      (*fmt == FMT_S16_LE && G_BYTE_ORDER == G_LITTLE_ENDIAN) ||
+	      (*fmt == FMT_S16_BE && G_BYTE_ORDER == G_BIG_ENDIAN)))
+		*fmt = FMT_S16_NE;
+}
+
 static int mod_samples(gpointer *d, gint length, AFormat afmt, gint srate, gint nch)
 {
 	gint i;
--- a/src/cue/cuesheet.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/cue/cuesheet.c	Mon May 19 18:07:28 2008 +0200
@@ -25,8 +25,6 @@
 #include <ctype.h>
 #include <audacious/plugin.h>
 #include <audacious/output.h>
-#include <audacious/util.h>
-#include <audacious/strings.h>
 
 #define MAX_CUE_LINE_LENGTH 1000
 #define MAX_CUE_TRACKS 1000
--- a/src/demac/plugin.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/demac/plugin.c	Mon May 19 18:07:28 2008 +0200
@@ -45,7 +45,6 @@
 
 #include <audacious/plugin.h> 
 #include <audacious/output.h> 
-#include <audacious/util.h> 
 
 #include "ape.h"
 #include "apev2.h"
--- a/src/dockalbumart/dockalbumart.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/dockalbumart/dockalbumart.c	Mon May 19 18:07:28 2008 +0200
@@ -28,7 +28,6 @@
 #include <Carbon/Carbon.h>
 
 #include <audacious/plugin.h>
-#include <audacious/util.h>
 
 #include "audacious_player.xpm"
 
--- a/src/echo_plugin/echo.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/echo_plugin/echo.c	Mon May 19 18:07:28 2008 +0200
@@ -11,6 +11,7 @@
 static void init(void);
 static void cleanup(void);
 static int mod_samples(gpointer * d, gint length, AFormat afmt, gint srate, gint nch);
+static void query_format(AFormat * fmt, gint * rate, gint * nch);
 
 #define MAX_SRATE 50000
 #define MAX_CHANNELS 2
@@ -27,6 +28,7 @@
 	.about = echo_about,
 	.configure = echo_configure,
 	.mod_samples = mod_samples,
+	.query_format = query_format,
 };
 
 static gint16 *buffer = NULL;
@@ -59,6 +61,14 @@
 	buffer = NULL;	
 }
 
+static void query_format(AFormat * fmt, gint * rate, gint * nch)
+{
+	if (!(*fmt == FMT_S16_NE ||
+	      (*fmt == FMT_S16_LE && G_BYTE_ORDER == G_LITTLE_ENDIAN) ||
+	      (*fmt == FMT_S16_BE && G_BYTE_ORDER == G_BIG_ENDIAN)))
+		*fmt = FMT_S16_NE;
+}
+
 static int mod_samples(gpointer * d, gint length, AFormat afmt, gint srate, gint nch)
 {
 	gint i, in, out, buf, r_ofs, fb_div;
--- a/src/echo_plugin/gui.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/echo_plugin/gui.c	Mon May 19 18:07:28 2008 +0200
@@ -3,7 +3,6 @@
 #include <gtk/gtk.h>
 #include <audacious/plugin.h>
 #include <audacious/i18n.h>
-#include <audacious/util.h>
 #include "echo.h"
 
 static const char *echo_about_text =
--- a/src/esd/about.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/esd/about.c	Mon May 19 18:07:28 2008 +0200
@@ -20,7 +20,6 @@
 #include <audacious/i18n.h>
 #include <gtk/gtk.h>
 
-#include <audacious/util.h>
 
 
 void
--- a/src/esd/audio.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/esd/audio.c	Mon May 19 18:07:28 2008 +0200
@@ -25,7 +25,6 @@
 #include <esd.h>
 
 #include <unistd.h>
-#include <audacious/util.h>
 
 #include "esdout.h"
 
--- a/src/esd/mixer.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/esd/mixer.c	Mon May 19 18:07:28 2008 +0200
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <esd.h>
 #include <audacious/plugin.h>
-#include <audacious/util.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/types.h>
--- a/src/evdev-plug/ed_internals.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/evdev-plug/ed_internals.c	Mon May 19 18:07:28 2008 +0200
@@ -24,7 +24,6 @@
 #include "ed_bindings_store.h"
 #include "ed_common.h"
 
-#include <audacious/util.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <linux/input.h>
--- a/src/filewriter/filewriter.h	Mon May 19 18:05:54 2008 +0200
+++ b/src/filewriter/filewriter.h	Mon May 19 18:07:28 2008 +0200
@@ -31,7 +31,6 @@
 
 #include <audacious/plugin.h>
 #include <audacious/i18n.h>
-#include <audacious/util.h>
 
 struct format_info { 
     AFormat format;
--- a/src/flacng/plugin.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/flacng/plugin.c	Mon May 19 18:07:28 2008 +0200
@@ -19,7 +19,6 @@
 /* #define FLACNG_DEBUG */
 
 #include "flacng.h"
-#include <audacious/util.h>
 #include <audacious/output.h>
 #include <audacious/i18n.h>
 #include "tools.h"
--- a/src/gnomeshortcuts/gnomeshortcuts.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/gnomeshortcuts/gnomeshortcuts.c	Mon May 19 18:07:28 2008 +0200
@@ -32,7 +32,6 @@
 #include <audacious/auddrct.h>
 
 #include <audacious/i18n.h>
-#include <audacious/util.h>
 
 
 static void init (void);
--- a/src/hotkey/gui.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/hotkey/gui.c	Mon May 19 18:07:28 2008 +0200
@@ -39,8 +39,8 @@
 #include <gdk/gdkx.h>
 #include <gdk/gdkkeysyms.h>
 
+#include <audacious/plugin.h>
 #include <audacious/i18n.h>
-#include <audacious/util.h>
 
 #include "plugin.h"
 #include "gui.h"
@@ -621,7 +621,7 @@
 		HotkeyConfiguration * old;
 		old = hotkey;
 		hotkey = hotkey->next;
-		free(old);
+		g_free(old);
 	}
 	plugin_cfg->first.next = NULL;
 	plugin_cfg->first.key = 0;
@@ -633,8 +633,7 @@
 	{
 		if (controls->hotkey.key) {
 			if (hotkey->key) {
-				hotkey->next = (HotkeyConfiguration*)
-					malloc(sizeof (HotkeyConfiguration));
+				hotkey->next = g_new(HotkeyConfiguration, 1);
 				hotkey = hotkey->next;
 				hotkey->next = NULL;
 			}
--- a/src/jack/jack.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/jack/jack.c	Mon May 19 18:07:28 2008 +0200
@@ -7,7 +7,6 @@
  */
 
 #include <audacious/plugin.h>
-#include <audacious/util.h>
 #include <dlfcn.h>
 #include <gtk/gtk.h>
 #include <audacious/i18n.h>
--- a/src/m3u/m3u.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/m3u/m3u.c	Mon May 19 18:07:28 2008 +0200
@@ -34,8 +34,6 @@
 #include <sys/errno.h>
 
 #include <audacious/plugin.h>
-#include <audacious/util.h>
-#include <audacious/strings.h>
 
 static void
 parse_extm3u_info(const gchar * info, gchar ** title, gint * length)
--- a/src/madplug/input.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/madplug/input.c	Mon May 19 18:07:28 2008 +0200
@@ -55,7 +55,6 @@
 
 #include <fcntl.h>
 #include <errno.h>
-#include <audacious/util.h>
 
 #include "input.h"
 #include "replaygain.h"
--- a/src/madplug/plugin.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/madplug/plugin.c	Mon May 19 18:07:28 2008 +0200
@@ -28,7 +28,6 @@
 #include <math.h>
 
 #include <gtk/gtk.h>
-#include <audacious/util.h>
 #include <stdarg.h>
 #include <fcntl.h>
 #include <sys/stat.h>
--- a/src/madplug/plugin.h	Mon May 19 18:05:54 2008 +0200
+++ b/src/madplug/plugin.h	Mon May 19 18:07:28 2008 +0200
@@ -37,8 +37,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <audacious/plugin.h>
-#include <audacious/util.h>
-#include <audacious/strings.h>
 #include <audacious/i18n.h>
 #include <audacious/id3tag.h>
 #include <mad.h>
--- a/src/madplug/tuple.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/madplug/tuple.c	Mon May 19 18:07:28 2008 +0200
@@ -31,7 +31,6 @@
 #include <glib.h> 
 #include <glib/gprintf.h>
 
-#include <audacious/util.h>
 #include <audacious/plugin.h>
 #include <audacious/id3tag.h>
 
--- a/src/metronom/metronom.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/metronom/metronom.c	Mon May 19 18:07:28 2008 +0200
@@ -20,7 +20,6 @@
 #include "config.h"
 #include <audacious/plugin.h>
 #include <audacious/output.h>
-#include <audacious/util.h>
 #include <audacious/i18n.h>
 #include <glib.h>
 #include <string.h>
--- a/src/modplug/gui/main.cxx	Mon May 19 18:05:54 2008 +0200
+++ b/src/modplug/gui/main.cxx	Mon May 19 18:07:28 2008 +0200
@@ -17,8 +17,6 @@
 #include <gtk/gtk.h>
 #include <libintl.h>
 extern "C" {
-#include <audacious/util.h>
-#include <audacious/strings.h>
 }
 
 #include "interface.h"
--- a/src/modplug/modplugbmp.cxx	Mon May 19 18:05:54 2008 +0200
+++ b/src/modplug/modplugbmp.cxx	Mon May 19 18:07:28 2008 +0200
@@ -16,7 +16,6 @@
 #include "archive/open.h"
 extern "C" {
 #include <audacious/output.h>
-#include <audacious/strings.h>
 }
 
 static char* format_and_free_ti( Tuple* ti, int* length )
--- a/src/mtp_up/mtp.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/mtp_up/mtp.c	Mon May 19 18:07:28 2008 +0200
@@ -26,7 +26,6 @@
 #include <audacious/i18n.h>
 
 #include <gtk/gtk.h>
-#include <audacious/util.h>
 #include "filetype.h"
 
 #define DEBUG 1
--- a/src/musepack/libmpc.h	Mon May 19 18:05:54 2008 +0200
+++ b/src/musepack/libmpc.h	Mon May 19 18:07:28 2008 +0200
@@ -8,7 +8,6 @@
 {
 #include <audacious/plugin.h>
 #include <audacious/output.h>
-#include <audacious/util.h>
 #include <audacious/i18n.h>
 }
 
--- a/src/null/null.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/null/null.c	Mon May 19 18:07:28 2008 +0200
@@ -24,7 +24,6 @@
 #include <gtk/gtk.h>
 #include <audacious/plugin.h>
 #include <audacious/i18n.h>
-#include <audacious/util.h>
 
 static GTimer *timer;
 static gulong offset_time, written;
--- a/src/paranormal-ng/plugin.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/paranormal-ng/plugin.c	Mon May 19 18:07:28 2008 +0200
@@ -38,7 +38,6 @@
 
 #include <gtk/gtk.h>
 #include <audacious/plugin.h>
-#include <audacious/util.h>
 #include <SDL/SDL.h>
 #include <SDL/SDL_thread.h>
 
--- a/src/paranormal/plugin.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/paranormal/plugin.c	Mon May 19 18:07:28 2008 +0200
@@ -38,7 +38,6 @@
 
 #include <gtk/gtk.h>
 #include <audacious/plugin.h>
-#include <audacious/util.h>
 #include <SDL.h>
 #include <SDL_thread.h>
 
--- a/src/pls/pls.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/pls/pls.c	Mon May 19 18:07:28 2008 +0200
@@ -33,9 +33,7 @@
 #include <sys/stat.h>
 #include <sys/errno.h>
 
-#include <audacious/util.h>
 #include <audacious/plugin.h>
-#include <audacious/strings.h>
 
 static void
 playlist_load_pls(const gchar * filename, gint pos)
--- a/src/projectm/main.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/projectm/main.c	Mon May 19 18:07:28 2008 +0200
@@ -35,7 +35,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <gtk/gtk.h>
-#include <audacious/util.h>
 #include <SDL/SDL.h>
 #include <SDL/SDL_thread.h>
 #include <GL/gl.h>
--- a/src/pulse_audio/pulse_audio.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/pulse_audio/pulse_audio.c	Mon May 19 18:07:28 2008 +0200
@@ -28,7 +28,6 @@
 
 #include <gtk/gtk.h>
 #include <audacious/plugin.h>
-#include <audacious/util.h>
 #include <audacious/i18n.h>
 
 #include <pulse/pulseaudio.h>
--- a/src/rootvis/rootvis.h	Mon May 19 18:05:54 2008 +0200
+++ b/src/rootvis/rootvis.h	Mon May 19 18:07:28 2008 +0200
@@ -4,7 +4,6 @@
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
 #include <audacious/plugin.h>
-#include <audacious/util.h>
 
 
 /* following values are used if there is no user configuration */
--- a/src/scrobbler/configure.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/scrobbler/configure.c	Mon May 19 18:07:28 2008 +0200
@@ -2,7 +2,6 @@
 
 #include <config.h>
 
-#include <audacious/util.h>
 #include <audacious/plugin.h>
 
 #include <sys/types.h>
--- a/src/scrobbler/gerpok.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/scrobbler/gerpok.c	Mon May 19 18:07:28 2008 +0200
@@ -14,7 +14,6 @@
 #include <glib.h>
 
 #include <audacious/plugin.h>
-#include <audacious/util.h>
 
 #define SCROBBLER_HS_URL "http://post.gerpok.com"
 #define SCROBBLER_CLI_ID "aud"
--- a/src/scrobbler/gtkstuff.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/scrobbler/gtkstuff.c	Mon May 19 18:07:28 2008 +0200
@@ -1,4 +1,3 @@
-#include <audacious/util.h>
 
 #include <glib.h>
 #include <audacious/i18n.h>
--- a/src/scrobbler/plugin.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/scrobbler/plugin.c	Mon May 19 18:07:28 2008 +0200
@@ -10,7 +10,6 @@
 #include <audacious/plugin.h>
 #include <audacious/ui_preferences.h>
 #include <audacious/hook.h>
-#include <audacious/strings.h>
 
 #include <unistd.h>
 #include <stdio.h>
--- a/src/scrobbler/scrobbler.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/scrobbler/scrobbler.c	Mon May 19 18:07:28 2008 +0200
@@ -13,7 +13,6 @@
 #include <glib.h>
 
 #include <audacious/plugin.h>
-#include <audacious/util.h>
 
 #define SCROBBLER_HS_URL "http://post.audioscrobbler.com"
 #define SCROBBLER_CLI_ID "aud"
--- a/src/sexypsf/plugin.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/sexypsf/plugin.c	Mon May 19 18:07:28 2008 +0200
@@ -18,7 +18,6 @@
 
 #include <audacious/plugin.h>
 #include <audacious/output.h>
-#include <audacious/util.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
--- a/src/shnplug/gtk.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/shnplug/gtk.c	Mon May 19 18:07:28 2008 +0200
@@ -22,7 +22,6 @@
 
 #include <stdlib.h>
 #include <glib.h>
-#include <audacious/util.h>
 #include "shorten.h"
 
 #undef XMMS_SHN_LOAD_TEXTFILES
--- a/src/shnplug/seek.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/shnplug/seek.c	Mon May 19 18:07:28 2008 +0200
@@ -22,7 +22,6 @@
 
 #include <stdlib.h>
 #include <glib.h>
-#include <audacious/util.h>
 #include "shorten.h"
 
 #ifdef HAVE_CONFIG_H
--- a/src/shnplug/shn.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/shnplug/shn.c	Mon May 19 18:07:28 2008 +0200
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <math.h>
 #include <glib.h>
-#include <audacious/util.h>
 #include "shorten.h"
 
 #ifdef HAVE_CONFIG_H
--- a/src/sid/xs_stil.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/sid/xs_stil.c	Mon May 19 18:07:28 2008 +0200
@@ -228,7 +228,7 @@
                     if (subEntry < 1) {
                         XS_STILDB_ERR(lineNum, tmpLine,
                             "Number of subEntry (%i) for '%s' is invalid\n",
-                            subEntry, tmnode->filename);
+                            subEntry, tmnode ? tmnode->filename : "");
                         subEntry = 0;
                     }
                 } else {
--- a/src/sid/xs_support.h	Mon May 19 18:05:54 2008 +0200
+++ b/src/sid/xs_support.h	Mon May 19 18:07:28 2008 +0200
@@ -15,7 +15,6 @@
 #ifdef AUDACIOUS_PLUGIN
 #include <audacious/plugin.h>
 #include <audacious/output.h>
-#include <audacious/util.h>
 #else
 #include <xmms/plugin.h>
 #include <xmms/util.h>
--- a/src/sndfile/plugin.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/sndfile/plugin.c	Mon May 19 18:07:28 2008 +0200
@@ -35,7 +35,6 @@
 #include <math.h>
 
 #include <audacious/plugin.h>
-#include <audacious/util.h>
 #include <audacious/i18n.h>
 #include <audacious/output.h>
 #include "plugin.h"
--- a/src/spectrum/spectrum.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/spectrum/spectrum.c	Mon May 19 18:07:28 2008 +0200
@@ -24,7 +24,6 @@
 #include <gtk/gtk.h>
 #include <math.h>
 #include <audacious/plugin.h>
-#include <audacious/util.h>
 #include <audacious/i18n.h>
 
 #include "logo.xpm"
--- a/src/statusicon/si_ui.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/statusicon/si_ui.c	Mon May 19 18:07:28 2008 +0200
@@ -24,7 +24,7 @@
 #include "si_common.h"
 #include "gtktrayicon.h"
 #include <audacious/ui_fileinfopopup.h>
-#include <audacious/util.h>
+#include <audacious/plugin.h>
 #include <audacious/i18n.h>
 #include <glib.h>
 #include <gdk/gdk.h>
--- a/src/stdio/stdio.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/stdio/stdio.c	Mon May 19 18:07:28 2008 +0200
@@ -18,7 +18,6 @@
 
 #include "config.h"
 #include <audacious/plugin.h>
-#include <audacious/strings.h>
 #include <stdio.h>
 
 #include <unistd.h>
--- a/src/stereo_plugin/stereo.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/stereo_plugin/stereo.c	Mon May 19 18:07:28 2008 +0200
@@ -1,7 +1,6 @@
 #include "config.h"
 #include <gtk/gtk.h>
 #include <audacious/i18n.h>
-#include <audacious/util.h>
 #include <audacious/plugin.h>
 
 
@@ -9,6 +8,7 @@
 static void about(void);
 static void configure(void);
 static int mod_samples(gpointer *d, gint length, AFormat afmt, gint srate, gint nch);
+static void query_format(AFormat * fmt, gint * rate, gint * nch);
 
 
 
@@ -18,7 +18,8 @@
 	.init = init,
 	.about = about,
 	.configure = configure,
-	.mod_samples = mod_samples
+	.mod_samples = mod_samples,
+	.query_format = query_format
 };
 
 static const char *about_text = N_("Extra Stereo Plugin\n\n"
@@ -140,6 +141,17 @@
 	gtk_widget_show(conf_dialog);
 }
 
+static void query_format(AFormat * fmt, gint * rate, gint * nch)
+{
+	if (!(*fmt == FMT_S16_NE ||
+	      (*fmt == FMT_S16_LE && G_BYTE_ORDER == G_LITTLE_ENDIAN) ||
+	      (*fmt == FMT_S16_BE && G_BYTE_ORDER == G_BIG_ENDIAN)))
+		*fmt = FMT_S16_NE;
+
+	if (*nch != 2)
+		*nch = 2;
+}
+
 static int mod_samples(gpointer *d, gint length, AFormat afmt, gint srate, gint nch)
 {
 	gint i;
--- a/src/sun/about.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/sun/about.c	Mon May 19 18:07:28 2008 +0200
@@ -20,7 +20,6 @@
 #include <glib.h>
 
 #include "sun.h"
-#include <audacious/util.h>
 #include <audacious/i18n.h>
 
 void sun_about(void)
--- a/src/sun/audio.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/sun/audio.c	Mon May 19 18:07:28 2008 +0200
@@ -20,7 +20,6 @@
 /* FIXME: g_error() is used several places, it will exit xmms */
 
 #include <errno.h>
-#include <audacious/util.h>
 #include "sun.h"
 #include "resample.h"
 
--- a/src/sun/configure.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/sun/configure.c	Mon May 19 18:07:28 2008 +0200
@@ -22,7 +22,6 @@
 #include <errno.h>
 
 #include "sun.h"
-#include <audacious/util.h>
 #include <audacious/i18n.h>
 
 #include "mixer.h"
--- a/src/timidity/xmms-timidity.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/timidity/xmms-timidity.c	Mon May 19 18:07:28 2008 +0200
@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include <audacious/util.h>
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <string.h>
--- a/src/tonegen/tonegen.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/tonegen/tonegen.c	Mon May 19 18:07:28 2008 +0200
@@ -20,7 +20,6 @@
 #include "config.h"
 #include <audacious/plugin.h>
 #include <audacious/output.h>
-#include <audacious/util.h>
 #include <audacious/i18n.h>
 #include <glib.h>
 #include <stdlib.h>
--- a/src/tta/libtta.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/tta/libtta.c	Mon May 19 18:07:28 2008 +0200
@@ -42,9 +42,7 @@
 #include <string.h>
 
 #include <audacious/plugin.h>
-#include <audacious/util.h>
 #include <audacious/output.h>
-#include <audacious/strings.h>
 #include <audacious/i18n.h>
 #include <audacious/id3tag.h>
 
--- a/src/voice_removal/voice_removal.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/voice_removal/voice_removal.c	Mon May 19 18:07:28 2008 +0200
@@ -28,16 +28,29 @@
 
 static int apply_effect (gpointer *d, gint length, AFormat afmt,
 			gint srate, gint nch);
+static void query_format (AFormat *fmt, gint *rate, gint *nch);
 
 static EffectPlugin xmms_plugin = {
 	.description = "Voice Removal Plugin",
 	.mod_samples = apply_effect,
+	.query_format = query_format
 };
 
 EffectPlugin *voice_eplist[] = { &xmms_plugin, NULL };
 
 DECLARE_PLUGIN(voice_removal, NULL, NULL, NULL, NULL, voice_eplist, NULL, NULL, NULL);
 
+static void query_format (AFormat *fmt, gint *rate, gint *nch)
+{
+	if (!((*fmt == FMT_S16_NE) ||
+		(*fmt == FMT_S16_LE && G_BYTE_ORDER == G_LITTLE_ENDIAN) ||
+		(*fmt == FMT_S16_BE && G_BYTE_ORDER == G_BIG_ENDIAN)))
+		*fmt = FMT_S16_NE;
+
+	if (*nch != 2)
+		*nch = 2;
+}
+
 static int apply_effect (gpointer *d, gint length, AFormat afmt,
 			gint srate, gint nch) {
 	int x;
--- a/src/vorbis/configure.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/vorbis/configure.c	Mon May 19 18:07:28 2008 +0200
@@ -8,7 +8,6 @@
 #include <string.h>
 
 #include <audacious/plugin.h>
-#include <audacious/util.h>
 #include <audacious/i18n.h>
 
 extern GMutex *vf_mutex;
--- a/src/vorbis/vcupdate.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/vorbis/vcupdate.c	Mon May 19 18:07:28 2008 +0200
@@ -33,8 +33,6 @@
 #include <unistd.h>
 
 #include <audacious/plugin.h>
-#include <audacious/strings.h>
-#include <audacious/util.h>
 #include <audacious/i18n.h>
 
 #include <mowgli.h>
--- a/src/vorbis/vorbis.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/vorbis/vorbis.c	Mon May 19 18:07:28 2008 +0200
@@ -54,9 +54,7 @@
 
 #include <audacious/plugin.h>
 #include <audacious/output.h>
-#include <audacious/util.h>
 #include <audacious/i18n.h>
-#include <audacious/strings.h>
 
 #include "vorbis.h"
 
--- a/src/vtx/about.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/vtx/about.c	Mon May 19 18:07:28 2008 +0200
@@ -1,7 +1,5 @@
 #include <audacious/plugin.h>
 #include <audacious/output.h>
-#include <audacious/util.h>
-#include <audacious/strings.h>
 #include <audacious/i18n.h>
 
 #include <gtk/gtk.h>
--- a/src/vtx/info.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/vtx/info.c	Mon May 19 18:07:28 2008 +0200
@@ -1,8 +1,6 @@
 #include "ayemu.h"
 #include "vtx.h"
-#include <audacious/util.h>
 #include <audacious/output.h>
-#include <audacious/strings.h>
 #include <audacious/i18n.h>
 
 void vtx_file_info(gchar *filename)
--- a/src/vtx/vtx.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/vtx/vtx.c	Mon May 19 18:07:28 2008 +0200
@@ -19,8 +19,6 @@
 
 #include <audacious/plugin.h>
 #include <audacious/output.h>
-#include <audacious/util.h>
-#include <audacious/strings.h>
 #include <audacious/i18n.h>
 
 #include "vtx.h"
--- a/src/wavpack/libwavpack.cxx	Mon May 19 18:05:54 2008 +0200
+++ b/src/wavpack/libwavpack.cxx	Mon May 19 18:07:28 2008 +0200
@@ -11,7 +11,6 @@
 #include <wavpack/wavpack.h>
 #include <audacious/plugin.h>
 #include <audacious/output.h>
-#include <audacious/util.h>
 }
 #include <glib.h>
 #include <gtk/gtk.h>
--- a/src/wavpack/tags.cxx	Mon May 19 18:05:54 2008 +0200
+++ b/src/wavpack/tags.cxx	Mon May 19 18:07:28 2008 +0200
@@ -4,7 +4,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <wchar.h>
-#include <audacious/util.h>
 #include <audacious/plugin.h>
 #include "tags.h"
 
--- a/src/wavpack/ui.cxx	Mon May 19 18:05:54 2008 +0200
+++ b/src/wavpack/ui.cxx	Mon May 19 18:07:28 2008 +0200
@@ -9,7 +9,6 @@
 extern "C" {
 #include <wavpack/wavpack.h>
 #include <audacious/plugin.h>
-#include <audacious/util.h>
 #include <audacious/i18n.h>
 }
 #include <glib.h>
--- a/src/wma/wma.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/wma/wma.c	Mon May 19 18:07:28 2008 +0200
@@ -37,8 +37,6 @@
 
 #include <audacious/plugin.h>
 #include <audacious/output.h>
-#include <audacious/util.h>
-#include <audacious/strings.h>
 #include <audacious/i18n.h>
 
 #include "avcodec.h"
--- a/src/xspf/xspf.c	Mon May 19 18:05:54 2008 +0200
+++ b/src/xspf/xspf.c	Mon May 19 18:07:28 2008 +0200
@@ -34,8 +34,6 @@
 #include <sys/errno.h>
 
 #include <audacious/plugin.h>
-#include <audacious/util.h>
-#include <audacious/strings.h>
 
 #include <libxml/tree.h>
 #include <libxml/parser.h>