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
bf7ad95b
Commit
bf7ad95b
authored
Feb 10, 2015
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lua: always use vlclua_dofile
Ref #13752
parent
278b85aa
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
modules/lua/demux.c
modules/lua/demux.c
+1
-1
modules/lua/intf.c
modules/lua/intf.c
+1
-1
modules/lua/meta.c
modules/lua/meta.c
+1
-1
modules/lua/services_discovery.c
modules/lua/services_discovery.c
+2
-2
No files found.
modules/lua/demux.c
View file @
bf7ad95b
...
...
@@ -163,7 +163,7 @@ static int probe_luascript( vlc_object_t *p_this, const char * psz_filename,
}
/* Load and run the script(s) */
if
(
luaL_dofile
(
L
,
psz_filename
)
)
if
(
vlclua_dofile
(
VLC_OBJECT
(
p_demux
),
L
,
psz_filename
)
)
{
msg_Warn
(
p_demux
,
"Error loading script %s: %s"
,
psz_filename
,
lua_tostring
(
L
,
lua_gettop
(
L
)
)
);
...
...
modules/lua/intf.c
View file @
bf7ad95b
...
...
@@ -402,7 +402,7 @@ static void *Run( void *data )
intf_sys_t
*
p_sys
=
p_intf
->
p_sys
;
lua_State
*
L
=
p_sys
->
L
;
if
(
luaL_dofile
(
L
,
p_sys
->
psz_filename
)
)
if
(
vlclua_dofile
(
VLC_OBJECT
(
p_intf
),
L
,
p_sys
->
psz_filename
)
)
{
msg_Err
(
p_intf
,
"Error loading script %s: %s"
,
p_sys
->
psz_filename
,
lua_tostring
(
L
,
lua_gettop
(
L
)
)
);
...
...
modules/lua/meta.c
View file @
bf7ad95b
...
...
@@ -89,7 +89,7 @@ static int run( vlc_object_t *p_this, const char * psz_filename,
lua_setglobal
(
L
,
luafunction
);
/* Load and run the script(s) */
if
(
luaL_dofile
(
L
,
psz_filename
)
)
if
(
vlclua_dofile
(
p_this
,
L
,
psz_filename
)
)
{
msg_Warn
(
p_this
,
"Error loading script %s: %s"
,
psz_filename
,
lua_tostring
(
L
,
lua_gettop
(
L
)
)
);
...
...
modules/lua/services_discovery.c
View file @
bf7ad95b
...
...
@@ -124,7 +124,7 @@ int Open_LuaSD( vlc_object_t *p_this )
p_sys
->
psz_filename
);
goto
error
;
}
if
(
luaL_dofile
(
L
,
p_sys
->
psz_filename
)
)
if
(
vlclua_dofile
(
VLC_OBJECT
(
p_sd
),
L
,
p_sys
->
psz_filename
)
)
{
msg_Err
(
p_sd
,
"Error loading script %s: %s"
,
p_sys
->
psz_filename
,
lua_tostring
(
L
,
lua_gettop
(
L
)
)
);
...
...
@@ -317,7 +317,7 @@ static int FillDescriptor( services_discovery_t *p_sd,
/* Create a new lua thread */
lua_State
*
L
=
luaL_newstate
();
if
(
luaL_dofile
(
L
,
p_sys
->
psz_filename
)
)
if
(
vlclua_dofile
(
VLC_OBJECT
(
p_sd
),
L
,
p_sys
->
psz_filename
)
)
{
msg_Err
(
p_sd
,
"Error loading script %s: %s"
,
p_sys
->
psz_filename
,
lua_tostring
(
L
,
-
1
)
);
...
...
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