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
3d7eabaf
Commit
3d7eabaf
authored
May 14, 2008
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove playlist destructor
We need to do stuff BEFORE the playlist is destroyed
parent
bb84da65
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
18 deletions
+2
-18
src/playlist/engine.c
src/playlist/engine.c
+2
-18
No files found.
src/playlist/engine.c
View file @
3d7eabaf
...
@@ -38,7 +38,6 @@
...
@@ -38,7 +38,6 @@
* Local prototypes
* Local prototypes
*****************************************************************************/
*****************************************************************************/
static
void
VariablesInit
(
playlist_t
*
p_playlist
);
static
void
VariablesInit
(
playlist_t
*
p_playlist
);
static
void
playlist_Destructor
(
vlc_object_t
*
p_this
);
static
int
RandomCallback
(
vlc_object_t
*
p_this
,
char
const
*
psz_cmd
,
static
int
RandomCallback
(
vlc_object_t
*
p_this
,
char
const
*
psz_cmd
,
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
a
)
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
a
)
...
@@ -154,8 +153,6 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
...
@@ -154,8 +153,6 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
playlist_MLLoad
(
p_playlist
);
playlist_MLLoad
(
p_playlist
);
p_playlist
->
b_auto_preparse
=
true
;
p_playlist
->
b_auto_preparse
=
true
;
vlc_object_set_destructor
(
p_playlist
,
playlist_Destructor
);
return
p_playlist
;
return
p_playlist
;
}
}
...
@@ -168,7 +165,6 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
...
@@ -168,7 +165,6 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
*/
*/
void
playlist_Destroy
(
playlist_t
*
p_playlist
)
void
playlist_Destroy
(
playlist_t
*
p_playlist
)
{
{
/* XXX: should go in the playlist destructor */
var_Destroy
(
p_playlist
,
"intf-change"
);
var_Destroy
(
p_playlist
,
"intf-change"
);
var_Destroy
(
p_playlist
,
"item-change"
);
var_Destroy
(
p_playlist
,
"item-change"
);
var_Destroy
(
p_playlist
,
"playlist-current"
);
var_Destroy
(
p_playlist
,
"playlist-current"
);
...
@@ -181,24 +177,12 @@ void playlist_Destroy( playlist_t *p_playlist )
...
@@ -181,24 +177,12 @@ void playlist_Destroy( playlist_t *p_playlist )
var_Destroy
(
p_playlist
,
"loop"
);
var_Destroy
(
p_playlist
,
"loop"
);
var_Destroy
(
p_playlist
,
"activity"
);
var_Destroy
(
p_playlist
,
"activity"
);
vlc_object_release
(
p_playlist
);
}
static
void
playlist_Destructor
(
vlc_object_t
*
p_this
)
{
playlist_t
*
p_playlist
=
(
playlist_t
*
)
p_this
;
// Kill preparser
if
(
p_playlist
->
p_preparse
)
if
(
p_playlist
->
p_preparse
)
{
vlc_object_release
(
p_playlist
->
p_preparse
);
vlc_object_release
(
p_playlist
->
p_preparse
);
}
// Kill meta fetcher
if
(
p_playlist
->
p_fetcher
)
if
(
p_playlist
->
p_fetcher
)
{
vlc_object_release
(
p_playlist
->
p_fetcher
);
vlc_object_release
(
p_playlist
->
p_fetcher
);
}
vlc_object_release
(
p_playlist
);
}
}
/* Destroy remaining objects */
/* Destroy remaining objects */
...
...
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