[vlc-devel] commit: Dbus controler: Fix path for the TrackListChange signal. ( Rémi Duraffort )

git version control git at videolan.org
Thu Jan 14 14:27:34 CET 2010


vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Thu Jan 14 14:14:12 2010 +0100| [e1091d8602d0ee319a58c70baf96678754c93ef4] | committer: Rémi Duraffort 

Dbus controler: Fix path for the TrackListChange signal.

Fix #3232

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

 modules/control/dbus.c |    8 ++++----
 modules/control/dbus.h |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/control/dbus.c b/modules/control/dbus.c
index 5a4018e..71c6bff 100644
--- a/modules/control/dbus.c
+++ b/modules/control/dbus.c
@@ -916,7 +916,7 @@ static int AllCallback( vlc_object_t *p_this, const char *psz_var,
  *****************************************************************************/
 DBUS_SIGNAL( CapsChangeSignal )
 {
-    SIGNAL_INIT( "CapsChange" );
+    SIGNAL_INIT( MPRIS_DBUS_PLAYER_PATH, "CapsChange" );
     OUT_ARGUMENTS;
 
     ADD_INT32( &((intf_thread_t*)p_data)->p_sys->i_caps );
@@ -928,7 +928,7 @@ DBUS_SIGNAL( CapsChangeSignal )
  *****************************************************************************/
 DBUS_SIGNAL( TrackListChangeSignal )
 { /* emit the new tracklist lengh */
-    SIGNAL_INIT("TrackListChange");
+    SIGNAL_INIT( MPRIS_DBUS_TRACKLIST_PATH, "TrackListChange");
     OUT_ARGUMENTS;
 
     /* XXX: locking */
@@ -975,7 +975,7 @@ static int TrackListChangeEmit( intf_thread_t *p_intf, int signal, int i_node )
 
 DBUS_SIGNAL( TrackChangeSignal )
 { /* emit the metadata of the new item */
-    SIGNAL_INIT( "TrackChange" );
+    SIGNAL_INIT( MPRIS_DBUS_PLAYER_PATH, "TrackChange" );
     OUT_ARGUMENTS;
 
     input_item_t *p_item = (input_item_t*) p_data;
@@ -990,7 +990,7 @@ DBUS_SIGNAL( TrackChangeSignal )
 
 DBUS_SIGNAL( StatusChangeSignal )
 { /* send the updated status info on the bus */
-    SIGNAL_INIT( "StatusChange" );
+    SIGNAL_INIT( MPRIS_DBUS_PLAYER_PATH, "StatusChange" );
     OUT_ARGUMENTS;
 
     /* we're called from a callback of input_thread_t, so it can not be
diff --git a/modules/control/dbus.h b/modules/control/dbus.h
index 929588b..43ec891 100644
--- a/modules/control/dbus.h
+++ b/modules/control/dbus.h
@@ -56,8 +56,8 @@
     dbus_message_unref( p_msg ); \
     return DBUS_HANDLER_RESULT_HANDLED
 
-#define SIGNAL_INIT( signal ) \
-    DBusMessage *p_msg = dbus_message_new_signal( MPRIS_DBUS_PLAYER_PATH, \
+#define SIGNAL_INIT( path, signal ) \
+    DBusMessage *p_msg = dbus_message_new_signal( path, \
         MPRIS_DBUS_INTERFACE, signal ); \
     if( !p_msg ) return DBUS_HANDLER_RESULT_NEED_MEMORY; \
 




More information about the vlc-devel mailing list