Changeset 47fd5024be5edf4ef7f85d56482d17bc598766e3

Timestamp:

28/09/08 02:08:39 (2 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1222560519 +0200

git-parent:

[f5292e55aa88b99533607ff1c191f2285d5e0d29]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1222560519 +0200

Message:

Fix playlist_CurrentInput usage.

Files:

• modules/control/dbus.c (modified) (13 diffs)
• modules/gui/skins2/src/vlcproc.cpp (modified) (3 diffs)
• modules/misc/notify/notify.c (modified) (1 diff)
• modules/misc/notify/telepathy.c (modified) (2 diffs)
• modules/video_filter/atmo/atmo.cpp (modified) (2 diffs)

modules/control/dbus.c

@@ -168 +168 @@
-
-    playlist_t *p_playlist = pl_Hold( ((vlc_object_t*) p_this) );
-    PL_LOCK;
-    input_thread_t *p_input = playlist_CurrentInput( p_playlist );
-
@@ -177 +176 @@
-        var_Get( p_input, "time", &position );
-        i_pos = position.i_time / 1000;
-}
-PL_UNLOCK;
+    vlc_object_release( p_input );
+}
-    pl_Release( ((vlc_object_t*) p_this) );
-    ADD_INT32( &i_pos );
@@ -207 +206 @@
-    }
-    p_playlist = pl_Hold( ((vlc_object_t*) p_this) );
-    PL_LOCK;
-    input_thread_t *p_input = playlist_CurrentInput( p_playlist );
-
@@ -214 +212 @@
-        position.i_time = i_pos * 1000;
-        var_Set( p_input, "time", position );
-}
-PL_UNLOCK;
+    vlc_object_release( p_input );
+}
-    pl_Release( ((vlc_object_t*) p_this) );
-    REPLY_SEND;
@@ -320 +318 @@
-    playlist_t *p_playlist = pl_Hold( (vlc_object_t*) p_this );
-
-    PL_LOCK;
-    input_thread_t *p_input =  playlist_CurrentInput( p_playlist );
-    if( p_input )
-        vlc_object_hold( p_input );
-    PL_UNLOCK;
-
-    if( p_input )
@@ -797 +791 @@
-    input_thread_t  *p_input;
-
-    PL_LOCK;
-    var_DelCallback( p_playlist, "playlist-current", TrackChange, p_intf );
-    var_DelCallback( p_playlist, "intf-change", TrackListChangeEmit, p_intf );
@@ -809 +802 @@
-    if ( p_input )
-    {
-        vlc_object_hold( p_input );
-        var_DelCallback( p_input, "state", StateChange, p_intf );
-        vlc_object_release( p_input );
-    }
-
-    PL_UNLOCK;
-    pl_Release( p_intf );
-
@@ -1000 +991 @@
-    p_playlist = pl_Hold( p_intf );
-    p_input = playlist_CurrentInput( p_playlist );
-
-    if( !p_input )
-    {
-        PL_UNLOCK;
-        pl_Release( p_intf );
-        return VLC_SUCCESS;
-    }
-
-    vlc_object_hold( p_input );
-    pl_Release( p_intf );
-
@@ -1042 +1030 @@
-    if( p_playlist->current.i_size > 0 )
-        i_caps |= CAPS_CAN_PLAY | CAPS_CAN_GO_PREV | CAPS_CAN_GO_NEXT;
-
+
+
-    input_thread_t* p_input = playlist_CurrentInput( p_playlist );
-    if( p_input )
@@ -1052 +1041 @@
-        if( var_GetBool( p_input, "seekable" ) )
-            i_caps |= CAPS_CAN_SEEK;
-}
-
-
+    vlc_object_release( p_input );
+
+
-    pl_Release( p_intf );
-
@@ -1164 +1153 @@
-
-    p_playlist = pl_Hold( p_intf );
-    if( lock )
-        PL_LOCK;
-
-    i_state = 2;
@@ -1179 +1166 @@
-        else if( val.i_int <= PLAYING_S )
-            i_state = 0;
+        vlc_object_release( p_input );
-    }
-
@@ -1187 +1175 @@
-    i_loop = var_CreateGetBool( p_playlist, "loop" );
-
-    if( lock )
-        PL_UNLOCK;
-    pl_Release( p_intf );
-

modules/gui/skins2/src/vlcproc.cpp

@@ -331 +331 @@
-        getIntf()->p_sys->p_input =
-            playlist_CurrentInput( getIntf()->p_sys->p_playlist );
-        if( getIntf()->p_sys->p_input )
-            vlc_object_hold( getIntf()->p_sys->p_input );
-    }
-    else if( getIntf()->p_sys->p_input->b_dead )
@@ -562 +560 @@
-void VlcProc::updateStreamName( playlist_t *p_playlist )
-{
-
-
+
+
+
-        // Get playlist item information
-playlist_CurrentInput( p_playlist)
+ p_input 
-
-        VarText &rStreamName = getStreamNameVar();
@@ -590 +589 @@
-        pQueue->push( CmdGenericPtr( pCmd1 ), false );
-        pQueue->push( CmdGenericPtr( pCmd2 ), false );
+        vlc_object_release( p_input );
-    }
-}

modules/misc/notify/notify.c

@@ -151 +151 @@
-
-    if( !p_input ) return VLC_SUCCESS;
-    vlc_object_hold( p_input );
-
-    if( p_input->b_dead )

modules/misc/notify/telepathy.c

@@ -140 +140 @@
-    input_thread_t *p_input = NULL;
-
-    PL_LOCK;
-    var_DelCallback( p_playlist, "item-change", ItemChange, p_intf );
-    var_DelCallback( p_playlist, "playlist-current", ItemChange, p_intf );
-    if( (p_input = playlist_CurrentInput( p_playlist )) )
+    {
-        var_DelCallback( p_input, "state", StateChange, p_intf );
-
+
+
-    pl_Release( p_this );
-
@@ -195 +196 @@
-
-    if( !p_input ) return VLC_SUCCESS;
-    vlc_object_hold( p_input );
-
-    if( p_input->b_dead || !input_GetItem(p_input)->psz_name )

modules/video_filter/atmo/atmo.cpp

@@ -1935 +1935 @@
-    {
-        var_AddCallback( p_input, "state", StateCallback, p_filter );
-
-
+
+
+
-}
-
@@ -1953 +1954 @@
-    {
-        var_DelCallback( p_input, "state", StateCallback, p_filter );
-
-
+
+
+
-}
-