[vlc-devel] commit: lua: Don't use the playlist in the lua demux. (Pierre d'Herbemont )
git version control
git at videolan.org
Sat Jun 14 17:34:34 CEST 2008
vlc | branch: master | Pierre d'Herbemont <pdherbemont at videolan.org> | Sat Jun 14 17:25:41 2008 +0200| [ff6d0af6bd54027a616eaab0caab220329b34b92]
lua: Don't use the playlist in the lua demux.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ff6d0af6bd54027a616eaab0caab220329b34b92
---
modules/misc/lua/playlist.c | 4 +---
modules/misc/lua/vlc.c | 4 ++++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/modules/misc/lua/playlist.c b/modules/misc/lua/playlist.c
index b24457a..60602fd 100644
--- a/modules/misc/lua/playlist.c
+++ b/modules/misc/lua/playlist.c
@@ -248,7 +248,6 @@ static int Demux( demux_t *p_demux )
lua_State *L = p_demux->p_sys->L;
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 *)
vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT );
input_item_t *p_current_input = input_GetItem( p_input_thread );
@@ -275,13 +274,12 @@ static int Demux( demux_t *p_demux )
}
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 );
else
msg_Err( p_demux, "Script went completely foobar" );
vlc_object_release( p_input_thread );
- vlc_object_release( p_playlist );
return -1; /* Needed for correct operation of go back */
}
diff --git a/modules/misc/lua/vlc.c b/modules/misc/lua/vlc.c
index 655926f..c86dd2b 100644
--- a/modules/misc/lua/vlc.c
+++ b/modules/misc/lua/vlc.c
@@ -33,6 +33,8 @@
# include "config.h"
#endif
+#include <assert.h>
+
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_meta.h>
@@ -673,6 +675,8 @@ int __vlclua_playlist_add_internal( vlc_object_t *p_this, lua_State *L,
{
int i_count = 0;
+ assert( p_parent || p_playlist );
+
/* playlist */
if( lua_istable( L, -1 ) )
{
More information about the vlc-devel
mailing list