# HG changeset patch
# User nenolod
# Date 1158570170 25200
# Node ID 0ad4849f62193ece479aec3f07ef1488c080aaf1
# Parent  088092a52fea12ae387e93c62df1e182c682c4c6
[svn] - the first pass missed some libaudacious references, this fixes them

diff -r 088092a52fea -r 0ad4849f6219 ChangeLog
--- a/ChangeLog	Mon Sep 18 01:35:25 2006 -0700
+++ b/ChangeLog	Mon Sep 18 02:02:50 2006 -0700
@@ -1,3 +1,73 @@
+2006-09-18 08:35:25 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [6]
+  - move from (internal) libaudacious/ include path to audacious/ include path
+  
+
+  Changes:        Modified:
+  +1 -1           trunk/src/Container/m3u/m3u.c  
+  +1 -1           trunk/src/Container/pls/pls.c  
+  +2 -2           trunk/src/Effect/audiocompress/audacious-glue.c  
+  +1 -1           trunk/src/Effect/stereo_plugin/stereo.c  
+  +1 -1           trunk/src/General/lirc/lirc.c  
+  +1 -1           trunk/src/General/notify/notify.c  
+  +2 -2           trunk/src/General/scrobbler/configure.c  
+  +2 -2           trunk/src/General/scrobbler/gtkstuff.c  
+  +3 -3           trunk/src/General/song_change/song_change.c  
+  +2 -2           trunk/src/Input/aac/src/mp4_utils.c  
+  +2 -2           trunk/src/Input/adplug/adplug-xmms.cc  
+  +2 -2           trunk/src/Input/amidi-plug/amidi-plug.h  
+  +1 -1           trunk/src/Input/amidi-plug/i_configure.c  
+  +1 -1           trunk/src/Input/amidi-plug/i_midi.h  
+  +1 -1           trunk/src/Input/console/Audacious_Config.cxx  
+  +2 -2           trunk/src/Input/console/Audacious_Driver.cxx  
+  +1 -1           trunk/src/Input/console/Vfs_File.cxx  
+  +1 -1           trunk/src/Input/console/abstract_file.h  
+  +4 -4           trunk/src/Input/flac/plugin.c  
+  +1 -1           trunk/src/Input/modplug/gui/main.cxx  
+  +2 -2           trunk/src/Input/modplug/modplugbmp.cxx  
+  +3 -3           trunk/src/Input/mpg123/fileinfo.c  
+  +4 -4           trunk/src/Input/mpg123/mpg123.c  
+  +4 -4           trunk/src/Input/musepack/libmpc.h  
+  +1 -1           trunk/src/Input/sexypsf/Misc.c  
+  +3 -3           trunk/src/Input/sexypsf/xmms.c  
+  +1 -1           trunk/src/Input/sid/xs_config.c  
+  +1 -1           trunk/src/Input/sid/xs_title.c  
+  +1 -1           trunk/src/Input/timidity/libtimidity/common.c  
+  +1 -1           trunk/src/Input/timidity/libtimidity/instrum.c  
+  +1 -1           trunk/src/Input/timidity/libtimidity/mix.c  
+  +1 -1           trunk/src/Input/timidity/libtimidity/playmidi.c  
+  +1 -1           trunk/src/Input/timidity/libtimidity/readmidi.c  
+  +1 -1           trunk/src/Input/timidity/libtimidity/resample.c  
+  +1 -1           trunk/src/Input/timidity/libtimidity/tables.c  
+  +1 -1           trunk/src/Input/timidity/libtimidity/timidity.c  
+  +1 -1           trunk/src/Input/timidity/libtimidity/timidity.h  
+  +4 -4           trunk/src/Input/timidity/src/xmms-timidity.c  
+  +1 -1           trunk/src/Input/tonegen/tonegen.c  
+  +4 -4           trunk/src/Input/vorbis/configure.c  
+  +1 -1           trunk/src/Input/vorbis/http.c  
+  +3 -3           trunk/src/Input/vorbis/vorbis.c  
+  +1 -1           trunk/src/Input/vorbis/vorbis.h  
+  +1 -1           trunk/src/Input/wma/libffwma/file.c  
+  +3 -3           trunk/src/Input/wma/wma.c  
+  +1 -1           trunk/src/Output/CoreAudio/about.c  
+  +1 -1           trunk/src/Output/CoreAudio/audio.c  
+  +1 -1           trunk/src/Output/CoreAudio/configure.c  
+  +1 -1           trunk/src/Output/CoreAudio/init.c  
+  +1 -1           trunk/src/Output/arts/arts.c  
+  +1 -1           trunk/src/Output/arts/arts.h  
+  +5 -5           trunk/src/Output/disk_writer/disk_writer.c  
+  +1 -1           trunk/src/Output/jack/configure.c  
+  +2 -2           trunk/src/Output/jack/jack.c  
+  +2 -2           trunk/src/Output/pulse_audio/pulse_audio.c  
+  +1 -1           trunk/src/Output/sun/about.c  
+  +1 -1           trunk/src/Output/sun/audio.c  
+  +2 -2           trunk/src/Output/sun/configure.c  
+  +1 -1           trunk/src/Output/sun/sun.c  
+  +1 -1           trunk/src/Output/sun/sun.h  
+  +2 -2           trunk/src/Visualization/blur_scope/blur_scope.c  
+  +1 -1           trunk/src/Visualization/blur_scope/config.c  
+
+
 2006-09-18 08:21:56 +0000  William Pitcock <nenolod@nenolod.net>
   revision [4]
   - denote the split in the changelog
