Changeset 59198c7ddb54e2193636425475ba46b09b135264

Timestamp:

03/10/07 02:35:13 (1 year ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1191371713 +0000

git-parent:

[2f9a9c57a553cad6a9cba042638044a32593aed3]

git-author:

Rafaël Carré <funman@videolan.org> 1191371713 +0000

Message:

playlist: fix media library loading, fix #1320.

Files:

• src/playlist/loadsave.c (modified) (4 diffs)

src/playlist/loadsave.c

@@ -23 +23 @@
-#include <vlc/vlc.h>
-#include <vlc_playlist.h>
+#include <vlc_events.h>
-#include "playlist_internal.h"
-#include "modules/configuration.h"
@@ -88 +89 @@
-}
-
+/*****************************************************************************
+ * A subitem has been added to the Media Library (Event Callback)
+ *****************************************************************************/
+static void input_item_subitem_added( const vlc_event_t * p_event,
+                                      void * user_data )
+{
+    playlist_t *p_playlist = user_data;
+    input_item_t *p_item = p_event->u.input_item_subitem_added.p_new_child;
+    playlist_AddInput( p_playlist, p_item, PLAYLIST_APPEND, PLAYLIST_END,
+            VLC_FALSE, VLC_FALSE );
+}
+
-int playlist_MLLoad( playlist_t *p_playlist )
-{
@@ -128 +141 @@
-        goto error;
-
-
-
-
+
+
+
+
+
-
-    p_playlist->b_doing_ml = VLC_TRUE;
@@ -137 +152 @@
-    stats_TimerStop( p_playlist,STATS_TIMER_ML_LOAD );
-    p_playlist->b_doing_ml = VLC_FALSE;
+
+    vlc_event_detach( &p_input->event_manager, vlc_InputItemSubItemAdded,
+                        input_item_subitem_added, p_playlist );
-
-    free( psz_uri );