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
fad80b62
Commit
fad80b62
authored
Mar 25, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Lua: revert should_die to using vlc_object_alive()
parent
2aca676c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
14 deletions
+2
-14
modules/lua/intf.c
modules/lua/intf.c
+0
-10
modules/lua/libs/misc.c
modules/lua/libs/misc.c
+2
-2
modules/lua/vlc.h
modules/lua/vlc.h
+0
-2
No files found.
modules/lua/intf.c
View file @
fad80b62
...
@@ -362,12 +362,8 @@ static int Start_LuaIntf( vlc_object_t *p_this, const char *name )
...
@@ -362,12 +362,8 @@ static int Start_LuaIntf( vlc_object_t *p_this, const char *name )
p_sys
->
L
=
L
;
p_sys
->
L
=
L
;
vlc_mutex_init
(
&
p_sys
->
lock
);
p_sys
->
exiting
=
false
;
if
(
vlc_clone
(
&
p_sys
->
thread
,
Run
,
p_intf
,
VLC_THREAD_PRIORITY_LOW
)
)
if
(
vlc_clone
(
&
p_sys
->
thread
,
Run
,
p_intf
,
VLC_THREAD_PRIORITY_LOW
)
)
{
{
vlc_mutex_destroy
(
&
p_sys
->
lock
);
lua_close
(
p_sys
->
L
);
lua_close
(
p_sys
->
L
);
goto
error
;
goto
error
;
}
}
...
@@ -387,13 +383,7 @@ void Close_LuaIntf( vlc_object_t *p_this )
...
@@ -387,13 +383,7 @@ void Close_LuaIntf( vlc_object_t *p_this )
intf_sys_t
*
p_sys
=
p_intf
->
p_sys
;
intf_sys_t
*
p_sys
=
p_intf
->
p_sys
;
vlc_cancel
(
p_sys
->
thread
);
vlc_cancel
(
p_sys
->
thread
);
vlc_mutex_lock
(
&
p_sys
->
lock
);
p_sys
->
exiting
=
true
;
vlc_mutex_unlock
(
&
p_sys
->
lock
);
vlc_join
(
p_sys
->
thread
,
NULL
);
vlc_join
(
p_sys
->
thread
,
NULL
);
vlc_mutex_destroy
(
&
p_sys
->
lock
);
lua_close
(
p_sys
->
L
);
lua_close
(
p_sys
->
L
);
free
(
p_sys
->
psz_filename
);
free
(
p_sys
->
psz_filename
);
...
...
modules/lua/libs/misc.c
View file @
fad80b62
...
@@ -147,8 +147,8 @@ static int vlclua_mwait( lua_State *L )
...
@@ -147,8 +147,8 @@ static int vlclua_mwait( lua_State *L )
static
int
vlclua_intf_should_die
(
lua_State
*
L
)
static
int
vlclua_intf_should_die
(
lua_State
*
L
)
{
{
intf_sys_t
*
p_sys
=
vlclua_get_intf
(
L
);
vlc_object_t
*
p_this
=
vlclua_get_this
(
L
);
lua_pushboolean
(
L
,
p_sys
->
exiting
);
lua_pushboolean
(
L
,
!
vlc_object_alive
(
p_this
)
);
return
1
;
return
1
;
}
}
...
...
modules/lua/vlc.h
View file @
fad80b62
...
@@ -164,8 +164,6 @@ struct intf_sys_t
...
@@ -164,8 +164,6 @@ struct intf_sys_t
lua_State
*
L
;
lua_State
*
L
;
vlc_thread_t
thread
;
vlc_thread_t
thread
;
vlc_mutex_t
lock
;
bool
exiting
;
};
};
#endif
/* VLC_LUA_H */
#endif
/* VLC_LUA_H */
...
...
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