diff -r 088092a52fea -r 0ad4849f6219 src/General/scrobbler/xmms_scrobbler.c
--- a/src/General/scrobbler/xmms_scrobbler.c	Mon Sep 18 01:35:25 2006 -0700
+++ b/src/General/scrobbler/xmms_scrobbler.c	Mon Sep 18 02:02:50 2006 -0700
@@ -9,8 +9,8 @@
 #include <audacious/plugin.h>
 #include <audacious/prefswin.h>
 #include <audacious/playlist.h>
-#include <libaudacious/configdb.h>
-#include <libaudacious/beepctrl.h>
+#include <audacious/configdb.h>
+#include <audacious/beepctrl.h>
 
 #include <unistd.h>
 #include <stdio.h>
diff -r 088092a52fea -r 0ad4849f6219 src/Input/aac/src/libmp4.c
--- a/src/Input/aac/src/libmp4.c	Mon Sep 18 01:35:25 2006 -0700
+++ b/src/Input/aac/src/libmp4.c	Mon Sep 18 02:02:50 2006 -0700
@@ -9,9 +9,9 @@
 
 #include <audacious/plugin.h>
 #include <audacious/output.h>
-#include <libaudacious/util.h>
-#include <libaudacious/titlestring.h>
-#include <libaudacious/vfs.h>
+#include <audacious/util.h>
+#include <audacious/titlestring.h>
+#include <audacious/vfs.h>
 
 #define MP4_VERSION	VERSION
 
diff -r 088092a52fea -r 0ad4849f6219 src/Input/cdaudio/cdaudio.c
--- a/src/Input/cdaudio/cdaudio.c	Mon Sep 18 01:35:25 2006 -0700
+++ b/src/Input/cdaudio/cdaudio.c	Mon Sep 18 02:02:50 2006 -0700
@@ -36,9 +36,9 @@
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 
-#include <libaudacious/configdb.h>
-#include <libaudacious/util.h>
-#include <libaudacious/titlestring.h>
+#include <audacious/configdb.h>
+#include <audacious/util.h>
+#include <audacious/titlestring.h>
 #include "audacious/output.h"
 
 #ifdef CDROMSTOP
diff -r 088092a52fea -r 0ad4849f6219 src/Input/cdaudio/configure.c
--- a/src/Input/cdaudio/configure.c	Mon Sep 18 01:35:25 2006 -0700
+++ b/src/Input/cdaudio/configure.c	Mon Sep 18 02:02:50 2006 -0700
@@ -31,8 +31,8 @@
 #include <errno.h>
 #include <sys/stat.h>
 
-#include <libaudacious/configdb.h>
-#include <libaudacious/titlestring.h>
+#include <audacious/configdb.h>
+#include <audacious/titlestring.h>
 
 
 #define GET_TB(b) gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b))
diff -r 088092a52fea -r 0ad4849f6219 src/Input/flac/configure.c
--- a/src/Input/flac/configure.c	Mon Sep 18 01:35:25 2006 -0700
+++ b/src/Input/flac/configure.c	Mon Sep 18 02:02:50 2006 -0700
@@ -27,10 +27,10 @@
 #include <gtk/gtk.h>
 #include <math.h>
 
-#include <libaudacious/configdb.h>
-#include <libaudacious/dirbrowser.h>
-#include <libaudacious/titlestring.h>
-#include <libaudacious/util.h>
+#include <audacious/configdb.h>
+#include <audacious/dirbrowser.h>
+#include <audacious/titlestring.h>
+#include <audacious/util.h>
 #include <audacious/plugin.h>
 
 #include "plugin_common/locale_hack.h"
