[vlc-devel] commit: dbus: include config. h before anything and remove duplicated #define. ( Rémi Duraffort )

git version control git at videolan.org
Mon Oct 6 20:31:15 CEST 2008


vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Mon Oct  6 20:29:53 2008 +0200| [12c5a013667ce1a73e6066e19be2941e93fb8698] | committer: Rémi Duraffort 

dbus: include config.h before anything and remove duplicated #define.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=12c5a013667ce1a73e6066e19be2941e93fb8698
---

 modules/control/dbus.c |    7 +++----
 modules/control/dbus.h |    3 ---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/modules/control/dbus.c b/modules/control/dbus.c
index 3968742..972a19c 100644
--- a/modules/control/dbus.c
+++ b/modules/control/dbus.c
@@ -39,14 +39,13 @@
  * Preamble
  *****************************************************************************/
 
-#include <dbus/dbus.h>
-
-#include "dbus.h"
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <dbus/dbus.h>
+#include "dbus.h"
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
diff --git a/modules/control/dbus.h b/modules/control/dbus.h
index b1093bd..929588b 100644
--- a/modules/control/dbus.h
+++ b/modules/control/dbus.h
@@ -205,9 +205,6 @@ const char* psz_introspection_xml_data_tracklist =
 "</node>\n"
 ;
 
-#define MPRIS_DBUS_ROOT_PATH      "/"
-#define MPRIS_DBUS_PLAYER_PATH    "/Player"
-#define MPRIS_DBUS_TRACKLIST_PATH "/TrackList"
 
 /* Handle  messages reception */
 DBUS_METHOD( handle_root );




More information about the vlc-devel mailing list