X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Fdbus.c;h=fd725a5f0ebef960a46cf806c4db68ff8881b877;hb=ec32411a264bc201954be6dfeb71c9b8e4cf3eb9;hp=26e07e421d7ad09ae612f821abf385ed6c1ce1b6;hpb=16364fa65c37326f7b99bb42b899a63b4a5ddbb5;p=vlc diff --git a/modules/control/dbus.c b/modules/control/dbus.c index 26e07e421d..fd725a5f0e 100644 --- a/modules/control/dbus.c +++ b/modules/control/dbus.c @@ -47,14 +47,17 @@ # include "config.h" #endif -#include +#include +#include #include #include #include #include #include -#include -#include + +#include + +#include /***************************************************************************** * Local prototypes. @@ -77,8 +80,8 @@ static int TrackListChangeEmit( 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 *, vlc_bool_t ); -static int UpdateCaps( intf_thread_t* ); +static int MarshalStatus ( intf_thread_t *, DBusMessageIter *, bool ); +static int UpdateCaps( intf_thread_t*, bool ); /* GetCaps() capabilities */ enum @@ -89,13 +92,14 @@ enum CAPS_CAN_PAUSE = 1 << 2, CAPS_CAN_PLAY = 1 << 3, CAPS_CAN_SEEK = 1 << 4, - CAPS_CAN_PROVIDE_METADATA = 1 << 5 + CAPS_CAN_PROVIDE_METADATA = 1 << 5, + CAPS_CAN_HAS_TRACKLIST = 1 << 6 }; struct intf_sys_t { DBusConnection *p_conn; - vlc_bool_t b_meta_read; + bool b_meta_read; dbus_int32_t i_caps; }; @@ -104,10 +108,10 @@ struct intf_sys_t *****************************************************************************/ vlc_module_begin(); - set_shortname( _("dbus")); + set_shortname( N_("dbus")); set_category( CAT_INTERFACE ); set_subcategory( SUBCAT_INTERFACE_CONTROL ); - set_description( _("D-Bus control interface") ); + set_description( N_("D-Bus control interface") ); set_capability( "interface", 0 ); set_callbacks( Open, Close ); vlc_module_end(); @@ -128,6 +132,32 @@ DBUS_METHOD( Quit ) REPLY_SEND; } +DBUS_METHOD( MprisVersion ) +{ /*implemented version of the mpris spec */ + REPLY_INIT; + OUT_ARGUMENTS; + VLC_UNUSED( p_this ); + dbus_uint16_t i_major = VLC_MPRIS_VERSION_MAJOR; + dbus_uint16_t i_minor = VLC_MPRIS_VERSION_MINOR; + DBusMessageIter version; + + if( !dbus_message_iter_open_container( &args, DBUS_TYPE_STRUCT, NULL, + &version ) ) + return DBUS_HANDLER_RESULT_NEED_MEMORY; + + if( !dbus_message_iter_append_basic( &version, DBUS_TYPE_UINT16, + &i_major ) ) + return DBUS_HANDLER_RESULT_NEED_MEMORY; + + if( !dbus_message_iter_append_basic( &version, DBUS_TYPE_UINT16, + &i_minor ) ) + return DBUS_HANDLER_RESULT_NEED_MEMORY; + + if( !dbus_message_iter_close_container( &args, &version ) ) + return DBUS_HANDLER_RESULT_NEED_MEMORY; + REPLY_SEND; +} + DBUS_METHOD( PositionGet ) { /* returns position in milliseconds */ REPLY_INIT; @@ -196,7 +226,8 @@ DBUS_METHOD( VolumeGet ) audio_volume_t i_vol; /* 2nd argument of aout_VolumeGet is int32 */ aout_VolumeGet( (vlc_object_t*) p_this, &i_vol ); - i_dbus_vol = ( 100 * i_vol ) / AOUT_VOLUME_MAX; + double f_vol = 100. * i_vol / AOUT_VOLUME_MAX; + i_dbus_vol = round( f_vol ); ADD_INT32( &i_dbus_vol ); REPLY_SEND; } @@ -223,7 +254,8 @@ DBUS_METHOD( VolumeSet ) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } - i_vol = ( AOUT_VOLUME_MAX / 100 ) *i_dbus_vol; + double f_vol = AOUT_VOLUME_MAX * i_dbus_vol / 100.; + i_vol = round( f_vol ); aout_VolumeSet( (vlc_object_t*) p_this, i_vol ); REPLY_SEND; @@ -267,7 +299,7 @@ DBUS_METHOD( GetStatus ) REPLY_INIT; OUT_ARGUMENTS; - MarshalStatus( p_this, &args, VLC_TRUE ); + MarshalStatus( p_this, &args, true ); REPLY_SEND; } @@ -285,7 +317,22 @@ DBUS_METHOD( Play ) { REPLY_INIT; playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this ); - playlist_Play( p_playlist ); + + PL_LOCK; + input_thread_t *p_input = p_playlist->p_input; + if( p_input ) + vlc_object_yield( p_input ); + PL_UNLOCK; + + if( p_input ) + { + double i_pos = 0; + input_Control( p_input, INPUT_SET_POSITION, i_pos ); + vlc_object_release( p_input ); + } + else + playlist_Play( p_playlist ); + pl_Release( p_playlist ); REPLY_SEND; } @@ -308,7 +355,6 @@ DBUS_METHOD( GetCaps ) REPLY_INIT; OUT_ARGUMENTS; - UpdateCaps( (intf_thread_t*)p_this ); ADD_INT32( &((intf_thread_t*)p_this)->p_sys->i_caps ); REPLY_SEND; @@ -338,6 +384,7 @@ DBUS_METHOD( Identity ) DBUS_METHOD( AddTrack ) { /* add the string to the playlist, and play it if the boolean is true */ REPLY_INIT; + OUT_ARGUMENTS; DBusError error; dbus_error_init( &error ); @@ -362,9 +409,12 @@ DBUS_METHOD( AddTrack ) p_playlist = pl_Yield( (vlc_object_t*) p_this ); playlist_Add( p_playlist, psz_mrl, NULL, PLAYLIST_APPEND | ( ( b_play == TRUE ) ? PLAYLIST_GO : 0 ) , - PLAYLIST_END, VLC_TRUE, VLC_FALSE ); + PLAYLIST_END, true, false ); pl_Release( p_playlist ); + dbus_int32_t i_success = 0; + ADD_INT32( &i_success ); + REPLY_SEND; } @@ -407,9 +457,9 @@ DBUS_METHOD( GetMetadata ) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } - if( i_position <= p_playlist->items.i_size / 2 ) + if( i_position < p_playlist->current.i_size ) { - GetInputMeta( p_playlist->items.p_elems[i_position*2-1]->p_input, &args ); + GetInputMeta( p_playlist->current.p_elems[i_position]->p_input, &args ); } PL_UNLOCK; @@ -423,7 +473,7 @@ DBUS_METHOD( GetLength ) OUT_ARGUMENTS; playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this ); - dbus_int32_t i_elements = p_playlist->items.i_size / 2; + dbus_int32_t i_elements = p_playlist->current.i_size; pl_Release( p_playlist ); ADD_INT32( &i_elements ); @@ -452,19 +502,21 @@ DBUS_METHOD( DelTrack ) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } - if( i_position <= p_playlist->items.i_size / 2 ) + PL_LOCK; + if( i_position < p_playlist->current.i_size ) { playlist_DeleteFromInput( p_playlist, - p_playlist->items.p_elems[i_position*2-1]->i_id, - VLC_FALSE ); + p_playlist->current.p_elems[i_position]->p_input->i_id, + true ); } + PL_UNLOCK; pl_Release( p_playlist ); REPLY_SEND; } -DBUS_METHOD( Loop ) +DBUS_METHOD( SetLoop ) { REPLY_INIT; OUT_ARGUMENTS; @@ -487,7 +539,7 @@ DBUS_METHOD( Loop ) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } - val.b_bool = ( b_loop == TRUE ) ? VLC_TRUE : VLC_FALSE ; + val.b_bool = ( b_loop == TRUE ) ? true : false ; p_playlist = pl_Yield( (vlc_object_t*) p_this ); var_Set ( p_playlist, "loop", val ); pl_Release( ((vlc_object_t*) p_this) ); @@ -518,7 +570,7 @@ DBUS_METHOD( Repeat ) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } - val.b_bool = ( b_repeat == TRUE ) ? VLC_TRUE : VLC_FALSE ; + val.b_bool = ( b_repeat == TRUE ) ? true : false ; p_playlist = pl_Yield( (vlc_object_t*) p_this ); var_Set ( p_playlist, "repeat", val ); @@ -527,7 +579,7 @@ DBUS_METHOD( Repeat ) REPLY_SEND; } -DBUS_METHOD( Random ) +DBUS_METHOD( SetRandom ) { REPLY_INIT; OUT_ARGUMENTS; @@ -550,7 +602,7 @@ DBUS_METHOD( Random ) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } - val.b_bool = ( b_random == TRUE ) ? VLC_TRUE : VLC_FALSE ; + val.b_bool = ( b_random == TRUE ) ? true : false ; p_playlist = pl_Yield( (vlc_object_t*) p_this ); var_Set ( p_playlist, "random", val ); @@ -607,6 +659,8 @@ DBUS_METHOD( handle_root ) /* here D-Bus method's names are associated to an handler */ METHOD_FUNC( "Identity", Identity ); + METHOD_FUNC( "MprisVersion", MprisVersion ); + METHOD_FUNC( "Quit", Quit ); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } @@ -622,7 +676,6 @@ DBUS_METHOD( handle_player ) METHOD_FUNC( "Prev", Prev ); METHOD_FUNC( "Next", Next ); - METHOD_FUNC( "Quit", Quit ); METHOD_FUNC( "Stop", Stop ); METHOD_FUNC( "Play", Play ); METHOD_FUNC( "Pause", Pause ); @@ -651,8 +704,8 @@ DBUS_METHOD( handle_tracklist ) METHOD_FUNC( "GetLength", GetLength ); METHOD_FUNC( "AddTrack", AddTrack ); METHOD_FUNC( "DelTrack", DelTrack ); - METHOD_FUNC( "Loop", Loop ); - METHOD_FUNC( "Random", Random ); + METHOD_FUNC( "SetLoop", SetLoop ); + METHOD_FUNC( "SetRandom", SetRandom ); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } @@ -672,7 +725,7 @@ static int Open( vlc_object_t *p_this ) if( !p_sys ) return VLC_ENOMEM; - p_sys->b_meta_read = VLC_FALSE; + p_sys->b_meta_read = false; p_sys->i_caps = CAPS_NONE; dbus_error_init( &error ); @@ -725,7 +778,7 @@ static int Open( vlc_object_t *p_this ) p_intf->p_sys = p_sys; p_sys->p_conn = p_conn; - UpdateCaps( p_intf ); + UpdateCaps( p_intf, false ); return VLC_SUCCESS; } @@ -740,7 +793,7 @@ static void Close ( vlc_object_t *p_this ) playlist_t *p_playlist = pl_Yield( p_intf );; input_thread_t *p_input; - p_this->b_dead = VLC_TRUE; + p_this->b_dead = true; PL_LOCK; var_DelCallback( p_playlist, "playlist-current", TrackChange, p_intf ); @@ -801,7 +854,7 @@ DBUS_SIGNAL( TrackListChangeSignal ) OUT_ARGUMENTS; playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_data ); - dbus_int32_t i_elements = p_playlist->items.i_size / 2; + dbus_int32_t i_elements = p_playlist->current.i_size; pl_Release( p_playlist ); ADD_INT32( &i_elements ); @@ -824,7 +877,7 @@ static int TrackListChangeEmit( vlc_object_t *p_this, const char *psz_var, 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, VLC_TRUE ); + p_item = playlist_ItemGetById( p_playlist, p_add->i_node, false ); assert( p_item ); while( p_item->p_parent ) p_item = p_item->p_parent; @@ -835,8 +888,7 @@ static int TrackListChangeEmit( vlc_object_t *p_this, const char *psz_var, if( p_intf->b_dead ) return VLC_SUCCESS; - /* We're called from the playlist, so that would cause locking issues */ - /* UpdateCaps( p_intf ); */ + UpdateCaps( p_intf, true ); TrackListChangeSignal( p_intf->p_sys->p_conn, p_data ); return VLC_SUCCESS; } @@ -866,7 +918,7 @@ DBUS_SIGNAL( StatusChangeSignal ) /* 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, VLC_FALSE ); + MarshalStatus( (intf_thread_t*) p_data, &args, false ); SIGNAL_SEND; } @@ -884,23 +936,24 @@ static int StateChange( vlc_object_t *p_this, const char* psz_var, if( p_intf->b_dead ) return VLC_SUCCESS; + UpdateCaps( p_intf, true ); + if( !p_sys->b_meta_read && newval.i_int == PLAYING_S ) { input_item_t *p_item = input_GetItem( (input_thread_t*)p_this ); if( p_item ) { - p_sys->b_meta_read = VLC_TRUE; + p_sys->b_meta_read = true; TrackChangeSignal( p_sys->p_conn, p_item ); } } if( newval.i_int == PLAYING_S || newval.i_int == PAUSE_S || - newval.i_int == END_S ) + newval.i_int == STOP_S || newval.i_int == END_S ) { StatusChangeSignal( p_sys->p_conn, (void*) p_intf ); } - return VLC_SUCCESS; } @@ -917,7 +970,7 @@ static int StatusChangeEmit( vlc_object_t *p_this, const char *psz_var, if( p_intf->b_dead ) return VLC_SUCCESS; - UpdateCaps( p_intf ); + UpdateCaps( p_intf, false ); StatusChangeSignal( p_intf->p_sys->p_conn, p_data ); return VLC_SUCCESS; } @@ -939,10 +992,9 @@ static int TrackChange( vlc_object_t *p_this, const char *psz_var, if( p_intf->b_dead ) return VLC_SUCCESS; - p_sys->b_meta_read = VLC_FALSE; + p_sys->b_meta_read = false; p_playlist = pl_Yield( p_intf ); - PL_LOCK; p_input = p_playlist->p_input; if( !p_input ) @@ -953,7 +1005,6 @@ static int TrackChange( vlc_object_t *p_this, const char *psz_var, } vlc_object_yield( p_input ); - PL_UNLOCK; pl_Release( p_playlist ); p_item = input_GetItem( p_input ); @@ -965,12 +1016,10 @@ static int TrackChange( vlc_object_t *p_this, const char *psz_var, if( input_item_IsPreparsed( p_item ) ) { - p_sys->b_meta_read = VLC_TRUE; + p_sys->b_meta_read = true; TrackChangeSignal( p_sys->p_conn, p_item ); } - UpdateCaps( p_intf ); - var_AddCallback( p_input, "state", StateChange, p_intf ); vlc_object_release( p_input ); @@ -980,48 +1029,35 @@ static int TrackChange( vlc_object_t *p_this, const char *psz_var, /***************************************************************************** * UpdateCaps: update p_sys->i_caps ****************************************************************************/ -static int UpdateCaps( intf_thread_t* p_intf ) +static int UpdateCaps( intf_thread_t* p_intf, bool b_playlist_locked ) { - dbus_int32_t i_caps = CAPS_NONE; + intf_sys_t* p_sys = p_intf->p_sys; + dbus_int32_t i_caps = CAPS_CAN_HAS_TRACKLIST; playlist_t* p_playlist = pl_Yield( (vlc_object_t*)p_intf ); - PL_LOCK; + if( !b_playlist_locked ) PL_LOCK; - if( p_playlist->items.i_size > 0 ) + if( p_playlist->current.i_size > 0 ) i_caps |= CAPS_CAN_PLAY | CAPS_CAN_GO_PREV | CAPS_CAN_GO_NEXT; if( p_playlist->p_input ) { - access_t *p_access = (access_t*)vlc_object_find( p_playlist->p_input, - VLC_OBJECT_ACCESS, FIND_CHILD ); - if( p_access ) - { - vlc_bool_t b_can_pause; - if( !access2_Control( p_access, ACCESS_CAN_PAUSE, &b_can_pause ) && - b_can_pause ) - i_caps |= CAPS_CAN_PAUSE; - vlc_object_release( p_access ); - } - demux_t *p_demux = (demux_t*)vlc_object_find( p_playlist->p_input, - VLC_OBJECT_DEMUX, FIND_CHILD ); - if( p_demux ) - { /* XXX: is: demux can seek and access can not a possibility ? */ - vlc_bool_t b_can_seek; - if( !stream_Control( p_demux->s, STREAM_CAN_SEEK, &b_can_seek ) && - b_can_seek ) - i_caps |= CAPS_CAN_SEEK; - vlc_object_release( p_demux ); - } + /* XXX: if UpdateCaps() is called too early, these are + * unconditionnaly true */ + if( var_GetBool( p_playlist->p_input, "can-pause" ) ) + i_caps |= CAPS_CAN_PAUSE; + if( var_GetBool( p_playlist->p_input, "seekable" ) ) + i_caps |= CAPS_CAN_SEEK; } - PL_UNLOCK; + if( !b_playlist_locked ) PL_UNLOCK; pl_Release( p_playlist ); - if( p_intf->p_sys->b_meta_read ) + if( p_sys->b_meta_read ) i_caps |= CAPS_CAN_PROVIDE_METADATA; if( i_caps != p_intf->p_sys->i_caps ) { - p_intf->p_sys->i_caps = i_caps; + p_sys->i_caps = i_caps; CapsChangeSignal( p_intf->p_sys->p_conn, (vlc_object_t*)p_intf ); } @@ -1067,7 +1103,7 @@ static int GetInputMeta( input_item_t* p_input, "title", "artist", "genre", "copyright", "album", "tracknum", "description", "rating", "date", "setting", "url", "language", "nowplaying", "publisher", "encodedby", "arturl", "trackid", - "status", "URI", "length", "video-codec", "audio-codec", + "status", "location", "length", "video-codec", "audio-codec", "video-bitrate", "audio-bitrate", "audio-samplerate" }; @@ -1111,7 +1147,7 @@ static int GetInputMeta( input_item_t* p_input, *****************************************************************************/ static int MarshalStatus( intf_thread_t* p_intf, DBusMessageIter* args, - vlc_bool_t lock ) + bool lock ) { /* 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 */ @@ -1140,14 +1176,11 @@ static int MarshalStatus( intf_thread_t* p_intf, DBusMessageIter* args, i_state = 0; } - var_Get( p_playlist, "random", &val ); - i_random = val.i_int; + i_random = var_CreateGetBool( p_playlist, "random" ); - var_Get( p_playlist, "repeat", &val ); - i_repeat = val.i_int; + i_repeat = var_CreateGetBool( p_playlist, "repeat" ); - var_Get( p_playlist, "loop", &val ); - i_loop = val.i_int; + i_loop = var_CreateGetBool( p_playlist, "loop" ); if( lock ) PL_UNLOCK;