The playlist is not lock for the moment.

[vlc] / modules / control / dbus.c

diff --git a/modules/control/dbus.c b/modules/control/dbus.c
index 4888e2ffbdcd36fffe7a1f7e2631458b1aa8da2f..fd725a5f0ebef960a46cf806c4db68ff8881b877 100644 (file)
--- a/modules/control/dbus.c
+++ b/modules/control/dbus.c
@@ -47,7 +47,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_interface.h>
 #include <vlc_meta.h>
@@ -56,6 +57,8 @@
 
 #include <math.h>
 
+#include <assert.h>
+
 /*****************************************************************************
  * Local prototypes.
  *****************************************************************************/
@@ -105,10 +108,10 @@ struct intf_sys_t
  *****************************************************************************/
 
 vlc_module_begin();
-    set_shortname( _("dbus"));
+    set_shortname( N_("dbus"));
     set_category( CAT_INTERFACE );
     set_subcategory( SUBCAT_INTERFACE_CONTROL );
-    set_description( _("D-Bus control interface") );
+    set_description( N_("D-Bus control interface") );
     set_capability( "interface", 0 );
     set_callbacks( Open, Close );
 vlc_module_end();
@@ -314,7 +317,22 @@ DBUS_METHOD( Play )
 {
     REPLY_INIT;
     playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this );
-    playlist_Play( p_playlist );
+
+    PL_LOCK;
+    input_thread_t *p_input = p_playlist->p_input;
+    if( p_input )
+        vlc_object_yield( p_input );
+    PL_UNLOCK;
+
+    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( p_playlist );
     REPLY_SEND;
 }
@@ -366,6 +384,7 @@ DBUS_METHOD( Identity )
 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 );
@@ -393,6 +412,9 @@ DBUS_METHOD( AddTrack )
             PLAYLIST_END, true, false );
     pl_Release( p_playlist );
 
+    dbus_int32_t i_success = 0;
+    ADD_INT32( &i_success );
+
     REPLY_SEND;
 }
 
@@ -435,9 +457,9 @@ DBUS_METHOD( GetMetadata )
         return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
     }
 
-    if( i_position <= p_playlist->items.i_size / 2 )
+    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;
@@ -451,7 +473,7 @@ DBUS_METHOD( GetLength )
     OUT_ARGUMENTS;
 
     playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this );
-    dbus_int32_t i_elements = p_playlist->items.i_size / 2;
+    dbus_int32_t i_elements = p_playlist->current.i_size;
     pl_Release( p_playlist );
 
     ADD_INT32( &i_elements );
@@ -480,12 +502,14 @@ DBUS_METHOD( DelTrack )
         return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
     }
 
-    if( i_position <= p_playlist->items.i_size / 2 )
+    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,
-            false );
+            p_playlist->current.p_elems[i_position]->p_input->i_id,
+            true );
     }
+    PL_UNLOCK;
 
     pl_Release( p_playlist );
 
@@ -830,7 +854,7 @@ DBUS_SIGNAL( TrackListChangeSignal )
     OUT_ARGUMENTS;
 
     playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_data );
-    dbus_int32_t i_elements = p_playlist->items.i_size / 2;
+    dbus_int32_t i_elements = p_playlist->current.i_size;
     pl_Release( p_playlist );
 
     ADD_INT32( &i_elements );
@@ -853,7 +877,7 @@ static int TrackListChangeEmit( vlc_object_t *p_this, const char *psz_var,
         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, true );
+        p_item = playlist_ItemGetById( p_playlist, p_add->i_node, false );
         assert( p_item );
         while( p_item->p_parent )
             p_item = p_item->p_parent;
@@ -925,7 +949,7 @@ static int StateChange( vlc_object_t *p_this, const char* psz_var,
     }
 
     if( newval.i_int == PLAYING_S || newval.i_int == PAUSE_S ||
-        newval.i_int == END_S )
+        newval.i_int == STOP_S ||  newval.i_int == END_S )
     {
         StatusChangeSignal( p_sys->p_conn, (void*) p_intf );
     }
@@ -1012,7 +1036,7 @@ static int UpdateCaps( intf_thread_t* p_intf, bool b_playlist_locked )
     playlist_t* p_playlist = pl_Yield( (vlc_object_t*)p_intf );
     if( !b_playlist_locked ) PL_LOCK;
     
-    if( p_playlist->items.i_size > 0 )
+    if( p_playlist->current.i_size > 0 )
         i_caps |= CAPS_CAN_PLAY | CAPS_CAN_GO_PREV | CAPS_CAN_GO_NEXT;
 
     if( p_playlist->p_input )