diff -r 088092a52fea -r 0ad4849f6219 src/Input/mpg123/configure.c
--- a/src/Input/mpg123/configure.c	Mon Sep 18 01:35:25 2006 -0700
+++ b/src/Input/mpg123/configure.c	Mon Sep 18 02:02:50 2006 -0700
@@ -8,9 +8,9 @@
 #include <string.h>
 #include <math.h>
 
-#include <libaudacious/configdb.h>
-#include <libaudacious/dirbrowser.h>
-#include <libaudacious/titlestring.h>
+#include <audacious/configdb.h>
+#include <audacious/dirbrowser.h>
+#include <audacious/titlestring.h>
 
 
 static GtkWidget *mpgdec_configurewin = NULL;
diff -r 088092a52fea -r 0ad4849f6219 src/Input/vorbis/fileinfo.c
--- a/src/Input/vorbis/fileinfo.c	Mon Sep 18 01:35:25 2006 -0700
+++ b/src/Input/vorbis/fileinfo.c	Mon Sep 18 02:02:50 2006 -0700
@@ -39,8 +39,8 @@
 #include <unistd.h>
 
 #include "audacious/util.h"
-#include <libaudacious/util.h>
-#include <libaudacious/vfs.h>
+#include <audacious/util.h>
+#include <audacious/vfs.h>
 
 #include "vorbis.h"
 #include "vcedit.h"
diff -r 088092a52fea -r 0ad4849f6219 src/Input/wav/wav-sndfile.c
--- a/src/Input/wav/wav-sndfile.c	Mon Sep 18 01:35:25 2006 -0700
+++ b/src/Input/wav/wav-sndfile.c	Mon Sep 18 02:02:50 2006 -0700
@@ -25,8 +25,8 @@
 #include <math.h>
 #include <stdio.h>
 
-#include <libaudacious/util.h>
-#include <libaudacious/titlestring.h>
+#include <audacious/util.h>
+#include <audacious/titlestring.h>
 #include "audacious/output.h"
 #include "wav-sndfile.h"
 
diff -r 088092a52fea -r 0ad4849f6219 src/Input/wav/wav.c
--- a/src/Input/wav/wav.c	Mon Sep 18 01:35:25 2006 -0700
+++ b/src/Input/wav/wav.c	Mon Sep 18 02:02:50 2006 -0700
@@ -25,8 +25,8 @@
 #include <glib/gi18n.h>
 #include <string.h>
 
-#include <libaudacious/util.h>
-#include <libaudacious/titlestring.h>
+#include <audacious/util.h>
+#include <audacious/titlestring.h>
 #include "audacious/output.h"
 
 
diff -r 088092a52fea -r 0ad4849f6219 src/Output/OSS/configure.c
--- a/src/Output/OSS/configure.c	Mon Sep 18 01:35:25 2006 -0700
+++ b/src/Output/OSS/configure.c	Mon Sep 18 02:02:50 2006 -0700
@@ -27,8 +27,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <libaudacious/configdb.h>
-#include <libaudacious/vfs.h>
+#include <audacious/configdb.h>
+#include <audacious/vfs.h>
 
 
 static GtkWidget *configure_win = NULL;
diff -r 088092a52fea -r 0ad4849f6219 src/Output/alsa/alsa.h
--- a/src/Output/alsa/alsa.h	Mon Sep 18 01:35:25 2006 -0700
+++ b/src/Output/alsa/alsa.h	Mon Sep 18 02:02:50 2006 -0700
@@ -23,8 +23,8 @@
 
 #include "config.h"
 
-#include <libaudacious/util.h>
-#include <libaudacious/configdb.h>
+#include <audacious/util.h>
+#include <audacious/configdb.h>
 #include <audacious/main.h>
 #include <audacious/plugin.h>
 #include <glib/gi18n.h>
diff -r 088092a52fea -r 0ad4849f6219 src/Output/esd/mixer.c
--- a/src/Output/esd/mixer.c	Mon Sep 18 01:35:25 2006 -0700
+++ b/src/Output/esd/mixer.c	Mon Sep 18 02:02:50 2006 -0700
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <esd.h>
 
-#include <libaudacious/configdb.h>
+#include <audacious/configdb.h>
 
 #include <unistd.h>
 #include <fcntl.h>
@@ -45,7 +45,7 @@
 # define OSS_AVAILABLE FALSE
 #endif
 
-#include <libaudacious/util.h>
+#include <audacious/util.h>
 
 #define QUERY_PLAYER_ID_ATTEMPTS 5