Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
77fbb447
Commit
77fbb447
authored
Nov 15, 2014
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
playlist: remove unsynchronized b_doing_ml
This could loose events and was theoretically undefined.
parent
0cf5d09c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
16 deletions
+2
-16
src/playlist/engine.c
src/playlist/engine.c
+0
-2
src/playlist/item.c
src/playlist/item.c
+2
-7
src/playlist/loadsave.c
src/playlist/loadsave.c
+0
-6
src/playlist/playlist_internal.h
src/playlist/playlist_internal.h
+0
-1
No files found.
src/playlist/engine.c
View file @
77fbb447
...
...
@@ -229,8 +229,6 @@ playlist_t *playlist_Create( vlc_object_t *p_parent )
pl_priv
(
p_playlist
)
->
b_tree
=
var_InheritBool
(
p_parent
,
"playlist-tree"
);
pl_priv
(
p_playlist
)
->
b_doing_ml
=
false
;
/* Create the root node */
PL_LOCK
;
p_playlist
->
p_root
=
playlist_NodeCreate
(
p_playlist
,
NULL
,
NULL
,
...
...
src/playlist/item.c
View file @
77fbb447
...
...
@@ -450,10 +450,6 @@ int playlist_AddInput( playlist_t* p_playlist, input_item_t *p_input,
{
playlist_item_t
*
p_item
;
if
(
!
pl_priv
(
p_playlist
)
->
b_doing_ml
)
PL_DEBUG
(
"adding item `%s' ( %s )"
,
p_input
->
psz_name
,
p_input
->
psz_uri
);
PL_LOCK_IF
(
!
b_locked
);
p_item
=
playlist_ItemNewFromInput
(
p_playlist
,
p_input
);
...
...
@@ -788,9 +784,8 @@ static void AddItem( playlist_t *p_playlist, playlist_item_t *p_item,
else
playlist_NodeInsert
(
p_playlist
,
p_item
,
p_node
,
i_pos
);
if
(
!
pl_priv
(
p_playlist
)
->
b_doing_ml
)
playlist_SendAddNotify
(
p_playlist
,
p_item
->
i_id
,
p_node
->
i_id
,
!
(
i_mode
&
PLAYLIST_NO_REBUILD
)
);
playlist_SendAddNotify
(
p_playlist
,
p_item
->
i_id
,
p_node
->
i_id
,
!
(
i_mode
&
PLAYLIST_NO_REBUILD
)
);
}
/* Actually convert an item to a node */
...
...
src/playlist/loadsave.c
View file @
77fbb447
...
...
@@ -170,16 +170,10 @@ int playlist_MLLoad( playlist_t *p_playlist )
vlc_event_attach
(
&
p_input
->
event_manager
,
vlc_InputItemSubItemTreeAdded
,
input_item_subitem_tree_added
,
p_playlist
);
pl_priv
(
p_playlist
)
->
b_doing_ml
=
true
;
PL_UNLOCK
;
input_Read
(
p_playlist
,
p_input
);
PL_LOCK
;
pl_priv
(
p_playlist
)
->
b_doing_ml
=
false
;
PL_UNLOCK
;
vlc_event_detach
(
&
p_input
->
event_manager
,
vlc_InputItemSubItemTreeAdded
,
input_item_subitem_tree_added
,
p_playlist
);
...
...
src/playlist/playlist_internal.h
View file @
77fbb447
...
...
@@ -89,7 +89,6 @@ typedef struct playlist_private_t
bool
b_reset_currently_playing
;
/** Reset current item array */
bool
b_tree
;
/**< Display as a tree */
bool
b_doing_ml
;
/**< Doing media library stuff get quicker */
}
playlist_private_t
;
#define pl_priv( pl ) ((playlist_private_t *)(pl))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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