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
ff6d0af6
Commit
ff6d0af6
authored
Jun 14, 2008
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lua: Don't use the playlist in the lua demux.
parent
44b98768
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
modules/misc/lua/playlist.c
modules/misc/lua/playlist.c
+1
-3
modules/misc/lua/vlc.c
modules/misc/lua/vlc.c
+4
-0
No files found.
modules/misc/lua/playlist.c
View file @
ff6d0af6
...
@@ -248,7 +248,6 @@ static int Demux( demux_t *p_demux )
...
@@ -248,7 +248,6 @@ static int Demux( demux_t *p_demux )
lua_State
*
L
=
p_demux
->
p_sys
->
L
;
lua_State
*
L
=
p_demux
->
p_sys
->
L
;
char
*
psz_filename
=
p_demux
->
p_sys
->
psz_filename
;
char
*
psz_filename
=
p_demux
->
p_sys
->
psz_filename
;
playlist_t
*
p_playlist
=
pl_Yield
(
p_demux
);
input_thread_t
*
p_input_thread
=
(
input_thread_t
*
)
input_thread_t
*
p_input_thread
=
(
input_thread_t
*
)
vlc_object_find
(
p_demux
,
VLC_OBJECT_INPUT
,
FIND_PARENT
);
vlc_object_find
(
p_demux
,
VLC_OBJECT_INPUT
,
FIND_PARENT
);
input_item_t
*
p_current_input
=
input_GetItem
(
p_input_thread
);
input_item_t
*
p_current_input
=
input_GetItem
(
p_input_thread
);
...
@@ -275,13 +274,12 @@ static int Demux( demux_t *p_demux )
...
@@ -275,13 +274,12 @@ static int Demux( demux_t *p_demux )
}
}
if
(
lua_gettop
(
L
)
)
if
(
lua_gettop
(
L
)
)
vlclua_playlist_add_internal
(
p_demux
,
L
,
p_playlist
,
vlclua_playlist_add_internal
(
p_demux
,
L
,
NULL
,
p_current_input
,
0
);
p_current_input
,
0
);
else
else
msg_Err
(
p_demux
,
"Script went completely foobar"
);
msg_Err
(
p_demux
,
"Script went completely foobar"
);
vlc_object_release
(
p_input_thread
);
vlc_object_release
(
p_input_thread
);
vlc_object_release
(
p_playlist
);
return
-
1
;
/* Needed for correct operation of go back */
return
-
1
;
/* Needed for correct operation of go back */
}
}
...
...
modules/misc/lua/vlc.c
View file @
ff6d0af6
...
@@ -33,6 +33,8 @@
...
@@ -33,6 +33,8 @@
# include "config.h"
# include "config.h"
#endif
#endif
#include <assert.h>
#include <vlc_common.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_plugin.h>
#include <vlc_meta.h>
#include <vlc_meta.h>
...
@@ -673,6 +675,8 @@ int __vlclua_playlist_add_internal( vlc_object_t *p_this, lua_State *L,
...
@@ -673,6 +675,8 @@ int __vlclua_playlist_add_internal( vlc_object_t *p_this, lua_State *L,
{
{
int
i_count
=
0
;
int
i_count
=
0
;
assert
(
p_parent
||
p_playlist
);
/* playlist */
/* playlist */
if
(
lua_istable
(
L
,
-
1
)
)
if
(
lua_istable
(
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