#include <vlc_common.h>
#include <vlc_input.h>
-#include <vlc_playlist.h>
#include <vlc_meta.h>
#include <vlc_demux.h>
#include <vlc_art_finder.h>
return NULL;
}
+ vlclua_set_this( L, p_this );
+
/* Load Lua libraries */
luaL_openlibs( L ); /* XXX: Don't open all the libs? */
luaopen_md5( L );
luaopen_input_item( L, p_item );
- lua_pushlightuserdata( L, p_this );
- lua_setfield( L, -2, "private" );
-
if( vlclua_add_modules_path( p_this, L, psz_filename ) )
{
msg_Warn( p_this, "Error while setting the module search path for %s",
if( !lua_isfunction( L, lua_gettop( L ) ) )
{
- msg_Warn( p_this, "Error while runing script %s, "
+ msg_Warn( p_this, "Error while running script %s, "
"function %s() not found", psz_filename, luafunction );
goto error;
}
if( lua_pcall( L, 0, 1, 0 ) )
{
- msg_Warn( p_this, "Error while runing script %s, "
+ msg_Warn( p_this, "Error while running script %s, "
"function %s(): %s", psz_filename, luafunction,
lua_tostring( L, lua_gettop( L ) ) );
goto error;
void * user_data )
{
input_item_t * p_item = user_data;
- int s;
lua_State *L = init( p_this, p_item, psz_filename );
if( !L )
return i_ret;
}
- if((s = lua_gettop( L )))
+ if(lua_gettop( L ))
{
const char * psz_value;
- if( lua_isstring( L, s ) )
+ if( lua_isstring( L, -1 ) )
{
- psz_value = lua_tostring( L, s );
+ psz_value = lua_tostring( L, -1 );
if( psz_value && *psz_value != 0 )
{
lua_Dbg( p_this, "setting arturl: %s", psz_value );
return VLC_SUCCESS;
}
}
- else if( !lua_isnil( L, s ) )
+ else if( !lua_isnoneornil( L, -1 ) )
{
msg_Err( p_this, "Lua art fetcher script %s: "
"didn't return a string", psz_filename );
demux_meta_t *p_demux_meta = (demux_meta_t *)p_this;
input_item_t *p_item = p_demux_meta->p_item;
- int i_ret = vlclua_scripts_batch_execute( p_this, "meta/reader", &read_meta, p_item );
-
- return i_ret;
+ return vlclua_scripts_batch_execute( p_this, "meta"DIR_SEP"reader",
+ &read_meta, p_item );
}
demux_meta_t *p_demux_meta = (demux_meta_t *)p_this;
input_item_t *p_item = p_demux_meta->p_item;
- int i_ret = vlclua_scripts_batch_execute( p_this, "meta/fetcher", &fetch_meta, p_item );
-
- return i_ret;
+ return vlclua_scripts_batch_execute( p_this, "meta"DIR_SEP"fetcher",
+ &fetch_meta, p_item );
}
art_finder_t *p_finder = (art_finder_t *)p_this;
input_item_t *p_item = p_finder->p_item;
- int i_ret = vlclua_scripts_batch_execute( p_this, "meta/art", &fetch_art, p_item );
-
- return i_ret;
+ return vlclua_scripts_batch_execute( p_this, "meta"DIR_SEP"art",
+ &fetch_art, p_item );
}