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
72d46b6b
Commit
72d46b6b
authored
May 07, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove now useless vlc_exit_t.killed
parent
a41e978c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
11 deletions
+5
-11
src/libvlc.h
src/libvlc.h
+0
-1
src/misc/exit.c
src/misc/exit.c
+5
-10
No files found.
src/libvlc.h
View file @
72d46b6b
...
...
@@ -76,7 +76,6 @@ typedef struct vlc_exit
vlc_mutex_t
lock
;
void
(
*
handler
)
(
void
*
);
void
*
opaque
;
bool
killed
;
}
vlc_exit_t
;
void
vlc_ExitInit
(
vlc_exit_t
*
);
...
...
src/misc/exit.c
View file @
72d46b6b
...
...
@@ -32,7 +32,6 @@ void vlc_ExitInit( vlc_exit_t *exit )
vlc_mutex_init
(
&
exit
->
lock
);
exit
->
handler
=
NULL
;
exit
->
opaque
=
NULL
;
exit
->
killed
=
false
;
}
void
vlc_ExitDestroy
(
vlc_exit_t
*
exit
)
...
...
@@ -50,8 +49,6 @@ void libvlc_SetExitHandler( libvlc_int_t *p_libvlc, void (*handler) (void *),
vlc_exit_t
*
exit
=
&
libvlc_priv
(
p_libvlc
)
->
exit
;
vlc_mutex_lock
(
&
exit
->
lock
);
if
(
exit
->
killed
&&
handler
!=
NULL
)
/* already exited (race condition) */
handler
(
opaque
);
exit
->
handler
=
handler
;
exit
->
opaque
=
opaque
;
vlc_mutex_unlock
(
&
exit
->
lock
);
...
...
@@ -65,13 +62,11 @@ void libvlc_Quit( libvlc_int_t *p_libvlc )
{
vlc_exit_t
*
exit
=
&
libvlc_priv
(
p_libvlc
)
->
exit
;
msg_Dbg
(
p_libvlc
,
"exiting"
);
vlc_mutex_lock
(
&
exit
->
lock
);
if
(
!
exit
->
killed
)
{
msg_Dbg
(
p_libvlc
,
"exiting"
);
exit
->
killed
=
true
;
if
(
exit
->
handler
!=
NULL
)
exit
->
handler
(
exit
->
opaque
);
}
if
(
exit
->
handler
!=
NULL
)
exit
->
handler
(
exit
->
opaque
);
else
msg_Dbg
(
p_libvlc
,
"no exit handler"
);
vlc_mutex_unlock
(
&
exit
->
lock
);
}
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