Fix deadlocks in playlist

diff --git a/modules/demux/demux2.c b/modules/demux/demux2.c
index 555e5c2dc54cfc65cc22240a41ee485a55b16396..0b9c05cbf80df7ba5940212579657daf05cc815d 100644 (file)
--- a/modules/demux/demux2.c
+++ b/modules/demux/demux2.c
@@ -57,6 +57,8 @@ vlc_module_begin();
     add_shortcut( "dts" );
     add_shortcut( "mod" );
     add_shortcut( "flac" );
+    add_shortcut( "m3u" );
+    add_shortcut( "playlist" );
 vlc_module_end();
 
 /*****************************************************************************

diff --git a/src/playlist/item.c b/src/playlist/item.c
index b7ed84b25fd9c17f8aede183d6c35131aa9b9f64..6d556ae8652ea2f56a5ec2b3e80b78237872b9e9 100644 (file)
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -2,7 +2,7 @@
  * item.c : Playlist item functions
  *****************************************************************************
  * Copyright (C) 1999-2004 VideoLAN
- * $Id: item.c,v 1.15 2004/02/28 17:10:23 gbazin Exp $
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *

diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c
index 52596af765e62f59a8d9b2b65077c4ed7e8b1f4c..ebd0588244515787d873b24d022d7394782369f4 100644 (file)
--- a/src/playlist/loadsave.c
+++ b/src/playlist/loadsave.c
@@ -2,7 +2,7 @@
  * loadsave.c : Playlist loading / saving functions
  *****************************************************************************
  * Copyright (C) 1999-2004 VideoLAN
- * $Id: loadsave.c,v 1.11 2004/03/03 20:39:53 gbazin Exp $
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -60,15 +60,16 @@ int playlist_Import( playlist_t * p_playlist, const char *psz_filename )
     psz_uri = (char *)malloc(sizeof(char)*strlen(psz_filename) + 17 );
     sprintf( psz_uri, "file/playlist://%s", psz_filename);
 
-    vlc_mutex_lock( &p_playlist->object_lock );
     i_id = playlist_Add( p_playlist, psz_uri, psz_uri,
-                  PLAYLIST_INSERT | PLAYLIST_GO , PLAYLIST_END);
+                  PLAYLIST_INSERT  , PLAYLIST_END);
 
+    vlc_mutex_lock( &p_playlist->object_lock );
     p_item = playlist_ItemGetById( p_playlist, i_id );
     p_item->b_autodeletion = VLC_TRUE;
-
     vlc_mutex_unlock( &p_playlist->object_lock );
 
+    playlist_Play(p_playlist);
+
     return VLC_SUCCESS;
 }
 

diff --git a/src/playlist/playlist.c b/src/playlist/playlist.c
index b4b060a5c26c80e0e641895425deb3bf64de8dc1..5a7c8dc9ac9be3ce0d318a2ae0aba926ea43d133 100644 (file)
--- a/src/playlist/playlist.c
+++ b/src/playlist/playlist.c
@@ -580,11 +580,13 @@ static void PlayItem( playlist_t *p_playlist )
     p_item = p_playlist->pp_items[p_playlist->i_index];
 
     p_item->i_nb_played++;
-
     p_playlist->p_input = input_CreateThread( p_playlist, p_item->psz_uri,
                                               p_item->ppsz_options,
                                               p_item->i_options );
 
     val.i_int = p_playlist->i_index;
+    /* unlock the playlist to set the var...mmm */
+    vlc_mutex_unlock( &p_playlist->object_lock);
     var_Set( p_playlist, "playlist-current", val);
+    vlc_mutex_lock( &p_playlist->object_lock);
 }