*****************************************************************************
* Copyright © 2006-2008 Rafaël Carré
* Copyright © 2007-2008 Mirsal Ennaime
+ * Copyright © 2009 The VideoLAN team
* $Id$
*
* Authors: Rafaël Carré <funman at videolanorg>
* Preamble
*****************************************************************************/
-#include <dbus/dbus.h>
-
-#include "dbus.h"
-
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <dbus/dbus.h>
+#include "dbus.h"
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_aout.h>
#include <vlc_interface.h>
-#include <vlc_meta.h>
-#include <vlc_input.h>
#include <vlc_playlist.h>
-#include <vlc_demux.h>
-#include <vlc_access.h>
+
+#include <math.h>
+
+#include <assert.h>
/*****************************************************************************
* Local prototypes.
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 *, vlc_bool_t );
+static int MarshalStatus ( intf_thread_t *, DBusMessageIter *, bool );
static int UpdateCaps( intf_thread_t* );
/* GetCaps() capabilities */
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;
- vlc_bool_t b_meta_read;
+ bool b_meta_read;
dbus_int32_t i_caps;
+ 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
*****************************************************************************/
-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
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;
}
vlc_value_t position;
dbus_int32_t i_pos;
- playlist_t *p_playlist = pl_Yield( ((vlc_object_t*) p_this) );
- PL_LOCK;
- 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;
{
var_Get( p_input, "time", &position );
i_pos = position.i_time / 1000;
+ vlc_object_release( p_input );
}
- PL_UNLOCK;
pl_Release( ((vlc_object_t*) p_this) );
ADD_INT32( &i_pos );
REPLY_SEND;
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) );
- PL_LOCK;
- 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_UNLOCK;
pl_Release( ((vlc_object_t*) p_this) );
REPLY_SEND;
}
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;
}
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;
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;
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;
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;
REPLY_INIT;
OUT_ARGUMENTS;
- MarshalStatus( p_this, &args, VLC_TRUE );
+ MarshalStatus( p_this, &args, true );
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;
}
{
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;
- if( p_playlist->status.p_item )
- GetInputMeta( p_playlist->status.p_item->p_input, &args );
+ playlist_item_t* p_item = playlist_CurrentPlayingItem( p_playlist );
+ if( p_item )
+ GetInputMeta( p_item->p_input, &args );
PL_UNLOCK;
- pl_Release( p_playlist );
+ pl_Release( (vlc_object_t*) p_this );
REPLY_SEND;
}
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 );
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;
}
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 );
dbus_int32_t i_position = p_playlist->i_current_index;
- pl_Release( p_playlist );
+ pl_Release( (vlc_object_t*) p_this );
ADD_INT32( &i_position );
REPLY_SEND;
dbus_error_init( &error );
dbus_int32_t i_position;
-
- playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this );
- PL_LOCK;
+ playlist_t *p_playlist;
dbus_message_get_args( p_from, &error,
DBUS_TYPE_INT32, &i_position,
if( dbus_error_is_set( &error ) )
{
- PL_UNLOCK;
- pl_Release( p_playlist );
- 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;
}
- if( i_position <= p_playlist->items.i_size / 2 )
+ p_playlist = pl_Hold( (vlc_object_t*) p_this );
+ PL_LOCK;
+ 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;
- pl_Release( p_playlist );
+ pl_Release( (vlc_object_t*) p_this );
REPLY_SEND;
}
REPLY_INIT;
OUT_ARGUMENTS;
- playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this );
- dbus_int32_t i_elements = p_playlist->items.i_size / 2;
- 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;
dbus_error_init( &error );
dbus_int32_t i_position;
- playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this );
+ playlist_t *p_playlist;
dbus_message_get_args( p_from, &error,
DBUS_TYPE_INT32, &i_position,
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;
}
- if( i_position <= p_playlist->items.i_size / 2 )
+ p_playlist = pl_Hold( (vlc_object_t*) p_this );
+ 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,
+ 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;
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,
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 );
- var_Set ( p_playlist, "loop", val );
+ p_playlist = pl_Hold( (vlc_object_t*) p_this );
+ var_SetBool( p_playlist, "loop", ( b_loop == TRUE ) );
pl_Release( ((vlc_object_t*) p_this) );
REPLY_SEND;
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,
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 ;
-
- p_playlist = pl_Yield( (vlc_object_t*) p_this );
- var_Set ( p_playlist, "repeat", val );
+ p_playlist = pl_Hold( (vlc_object_t*) p_this );
+ var_SetBool( p_playlist, "repeat", ( b_repeat == TRUE ) );
pl_Release( ((vlc_object_t*) p_this) );
REPLY_SEND;
}
-DBUS_METHOD( Random )
+DBUS_METHOD( SetRandom )
{
REPLY_INIT;
OUT_ARGUMENTS;
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,
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 );
- var_Set ( p_playlist, "random", val );
+ p_playlist = pl_Hold( (vlc_object_t*) p_this );
+ var_SetBool( p_playlist, "random", ( b_random == TRUE ) );
pl_Release( ((vlc_object_t*) p_this) );
REPLY_SEND;
/* 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;
}
METHOD_FUNC( "Prev", Prev );
METHOD_FUNC( "Next", Next );
- METHOD_FUNC( "Quit", Quit );
METHOD_FUNC( "Stop", Stop );
METHOD_FUNC( "Play", Play );
METHOD_FUNC( "Pause", Pause );
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;
}
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;
+ p_sys->b_dead = false;
dbus_error_init( &error );
dbus_connection_flush( p_conn );
- p_playlist = pl_Yield( 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_playlist );
-
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", 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 );
UpdateCaps( p_intf );
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;
- p_this->b_dead = VLC_TRUE;
+ 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 );
- PL_LOCK;
- 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 = p_playlist->p_input;
+ p_input = playlist_CurrentInput( p_playlist );
if ( p_input )
{
- vlc_object_yield( p_input );
- var_DelCallback( p_input, "state", StateChange, p_intf );
+ var_DelCallback( p_input, "state", AllCallback, p_intf );
vlc_object_release( p_input );
}
- PL_UNLOCK;
- pl_Release( p_playlist );
+ pl_Release( p_intf );
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 );
}
static void Run ( intf_thread_t *p_intf )
{
- while( !intf_ShouldDie( p_intf ) )
+ for( ;; )
{
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;
}
/******************************************************************************
SIGNAL_INIT("TrackListChange");
OUT_ARGUMENTS;
- playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_data );
- dbus_int32_t i_elements = p_playlist->items.i_size / 2;
- pl_Release( p_playlist );
+ 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 )
+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, VLC_TRUE );
+ 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->b_dead )
+ if( p_intf->p_sys->b_dead )
return VLC_SUCCESS;
- /* We're called from the playlist, so that would cause locking issues */
- /* UpdateCaps( p_intf ); */
- TrackListChangeSignal( p_intf->p_sys->p_conn, p_data );
+ UpdateCaps( p_intf );
+ TrackListChangeSignal( p_intf->p_sys->p_conn, p_intf );
return VLC_SUCCESS;
}
/*****************************************************************************
/* 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;
}
/*****************************************************************************
* 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->b_dead )
+ if( p_intf->p_sys->b_dead )
return VLC_SUCCESS;
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 = VLC_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;
/*****************************************************************************
* 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->b_dead )
+ if( p_intf->p_sys->b_dead )
return VLC_SUCCESS;
UpdateCaps( p_intf );
- StatusChangeSignal( p_intf->p_sys->p_conn, p_data );
+ 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;
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->b_dead )
+ if( p_intf->p_sys->b_dead )
return VLC_SUCCESS;
- p_sys->b_meta_read = VLC_FALSE;
-
- p_playlist = pl_Yield( p_intf );
- PL_LOCK;
- p_input = p_playlist->p_input;
+ 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 );
p_item = input_GetItem( p_input );
if( !p_item )
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 );
}
- var_AddCallback( p_input, "state", StateChange, p_intf );
+ 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 )
{
+ 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;
+ playlist_t* p_playlist = pl_Hold( p_intf );
- if( p_playlist->items.i_size > 0 )
+ PL_LOCK;
+ if( p_playlist->current.i_size > 0 )
i_caps |= CAPS_CAN_PLAY | CAPS_CAN_GO_PREV | CAPS_CAN_GO_NEXT;
+ PL_UNLOCK;
- if( p_playlist->p_input )
+ input_thread_t* p_input = playlist_CurrentInput( p_playlist );
+ if( p_input )
{
- access_t *p_access = (access_t*)vlc_object_find( p_playlist->p_input,
- VLC_OBJECT_ACCESS, FIND_CHILD );
- if( p_access && p_access->pf_control )
- {
- 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_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_UNLOCK;
- pl_Release( p_playlist );
+ pl_Release( p_intf );
- 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 );
}
"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"
};
*****************************************************************************/
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 */
playlist_t* p_playlist = NULL;
input_thread_t* p_input = NULL;
- p_playlist = pl_Yield( (vlc_object_t*) p_intf );
- if( lock )
- PL_LOCK;
+ p_playlist = pl_Hold( p_intf );
i_state = 2;
- p_input = p_playlist->p_input;
+ p_input = playlist_CurrentInput( p_playlist );
if( p_input )
{
var_Get( p_input, "state", &val );
i_state = 1;
else if( val.i_int <= PLAYING_S )
i_state = 0;
+ vlc_object_release( p_input );
}
- 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;
- pl_Release( p_playlist );
+ 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 );
projects / vlc / blobdiff