Commit e1091d86 authored by Rémi Duraffort's avatar Rémi Duraffort

Dbus controler: Fix path for the TrackListChange signal.

Fix #3232
parent 60f0938f
...@@ -916,7 +916,7 @@ static int AllCallback( vlc_object_t *p_this, const char *psz_var, ...@@ -916,7 +916,7 @@ static int AllCallback( vlc_object_t *p_this, const char *psz_var,
*****************************************************************************/ *****************************************************************************/
DBUS_SIGNAL( CapsChangeSignal ) DBUS_SIGNAL( CapsChangeSignal )
{ {
SIGNAL_INIT( "CapsChange" ); SIGNAL_INIT( MPRIS_DBUS_PLAYER_PATH, "CapsChange" );
OUT_ARGUMENTS; OUT_ARGUMENTS;
ADD_INT32( &((intf_thread_t*)p_data)->p_sys->i_caps ); ADD_INT32( &((intf_thread_t*)p_data)->p_sys->i_caps );
...@@ -928,7 +928,7 @@ DBUS_SIGNAL( CapsChangeSignal ) ...@@ -928,7 +928,7 @@ DBUS_SIGNAL( CapsChangeSignal )
*****************************************************************************/ *****************************************************************************/
DBUS_SIGNAL( TrackListChangeSignal ) DBUS_SIGNAL( TrackListChangeSignal )
{ /* emit the new tracklist lengh */ { /* emit the new tracklist lengh */
SIGNAL_INIT("TrackListChange"); SIGNAL_INIT( MPRIS_DBUS_TRACKLIST_PATH, "TrackListChange");
OUT_ARGUMENTS; OUT_ARGUMENTS;
/* XXX: locking */ /* XXX: locking */
...@@ -975,7 +975,7 @@ static int TrackListChangeEmit( intf_thread_t *p_intf, int signal, int i_node ) ...@@ -975,7 +975,7 @@ static int TrackListChangeEmit( intf_thread_t *p_intf, int signal, int i_node )
DBUS_SIGNAL( TrackChangeSignal ) DBUS_SIGNAL( TrackChangeSignal )
{ /* emit the metadata of the new item */ { /* emit the metadata of the new item */
SIGNAL_INIT( "TrackChange" ); SIGNAL_INIT( MPRIS_DBUS_PLAYER_PATH, "TrackChange" );
OUT_ARGUMENTS; OUT_ARGUMENTS;
input_item_t *p_item = (input_item_t*) p_data; input_item_t *p_item = (input_item_t*) p_data;
...@@ -990,7 +990,7 @@ DBUS_SIGNAL( TrackChangeSignal ) ...@@ -990,7 +990,7 @@ DBUS_SIGNAL( TrackChangeSignal )
DBUS_SIGNAL( StatusChangeSignal ) DBUS_SIGNAL( StatusChangeSignal )
{ /* send the updated status info on the bus */ { /* send the updated status info on the bus */
SIGNAL_INIT( "StatusChange" ); SIGNAL_INIT( MPRIS_DBUS_PLAYER_PATH, "StatusChange" );
OUT_ARGUMENTS; OUT_ARGUMENTS;
/* we're called from a callback of input_thread_t, so it can not be /* we're called from a callback of input_thread_t, so it can not be
......
...@@ -56,8 +56,8 @@ ...@@ -56,8 +56,8 @@
dbus_message_unref( p_msg ); \ dbus_message_unref( p_msg ); \
return DBUS_HANDLER_RESULT_HANDLED return DBUS_HANDLER_RESULT_HANDLED
#define SIGNAL_INIT( signal ) \ #define SIGNAL_INIT( path, signal ) \
DBusMessage *p_msg = dbus_message_new_signal( MPRIS_DBUS_PLAYER_PATH, \ DBusMessage *p_msg = dbus_message_new_signal( path, \
MPRIS_DBUS_INTERFACE, signal ); \ MPRIS_DBUS_INTERFACE, signal ); \
if( !p_msg ) return DBUS_HANDLER_RESULT_NEED_MEMORY; \ if( !p_msg ) return DBUS_HANDLER_RESULT_NEED_MEMORY; \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment