Input access locking, part 3 (final).

[vlc] / modules / control / dbus.c

diff --git a/modules/control/dbus.c b/modules/control/dbus.c
index d6ed766f48cd8cd5f602c3744914c742576834bd..7dc1aa1a2e6b5c808e0a31c5266ce0bf8316bc5a 100644 (file)
--- a/modules/control/dbus.c
+++ b/modules/control/dbus.c
@@ -38,9 +38,6 @@
  *****************************************************************************/
 
 #include <dbus/dbus.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include "dbus.h"
 
@@ -326,7 +323,7 @@ DBUS_METHOD( Disconnect )
     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",
@@ -643,7 +640,7 @@ DBUS_METHOD( handle_introspect_tracklist )
  *****************************************************************************/
 
 #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 )
@@ -737,21 +734,22 @@ static int Open( vlc_object_t *p_this )
     }
 
     /* 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 );
@@ -862,11 +860,15 @@ static int TrackChange( vlc_object_t *p_this, const char *psz_var,
                 type, \
                 & data ); \
         dbus_message_iter_close_container( &dict_entry, &variant ); \
-        dbus_message_iter_close_container( &dict, &dict_entry ); }\
+        dbus_message_iter_close_container( &dict, &dict_entry ); }
 
 #define ADD_VLC_META_STRING( entry, item ) \
+    { \
+        char * psz = input_item_Get##item( p_input );\
         ADD_META( entry, DBUS_TYPE_STRING, \
-                p_input->p_meta->psz_##item );
+                  psz ); \
+        free( psz ); \
+    }
 
 static int GetInputMeta( input_item_t* p_input,
                         DBusMessageIter *args )
@@ -875,8 +877,7 @@ static int GetInputMeta( input_item_t* p_input,
     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[] = 
     {
@@ -889,26 +890,29 @@ static int GetInputMeta( input_item_t* p_input,
 
     dbus_message_iter_open_container( args, DBUS_TYPE_ARRAY, "{sv}", &dict );
 
-    ADD_VLC_META_STRING( 0, title );
-    ADD_VLC_META_STRING( 1, artist );
-    ADD_VLC_META_STRING( 2, genre );
-    ADD_VLC_META_STRING( 3, copyright );
-    ADD_VLC_META_STRING( 4, album );
-    ADD_VLC_META_STRING( 5, tracknum );
-    ADD_VLC_META_STRING( 6, description );
-    ADD_VLC_META_STRING( 7, rating );
-    ADD_VLC_META_STRING( 8, date );
-    ADD_VLC_META_STRING( 9, setting );
-    ADD_VLC_META_STRING( 10, url );
-    ADD_VLC_META_STRING( 11, language );
-    ADD_VLC_META_STRING( 12, nowplaying );
-    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( 0,  Title );
+    ADD_VLC_META_STRING( 1,  Artist );
+    ADD_VLC_META_STRING( 2,  Genre );
+    ADD_VLC_META_STRING( 3,  Copyright );
+    ADD_VLC_META_STRING( 4,  Album );
+    ADD_VLC_META_STRING( 5,  TrackNum );
+    ADD_VLC_META_STRING( 6,  Description );
+    ADD_VLC_META_STRING( 7,  Rating );
+    ADD_VLC_META_STRING( 8,  Date );
+    ADD_VLC_META_STRING( 9,  Setting );
+    ADD_VLC_META_STRING( 10, URL );
+    ADD_VLC_META_STRING( 11, Language );
+    ADD_VLC_META_STRING( 12, NowPlaying );
+    ADD_VLC_META_STRING( 13, Publisher );
+    ADD_VLC_META_STRING( 14, EncodedBy );
+    ADD_VLC_META_STRING( 15, ArtURL );
+    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 );