Changeset 211b483e7eb44ad8c4fe56ca298515d210d9ef71

Timestamp:

30/05/07 01:25:47 (2 years ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

Jean-Baptiste Kempf <jb@videolan.org> 1180481147 +0000

git-parent:

[18ce8f4b3eedd946fc1a0fed2271b0e77b21a585]

git-author:

Jean-Baptiste Kempf <jb@videolan.org> 1180481147 +0000

Message:

Dbus Improvements thanks to Mirsal ENNAIME

* Added Loop and Repeat methods in /TrackList
* Added GetMetadata? method in /Player
* Fixed "length" metadata item to fit the spec (It should be expressed

in seconds)

Files:

• modules/control/dbus.c (modified) (15 diffs)
• modules/control/dbus.h (modified) (3 diffs)

modules/control/dbus.c

@@ -67 +67 @@
-static int  Open    ( vlc_object_t * );
-static void Close   ( vlc_object_t * );
-   
+
-
-
@@ -179 +179 @@
-        i_pos = position.f_float * 1000 ;
-    }
+    pl_Release( ((vlc_object_t*) p_this) );
-    ADD_INT32( &i_pos );
-    pl_Release( ((vlc_object_t*) p_this) );
-    REPLY_SEND;
-}
@@ -189 +189 @@
-    REPLY_INIT;
-    vlc_value_t position;
+    playlist_t* p_playlist = NULL;
-    dbus_int32_t i_pos;
-
@@ -205 +206 @@
-        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-    }
-laylist_t *p
+
-    input_thread_t *p_input = p_playlist->p_input;
-
@@ -330 +331 @@
-}
-
+DBUS_METHOD( GetCurrentMetadata )
+{
+    REPLY_INIT;
+    OUT_ARGUMENTS;
+    playlist_t* p_playlist = pl_Yield( (vlc_object_t*) p_this );
+
+    GetInputMeta( p_playlist->status.p_item->p_input, &args );
+
+    pl_Release( p_playlist );
+    REPLY_SEND;
+}
+
-/* Media Player information */
-
@@ -351 +364 @@
-    DBusError error;
-    dbus_error_init( &error );
+    playlist_t* p_playlist = NULL;
-
-    char *psz_mrl;
@@ -368 +382 @@
-    }
-
-laylist_t *p
+
-    playlist_Add( p_playlist, psz_mrl, NULL, PLAYLIST_APPEND |
- 
-   
+
+        
-    pl_Release( p_playlist );
-
@@ -384 +398 @@
-    playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this );
-    playlist_item_t* p_tested_item = p_playlist->p_root_onelevel;
-
- 
+
+
-                    p_playlist->status.p_item->p_input->i_id )
-    {
@@ -399 +413 @@
-
-DBUS_METHOD( GetMetadata )
- 
+
-    REPLY_INIT;
-    OUT_ARGUMENTS;
@@ -406 +420 @@
-
-    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;
@@ -494 +508 @@
-    pl_Release( p_playlist );
-    
+    REPLY_SEND;
+}
+
+DBUS_METHOD( Loop )
+{
+    REPLY_INIT;
+    OUT_ARGUMENTS;
+
+    DBusError error;
+    dbus_bool_t b_loop;
+    vlc_value_t val;
+    playlist_t* p_playlist = NULL;
+    
+    dbus_error_init( &error );
+    dbus_message_get_args( p_from, &error,
+            DBUS_TYPE_BOOLEAN, &b_loop,
+            DBUS_TYPE_INVALID );
+    
+    if( dbus_error_is_set( &error ) )
+    {
+        msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s\n",
+                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 );
+    pl_Release( ((vlc_object_t*) p_this) );
+
+    REPLY_SEND;
+}
+
+DBUS_METHOD( Repeat )
+{
+    REPLY_INIT;
+    OUT_ARGUMENTS;
+
+    DBusError error;
+    dbus_bool_t b_repeat;
+    vlc_value_t val;
+    playlist_t* p_playlist = NULL;
+    
+    dbus_error_init( &error );
+    dbus_message_get_args( p_from, &error,
+            DBUS_TYPE_BOOLEAN, &b_repeat,
+            DBUS_TYPE_INVALID );
+    
+    if( dbus_error_is_set( &error ) )
+    {
+        msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s\n",
+                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 );
+    pl_Release( ((vlc_object_t*) p_this) );
+
-    REPLY_SEND;
-}
@@ -567 +644 @@
-    METHOD_FUNC( "PositionGet",             PositionGet );
-    METHOD_FUNC( "GetStatus",               GetStatus );
+    METHOD_FUNC( "GetMetadata",             GetCurrentMetadata );
-
-    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
@@ -584 +662 @@
-    METHOD_FUNC( "AddTrack",                AddTrack );
-    METHOD_FUNC( "DelTrack",                DelTrack );
+    METHOD_FUNC( "Loop",                    Loop );
+    METHOD_FUNC( "Repeat",                  Repeat );
-
-    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
@@ -753 +833 @@
-                        DBusMessageIter *args )
-{ /*FIXME: Works only for already read metadata. */ 
-  /*FIXME: Should return the length in seconds rather than milliseconds */
-  
-    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);
+
-
-    const char* ppsz_meta_items[] = 
@@ -788 +871 @@
-    ADD_META( 17, DBUS_TYPE_INT32, p_input->p_meta->i_status );
-    ADD_META( 18, DBUS_TYPE_STRING, p_input->psz_uri ); 
-p_input->i_duration
+i_length
-
-    dbus_message_iter_close_container( args, &dict );

modules/control/dbus.h

@@ -5 +5 @@
- * $Id$
- *
-
+
+
- *
- * This program is free software; you can redistribute it and/or modify
@@ -139 +140 @@
-"      <arg type=\"i\" direction=\"out\" />\n"
-"    </method>\n"
+"    <method name=\"GetMetadata\">\n"
+"      <arg type=\"a{sv}\" direction=\"out\" />\n"
+"    </method>\n"
-"  </interface>\n"
-"</node>\n"
@@ -170 +174 @@
-"      <arg type=\"i\" direction=\"out\" />\n"
-"    </method>\n"
+"    <method name=\"Loop\">\n"
+"      <arg type=\"b\" direction=\"in\" />\n"
+"    </method>\n"
+"    <method name=\"Repeat\">\n"
+"      <arg type=\"b\" direction=\"in\" />\n"
+"    </method>\n"
-"  </interface>\n"
-"</node>\n"