Commit ac351eda authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Merge branch '1.0-bugfix' into HEAD

parents b381e4a4 9e1a568b
...@@ -104,6 +104,7 @@ int playlist_RecursiveNodeSort( playlist_t *p_playlist, playlist_item_t *p_node, ...@@ -104,6 +104,7 @@ int playlist_RecursiveNodeSort( playlist_t *p_playlist, playlist_item_t *p_node,
static int sort_mode = 0; static int sort_mode = 0;
static int sort_type = 0; static int sort_type = 0;
static vlc_mutex_t sort_lock = VLC_STATIC_MUTEX;
static int playlist_ItemArraySort( playlist_t *p_playlist, int i_items, static int playlist_ItemArraySort( playlist_t *p_playlist, int i_items,
playlist_item_t **pp_items, int i_mode, playlist_item_t **pp_items, int i_mode,
...@@ -111,8 +112,6 @@ static int playlist_ItemArraySort( playlist_t *p_playlist, int i_items, ...@@ -111,8 +112,6 @@ static int playlist_ItemArraySort( playlist_t *p_playlist, int i_items,
{ {
int i_position; int i_position;
playlist_item_t *p_temp; playlist_item_t *p_temp;
sort_mode = i_mode;
sort_type = i_type;
(void)p_playlist; // a bit surprising we don't need p_playlist! (void)p_playlist; // a bit surprising we don't need p_playlist!
...@@ -133,7 +132,12 @@ static int playlist_ItemArraySort( playlist_t *p_playlist, int i_items, ...@@ -133,7 +132,12 @@ static int playlist_ItemArraySort( playlist_t *p_playlist, int i_items,
return VLC_SUCCESS; return VLC_SUCCESS;
} }
vlc_mutex_lock( &sort_lock );
sort_mode = i_mode;
sort_type = i_type;
qsort(pp_items,i_items,sizeof(pp_items[0]),playlist_cmp); qsort(pp_items,i_items,sizeof(pp_items[0]),playlist_cmp);
vlc_mutex_unlock( &sort_lock );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment