cdda/info: fix memleaks.

[vlc] / modules / control / dbus.c

diff --git a/modules/control/dbus.c b/modules/control/dbus.c
index 06f716b47c27113b0e33b4d7473f43423f22c7d5..7c8a1c9431258f3661aa1f08d356be6934eaefa7 100644 (file)
--- a/modules/control/dbus.c
+++ b/modules/control/dbus.c
@@ -47,7 +47,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_interface.h>
@@ -57,6 +57,8 @@
 
 #include <math.h>
 
+#include <assert.h>
+
 /*****************************************************************************
  * Local prototypes.
  *****************************************************************************/
@@ -106,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();
@@ -307,7 +309,7 @@ DBUS_METHOD( Pause )
     REPLY_INIT;
     playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this );
     playlist_Pause( p_playlist );
-    pl_Release( p_playlist );
+    pl_Release( (vlc_object_t*) p_this );
     REPLY_SEND;
 }
 
@@ -315,8 +317,23 @@ DBUS_METHOD( Play )
 {
     REPLY_INIT;
     playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this );
-    playlist_Play( p_playlist );
-    pl_Release( 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( (vlc_object_t*) p_this );
     REPLY_SEND;
 }
 
@@ -329,7 +346,7 @@ DBUS_METHOD( GetCurrentMetadata )
     if( p_playlist->status.p_item )
         GetInputMeta( p_playlist->status.p_item->p_input, &args );
     PL_UNLOCK;
-    pl_Release( p_playlist );
+    pl_Release( (vlc_object_t*) p_this );
     REPLY_SEND;
 }
 
@@ -367,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 );
@@ -392,7 +410,10 @@ DBUS_METHOD( AddTrack )
     playlist_Add( p_playlist, psz_mrl, NULL, PLAYLIST_APPEND |
             ( ( b_play == TRUE ) ? PLAYLIST_GO : 0 ) ,
             PLAYLIST_END, true, false );
-    pl_Release( p_playlist );
+    pl_Release( (vlc_object_t*) p_this );
+
+    dbus_int32_t i_success = 0;
+    ADD_INT32( &i_success );
 
     REPLY_SEND;
 }
@@ -404,7 +425,7 @@ DBUS_METHOD( GetCurrentTrack )
 
     playlist_t *p_playlist = pl_Yield( (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;
@@ -429,7 +450,7 @@ DBUS_METHOD( GetMetadata )
     if( dbus_error_is_set( &error ) )
     {
         PL_UNLOCK;
-        pl_Release( p_playlist );
+        pl_Release( (vlc_object_t*) p_this );
         msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s\n",
                 error.message );
         dbus_error_free( &error );
@@ -442,7 +463,7 @@ DBUS_METHOD( GetMetadata )
     }
 
     PL_UNLOCK;
-    pl_Release( p_playlist );
+    pl_Release( (vlc_object_t*) p_this );
     REPLY_SEND;
 }
 
@@ -453,7 +474,7 @@ DBUS_METHOD( GetLength )
 
     playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this );
     dbus_int32_t i_elements = p_playlist->current.i_size;
-    pl_Release( p_playlist );
+    pl_Release( (vlc_object_t*) p_this );
 
     ADD_INT32( &i_elements );
     REPLY_SEND;
@@ -486,11 +507,11 @@ DBUS_METHOD( DelTrack )
     {
         playlist_DeleteFromInput( p_playlist,
             p_playlist->current.p_elems[i_position]->p_input->i_id,
-            true );
+            pl_Locked );
     }
     PL_UNLOCK;
 
-    pl_Release( p_playlist );
+    pl_Release( (vlc_object_t*) p_this );
 
     REPLY_SEND;
 }
@@ -751,7 +772,7 @@ static int Open( vlc_object_t *p_this )
     var_AddCallback( p_playlist, "repeat", StatusChangeEmit, p_intf );
     var_AddCallback( p_playlist, "loop", StatusChangeEmit, p_intf );
     PL_UNLOCK;
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 
     p_intf->pf_run = Run;
     p_intf->p_sys = p_sys;
@@ -792,7 +813,7 @@ static void Close   ( vlc_object_t *p_this )
     }
 
     PL_UNLOCK;
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 
     dbus_connection_unref( p_intf->p_sys->p_conn );
 
@@ -834,7 +855,7 @@ DBUS_SIGNAL( TrackListChangeSignal )
 
     playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_data );
     dbus_int32_t i_elements = p_playlist->current.i_size;
-    pl_Release( p_playlist );
+    pl_Release( (vlc_object_t*) p_data );
 
     ADD_INT32( &i_elements );
     SIGNAL_SEND;
@@ -856,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, pl_Locked );
         assert( p_item );
         while( p_item->p_parent )
             p_item = p_item->p_parent;
@@ -928,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 );
     }
@@ -979,12 +1000,12 @@ static int TrackChange( vlc_object_t *p_this, const char *psz_var,
     if( !p_input )
     {
         PL_UNLOCK;
-        pl_Release( p_playlist );
+        pl_Release( p_intf );
         return VLC_SUCCESS;
     }
 
     vlc_object_yield( p_input );
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 
     p_item = input_GetItem( p_input );
     if( !p_item )
@@ -1012,7 +1033,7 @@ static int UpdateCaps( intf_thread_t* p_intf, bool b_playlist_locked )
 {
     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 );
+    playlist_t* p_playlist = pl_Yield( p_intf );
     if( !b_playlist_locked ) PL_LOCK;
     
     if( p_playlist->current.i_size > 0 )
@@ -1029,7 +1050,7 @@ static int UpdateCaps( intf_thread_t* p_intf, bool b_playlist_locked )
     }
 
     if( !b_playlist_locked ) PL_UNLOCK;
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 
     if( p_sys->b_meta_read )
         i_caps |= CAPS_CAN_PROVIDE_METADATA;
@@ -1137,7 +1158,7 @@ static int MarshalStatus( intf_thread_t* p_intf, DBusMessageIter* args,
     playlist_t* p_playlist = NULL;
     input_thread_t* p_input = NULL;
 
-    p_playlist = pl_Yield( (vlc_object_t*) p_intf );
+    p_playlist = pl_Yield( p_intf );
     if( lock )
         PL_LOCK;
 
@@ -1163,7 +1184,7 @@ static int MarshalStatus( intf_thread_t* p_intf, DBusMessageIter* args,
 
     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 );