X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Fdbus.c;h=8f47d7736877ec1f45fea705e2d25b4cf2e3f5d8;hb=8a163fd8273e5feaa366c2a4dacc0eb75d0dbf77;hp=c8237bf48639dca00c8cc78f1f71081d33a201bf;hpb=343159443fbbcd108d9cffe8a77f2e6a52754e42;p=vlc diff --git a/modules/control/dbus.c b/modules/control/dbus.c index c8237bf486..8f47d77368 100644 --- a/modules/control/dbus.c +++ b/modules/control/dbus.c @@ -1,7 +1,8 @@ /***************************************************************************** * dbus.c : D-Bus control interface ***************************************************************************** - * Copyright (C) 2006 Rafaël Carré + * Copyright © 2006-2008 Rafaël Carré + * Copyright © 2007-2008 Mirsal Ennaime * $Id$ * * Authors: Rafaël Carré @@ -28,26 +29,35 @@ * D-Bus low-level C API (libdbus) * http://dbus.freedesktop.org/doc/dbus/api/html/index.html * extract: - "If you use this low-level API directly, you're signing up for some pain." - * MPRIS Specification (still drafting on June, 25 of 2007): - * http://wiki.xmms2.xmms.se/index.php/Media_Player_Interfaces + * "If you use this low-level API directly, you're signing up for some pain." + * + * MPRIS Specification (still drafting on Jan, 23 of 2008): + * http://wiki.xmms2.xmms.se/index.php/MPRIS */ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif +#include #include "dbus.h" -#include +#include +#include #include #include #include #include #include +#include + +#include + /***************************************************************************** * Local prototypes. *****************************************************************************/ @@ -56,29 +66,55 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); static void Run ( intf_thread_t * ); -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 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 GetInputMeta ( input_item_t *p_input, - DBusMessageIter *args); +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 GetInputMeta ( input_item_t *, DBusMessageIter * ); +static int MarshalStatus ( intf_thread_t *, DBusMessageIter *, bool ); +static int UpdateCaps( intf_thread_t*, bool ); + +/* GetCaps() capabilities */ +enum +{ + CAPS_NONE = 0, + CAPS_CAN_GO_NEXT = 1 << 0, + CAPS_CAN_GO_PREV = 1 << 1, + CAPS_CAN_PAUSE = 1 << 2, + CAPS_CAN_PLAY = 1 << 3, + CAPS_CAN_SEEK = 1 << 4, + CAPS_CAN_PROVIDE_METADATA = 1 << 5, + CAPS_CAN_HAS_TRACKLIST = 1 << 6 +}; struct intf_sys_t { DBusConnection *p_conn; + bool b_meta_read; + dbus_int32_t i_caps; + bool b_dead; }; /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_shortname( _("dbus")); - set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_CONTROL ); - set_description( _("D-Bus control interface") ); - set_capability( "interface", 0 ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_shortname( N_("dbus")) + set_category( CAT_INTERFACE ) + set_subcategory( SUBCAT_INTERFACE_CONTROL ) + set_description( N_("D-Bus control interface") ) + set_capability( "interface", 0 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Methods @@ -89,10 +125,33 @@ vlc_module_end(); DBUS_METHOD( Quit ) { /* exits vlc */ REPLY_INIT; - playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this ); - playlist_Stop( p_playlist ); - pl_Release( ((vlc_object_t*) p_this) ); - vlc_object_kill(((vlc_object_t*)p_this)->p_libvlc); + libvlc_Quit(((vlc_object_t*)p_this)->p_libvlc); + 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; } @@ -103,8 +162,8 @@ DBUS_METHOD( PositionGet ) vlc_value_t position; dbus_int32_t i_pos; - playlist_t *p_playlist = pl_Yield( ((vlc_object_t*) p_this) ); - input_thread_t *p_input = p_playlist->p_input; + playlist_t *p_playlist = pl_Hold( ((vlc_object_t*) p_this) ); + input_thread_t *p_input = playlist_CurrentInput( p_playlist ); if( !p_input ) i_pos = 0; @@ -112,6 +171,7 @@ DBUS_METHOD( PositionGet ) { var_Get( p_input, "time", &position ); i_pos = position.i_time / 1000; + vlc_object_release( p_input ); } pl_Release( ((vlc_object_t*) p_this) ); ADD_INT32( &i_pos ); @@ -135,18 +195,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_Yield( ((vlc_object_t*) p_this) ); - input_thread_t *p_input = p_playlist->p_input; + p_playlist = pl_Hold( ((vlc_object_t*) p_this) ); + input_thread_t *p_input = playlist_CurrentInput( p_playlist ); if( p_input ) { position.i_time = i_pos * 1000; var_Set( p_input, "time", position ); + vlc_object_release( p_input ); } pl_Release( ((vlc_object_t*) p_this) ); REPLY_SEND; @@ -160,7 +221,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; } @@ -181,13 +243,14 @@ 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; } - 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; @@ -196,7 +259,7 @@ DBUS_METHOD( VolumeSet ) DBUS_METHOD( Next ) { /* next playlist item */ REPLY_INIT; - playlist_t *p_playlist = pl_Yield( ((vlc_object_t*) p_this) ); + playlist_t *p_playlist = pl_Hold( ((vlc_object_t*) p_this) ); playlist_Next( p_playlist ); pl_Release( ((vlc_object_t*) p_this) ); REPLY_SEND; @@ -205,7 +268,7 @@ DBUS_METHOD( Next ) DBUS_METHOD( Prev ) { /* previous playlist item */ REPLY_INIT; - playlist_t *p_playlist = pl_Yield( ((vlc_object_t*) p_this) ); + playlist_t *p_playlist = pl_Hold( ((vlc_object_t*) p_this) ); playlist_Prev( p_playlist ); pl_Release( ((vlc_object_t*) p_this) ); REPLY_SEND; @@ -214,54 +277,54 @@ DBUS_METHOD( Prev ) DBUS_METHOD( Stop ) { /* stop playing */ REPLY_INIT; - playlist_t *p_playlist = pl_Yield( ((vlc_object_t*) p_this) ); + playlist_t *p_playlist = pl_Hold( ((vlc_object_t*) p_this) ); playlist_Stop( p_playlist ); pl_Release( ((vlc_object_t*) p_this) ); REPLY_SEND; } DBUS_METHOD( GetStatus ) -{ /* returns an int: 0=playing 1=paused 2=stopped */ +{ /* returns the current status as a struct of 4 ints */ +/* + First 0 = Playing, 1 = Paused, 2 = Stopped. + Second 0 = Playing linearly , 1 = Playing randomly. + Third 0 = Go to the next element once the current has finished playing , 1 = Repeat the current element + Fourth 0 = Stop playing once the last element has been played, 1 = Never give up playing * + */ REPLY_INIT; OUT_ARGUMENTS; - dbus_int32_t i_status; - vlc_value_t val; - - playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this ); - input_thread_t *p_input = p_playlist->p_input; - - i_status = 2; - if( p_input ) - { - var_Get( p_input, "state", &val ); - if( val.i_int == PAUSE_S ) - i_status = 1; - else if( val.i_int == PLAYING_S ) - i_status = 0; - } + MarshalStatus( p_this, &args, true ); - pl_Release( p_playlist ); - - ADD_INT32( &i_status ); REPLY_SEND; } DBUS_METHOD( Pause ) { REPLY_INIT; - playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this ); + playlist_t *p_playlist = pl_Hold( (vlc_object_t*) p_this ); playlist_Pause( p_playlist ); - pl_Release( p_playlist ); + pl_Release( (vlc_object_t*) p_this ); REPLY_SEND; } DBUS_METHOD( Play ) { REPLY_INIT; - playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this ); - playlist_Play( p_playlist ); - pl_Release( p_playlist ); + playlist_t *p_playlist = pl_Hold( (vlc_object_t*) p_this ); + + input_thread_t *p_input = playlist_CurrentInput( p_playlist ); + + 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( (vlc_object_t*) p_this ); REPLY_SEND; } @@ -269,12 +332,23 @@ DBUS_METHOD( GetCurrentMetadata ) { REPLY_INIT; OUT_ARGUMENTS; - playlist_t* p_playlist = pl_Yield( (vlc_object_t*) p_this ); + playlist_t* p_playlist = pl_Hold( (vlc_object_t*) p_this ); + PL_LOCK; + playlist_item_t* p_item = playlist_CurrentPlayingItem( p_playlist ); + if( p_item ) + GetInputMeta( p_item->p_input, &args ); + PL_UNLOCK; + pl_Release( (vlc_object_t*) p_this ); + REPLY_SEND; +} + +DBUS_METHOD( GetCaps ) +{ + REPLY_INIT; + OUT_ARGUMENTS; - if( p_playlist->status.p_item ) - GetInputMeta( p_playlist->status.p_item->p_input, &args ); + ADD_INT32( &((intf_thread_t*)p_this)->p_sys->i_caps ); - pl_Release( p_playlist ); REPLY_SEND; } @@ -282,12 +356,18 @@ DBUS_METHOD( GetCurrentMetadata ) DBUS_METHOD( Identity ) { + VLC_UNUSED(p_this); REPLY_INIT; OUT_ARGUMENTS; - char *psz_identity = malloc( strlen( PACKAGE ) + strlen( VERSION ) + 2 ); - sprintf( psz_identity, "%s %s", PACKAGE, VERSION ); - ADD_STRING( &psz_identity ); - free( psz_identity ); + char *psz_identity; + if( asprintf( &psz_identity, "%s %s", PACKAGE, VERSION ) != -1 ) + { + ADD_STRING( &psz_identity ); + free( psz_identity ); + } + else + return DBUS_HANDLER_RESULT_NEED_MEMORY; + REPLY_SEND; } @@ -296,6 +376,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 ); @@ -311,17 +392,20 @@ 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_Yield( (vlc_object_t*) p_this ); + p_playlist = pl_Hold( (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 ); - pl_Release( p_playlist ); + PLAYLIST_END, true, false ); + pl_Release( (vlc_object_t*) p_this ); + + dbus_int32_t i_success = 0; + ADD_INT32( &i_success ); REPLY_SEND; } @@ -330,21 +414,10 @@ DBUS_METHOD( GetCurrentTrack ) { REPLY_INIT; OUT_ARGUMENTS; - /* FIXME 0 indicates the first item, - * what to do if we're stopped, or empty ? */ - dbus_int32_t i_position = 0; - playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this ); - playlist_item_t* p_tested_item = p_playlist->p_root_onelevel; - - if( p_playlist->status.p_item ) - while ( p_tested_item && p_tested_item->p_input->i_id != - p_playlist->status.p_item->p_input->i_id ) - { - i_position++; - TEST_NEXT_ITEM; - } - /* FIXME if p_tested_item is NULL at that point, what do we do ? */ - pl_Release( p_playlist ); + + 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 ); ADD_INT32( &i_position ); REPLY_SEND; @@ -357,10 +430,10 @@ DBUS_METHOD( GetMetadata ) DBusError error; dbus_error_init( &error ); - dbus_int32_t i_position, i_count = 0; + dbus_int32_t i_position; - playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this ); - playlist_item_t* p_tested_item = p_playlist->p_root_onelevel; + playlist_t *p_playlist = pl_Hold( (vlc_object_t*) p_this ); + PL_LOCK; dbus_message_get_args( p_from, &error, DBUS_TYPE_INT32, &i_position, @@ -368,22 +441,21 @@ DBUS_METHOD( GetMetadata ) if( dbus_error_is_set( &error ) ) { - msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s\n", + PL_UNLOCK; + pl_Release( (vlc_object_t*) p_this ); + 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; } - while ( p_tested_item && ( i_count < i_position ) ) + if( i_position < p_playlist->current.i_size ) { - i_count++; - TEST_NEXT_ITEM; + GetInputMeta( p_playlist->current.p_elems[i_position]->p_input, &args ); } - if( p_tested_item ) - GetInputMeta ( p_tested_item->p_input, &args ); - - pl_Release( p_playlist ); + PL_UNLOCK; + pl_Release( (vlc_object_t*) p_this ); REPLY_SEND; } @@ -392,20 +464,9 @@ DBUS_METHOD( GetLength ) REPLY_INIT; OUT_ARGUMENTS; - dbus_int32_t i_elements = 0; - playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this ); - playlist_item_t* p_tested_item = p_playlist->p_root_onelevel; - playlist_item_t* p_last_item = playlist_GetLastLeaf( p_playlist, - p_playlist->p_root_onelevel ); - - while ( p_tested_item && - ( p_tested_item->p_input->i_id != p_last_item->p_input->i_id ) ) - { - i_elements++; - TEST_NEXT_ITEM; - } - - pl_Release( p_playlist ); + 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 ); ADD_INT32( &i_elements ); REPLY_SEND; @@ -418,9 +479,8 @@ DBUS_METHOD( DelTrack ) DBusError error; dbus_error_init( &error ); - dbus_int32_t i_position, i_count = 0; - playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this ); - playlist_item_t* p_tested_item = p_playlist->p_root_onelevel; + dbus_int32_t i_position; + playlist_t *p_playlist = pl_Hold( (vlc_object_t*) p_this ); dbus_message_get_args( p_from, &error, DBUS_TYPE_INT32, &i_position, @@ -428,33 +488,27 @@ 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; } - while ( p_tested_item && ( i_count < i_position ) ) - { - i_count++; - TEST_NEXT_ITEM; - } - - if( p_tested_item ) + PL_LOCK; + if( i_position < p_playlist->current.i_size ) { - PL_LOCK; playlist_DeleteFromInput( p_playlist, - p_tested_item->p_input->i_id, - VLC_TRUE ); - PL_UNLOCK; + p_playlist->current.p_elems[i_position]->p_input->i_id, + pl_Locked ); } + PL_UNLOCK; - pl_Release( p_playlist ); + pl_Release( (vlc_object_t*) p_this ); REPLY_SEND; } -DBUS_METHOD( Loop ) +DBUS_METHOD( SetLoop ) { REPLY_INIT; OUT_ARGUMENTS; @@ -471,14 +525,14 @@ DBUS_METHOD( Loop ) 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 ) ? VLC_TRUE : VLC_FALSE ; - p_playlist = pl_Yield( (vlc_object_t*) p_this ); + 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) ); @@ -502,22 +556,22 @@ 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 ) ? VLC_TRUE : VLC_FALSE ; + val.b_bool = ( b_repeat == TRUE ) ? true : false ; - p_playlist = pl_Yield( (vlc_object_t*) p_this ); + p_playlist = pl_Hold( (vlc_object_t*) p_this ); var_Set ( p_playlist, "repeat", val ); pl_Release( ((vlc_object_t*) p_this) ); REPLY_SEND; } -DBUS_METHOD( Random ) +DBUS_METHOD( SetRandom ) { REPLY_INIT; OUT_ARGUMENTS; @@ -526,23 +580,23 @@ DBUS_METHOD( Random ) 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, DBUS_TYPE_BOOLEAN, &b_random, DBUS_TYPE_INVALID ); - + 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 ) ? VLC_TRUE : VLC_FALSE ; - - p_playlist = pl_Yield( (vlc_object_t*) p_this ); + 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) ); @@ -554,6 +608,7 @@ DBUS_METHOD( Random ) DBUS_METHOD( handle_introspect_root ) { /* handles introspection of root object */ + VLC_UNUSED(p_this); REPLY_INIT; OUT_ARGUMENTS; ADD_STRING( &psz_introspection_xml_data_root ); @@ -562,6 +617,7 @@ DBUS_METHOD( handle_introspect_root ) DBUS_METHOD( handle_introspect_player ) { + VLC_UNUSED(p_this); REPLY_INIT; OUT_ARGUMENTS; ADD_STRING( &psz_introspection_xml_data_player ); @@ -570,6 +626,7 @@ DBUS_METHOD( handle_introspect_player ) DBUS_METHOD( handle_introspect_tracklist ) { + VLC_UNUSED(p_this); REPLY_INIT; OUT_ARGUMENTS; ADD_STRING( &psz_introspection_xml_data_tracklist ); @@ -594,6 +651,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; } @@ -603,13 +662,12 @@ DBUS_METHOD( handle_player ) { if( dbus_message_is_method_call( p_from, DBUS_INTERFACE_INTROSPECTABLE, "Introspect" ) ) - return handle_introspect_player( p_conn, p_from, p_this ); + return handle_introspect_player( p_conn, p_from, p_this ); /* here D-Bus method's names are associated to an handler */ METHOD_FUNC( "Prev", Prev ); METHOD_FUNC( "Next", Next ); - METHOD_FUNC( "Quit", Quit ); METHOD_FUNC( "Stop", Stop ); METHOD_FUNC( "Play", Play ); METHOD_FUNC( "Pause", Pause ); @@ -620,6 +678,7 @@ DBUS_METHOD( handle_player ) METHOD_FUNC( "PositionGet", PositionGet ); METHOD_FUNC( "GetStatus", GetStatus ); METHOD_FUNC( "GetMetadata", GetCurrentMetadata ); + METHOD_FUNC( "GetCaps", GetCaps ); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } @@ -637,8 +696,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; } @@ -658,7 +717,9 @@ static int Open( vlc_object_t *p_this ) if( !p_sys ) return VLC_ENOMEM; - dbus_threads_init_default(); + p_sys->b_meta_read = false; + p_sys->i_caps = CAPS_NONE; + p_sys->b_dead = false; dbus_error_init( &error ); @@ -694,16 +755,24 @@ static int Open( vlc_object_t *p_this ) dbus_connection_flush( p_conn ); - p_playlist = pl_Yield( p_intf ); + p_playlist = pl_Hold( p_intf ); PL_LOCK; - var_AddCallback( p_playlist, "playlist-current", TrackChange, p_intf ); + var_AddCallback( p_playlist, "item-current", TrackChange, p_intf ); + var_AddCallback( p_playlist, "intf-change", TrackListChangeEmit, p_intf ); + var_AddCallback( p_playlist, "playlist-item-append", TrackListChangeEmit, p_intf ); + var_AddCallback( p_playlist, "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_playlist ); + pl_Release( p_intf ); p_intf->pf_run = Run; p_intf->p_sys = p_sys; p_sys->p_conn = p_conn; + UpdateCaps( p_intf, false ); + return VLC_SUCCESS; } @@ -714,12 +783,25 @@ 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_Yield( p_intf );; + playlist_t *p_playlist = pl_Hold( p_intf );; + input_thread_t *p_input; + + var_DelCallback( p_playlist, "item-current", TrackChange, p_intf ); + var_DelCallback( p_playlist, "intf-change", TrackListChangeEmit, p_intf ); + var_DelCallback( p_playlist, "playlist-item-append", TrackListChangeEmit, p_intf ); + var_DelCallback( p_playlist, "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 ) + { + var_DelCallback( p_input, "state", StateChange, p_intf ); + vlc_object_release( p_input ); + } - PL_LOCK; - var_DelCallback( p_playlist, "playlist-current", TrackChange, p_intf ); - PL_UNLOCK; - pl_Release( p_playlist ); + pl_Release( p_intf ); dbus_connection_unref( p_intf->p_sys->p_conn ); @@ -732,13 +814,74 @@ static void Close ( vlc_object_t *p_this ) static void Run ( intf_thread_t *p_intf ) { - while( !p_intf->b_die ) + for( ;; ) { msleep( INTF_IDLE_SLEEP ); + int canc = vlc_savecancel(); dbus_connection_read_write_dispatch( p_intf->p_sys->p_conn, 0 ); + vlc_restorecancel( canc ); } } +/****************************************************************************** + * CapsChange: player capabilities change signal + *****************************************************************************/ +DBUS_SIGNAL( CapsChangeSignal ) +{ + SIGNAL_INIT( "CapsChange" ); + OUT_ARGUMENTS; + + ADD_INT32( &((intf_thread_t*)p_data)->p_sys->i_caps ); + SIGNAL_SEND; +} + +/****************************************************************************** + * TrackListChange: tracklist order / length change signal + *****************************************************************************/ +DBUS_SIGNAL( TrackListChangeSignal ) +{ /* emit the new tracklist lengh */ + SIGNAL_INIT("TrackListChange"); + OUT_ARGUMENTS; + + playlist_t *p_playlist = pl_Hold( (vlc_object_t*) p_data ); + dbus_int32_t i_elements = p_playlist->current.i_size; + pl_Release( (vlc_object_t*) p_data ); + + ADD_INT32( &i_elements ); + SIGNAL_SEND; +} + +/***************************************************************************** + * 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 ) +{ + VLC_UNUSED(oldval); + intf_thread_t *p_intf = p_data; + + if( !strcmp( psz_var, "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 ); + assert( p_item ); + while( p_item->p_parent ) + p_item = p_item->p_parent; + if( p_item == p_playlist->p_root_category ) + return VLC_SUCCESS; + } + + if( p_intf->p_sys->b_dead ) + return VLC_SUCCESS; + + UpdateCaps( p_intf, true ); + TrackListChangeSignal( p_intf->p_sys->p_conn, p_data ); + return VLC_SUCCESS; +} /***************************************************************************** * TrackChange: Playlist item change callback *****************************************************************************/ @@ -748,12 +891,83 @@ DBUS_SIGNAL( TrackChangeSignal ) SIGNAL_INIT( "TrackChange" ); OUT_ARGUMENTS; - input_thread_t *p_input = (input_thread_t*) p_data; - GetInputMeta ( input_GetItem(p_input), &args ); + input_item_t *p_item = (input_item_t*) p_data; + GetInputMeta ( p_item, &args ); SIGNAL_SEND; } +/***************************************************************************** + * StatusChange: Player status change signal + *****************************************************************************/ + +DBUS_SIGNAL( StatusChangeSignal ) +{ /* send the updated status info on the bus */ + SIGNAL_INIT( "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 ); + + SIGNAL_SEND; +} + +/***************************************************************************** + * 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 ) +{ + 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; + + if( p_intf->p_sys->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 = true; + TrackChangeSignal( p_sys->p_conn, p_item ); + } + } + + if( newval.i_int == PLAYING_S || newval.i_int == PAUSE_S || + newval.i_int == END_S ) + { + StatusChangeSignal( p_sys->p_conn, (void*) p_intf ); + } + + return VLC_SUCCESS; +} + +/***************************************************************************** + * 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 ) +{ + 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 ); + return VLC_SUCCESS; +} + +/***************************************************************************** + * 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 ) { @@ -761,29 +975,84 @@ static int TrackChange( vlc_object_t *p_this, const char *psz_var, intf_sys_t *p_sys = p_intf->p_sys; playlist_t *p_playlist; input_thread_t *p_input = NULL; - (void)p_this; (void)psz_var; (void)oldval; (void)newval; + input_item_t *p_item = NULL; + VLC_UNUSED( p_this ); VLC_UNUSED( psz_var ); + VLC_UNUSED( oldval ); VLC_UNUSED( newval ); - p_playlist = pl_Yield( p_intf ); - PL_LOCK; - p_input = p_playlist->p_input; + if( p_intf->p_sys->b_dead ) + return VLC_SUCCESS; + p_sys->b_meta_read = false; + + p_playlist = pl_Hold( p_intf ); + p_input = playlist_CurrentInput( p_playlist ); if( !p_input ) { - PL_UNLOCK; - pl_Release( p_playlist ); + pl_Release( p_intf ); return VLC_SUCCESS; } - vlc_object_yield( p_input ); - PL_UNLOCK; - pl_Release( p_playlist ); + pl_Release( p_intf ); - TrackChangeSignal( p_sys->p_conn, p_input ); + p_item = input_GetItem( p_input ); + if( !p_item ) + { + vlc_object_release( p_input ); + return VLC_EGENERIC; + } + + if( input_item_IsPreparsed( p_item ) ) + { + p_sys->b_meta_read = true; + TrackChangeSignal( p_sys->p_conn, p_item ); + } + + var_AddCallback( p_input, "state", StateChange, p_intf ); vlc_object_release( p_input ); return VLC_SUCCESS; } +/***************************************************************************** + * UpdateCaps: update p_sys->i_caps + ****************************************************************************/ +static int UpdateCaps( intf_thread_t* p_intf, bool b_playlist_locked ) +{ + 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; + + 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; + + input_thread_t* p_input = playlist_CurrentInput( p_playlist ); + if( p_input ) + { + /* XXX: if UpdateCaps() is called too early, these are + * unconditionnaly true */ + if( var_GetBool( p_input, "can-pause" ) ) + i_caps |= CAPS_CAN_PAUSE; + if( var_GetBool( p_input, "can-seek" ) ) + i_caps |= CAPS_CAN_SEEK; + vlc_object_release( p_input ); + } + + pl_Release( p_intf ); + + if( p_sys->b_meta_read ) + i_caps |= CAPS_CAN_PROVIDE_METADATA; + + if( i_caps != p_intf->p_sys->i_caps ) + { + p_sys->i_caps = i_caps; + CapsChangeSignal( p_intf->p_sys->p_conn, (vlc_object_t*)p_intf ); + } + + return VLC_SUCCESS; +} + /***************************************************************************** * GetInputMeta: Fill a DBusMessage with the given input item metadata *****************************************************************************/ @@ -812,11 +1081,10 @@ static int TrackChange( vlc_object_t *p_this, const char *psz_var, static int GetInputMeta( input_item_t* p_input, DBusMessageIter *args ) -{ /*FIXME: Works only for already read metadata. */ - +{ DBusMessageIter dict, dict_entry, variant; - /* We need the track length to be expressed in seconds - * instead of milliseconds */ + /* 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 ); const char* ppsz_meta_items[] = @@ -824,7 +1092,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" }; @@ -862,3 +1130,54 @@ static int GetInputMeta( input_item_t* p_input, #undef ADD_META #undef ADD_VLC_META_STRING + +/***************************************************************************** + * MarshalStatus: Fill a DBusMessage with the current player status + *****************************************************************************/ + +static int MarshalStatus( intf_thread_t* p_intf, DBusMessageIter* args, + 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 */ + + DBusMessageIter status; + dbus_int32_t i_state, i_random, i_repeat, i_loop; + vlc_value_t val; + playlist_t* p_playlist = NULL; + 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_state = 2; + else if( val.i_int == PAUSE_S ) + i_state = 1; + else if( val.i_int <= PLAYING_S ) + i_state = 0; + vlc_object_release( p_input ); + } + + i_random = var_CreateGetBool( p_playlist, "random" ); + + i_repeat = var_CreateGetBool( p_playlist, "repeat" ); + + 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 ); + dbus_message_iter_append_basic( &status, DBUS_TYPE_INT32, &i_repeat ); + dbus_message_iter_append_basic( &status, DBUS_TYPE_INT32, &i_loop ); + dbus_message_iter_close_container( args, &status ); + + return VLC_SUCCESS; +}