Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
59198c7d
Commit
59198c7d
authored
Oct 03, 2007
by
Rafaël Carré
Browse files
playlist: fix media library loading, fix #1320.
parent
2f9a9c57
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/playlist/loadsave.c
View file @
59198c7d
...
...
@@ -22,6 +22,7 @@
*****************************************************************************/
#include
<vlc/vlc.h>
#include
<vlc_playlist.h>
#include
<vlc_events.h>
#include
"playlist_internal.h"
#include
"modules/configuration.h"
#include
<vlc_charset.h>
...
...
@@ -87,6 +88,18 @@ int playlist_Export( playlist_t * p_playlist, const char *psz_filename ,
return
VLC_SUCCESS
;
}
/*****************************************************************************
* 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
)
{
const
char
*
psz_datadir
=
p_playlist
->
p_libvlc
->
psz_datadir
;
...
...
@@ -127,9 +140,11 @@ int playlist_MLLoad( playlist_t *p_playlist )
if
(
p_input
==
NULL
)
goto
error
;
/* FIXME [21574] pdherbemont do we need *install_input_item_observer ? */
playlist_AddInput
(
p_playlist
,
p_input
,
PLAYLIST_APPEND
,
0
,
VLC_FALSE
,
VLC_FALSE
);
p_playlist
->
p_ml_onelevel
->
p_input
=
p_playlist
->
p_ml_category
->
p_input
=
p_input
;
vlc_event_attach
(
&
p_input
->
event_manager
,
vlc_InputItemSubItemAdded
,
input_item_subitem_added
,
p_playlist
);
p_playlist
->
b_doing_ml
=
VLC_TRUE
;
stats_TimerStart
(
p_playlist
,
"ML Load"
,
STATS_TIMER_ML_LOAD
);
...
...
@@ -137,6 +152,9 @@ int playlist_MLLoad( playlist_t *p_playlist )
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
);
return
VLC_SUCCESS
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment