Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
35506f4d
Commit
35506f4d
authored
Sep 27, 2008
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
playlist: items_to_delete is now private.
parent
d228fdd2
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
6 deletions
+7
-6
include/vlc_playlist.h
include/vlc_playlist.h
+0
-2
src/playlist/engine.c
src/playlist/engine.c
+3
-3
src/playlist/item.c
src/playlist/item.c
+1
-1
src/playlist/playlist_internal.h
src/playlist/playlist_internal.h
+3
-0
No files found.
include/vlc_playlist.h
View file @
35506f4d
...
@@ -160,8 +160,6 @@ struct playlist_t
...
@@ -160,8 +160,6 @@ struct playlist_t
playlist_item_array_t
items
;
/**< Arrays of items */
playlist_item_array_t
items
;
/**< Arrays of items */
playlist_item_array_t
all_items
;
/**< Array of items and nodes */
playlist_item_array_t
all_items
;
/**< Array of items and nodes */
playlist_item_array_t
items_to_delete
;
/**< Array of items and nodes to
delete... At the very end. This sucks. */
playlist_item_array_t
current
;
/**< Items currently being played */
playlist_item_array_t
current
;
/**< Items currently being played */
int
i_current_index
;
/**< Index in current array */
int
i_current_index
;
/**< Index in current array */
...
...
src/playlist/engine.c
View file @
35506f4d
...
@@ -87,7 +87,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
...
@@ -87,7 +87,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
ARRAY_INIT
(
p_playlist
->
items
);
ARRAY_INIT
(
p_playlist
->
items
);
ARRAY_INIT
(
p_playlist
->
all_items
);
ARRAY_INIT
(
p_playlist
->
all_items
);
ARRAY_INIT
(
p
_playlist
->
items_to_delete
);
ARRAY_INIT
(
p
l_priv
(
p_playlist
)
->
items_to_delete
);
ARRAY_INIT
(
p_playlist
->
current
);
ARRAY_INIT
(
p_playlist
->
current
);
p_playlist
->
i_current_index
=
0
;
p_playlist
->
i_current_index
=
0
;
...
@@ -554,12 +554,12 @@ void playlist_LastLoop( playlist_t *p_playlist )
...
@@ -554,12 +554,12 @@ void playlist_LastLoop( playlist_t *p_playlist )
free
(
p_del
);
free
(
p_del
);
FOREACH_END
();
FOREACH_END
();
ARRAY_RESET
(
p_playlist
->
all_items
);
ARRAY_RESET
(
p_playlist
->
all_items
);
FOREACH_ARRAY
(
playlist_item_t
*
p_del
,
p
_playlist
->
items_to_delete
)
FOREACH_ARRAY
(
playlist_item_t
*
p_del
,
p
l_priv
(
p_playlist
)
->
items_to_delete
)
free
(
p_del
->
pp_children
);
free
(
p_del
->
pp_children
);
vlc_gc_decref
(
p_del
->
p_input
);
vlc_gc_decref
(
p_del
->
p_input
);
free
(
p_del
);
free
(
p_del
);
FOREACH_END
();
FOREACH_END
();
ARRAY_RESET
(
p
_playlist
->
items_to_delete
);
ARRAY_RESET
(
p
l_priv
(
p_playlist
)
->
items_to_delete
);
ARRAY_RESET
(
p_playlist
->
items
);
ARRAY_RESET
(
p_playlist
->
items
);
ARRAY_RESET
(
p_playlist
->
current
);
ARRAY_RESET
(
p_playlist
->
current
);
...
...
src/playlist/item.c
View file @
35506f4d
...
@@ -220,7 +220,7 @@ int playlist_ItemRelease( playlist_item_t *p_item )
...
@@ -220,7 +220,7 @@ int playlist_ItemRelease( playlist_item_t *p_item )
*
*
* Who wants to add proper memory management? */
* Who wants to add proper memory management? */
uninstall_input_item_observer
(
p_item
);
uninstall_input_item_observer
(
p_item
);
ARRAY_APPEND
(
p
_item
->
p_playlist
->
items_to_delete
,
p_item
);
ARRAY_APPEND
(
p
l_priv
(
p_playlist
)
->
items_to_delete
,
p_item
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
...
...
src/playlist/playlist_internal.h
View file @
35506f4d
...
@@ -67,6 +67,9 @@ typedef struct playlist_private_t
...
@@ -67,6 +67,9 @@ typedef struct playlist_private_t
playlist_fetcher_t
fetcher
;
/**< Meta and art fetcher data */
playlist_fetcher_t
fetcher
;
/**< Meta and art fetcher data */
sout_instance_t
*
p_sout
;
/**< Kept sout instance */
sout_instance_t
*
p_sout
;
/**< Kept sout instance */
playlist_item_array_t
items_to_delete
;
/**< Array of items and nodes to
delete... At the very end. This sucks. */
struct
playlist_services_discovery_support_t
{
struct
playlist_services_discovery_support_t
{
/* the playlist items for category and onelevel */
/* the playlist items for category and onelevel */
playlist_item_t
*
p_cat
;
playlist_item_t
*
p_cat
;
...
...
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