*****************************************************************************/
#include <dbus/dbus.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include "dbus.h"
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 GetInputMeta ( input_item_t *p_input,
+static int GetInputMeta ( input_item_t *p_input,
DBusMessageIter *args);
struct intf_sys_t
REPLY_INIT;
OUT_ARGUMENTS;
- DBusError error;
+ DBusError error;
dbus_error_init( &error );
char *psz_file;
DBusError error;
int i;
dbus_error_init( &error );
- i = dbus_bus_release_name( p_conn, "org.mpris.vlc", &error );
+ i = dbus_bus_release_name( p_conn, VLC_MPRIS_DBUS_SERVICE, &error );
if( ( i == -1 ) && ( dbus_error_is_set( &error ) ) )
{
msg_Err( (vlc_object_t*) p_this, "D-Bus disconnection failed : %s\n",
{
REPLY_INIT;
OUT_ARGUMENTS;
- char *psz_identity = malloc( strlen( PACKAGE ) + strlen( VERSION ) + 1 );
+ char *psz_identity = malloc( strlen( PACKAGE ) + strlen( VERSION ) + 2 );
sprintf( psz_identity, "%s %s", PACKAGE, VERSION );
ADD_STRING( &psz_identity );
free( psz_identity );
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
- while ( i_count < i_position )
+ while ( i_count < i_position )
{
i_count++;
TEST_NEXT;
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 );
+ p_playlist->p_root_onelevel );
while ( p_tested_item->p_input->i_id != p_last_item->p_input->i_id )
{
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
- while ( i_count < i_position )
+ while ( i_count < i_position )
{
i_count++;
TEST_NEXT;
}
- PL_LOCK;
+ PL_LOCK;
playlist_DeleteFromInput( p_playlist,
p_tested_item->p_input->i_id,
VLC_TRUE );
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",
}
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 );
pl_Release( ((vlc_object_t*) p_this) );
*****************************************************************************/
#define METHOD_FUNC( method, function ) \
- else if( dbus_message_is_method_call( p_from, VLC_DBUS_INTERFACE, method ) )\
+ else if( dbus_message_is_method_call( p_from, MPRIS_DBUS_INTERFACE, method ) )\
return function( p_conn, p_from, p_this )
DBUS_METHOD( handle_root )
}
/* register a well-known name on the bus */
- dbus_bus_request_name( p_conn, "org.mpris.vlc", 0, &error );
+ dbus_bus_request_name( p_conn, VLC_MPRIS_DBUS_SERVICE, 0, &error );
if( dbus_error_is_set( &error ) )
{
- msg_Err( p_this, "Error requesting org.mpris.vlc service:" " %s\n", error.message );
+ msg_Err( p_this, "Error requesting % service: %s\n"
+ VLC_MPRIS_DBUS_SERVICE, error.message );
dbus_error_free( &error );
free( p_sys );
return VLC_EGENERIC;
}
/* we register the objects */
- dbus_connection_register_object_path( p_conn, VLC_DBUS_ROOT_PATH,
+ dbus_connection_register_object_path( p_conn, MPRIS_DBUS_ROOT_PATH,
&vlc_dbus_root_vtable, p_this );
- dbus_connection_register_object_path( p_conn, VLC_DBUS_PLAYER_PATH,
+ dbus_connection_register_object_path( p_conn, MPRIS_DBUS_PLAYER_PATH,
&vlc_dbus_player_vtable, p_this );
- dbus_connection_register_object_path( p_conn, VLC_DBUS_TRACKLIST_PATH,
+ dbus_connection_register_object_path( p_conn, MPRIS_DBUS_TRACKLIST_PATH,
&vlc_dbus_tracklist_vtable, p_this );
dbus_connection_flush( p_conn );
DBusMessageIter dict, dict_entry, variant;
/* We need the track length to be expressed in seconds
* instead of milliseconds */
- dbus_int64_t i_length = (p_input->i_duration / 1000);
+ dbus_int64_t i_length = ( input_item_GetDuration( p_input ) / 1000 );
-
- const char* ppsz_meta_items[] =
+ const char* ppsz_meta_items[] =
{
"title", "artist", "genre", "copyright", "album", "tracknum",
"description", "rating", "date", "setting", "url", "language",
ADD_VLC_META_STRING( 13, Publisher );
ADD_VLC_META_STRING( 14, EncodedBy );
ADD_VLC_META_STRING( 15, ArtURL );
- ADD_VLC_META_STRING( 16, TrackID );
+ ADD_VLC_META_STRING( 16, TrackID );
+ vlc_mutex_lock( &p_input->lock );
ADD_META( 17, DBUS_TYPE_INT32, p_input->p_meta->i_status );
- ADD_META( 18, DBUS_TYPE_STRING, p_input->psz_uri );
+ vlc_mutex_unlock( &p_input->lock );
+
+ ADD_VLC_META_STRING( 18, URI );
ADD_META( 19, DBUS_TYPE_INT64, i_length );
dbus_message_iter_close_container( args, &dict );