Changeset a3e989d4523e9252f53017fd030db87ac5691e00

Timestamp:

17/06/08 20:43:32 (4 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1213728212 +0300

git-parent:

[337933ee7056470f0a253aa582a08807c8c01945]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1213728212 +0300

Message:

Remove the last direct use of object_wait

Files:

• src/libvlc.h (modified) (1 diff)
• src/playlist/control.c (modified) (1 diff)
• src/playlist/item.c (modified) (4 diffs)
• src/playlist/search.c (modified) (1 diff)
• src/video_output/vout_intf.c (modified) (4 diffs)

src/libvlc.h

@@ -142 +142 @@
-vlc_custom_create (vlc_object_t *p_this, size_t i_size, int i_type,
-                   const char *psz_type);
+
+/* Signal an object without checking for locking consistency. This is wrong. */
+#ifdef __GNUC__
+__attribute__((deprecated))
+#endif
+static inline void
+vlc_object_signal_maybe (vlc_object_t *p_this)
+{
+    vlc_cond_signal (&p_this->object_wait);
+}
-
-/**

src/playlist/control.c

@@ -163 +163 @@
-        break;
-    }
-cond_signal( &p_playlist->object_wait
+object_signal_maybe( VLC_OBJECT(p_playlist)
-
-    return VLC_SUCCESS;

src/playlist/item.c

@@ -725 +725 @@
-        i_ret = TreeMove( p_playlist, p_item, p_node, i_newpos );
-    p_playlist->b_reset_currently_playing = true;
-cond_signal( &p_playlist->object_wait
+object_signal_maybe( VLC_OBJECT(p_playlist)
-    return i_ret;
-}
@@ -751 +751 @@
-    p_playlist->b_reset_currently_playing = true;
-    if( b_signal )
-cond_signal( &p_playlist->object_wai
+object_signal_maybe( p_playlis
-    var_Set( p_playlist, "item-append", val );
-    free( p_add );
@@ -809 +809 @@
-            input_StopThread( p_playlist->p_input );
-        p_playlist->request.i_status = PLAYLIST_RUNNING;
-cond_signal( &p_playlist->object_wait
+object_signal_maybe( VLC_OBJECT(p_playlist)
-    }
-    /* Preparse if PREPARSE or SPREPARSE & not enough meta */
@@ -891 +891 @@
-            p_playlist->request.p_item = NULL;
-            msg_Info( p_playlist, "stopping playback" );
-cond_signal( &p_playlist->object_wait
+object_signal_maybe( VLC_OBJECT(p_playlist)
-        }
-        b_delay_deletion = true;

src/playlist/search.c

@@ -168 +168 @@
-    p_playlist->b_reset_currently_playing = true;
-    playlist_LiveSearchUpdateInternal( p_playlist, p_root, psz_string );
-cond_signal( &p_playlist->object_wait
+object_signal_maybe( VLC_OBJECT(p_playlist)
-    return VLC_SUCCESS;
-}

src/video_output/vout_intf.c

@@ -545 +545 @@
-            msg_Err( p_vout, "Could not get snapshot" );
-            image_HandlerDelete( p_image );
-cond_signal( &p_dest->object_wait
+object_signal_maybe( VLC_OBJECT(p_dest)
-            vlc_object_release( p_dest );
-            return VLC_EGENERIC;
@@ -557 +557 @@
-            block_Release( p_block );
-            image_HandlerDelete( p_image );
-cond_signal( &p_dest->object_wait
+object_signal_maybe( VLC_OBJECT(p_dest)
-            vlc_object_release( p_dest );
-            return VLC_ENOMEM;
@@ -574 +574 @@
-            free( p_snapshot );
-            image_HandlerDelete( p_image );
-cond_signal( &p_dest->object_wait
+object_signal_maybe( VLC_OBJECT(p_dest)
-            vlc_object_release( p_dest );
-            return VLC_ENOMEM;
@@ -585 +585 @@
-
-        /* Unlock the object */
-cond_signal( &p_dest->object_wait
+object_signal_maybe( VLC_OBJECT(p_dest)
-        vlc_object_release( p_dest );
-