changeset 2717:6884a2144a01 trunk

[svn] - make audacious build again
author nenolod
date Wed, 09 May 2007 15:07:50 -0700
parents 451d3a63f4f7
children 2f8d5c2a5900
files ChangeLog src/audacious/build_stamp.c src/audacious/dbus.c src/audacious/genevent.c src/audacious/main.c src/audacious/output.c src/audacious/playback.c src/audacious/playlist.c src/audacious/ui_fileinfo.c src/audacious/ui_jumptotrack.c src/audacious/ui_main.c src/audacious/ui_preferences.c
diffstat 12 files changed, 17 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed May 09 15:03:50 2007 -0700
+++ b/ChangeLog	Wed May 09 15:07:50 2007 -0700
@@ -1,3 +1,11 @@
+2007-05-09 22:03:50 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [4458]
+  - make widgetcore build again
+  
+  trunk/src/audacious/widgets/Makefile |    1 +
+  1 file changed, 1 insertion(+)
+
+
 2007-05-09 21:58:26 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [4456]
   - some progress towards making audtool build again
--- a/src/audacious/build_stamp.c	Wed May 09 15:03:50 2007 -0700
+++ b/src/audacious/build_stamp.c	Wed May 09 15:07:50 2007 -0700
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070509-4456";
+const gchar *svn_stamp = "20070509-4458";
--- a/src/audacious/dbus.c	Wed May 09 15:03:50 2007 -0700
+++ b/src/audacious/dbus.c	Wed May 09 15:07:50 2007 -0700
@@ -35,7 +35,6 @@
 #include "playlist.h"
 #include "ui_playlist.h"
 #include "ui_preferences.h"
-#include "libaudacious/beepctrl.h"
 #include "memorypool.h"
 #include "titlestring.h"
 #include "ui_jumptotrack.h"
--- a/src/audacious/genevent.c	Wed May 09 15:03:50 2007 -0700
+++ b/src/audacious/genevent.c	Wed May 09 15:07:50 2007 -0700
@@ -43,9 +43,6 @@
 #include <sys/stat.h>
 #include <signal.h>
 
-#include "libaudacious/configdb.h"
-#include "libaudacious/beepctrl.h"
-
 #include "dnd.h"
 #include "effect.h"
 #include "general.h"
--- a/src/audacious/main.c	Wed May 09 15:03:50 2007 -0700
+++ b/src/audacious/main.c	Wed May 09 15:07:50 2007 -0700
@@ -45,8 +45,7 @@
 
 #include "platform/smartinclude.h"
 
-#include "libaudacious/configdb.h"
-#include "libaudacious/beepctrl.h"
+#include "configdb.h"
 #include "vfs.h"
 
 #ifdef USE_DBUS
@@ -905,6 +904,7 @@
         exit(EXIT_SUCCESS);
     }
 
+#if 0
     if (filenames != NULL)
     {
         gint pos = 0;
@@ -989,6 +989,7 @@
 
     if (options->activate)
         xmms_remote_activate(session);
+#endif
 
     if (options->playcd)
         play_medium();
--- a/src/audacious/output.c	Wed May 09 15:03:50 2007 -0700
+++ b/src/audacious/output.c	Wed May 09 15:07:50 2007 -0700
@@ -32,7 +32,7 @@
 #include "playback.h"
 
 #include "playlist.h"
-#include "libaudacious/configdb.h"
+#include "configdb.h"
 
 #include <math.h>
 
--- a/src/audacious/playback.c	Wed May 09 15:03:50 2007 -0700
+++ b/src/audacious/playback.c	Wed May 09 15:07:50 2007 -0700
@@ -37,7 +37,7 @@
 #include <sys/stat.h>
 #include <dirent.h>
 
-#include "libaudacious/configdb.h"
+#include "configdb.h"
 
 #include "hook.h"
 #include "input.h"
--- a/src/audacious/playlist.c	Wed May 09 15:03:50 2007 -0700
+++ b/src/audacious/playlist.c	Wed May 09 15:07:50 2007 -0700
@@ -54,7 +54,7 @@
 #include "main.h"
 #include "ui_main.h"
 #include "util.h"
-#include "libaudacious/configdb.h"
+#include "configdb.h"
 #include "vfs.h"
 #include "urldecode.h"
 #include "ui_equalizer.h"
--- a/src/audacious/ui_fileinfo.c	Wed May 09 15:03:50 2007 -0700
+++ b/src/audacious/ui_fileinfo.c	Wed May 09 15:07:50 2007 -0700
@@ -53,8 +53,6 @@
 #include "dnd.h"
 #include "titlestring.h"
 
-#include "libaudacious/configdb.h"
-
 #include "playlist.h"
 
 #include "ui_main.h"
--- a/src/audacious/ui_jumptotrack.c	Wed May 09 15:03:50 2007 -0700
+++ b/src/audacious/ui_jumptotrack.c	Wed May 09 15:07:50 2007 -0700
@@ -64,7 +64,6 @@
 #include "genevent.h"
 #include "hints.h"
 #include "input.h"
-#include "libaudacious/configdb.h"
 #include "urldecode.h"
 #include "playback.h"
 #include "playlist.h"
--- a/src/audacious/ui_main.c	Wed May 09 15:03:50 2007 -0700
+++ b/src/audacious/ui_main.c	Wed May 09 15:07:50 2007 -0700
@@ -58,13 +58,12 @@
 #include "actions-mainwin.h"
 
 #include "main.h"
-
+#include "configdb.h"
 #include "dnd.h"
 #include "dock.h"
 #include "genevent.h"
 #include "hints.h"
 #include "input.h"
-#include "libaudacious/configdb.h"
 #include "urldecode.h"
 #include "playback.h"
 #include "playlist.h"
--- a/src/audacious/ui_preferences.c	Wed May 09 15:03:50 2007 -0700
+++ b/src/audacious/ui_preferences.c	Wed May 09 15:07:50 2007 -0700
@@ -52,7 +52,7 @@
 #include "strings.h"
 #include "util.h"
 #include "dnd.h"
-#include "libaudacious/configdb.h"
+#include "configdb.h"
 
 #include "ui_main.h"
 #include "ui_playlist.h"