X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Fdbus.c;h=f3be8314e543094ffe2a14e67972bf8a8a812669;hb=fe85cd9a157e393e6e03decb5a474fdb929f2172;hp=6da7504453dbff020f0f9b96ac8fda429f3993ab;hpb=7e4419bcc6ed629cd9a06863965260b96b9cb1fa;p=vlc diff --git a/modules/control/dbus.c b/modules/control/dbus.c index 6da7504453..f3be8314e5 100644 --- a/modules/control/dbus.c +++ b/modules/control/dbus.c @@ -3,6 +3,7 @@ ***************************************************************************** * Copyright © 2006-2008 Rafaël Carré * Copyright © 2007-2008 Mirsal Ennaime + * Copyright © 2009 The VideoLAN team * $Id$ * * Authors: Rafaël Carré @@ -31,7 +32,7 @@ * extract: * "If you use this low-level API directly, you're signing up for some pain." * - * MPRIS Specification (still drafting on Jan, 23 of 2008): + * MPRIS Specification version 1.0 * http://wiki.xmms2.xmms.se/index.php/MPRIS */ @@ -50,9 +51,8 @@ #include #include #include -#include -#include #include +#include #include @@ -66,21 +66,16 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); static void Run ( intf_thread_t * ); -static int StateChange( vlc_object_t *, const char *, vlc_value_t, - vlc_value_t, void * ); - -static int TrackChange( vlc_object_t *, const char *, vlc_value_t, - vlc_value_t, void * ); +static int StateChange( intf_thread_t *, int ); +static int TrackChange( intf_thread_t * ); +static int StatusChangeEmit( intf_thread_t *); +static int TrackListChangeEmit( intf_thread_t *, int, int ); -static int StatusChangeEmit( vlc_object_t *, const char *, vlc_value_t, - vlc_value_t, void * ); - -static int TrackListChangeEmit( vlc_object_t *, const char *, vlc_value_t, - vlc_value_t, void * ); +static int AllCallback( vlc_object_t*, const char*, vlc_value_t, vlc_value_t, void* ); static int GetInputMeta ( input_item_t *, DBusMessageIter * ); -static int MarshalStatus ( intf_thread_t *, DBusMessageIter *, bool ); -static int UpdateCaps( intf_thread_t*, bool ); +static int MarshalStatus ( intf_thread_t *, DBusMessageIter * ); +static int UpdateCaps( intf_thread_t* ); /* GetCaps() capabilities */ enum @@ -95,14 +90,42 @@ enum CAPS_CAN_HAS_TRACKLIST = 1 << 6 }; +// The signal that can be get from the callbacks +enum +{ + SIGNAL_ITEM_CURRENT, + SIGNAL_INTF_CHANGE, + SIGNAL_PLAYLIST_ITEM_APPEND, + SIGNAL_PLAYLIST_ITEM_DELETED, + SIGNAL_RANDOM, + SIGNAL_REPEAT, + SIGNAL_LOOP, + SIGNAL_STATE +}; + struct intf_sys_t { DBusConnection *p_conn; - bool b_meta_read; + playlist_t *p_playlist; + bool b_meta_read; dbus_int32_t i_caps; - bool b_dead; + bool b_dead; + vlc_array_t *p_events; + vlc_mutex_t lock; + input_thread_t *p_input; }; +typedef struct +{ + int signal; + int i_node; + int i_input_state; +} callback_info_t; + +#define INTF ((intf_thread_t *)p_this) +#define PL (INTF->p_sys->p_playlist) + + /***************************************************************************** * Module descriptor *****************************************************************************/ @@ -125,7 +148,7 @@ vlc_module_end () DBUS_METHOD( Quit ) { /* exits vlc */ REPLY_INIT; - libvlc_Quit(((vlc_object_t*)p_this)->p_libvlc); + libvlc_Quit(INTF->p_libvlc); REPLY_SEND; } @@ -159,21 +182,17 @@ DBUS_METHOD( PositionGet ) { /* returns position in milliseconds */ REPLY_INIT; OUT_ARGUMENTS; - vlc_value_t position; dbus_int32_t i_pos; - playlist_t *p_playlist = pl_Hold( ((vlc_object_t*) p_this) ); - input_thread_t *p_input = playlist_CurrentInput( p_playlist ); + input_thread_t *p_input = playlist_CurrentInput( PL ); if( !p_input ) i_pos = 0; else { - var_Get( p_input, "time", &position ); - i_pos = position.i_time / 1000; + i_pos = var_GetTime( p_input, "time" ) / 1000; vlc_object_release( p_input ); } - pl_Release( ((vlc_object_t*) p_this) ); ADD_INT32( &i_pos ); REPLY_SEND; } @@ -183,7 +202,6 @@ DBUS_METHOD( PositionSet ) REPLY_INIT; vlc_value_t position; - playlist_t* p_playlist = NULL; dbus_int32_t i_pos; DBusError error; @@ -195,21 +213,19 @@ DBUS_METHOD( PositionSet ) if( dbus_error_is_set( &error ) ) { - msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s\n", + msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s", error.message ); dbus_error_free( &error ); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } - p_playlist = pl_Hold( ((vlc_object_t*) p_this) ); - input_thread_t *p_input = playlist_CurrentInput( p_playlist ); + input_thread_t *p_input = playlist_CurrentInput( PL ); if( p_input ) { - position.i_time = i_pos * 1000; + position.i_time = ((mtime_t)i_pos) * 1000; var_Set( p_input, "time", position ); vlc_object_release( p_input ); } - pl_Release( ((vlc_object_t*) p_this) ); REPLY_SEND; } @@ -219,8 +235,10 @@ DBUS_METHOD( VolumeGet ) OUT_ARGUMENTS; dbus_int32_t i_dbus_vol; audio_volume_t i_vol; + /* 2nd argument of aout_VolumeGet is int32 */ - aout_VolumeGet( (vlc_object_t*) p_this, &i_vol ); + aout_VolumeGet( PL, &i_vol ); + double f_vol = 100. * i_vol / AOUT_VOLUME_MAX; i_dbus_vol = round( f_vol ); ADD_INT32( &i_dbus_vol ); @@ -243,7 +261,7 @@ DBUS_METHOD( VolumeSet ) if( dbus_error_is_set( &error ) ) { - msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s\n", + msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s", error.message ); dbus_error_free( &error ); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; @@ -251,35 +269,28 @@ DBUS_METHOD( VolumeSet ) double f_vol = AOUT_VOLUME_MAX * i_dbus_vol / 100.; i_vol = round( f_vol ); - aout_VolumeSet( (vlc_object_t*) p_this, i_vol ); - + aout_VolumeSet( PL, i_vol ); REPLY_SEND; } DBUS_METHOD( Next ) { /* next playlist item */ REPLY_INIT; - playlist_t *p_playlist = pl_Hold( ((vlc_object_t*) p_this) ); - playlist_Next( p_playlist ); - pl_Release( ((vlc_object_t*) p_this) ); + playlist_Next( PL ); REPLY_SEND; } DBUS_METHOD( Prev ) { /* previous playlist item */ REPLY_INIT; - playlist_t *p_playlist = pl_Hold( ((vlc_object_t*) p_this) ); - playlist_Prev( p_playlist ); - pl_Release( ((vlc_object_t*) p_this) ); + playlist_Prev( PL ); REPLY_SEND; } DBUS_METHOD( Stop ) { /* stop playing */ REPLY_INIT; - playlist_t *p_playlist = pl_Hold( ((vlc_object_t*) p_this) ); - playlist_Stop( p_playlist ); - pl_Release( ((vlc_object_t*) p_this) ); + playlist_Stop( PL ); REPLY_SEND; } @@ -294,7 +305,7 @@ DBUS_METHOD( GetStatus ) REPLY_INIT; OUT_ARGUMENTS; - MarshalStatus( p_this, &args, true ); + MarshalStatus( p_this, &args ); REPLY_SEND; } @@ -302,18 +313,15 @@ DBUS_METHOD( GetStatus ) DBUS_METHOD( Pause ) { REPLY_INIT; - playlist_t *p_playlist = pl_Hold( (vlc_object_t*) p_this ); - playlist_Pause( p_playlist ); - pl_Release( (vlc_object_t*) p_this ); + playlist_Pause( PL ); REPLY_SEND; } DBUS_METHOD( Play ) { REPLY_INIT; - playlist_t *p_playlist = pl_Hold( (vlc_object_t*) p_this ); - input_thread_t *p_input = playlist_CurrentInput( p_playlist ); + input_thread_t *p_input = playlist_CurrentInput( PL ); if( p_input ) { @@ -322,9 +330,8 @@ DBUS_METHOD( Play ) vlc_object_release( p_input ); } else - playlist_Play( p_playlist ); + playlist_Play( PL ); - pl_Release( (vlc_object_t*) p_this ); REPLY_SEND; } @@ -332,13 +339,13 @@ DBUS_METHOD( GetCurrentMetadata ) { REPLY_INIT; OUT_ARGUMENTS; - playlist_t* p_playlist = pl_Hold( (vlc_object_t*) p_this ); + playlist_t *p_playlist = PL; + PL_LOCK; playlist_item_t* p_item = playlist_CurrentPlayingItem( p_playlist ); - if( p_item ) + if( p_item ) GetInputMeta( p_item->p_input, &args ); PL_UNLOCK; - pl_Release( (vlc_object_t*) p_this ); REPLY_SEND; } @@ -347,7 +354,7 @@ DBUS_METHOD( GetCaps ) REPLY_INIT; OUT_ARGUMENTS; - ADD_INT32( &((intf_thread_t*)p_this)->p_sys->i_caps ); + ADD_INT32( &INTF->p_sys->i_caps ); REPLY_SEND; } @@ -360,6 +367,7 @@ DBUS_METHOD( Identity ) REPLY_INIT; OUT_ARGUMENTS; char *psz_identity; + if( asprintf( &psz_identity, "%s %s", PACKAGE, VERSION ) != -1 ) { ADD_STRING( &psz_identity ); @@ -380,7 +388,6 @@ DBUS_METHOD( AddTrack ) DBusError error; dbus_error_init( &error ); - playlist_t* p_playlist = NULL; char *psz_mrl; dbus_bool_t b_play; @@ -392,17 +399,15 @@ DBUS_METHOD( AddTrack ) if( dbus_error_is_set( &error ) ) { - msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s\n", + msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s", error.message ); dbus_error_free( &error ); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } - p_playlist = pl_Hold( (vlc_object_t*) p_this ); - playlist_Add( p_playlist, psz_mrl, NULL, PLAYLIST_APPEND | + playlist_Add( PL, psz_mrl, NULL, PLAYLIST_APPEND | ( ( b_play == TRUE ) ? PLAYLIST_GO : 0 ) , PLAYLIST_END, true, false ); - pl_Release( (vlc_object_t*) p_this ); dbus_int32_t i_success = 0; ADD_INT32( &i_success ); @@ -415,9 +420,11 @@ DBUS_METHOD( GetCurrentTrack ) REPLY_INIT; OUT_ARGUMENTS; - playlist_t *p_playlist = pl_Hold( (vlc_object_t*) p_this ); - dbus_int32_t i_position = p_playlist->i_current_index; - pl_Release( (vlc_object_t*) p_this ); + playlist_t *p_playlist = PL; + + PL_LOCK; + dbus_int32_t i_position = PL->i_current_index; + PL_UNLOCK; ADD_INT32( &i_position ); REPLY_SEND; @@ -431,9 +438,7 @@ DBUS_METHOD( GetMetadata ) dbus_error_init( &error ); dbus_int32_t i_position; - - playlist_t *p_playlist = pl_Hold( (vlc_object_t*) p_this ); - PL_LOCK; + playlist_t *p_playlist = PL; dbus_message_get_args( p_from, &error, DBUS_TYPE_INT32, &i_position, @@ -441,21 +446,19 @@ DBUS_METHOD( GetMetadata ) if( dbus_error_is_set( &error ) ) { - PL_UNLOCK; - pl_Release( (vlc_object_t*) p_this ); - msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s\n", + msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s", error.message ); dbus_error_free( &error ); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } + PL_LOCK; if( i_position < p_playlist->current.i_size ) { GetInputMeta( p_playlist->current.p_elems[i_position]->p_input, &args ); } PL_UNLOCK; - pl_Release( (vlc_object_t*) p_this ); REPLY_SEND; } @@ -463,10 +466,11 @@ DBUS_METHOD( GetLength ) { REPLY_INIT; OUT_ARGUMENTS; + playlist_t *p_playlist = PL; - playlist_t *p_playlist = pl_Hold( (vlc_object_t*) p_this ); - dbus_int32_t i_elements = p_playlist->current.i_size; - pl_Release( (vlc_object_t*) p_this ); + PL_LOCK; + dbus_int32_t i_elements = PL->current.i_size; + PL_UNLOCK; ADD_INT32( &i_elements ); REPLY_SEND; @@ -480,7 +484,7 @@ DBUS_METHOD( DelTrack ) dbus_error_init( &error ); dbus_int32_t i_position; - playlist_t *p_playlist = pl_Hold( (vlc_object_t*) p_this ); + playlist_t *p_playlist = PL; dbus_message_get_args( p_from, &error, DBUS_TYPE_INT32, &i_position, @@ -488,7 +492,7 @@ DBUS_METHOD( DelTrack ) if( dbus_error_is_set( &error ) ) { - msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s\n", + msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s", error.message ); dbus_error_free( &error ); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; @@ -498,13 +502,11 @@ DBUS_METHOD( DelTrack ) if( i_position < p_playlist->current.i_size ) { playlist_DeleteFromInput( p_playlist, - p_playlist->current.p_elems[i_position]->p_input->i_id, + p_playlist->current.p_elems[i_position]->p_input, pl_Locked ); } PL_UNLOCK; - pl_Release( (vlc_object_t*) p_this ); - REPLY_SEND; } @@ -515,8 +517,6 @@ DBUS_METHOD( SetLoop ) DBusError error; dbus_bool_t b_loop; - vlc_value_t val; - playlist_t* p_playlist = NULL; dbus_error_init( &error ); dbus_message_get_args( p_from, &error, @@ -525,16 +525,13 @@ DBUS_METHOD( SetLoop ) if( dbus_error_is_set( &error ) ) { - msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s\n", + msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s", error.message ); dbus_error_free( &error ); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } - val.b_bool = ( b_loop == TRUE ) ? true : false ; - p_playlist = pl_Hold( (vlc_object_t*) p_this ); - var_Set ( p_playlist, "loop", val ); - pl_Release( ((vlc_object_t*) p_this) ); + var_SetBool( PL, "loop", ( b_loop == TRUE ) ); REPLY_SEND; } @@ -546,8 +543,6 @@ DBUS_METHOD( Repeat ) DBusError error; dbus_bool_t b_repeat; - vlc_value_t val; - playlist_t* p_playlist = NULL; dbus_error_init( &error ); dbus_message_get_args( p_from, &error, @@ -556,17 +551,13 @@ DBUS_METHOD( Repeat ) if( dbus_error_is_set( &error ) ) { - msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s\n", + msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s", error.message ); dbus_error_free( &error ); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } - val.b_bool = ( b_repeat == TRUE ) ? true : false ; - - p_playlist = pl_Hold( (vlc_object_t*) p_this ); - var_Set ( p_playlist, "repeat", val ); - pl_Release( ((vlc_object_t*) p_this) ); + var_SetBool( PL, "repeat", ( b_repeat == TRUE ) ); REPLY_SEND; } @@ -578,8 +569,6 @@ DBUS_METHOD( SetRandom ) DBusError error; dbus_bool_t b_random; - vlc_value_t val; - playlist_t* p_playlist = NULL; dbus_error_init( &error ); dbus_message_get_args( p_from, &error, @@ -588,17 +577,13 @@ DBUS_METHOD( SetRandom ) if( dbus_error_is_set( &error ) ) { - msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s\n", + msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s", error.message ); dbus_error_free( &error ); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } - val.b_bool = ( b_random == TRUE ) ? true : false ; - - p_playlist = pl_Hold( (vlc_object_t*) p_this ); - var_Set ( p_playlist, "random", val ); - pl_Release( ((vlc_object_t*) p_this) ); + var_SetBool( PL, "random", ( b_random == TRUE ) ); REPLY_SEND; } @@ -720,6 +705,7 @@ static int Open( vlc_object_t *p_this ) p_sys->b_meta_read = false; p_sys->i_caps = CAPS_NONE; p_sys->b_dead = false; + p_sys->p_input = NULL; dbus_error_init( &error ); @@ -755,23 +741,24 @@ static int Open( vlc_object_t *p_this ) dbus_connection_flush( p_conn ); - p_playlist = pl_Hold( p_intf ); - PL_LOCK; - var_AddCallback( p_playlist, "playlist-current", TrackChange, p_intf ); - var_AddCallback( p_playlist, "intf-change", TrackListChangeEmit, p_intf ); - var_AddCallback( p_playlist, "item-append", TrackListChangeEmit, p_intf ); - var_AddCallback( p_playlist, "item-deleted", TrackListChangeEmit, p_intf ); - var_AddCallback( p_playlist, "random", StatusChangeEmit, p_intf ); - var_AddCallback( p_playlist, "repeat", StatusChangeEmit, p_intf ); - var_AddCallback( p_playlist, "loop", StatusChangeEmit, p_intf ); - PL_UNLOCK; - pl_Release( p_intf ); - p_intf->pf_run = Run; p_intf->p_sys = p_sys; p_sys->p_conn = p_conn; + p_sys->p_events = vlc_array_new(); + vlc_mutex_init( &p_sys->lock ); + + p_playlist = pl_Get( p_intf ); + p_sys->p_playlist = p_playlist; + + var_AddCallback( p_playlist, "item-current", AllCallback, p_intf ); + var_AddCallback( p_playlist, "intf-change", AllCallback, p_intf ); + var_AddCallback( p_playlist, "playlist-item-append", AllCallback, p_intf ); + var_AddCallback( p_playlist, "playlist-item-deleted", AllCallback, p_intf ); + var_AddCallback( p_playlist, "random", AllCallback, p_intf ); + var_AddCallback( p_playlist, "repeat", AllCallback, p_intf ); + var_AddCallback( p_playlist, "loop", AllCallback, p_intf ); - UpdateCaps( p_intf, false ); + UpdateCaps( p_intf ); return VLC_SUCCESS; } @@ -783,29 +770,34 @@ static int Open( vlc_object_t *p_this ) static void Close ( vlc_object_t *p_this ) { intf_thread_t *p_intf = (intf_thread_t*) p_this; - playlist_t *p_playlist = pl_Hold( p_intf );; - input_thread_t *p_input; - - var_DelCallback( p_playlist, "playlist-current", TrackChange, p_intf ); - var_DelCallback( p_playlist, "intf-change", TrackListChangeEmit, p_intf ); - var_DelCallback( p_playlist, "item-append", TrackListChangeEmit, p_intf ); - var_DelCallback( p_playlist, "item-deleted", TrackListChangeEmit, p_intf ); - var_DelCallback( p_playlist, "random", StatusChangeEmit, p_intf ); - var_DelCallback( p_playlist, "repeat", StatusChangeEmit, p_intf ); - var_DelCallback( p_playlist, "loop", StatusChangeEmit, p_intf ); - - p_input = playlist_CurrentInput( p_playlist ); - if ( p_input ) + intf_sys_t *p_sys = p_intf->p_sys; + playlist_t *p_playlist = p_sys->p_playlist; + + var_DelCallback( p_playlist, "item-current", AllCallback, p_intf ); + var_DelCallback( p_playlist, "intf-change", AllCallback, p_intf ); + var_DelCallback( p_playlist, "playlist-item-append", AllCallback, p_intf ); + var_DelCallback( p_playlist, "playlist-item-deleted", AllCallback, p_intf ); + var_DelCallback( p_playlist, "random", AllCallback, p_intf ); + var_DelCallback( p_playlist, "repeat", AllCallback, p_intf ); + var_DelCallback( p_playlist, "loop", AllCallback, p_intf ); + + if( p_sys->p_input ) { - var_DelCallback( p_input, "state", StateChange, p_intf ); - vlc_object_release( p_input ); + var_DelCallback( p_sys->p_input, "state", AllCallback, p_intf ); + vlc_object_release( p_sys->p_input ); } - pl_Release( p_intf ); - - dbus_connection_unref( p_intf->p_sys->p_conn ); + dbus_connection_unref( p_sys->p_conn ); - free( p_intf->p_sys ); + // Free the events array + for( int i = 0; i < vlc_array_count( p_sys->p_events ); i++ ) + { + callback_info_t* info = vlc_array_item_at_index( p_sys->p_events, i ); + free( info ); + } + vlc_mutex_destroy( &p_sys->lock ); + vlc_array_destroy( p_sys->p_events ); + free( p_sys ); } /***************************************************************************** @@ -816,19 +808,112 @@ static void Run ( intf_thread_t *p_intf ) { for( ;; ) { - msleep( INTF_IDLE_SLEEP ); + if( dbus_connection_get_dispatch_status(p_intf->p_sys->p_conn) + == DBUS_DISPATCH_COMPLETE ) + msleep( INTF_IDLE_SLEEP ); int canc = vlc_savecancel(); dbus_connection_read_write_dispatch( p_intf->p_sys->p_conn, 0 ); + + /* Get the list of events to process + * + * We can't keep the lock on p_intf->p_sys->p_events, else we risk a + * deadlock: + * The signal functions could lock mutex X while p_events is locked; + * While some other function in vlc (playlist) might lock mutex X + * and then set a variable which would call AllCallback(), which itself + * needs to lock p_events to add a new event. + */ + vlc_mutex_lock( &p_intf->p_sys->lock ); + int i_events = vlc_array_count( p_intf->p_sys->p_events ); + callback_info_t* info[i_events]; + for( int i = i_events - 1; i >= 0; i-- ) + { + info[i] = vlc_array_item_at_index( p_intf->p_sys->p_events, i ); + vlc_array_remove( p_intf->p_sys->p_events, i ); + } + vlc_mutex_unlock( &p_intf->p_sys->lock ); + + for( int i = 0; i < i_events; i++ ) + { + switch( info[i]->signal ) + { + case SIGNAL_ITEM_CURRENT: + TrackChange( p_intf ); + break; + case SIGNAL_INTF_CHANGE: + case SIGNAL_PLAYLIST_ITEM_APPEND: + case SIGNAL_PLAYLIST_ITEM_DELETED: + TrackListChangeEmit( p_intf, info[i]->signal, info[i]->i_node ); + break; + case SIGNAL_RANDOM: + case SIGNAL_REPEAT: + case SIGNAL_LOOP: + StatusChangeEmit( p_intf ); + break; + case SIGNAL_STATE: + StateChange( p_intf, info[i]->i_input_state ); + break; + default: + assert(0); + } + free( info[i] ); + } vlc_restorecancel( canc ); } } + +// Get all the callbacks +static int AllCallback( vlc_object_t *p_this, const char *psz_var, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) +{ + (void)p_this; + (void)oldval; + intf_thread_t *p_intf = (intf_thread_t*)p_data; + + callback_info_t *info = malloc( sizeof( callback_info_t ) ); + if( !info ) + return VLC_ENOMEM; + + // Wich event is it ? + if( !strcmp( "item-current", psz_var ) ) + info->signal = SIGNAL_ITEM_CURRENT; + else if( !strcmp( "intf-change", psz_var ) ) + info->signal = SIGNAL_INTF_CHANGE; + else if( !strcmp( "playlist-item-append", psz_var ) ) + { + info->signal = SIGNAL_PLAYLIST_ITEM_APPEND; + info->i_node = ((playlist_add_t*)newval.p_address)->i_node; + } + else if( !strcmp( "playlist-item-deleted", psz_var ) ) + info->signal = SIGNAL_PLAYLIST_ITEM_DELETED; + else if( !strcmp( "random", psz_var ) ) + info->signal = SIGNAL_RANDOM; + else if( !strcmp( "repeat", psz_var ) ) + info->signal = SIGNAL_REPEAT; + else if( !strcmp( "loop", psz_var ) ) + info->signal = SIGNAL_LOOP; + else if( !strcmp( "state", psz_var ) ) + { + info->signal = SIGNAL_STATE; + info->i_input_state = newval.i_int; + } + else + assert(0); + + // Append the event + vlc_mutex_lock( &p_intf->p_sys->lock ); + vlc_array_append( p_intf->p_sys->p_events, info ); + vlc_mutex_unlock( &p_intf->p_sys->lock ); + return VLC_SUCCESS; +} + /****************************************************************************** * CapsChange: player capabilities change signal *****************************************************************************/ 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 ); @@ -836,16 +921,17 @@ DBUS_SIGNAL( CapsChangeSignal ) } /****************************************************************************** - * TrackListChange: tracklist order / length change signal + * TrackListChange: tracklist order / length change signal *****************************************************************************/ DBUS_SIGNAL( TrackListChangeSignal ) { /* emit the new tracklist lengh */ - SIGNAL_INIT("TrackListChange"); + SIGNAL_INIT( MPRIS_DBUS_TRACKLIST_PATH, "TrackListChange"); OUT_ARGUMENTS; - playlist_t *p_playlist = pl_Hold( (vlc_object_t*) p_data ); + playlist_t *p_playlist = ((intf_thread_t*)p_data)->p_sys->p_playlist; + PL_LOCK; dbus_int32_t i_elements = p_playlist->current.i_size; - pl_Release( (vlc_object_t*) p_data ); + PL_UNLOCK; ADD_INT32( &i_elements ); SIGNAL_SEND; @@ -855,31 +941,31 @@ DBUS_SIGNAL( TrackListChangeSignal ) * TrackListChangeEmit: Emits the TrackListChange signal *****************************************************************************/ /* FIXME: It is not called on tracklist reordering */ -static int TrackListChangeEmit( vlc_object_t *p_this, const char *psz_var, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) +static int TrackListChangeEmit( intf_thread_t *p_intf, int signal, int i_node ) { - VLC_UNUSED(oldval); - intf_thread_t *p_intf = p_data; - - if( !strcmp( psz_var, "item-append" ) || !strcmp( psz_var, "item-remove" ) ) + // "playlist-item-append" + if( signal == SIGNAL_PLAYLIST_ITEM_APPEND ) { /* don't signal when items are added/removed in p_category */ - playlist_t *p_playlist = (playlist_t*)p_this; - playlist_add_t *p_add = newval.p_address; - playlist_item_t *p_item; - p_item = playlist_ItemGetById( p_playlist, p_add->i_node ); + playlist_t *p_playlist = p_intf->p_sys->p_playlist; + PL_LOCK; + playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_node ); assert( p_item ); while( p_item->p_parent ) p_item = p_item->p_parent; if( p_item == p_playlist->p_root_category ) + { + PL_UNLOCK; return VLC_SUCCESS; + } + PL_UNLOCK; } if( p_intf->p_sys->b_dead ) return VLC_SUCCESS; - UpdateCaps( p_intf, true ); - TrackListChangeSignal( p_intf->p_sys->p_conn, p_data ); + UpdateCaps( p_intf ); + TrackListChangeSignal( p_intf->p_sys->p_conn, p_intf ); return VLC_SUCCESS; } /***************************************************************************** @@ -888,7 +974,7 @@ static int TrackListChangeEmit( vlc_object_t *p_this, const char *psz_var, 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; @@ -903,12 +989,12 @@ 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 * destroyed before we return */ - MarshalStatus( (intf_thread_t*) p_data, &args, false ); + MarshalStatus( (intf_thread_t*) p_data, &args ); SIGNAL_SEND; } @@ -916,32 +1002,39 @@ DBUS_SIGNAL( StatusChangeSignal ) /***************************************************************************** * StateChange: callback on input "state" *****************************************************************************/ -static int StateChange( vlc_object_t *p_this, const char* psz_var, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) +//static int StateChange( vlc_object_t *p_this, const char* psz_var, +// vlc_value_t oldval, vlc_value_t newval, void *p_data ) +static int StateChange( intf_thread_t *p_intf, int i_input_state ) { - VLC_UNUSED(psz_var); VLC_UNUSED(oldval); - intf_thread_t *p_intf = ( intf_thread_t* ) p_data; intf_sys_t *p_sys = p_intf->p_sys; + playlist_t *p_playlist = p_sys->p_playlist; + input_thread_t *p_input; + input_item_t *p_item; if( p_intf->p_sys->b_dead ) return VLC_SUCCESS; - UpdateCaps( p_intf, true ); + UpdateCaps( p_intf ); - if( !p_sys->b_meta_read && newval.i_int == PLAYING_S ) + if( !p_sys->b_meta_read && i_input_state == PLAYING_S ) { - input_item_t *p_item = input_GetItem( (input_thread_t*)p_this ); - if( p_item ) + p_input = playlist_CurrentInput( p_playlist ); + if( p_input ) { - p_sys->b_meta_read = true; - TrackChangeSignal( p_sys->p_conn, p_item ); + p_item = input_GetItem( p_input ); + if( p_item ) + { + p_sys->b_meta_read = true; + TrackChangeSignal( p_sys->p_conn, p_item ); + } + vlc_object_release( p_input ); } } - if( newval.i_int == PLAYING_S || newval.i_int == PAUSE_S || - newval.i_int == END_S ) + if( i_input_state == PLAYING_S || i_input_state == PAUSE_S || + i_input_state == END_S ) { - StatusChangeSignal( p_sys->p_conn, (void*) p_intf ); + StatusChangeSignal( p_sys->p_conn, p_intf ); } return VLC_SUCCESS; @@ -950,50 +1043,44 @@ static int StateChange( vlc_object_t *p_this, const char* psz_var, /***************************************************************************** * StatusChangeEmit: Emits the StatusChange signal *****************************************************************************/ -static int StatusChangeEmit( vlc_object_t *p_this, const char *psz_var, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) +static int StatusChangeEmit( intf_thread_t * p_intf ) { - VLC_UNUSED(p_this); VLC_UNUSED(psz_var); - VLC_UNUSED(oldval); VLC_UNUSED(newval); - intf_thread_t *p_intf = p_data; - if( p_intf->p_sys->b_dead ) return VLC_SUCCESS; - UpdateCaps( p_intf, false ); - StatusChangeSignal( p_intf->p_sys->p_conn, p_data ); + UpdateCaps( p_intf ); + StatusChangeSignal( p_intf->p_sys->p_conn, p_intf ); return VLC_SUCCESS; } /***************************************************************************** - * TrackChange: callback on playlist "playlist-current" + * TrackChange: callback on playlist "item-current" *****************************************************************************/ -static int TrackChange( vlc_object_t *p_this, const char *psz_var, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) +static int TrackChange( intf_thread_t *p_intf ) { - intf_thread_t *p_intf = ( intf_thread_t* ) p_data; intf_sys_t *p_sys = p_intf->p_sys; - playlist_t *p_playlist; + playlist_t *p_playlist = p_sys->p_playlist; input_thread_t *p_input = NULL; input_item_t *p_item = NULL; - VLC_UNUSED( p_this ); VLC_UNUSED( psz_var ); - VLC_UNUSED( oldval ); VLC_UNUSED( newval ); if( p_intf->p_sys->b_dead ) return VLC_SUCCESS; + if( p_sys->p_input ) + { + var_DelCallback( p_sys->p_input, "state", AllCallback, p_intf ); + vlc_object_release( p_sys->p_input ); + p_sys->p_input = NULL; + } + p_sys->b_meta_read = false; - p_playlist = pl_Hold( p_intf ); p_input = playlist_CurrentInput( p_playlist ); if( !p_input ) { - pl_Release( p_intf ); return VLC_SUCCESS; } - pl_Release( p_intf ); - p_item = input_GetItem( p_input ); if( !p_item ) { @@ -1007,25 +1094,26 @@ static int TrackChange( vlc_object_t *p_this, const char *psz_var, TrackChangeSignal( p_sys->p_conn, p_item ); } - var_AddCallback( p_input, "state", StateChange, p_intf ); + p_sys->p_input = p_input; + var_AddCallback( p_input, "state", AllCallback, p_intf ); - vlc_object_release( p_input ); return VLC_SUCCESS; } /***************************************************************************** * UpdateCaps: update p_sys->i_caps + * This function have to be called with the playlist unlocked ****************************************************************************/ -static int UpdateCaps( intf_thread_t* p_intf, bool b_playlist_locked ) +static int UpdateCaps( intf_thread_t* p_intf ) { intf_sys_t* p_sys = p_intf->p_sys; dbus_int32_t i_caps = CAPS_CAN_HAS_TRACKLIST; - playlist_t* p_playlist = pl_Hold( p_intf ); - if( !b_playlist_locked ) PL_LOCK; - + playlist_t* p_playlist = p_sys->p_playlist; + + PL_LOCK; if( p_playlist->current.i_size > 0 ) i_caps |= CAPS_CAN_PLAY | CAPS_CAN_GO_PREV | CAPS_CAN_GO_NEXT; - if( !b_playlist_locked ) PL_UNLOCK; + PL_UNLOCK; input_thread_t* p_input = playlist_CurrentInput( p_playlist ); if( p_input ) @@ -1039,8 +1127,6 @@ static int UpdateCaps( intf_thread_t* p_intf, bool b_playlist_locked ) vlc_object_release( p_input ); } - pl_Release( p_intf ); - if( p_sys->b_meta_read ) i_caps |= CAPS_CAN_PROVIDE_METADATA; @@ -1083,47 +1169,57 @@ static int GetInputMeta( input_item_t* p_input, DBusMessageIter *args ) { DBusMessageIter dict, dict_entry, variant; - /* We need the track length to be expressed in milli-seconds - * instead of µ-seconds */ - dbus_int64_t i_length = ( input_item_GetDuration( p_input ) / 1000 ); + /** The duration of the track can be expressed in second, milli-seconds and + µ-seconds */ + dbus_int64_t i_mtime = input_item_GetDuration( p_input ); + dbus_uint32_t i_time = i_mtime / 1000000; + dbus_int64_t i_length = i_mtime / 1000; const char* ppsz_meta_items[] = { - "title", "artist", "genre", "copyright", "album", "tracknum", - "description", "rating", "date", "setting", "url", "language", - "nowplaying", "publisher", "encodedby", "arturl", "trackid", - "status", "location", "length", "video-codec", "audio-codec", - "video-bitrate", "audio-bitrate", "audio-samplerate" + /* Official MPRIS metas */ + "location", "title", "artist", "album", "tracknumber", "time", "mtime", + "genre", "rating", "date", "arturl", + "audio-bitrate", "audio-samplerate", "video-bitrate", + /* VLC specifics metas */ + "audio-codec", "copyright", "description", "encodedby", "language", "length", + "nowplaying", "publisher", "setting", "status", "trackid", "url", + "video-codec" }; dbus_message_iter_open_container( args, DBUS_TYPE_ARRAY, "{sv}", &dict ); - ADD_VLC_META_STRING( 0, Title ); - ADD_VLC_META_STRING( 1, Artist ); - ADD_VLC_META_STRING( 2, Genre ); - ADD_VLC_META_STRING( 3, Copyright ); - ADD_VLC_META_STRING( 4, Album ); - ADD_VLC_META_STRING( 5, TrackNum ); - ADD_VLC_META_STRING( 6, Description ); - ADD_VLC_META_STRING( 7, Rating ); - ADD_VLC_META_STRING( 8, Date ); - ADD_VLC_META_STRING( 9, Setting ); - ADD_VLC_META_STRING( 10, URL ); - ADD_VLC_META_STRING( 11, Language ); - ADD_VLC_META_STRING( 12, NowPlaying ); - ADD_VLC_META_STRING( 13, Publisher ); - ADD_VLC_META_STRING( 14, EncodedBy ); - ADD_VLC_META_STRING( 15, ArtURL ); - ADD_VLC_META_STRING( 16, TrackID ); + ADD_VLC_META_STRING( 0, URI ); + ADD_VLC_META_STRING( 1, Title ); + ADD_VLC_META_STRING( 2, Artist ); + ADD_VLC_META_STRING( 3, Album ); + ADD_VLC_META_STRING( 4, TrackNum ); + ADD_META( 5, DBUS_TYPE_UINT32, i_time ); + ADD_META( 6, DBUS_TYPE_UINT32, i_mtime ); + ADD_VLC_META_STRING( 7, Genre ); + ADD_VLC_META_STRING( 8, Rating ); + ADD_VLC_META_STRING( 9, Date ); + ADD_VLC_META_STRING( 10, ArtURL ); + + ADD_VLC_META_STRING( 15, Copyright ); + ADD_VLC_META_STRING( 16, Description ); + ADD_VLC_META_STRING( 17, EncodedBy ); + ADD_VLC_META_STRING( 18, Language ); + ADD_META( 19, DBUS_TYPE_INT64, i_length ); + ADD_VLC_META_STRING( 20, NowPlaying ); + ADD_VLC_META_STRING( 21, Publisher ); + ADD_VLC_META_STRING( 22, Setting ); + ADD_VLC_META_STRING( 24, TrackID ); + ADD_VLC_META_STRING( 25, URL ); vlc_mutex_lock( &p_input->lock ); if( p_input->p_meta ) - ADD_META( 17, DBUS_TYPE_INT32, p_input->p_meta->i_status ); + { + int i_status = vlc_meta_GetStatus( p_input->p_meta ); + ADD_META( 23, DBUS_TYPE_INT32, i_status ); + } vlc_mutex_unlock( &p_input->lock ); - ADD_VLC_META_STRING( 18, URI ); - ADD_META( 19, DBUS_TYPE_INT64, i_length ); - dbus_message_iter_close_container( args, &dict ); return VLC_SUCCESS; } @@ -1135,31 +1231,28 @@ static int GetInputMeta( input_item_t* p_input, * MarshalStatus: Fill a DBusMessage with the current player status *****************************************************************************/ -static int MarshalStatus( intf_thread_t* p_intf, DBusMessageIter* args, - bool lock ) +static int MarshalStatus( intf_thread_t* p_intf, DBusMessageIter* args ) { /* This is NOT the right way to do that, it would be better to sore the status information in p_sys and update it on change, thus avoiding a long lock */ DBusMessageIter status; dbus_int32_t i_state, i_random, i_repeat, i_loop; - vlc_value_t val; - playlist_t* p_playlist = NULL; + int i_val; + playlist_t* p_playlist = p_intf->p_sys->p_playlist; input_thread_t* p_input = NULL; - p_playlist = pl_Hold( p_intf ); - i_state = 2; p_input = playlist_CurrentInput( p_playlist ); if( p_input ) { - var_Get( p_input, "state", &val ); - if( val.i_int >= END_S ) + i_val = var_GetInteger( p_input, "state" ); + if( i_val >= END_S ) i_state = 2; - else if( val.i_int == PAUSE_S ) + else if( i_val == PAUSE_S ) i_state = 1; - else if( val.i_int <= PLAYING_S ) + else if( i_val <= PLAYING_S ) i_state = 0; vlc_object_release( p_input ); } @@ -1170,8 +1263,6 @@ static int MarshalStatus( intf_thread_t* p_intf, DBusMessageIter* args, i_loop = var_CreateGetBool( p_playlist, "loop" ); - pl_Release( p_intf ); - dbus_message_iter_open_container( args, DBUS_TYPE_STRUCT, NULL, &status ); dbus_message_iter_append_basic( &status, DBUS_TYPE_INT32, &i_state ); dbus_message_iter_append_basic( &status, DBUS_TYPE_INT32, &i_random );