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
93143da0
Commit
93143da0
authored
May 07, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove useless MonitorLibVLCDeath() contorsion
parent
02a2074e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
32 deletions
+1
-32
src/interface/interface.c
src/interface/interface.c
+1
-32
No files found.
src/interface/interface.c
View file @
93143da0
...
...
@@ -134,19 +134,9 @@ int intf_Create( vlc_object_t *p_this, const char *chain )
* (it needs access to the main thread) */
if
(
p_intf
->
b_should_run_on_first_thread
)
{
if
(
vlc_clone
(
&
p_intf
->
thread
,
MonitorLibVLCDeath
,
p_intf
,
VLC_THREAD_PRIORITY_LOW
)
)
{
msg_Err
(
p_intf
,
"cannot spawn libvlc death monitoring thread"
);
goto
error
;
}
libvlc_SetExitHandler
(
p_libvlc
,
vlc_object_kill
,
p_intf
);
assert
(
p_intf
->
pf_run
);
p_intf
->
pf_run
(
p_intf
);
/* It is monitoring libvlc, not the p_intf */
vlc_object_kill
(
p_intf
->
p_libvlc
);
vlc_join
(
p_intf
->
thread
,
NULL
);
}
else
#endif
...
...
@@ -230,27 +220,6 @@ static void* RunInterface( void *p_this )
return
NULL
;
}
#if defined( __APPLE__ )
#include "../lib/libvlc_internal.h"
/* libvlc_InternalWait */
/**
* MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set.
*
* @param p_this: the interface object
*/
static
void
*
MonitorLibVLCDeath
(
vlc_object_t
*
p_this
)
{
intf_thread_t
*
p_intf
=
(
intf_thread_t
*
)
p_this
;
libvlc_int_t
*
p_libvlc
=
p_intf
->
p_libvlc
;
int
canc
=
vlc_savecancel
();
libvlc_InternalWait
(
p_libvlc
);
vlc_object_kill
(
p_intf
);
/* Kill the stupid first thread interface */
vlc_restorecancel
(
canc
);
return
NULL
;
}
#endif
static
int
AddIntfCallback
(
vlc_object_t
*
p_this
,
char
const
*
psz_cmd
,
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
p_data
)
{
...
...
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