herm, "attachment://" is 13 characters, not 15

[vlc] / src / playlist / control.c

diff --git a/src/playlist/control.c b/src/playlist/control.c
index 70ccf5a7bab7d1ba1cf18bf236f0d249e9a21ca7..880bdfde79b494524184be300e20b06dff8abcc7 100644 (file)
--- a/src/playlist/control.c
+++ b/src/playlist/control.c
@@ -206,7 +206,7 @@ int playlist_AskForArtEnqueue( playlist_t *p_playlist,
     p.p_item = p_item;
     p.b_fetch_art = VLC_TRUE;
 
-    vlc_mutex_lock( &p_playlist->p_fetcher->object_lock );
+    vlc_object_lock( p_playlist->p_fetcher );
     for( i = 0; i < p_playlist->p_fetcher->i_waiting &&
          p_playlist->p_fetcher->p_waiting->b_fetch_art == VLC_TRUE;
          i++ );
@@ -214,8 +214,8 @@ int playlist_AskForArtEnqueue( playlist_t *p_playlist,
     INSERT_ELEM( p_playlist->p_fetcher->p_waiting,
                  p_playlist->p_fetcher->i_waiting,
                  i, p );
-    vlc_cond_signal( &p_playlist->p_fetcher->object_wait );
-    vlc_mutex_unlock( &p_playlist->p_fetcher->object_lock );
+    vlc_object_signal_unlocked( p_playlist->p_fetcher );
+    vlc_obj_unlock( p_playlist->p_fetcher );
     return VLC_SUCCESS;
 }
 
@@ -503,7 +503,7 @@ int playlist_PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
         /* p_input->p_meta should not be null after a successfull CreateThread */
         b_has_art = !EMPTY_STR( psz_arturl );
 
-        if( !b_has_art || strncmp( psz_arturl, "attachment://", 15 ) )
+        if( !b_has_art || strncmp( psz_arturl, "attachment://", 13 ) )
         {
             PL_DEBUG( "requesting art for %s", psz_name );
             playlist_AskForArtEnqueue( p_playlist, p_input );
@@ -513,9 +513,9 @@ int playlist_PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
     }
 
     val.i_int = p_input->i_id;
-    vlc_mutex_unlock( &p_playlist->object_lock );
+    PL_UNLOCK;
     var_Set( p_playlist, "playlist-current", val );
-    vlc_mutex_lock( &p_playlist->object_lock );
+    PL_LOCK;
 
     return VLC_SUCCESS;
 }