X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Fdbus.c;h=2753140710742b42bab9ade2db57f424b63be128;hb=086a3600d6ba6fc7d9b44cbb42d37a5572102854;hp=8f47d7736877ec1f45fea705e2d25b4cf2e3f5d8;hpb=8a163fd8273e5feaa366c2a4dacc0eb75d0dbf77;p=vlc diff --git a/modules/control/dbus.c b/modules/control/dbus.c index 8f47d77368..2753140710 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é @@ -50,8 +51,6 @@ #include #include #include -#include -#include #include #include @@ -66,21 +65,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 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 TrackChange( vlc_object_t *, const char *, vlc_value_t, - vlc_value_t, void * ); - -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 UpdateCaps( intf_thread_t* ); /* GetCaps() capabilities */ enum @@ -95,14 +89,37 @@ 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; + bool b_meta_read; dbus_int32_t i_caps; - bool b_dead; + bool b_dead; + vlc_array_t *p_events; + vlc_mutex_t lock; }; +typedef struct +{ + int signal; + int i_node; + int i_input_state; +} callback_info_t; + + /***************************************************************************** * Module descriptor *****************************************************************************/ @@ -335,7 +352,7 @@ DBUS_METHOD( GetCurrentMetadata ) 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 ) + if( p_item ) GetInputMeta( p_item->p_input, &args ); PL_UNLOCK; pl_Release( (vlc_object_t*) p_this ); @@ -431,9 +448,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; dbus_message_get_args( p_from, &error, DBUS_TYPE_INT32, &i_position, @@ -441,14 +456,14 @@ 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", error.message ); dbus_error_free( &error ); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } + p_playlist = pl_Hold( (vlc_object_t*) p_this ); + PL_LOCK; if( i_position < p_playlist->current.i_size ) { GetInputMeta( p_playlist->current.p_elems[i_position]->p_input, &args ); @@ -480,7 +495,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; dbus_message_get_args( p_from, &error, DBUS_TYPE_INT32, &i_position, @@ -494,6 +509,7 @@ DBUS_METHOD( DelTrack ) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } + p_playlist = pl_Hold( (vlc_object_t*) p_this ); PL_LOCK; if( i_position < p_playlist->current.i_size ) { @@ -515,8 +531,7 @@ DBUS_METHOD( SetLoop ) DBusError error; dbus_bool_t b_loop; - vlc_value_t val; - playlist_t* p_playlist = NULL; + playlist_t* p_playlist; dbus_error_init( &error ); dbus_message_get_args( p_from, &error, @@ -531,9 +546,8 @@ DBUS_METHOD( SetLoop ) 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 ); + var_SetBool( p_playlist, "loop", ( b_loop == TRUE ) ); pl_Release( ((vlc_object_t*) p_this) ); REPLY_SEND; @@ -546,8 +560,7 @@ DBUS_METHOD( Repeat ) DBusError error; dbus_bool_t b_repeat; - vlc_value_t val; - playlist_t* p_playlist = NULL; + playlist_t* p_playlist; dbus_error_init( &error ); dbus_message_get_args( p_from, &error, @@ -562,10 +575,8 @@ DBUS_METHOD( Repeat ) 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 ); + var_SetBool( p_playlist, "repeat", ( b_repeat == TRUE ) ); pl_Release( ((vlc_object_t*) p_this) ); REPLY_SEND; @@ -578,8 +589,7 @@ DBUS_METHOD( SetRandom ) DBusError error; dbus_bool_t b_random; - vlc_value_t val; - playlist_t* p_playlist = NULL; + playlist_t* p_playlist; dbus_error_init( &error ); dbus_message_get_args( p_from, &error, @@ -594,10 +604,8 @@ DBUS_METHOD( SetRandom ) 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 ); + var_SetBool( p_playlist, "random", ( b_random == TRUE ) ); pl_Release( ((vlc_object_t*) p_this) ); REPLY_SEND; @@ -755,23 +763,25 @@ static int Open( vlc_object_t *p_this ) dbus_connection_flush( p_conn ); + 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_Hold( p_intf ); PL_LOCK; - 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 ); + 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 ); PL_UNLOCK; 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 ); + UpdateCaps( p_intf ); return VLC_SUCCESS; } @@ -786,18 +796,18 @@ static void Close ( vlc_object_t *p_this ) 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 ); + 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 ); p_input = playlist_CurrentInput( p_playlist ); if ( p_input ) { - var_DelCallback( p_input, "state", StateChange, p_intf ); + var_DelCallback( p_input, "state", AllCallback, p_intf ); vlc_object_release( p_input ); } @@ -805,6 +815,14 @@ static void Close ( vlc_object_t *p_this ) dbus_connection_unref( p_intf->p_sys->p_conn ); + // Free the events array + for( int i = 0; i < vlc_array_count( p_intf->p_sys->p_events ); i++ ) + { + callback_info_t* info = vlc_array_item_at_index( p_intf->p_sys->p_events, i ); + free( info ); + } + vlc_mutex_destroy( &p_intf->p_sys->lock ); + vlc_array_destroy( p_intf->p_sys->p_events ); free( p_intf->p_sys ); } @@ -819,10 +837,87 @@ static void Run ( intf_thread_t *p_intf ) msleep( INTF_IDLE_SLEEP ); int canc = vlc_savecancel(); dbus_connection_read_write_dispatch( p_intf->p_sys->p_conn, 0 ); + + // Get the messages + vlc_mutex_lock( &p_intf->p_sys->lock ); + for( int i = vlc_array_count( p_intf->p_sys->p_events ) - 1; i >= 0; i-- ) + { + callback_info_t* info = vlc_array_item_at_index( p_intf->p_sys->p_events, i ); + switch( info->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->signal, info->i_node ); + break; + case SIGNAL_RANDOM: + case SIGNAL_REPEAT: + case SIGNAL_LOOP: + StatusChangeEmit( p_intf ); + break; + case SIGNAL_STATE: + StateChange( p_intf, info->i_input_state ); + break; + default: + assert(0); + } + free( info ); + vlc_array_remove( p_intf->p_sys->p_events, i ); + } + vlc_mutex_unlock( &p_intf->p_sys->lock ); 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 *****************************************************************************/ @@ -855,31 +950,33 @@ 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, "playlist-item-append" ) ) + // "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 = pl_Hold( p_intf ); + 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; + pl_Release( p_intf ); return VLC_SUCCESS; + } + PL_UNLOCK; + pl_Release( p_intf ); } 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; } /***************************************************************************** @@ -916,32 +1013,41 @@ 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; + 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_playlist = pl_Hold( p_intf ); + 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 ); } + pl_Release( p_intf ); } - 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,34 +1056,25 @@ 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 "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; 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; @@ -1007,7 +1104,7 @@ 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 ); + var_AddCallback( p_input, "state", AllCallback, p_intf ); vlc_object_release( p_input ); return VLC_SUCCESS; @@ -1015,17 +1112,18 @@ static int TrackChange( vlc_object_t *p_this, const char *psz_var, /***************************************************************************** * 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; + 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 )