/*****************************************************************************
- * intf.c: Generic lua inteface functions
+ * intf.c: Generic lua interface functions
*****************************************************************************
- * Copyright (C) 2007 the VideoLAN team
+ * Copyright (C) 2007-2008 the VideoLAN team
* $Id$
*
* Authors: Antoine Cellerier <dionoea at videolan tod org>
# define _GNU_SOURCE
#endif
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <vlc_meta.h>
#include <vlc_charset.h>
#include <vlc_interface.h>
#include <vlc_playlist.h>
#include <vlc_aout.h>
-#include <vlc_vout.h>
-#include <vlc_osd.h>
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
#include <lualib.h> /* Lua libs */
#include "vlc.h"
+#include "libs.h"
+/*****************************************************************************
+ * Prototypes
+ *****************************************************************************/
struct intf_sys_t
{
char *psz_filename;
lua_State *L;
};
-/*****************************************************************************
- * Internal lua<->vlc utils
- *****************************************************************************/
-playlist_t *vlclua_get_playlist_internal( lua_State *L )
-{
- vlc_object_t *p_this = vlclua_get_this( L );
- return pl_Yield( p_this );
-}
-
-static input_thread_t * vlclua_get_input_internal( lua_State *L )
-{
- playlist_t *p_playlist = vlclua_get_playlist_internal( L );
- input_thread_t *p_input = p_playlist->p_input;
- if( p_input ) vlc_object_yield( p_input );
- vlc_object_release( p_playlist );
- return p_input;
-}
-
-/* FIXME: This is high level logic. Should be implemented in lua */
-#define vlclua_var_toggle_or_set(a,b,c) \
- __vlclua_var_toggle_or_set(a,VLC_OBJECT(b),c)
-static int __vlclua_var_toggle_or_set( lua_State *L, vlc_object_t *p_obj,
- const char *psz_name )
-{
- vlc_bool_t b_bool;
- if( lua_gettop( L ) > 1 ) return vlclua_error( L );
-
- if( lua_gettop( L ) == 0 )
- b_bool = !var_GetBool( p_obj, psz_name );
- else /* lua_gettop( L ) == 1 */
- {
- b_bool = luaL_checkboolean( L, -1 )?VLC_TRUE:VLC_FALSE;
- lua_pop( L, 1 );
- }
-
- if( b_bool != var_GetBool( p_obj, psz_name ) )
- var_SetBool( p_obj, psz_name, b_bool );
-
- lua_pushboolean( L, b_bool );
- return 1;
-}
-
-/*****************************************************************************
- * Libvlc TODO: move to vlc.c
- *****************************************************************************/
-static int vlclua_get_libvlc( lua_State *L )
-{
- vlclua_push_vlc_object( L, vlclua_get_this( L )->p_libvlc,
- NULL );
- return 1;
-}
-
-/*****************************************************************************
- * Input handling
- *****************************************************************************/
-static int vlclua_get_input( lua_State *L )
-{
- input_thread_t *p_input = vlclua_get_input_internal( L );
- if( p_input )
- {
- vlclua_push_vlc_object( L, p_input, vlclua_gc_release );
- }
- else lua_pushnil( L );
- return 1;
-}
-
-static int vlclua_input_info( lua_State *L )
-{
- input_thread_t * p_input = vlclua_get_input_internal( L );
- int i_cat;
- int i;
- if( !p_input ) return vlclua_error( L );
- //vlc_mutex_lock( &input_GetItem(p_input)->lock );
- i_cat = input_GetItem(p_input)->i_categories;
- lua_createtable( L, 0, i_cat );
- for( i = 0; i < i_cat; i++ )
- {
- info_category_t *p_category = input_GetItem(p_input)->pp_categories[i];
- int i_infos = p_category->i_infos;
- int j;
- lua_pushstring( L, p_category->psz_name );
- lua_createtable( L, 0, i_infos );
- for( j = 0; j < i_infos; j++ )
- {
- info_t *p_info = p_category->pp_infos[j];
- lua_pushstring( L, p_info->psz_name );
- lua_pushstring( L, p_info->psz_value );
- lua_settable( L, -3 );
- }
- lua_settable( L, -3 );
- }
- //vlc_object_release( p_input );
- return 1;
-}
-
-static int vlclua_is_playing( lua_State *L )
-{
- input_thread_t * p_input = vlclua_get_input_internal( L );
- lua_pushboolean( L, !!p_input );
- return 1;
-}
-
-static int vlclua_get_title( lua_State *L )
-{
- input_thread_t *p_input = vlclua_get_input_internal( L );
- if( !p_input )
- lua_pushnil( L );
- else
- {
- lua_pushstring( L, input_GetItem(p_input)->psz_name );
- vlc_object_release( p_input );
- }
- return 1;
-}
-
-static int vlclua_input_stats( lua_State *L )
-{
- input_thread_t *p_input = vlclua_get_input_internal( L );
- input_item_t *p_item = p_input && p_input->p ? input_GetItem( p_input ) : NULL;
- lua_newtable( L );
- if( p_item )
- {
-#define STATS_INT( n ) lua_pushinteger( L, p_item->p_stats->i_ ## n ); \
- lua_setfield( L, -2, #n );
-#define STATS_FLOAT( n ) lua_pushnumber( L, p_item->p_stats->f_ ## n ); \
- lua_setfield( L, -2, #n );
- STATS_INT( read_bytes )
- STATS_FLOAT( input_bitrate )
- STATS_INT( demux_read_bytes )
- STATS_FLOAT( demux_bitrate )
- STATS_INT( decoded_video )
- STATS_INT( displayed_pictures )
- STATS_INT( lost_pictures )
- STATS_INT( decoded_audio )
- STATS_INT( played_abuffers )
- STATS_INT( lost_abuffers )
- STATS_INT( sent_packets )
- STATS_INT( sent_bytes )
- STATS_FLOAT( send_bitrate )
-#undef STATS_INT
-#undef STATS_FLOAT
- }
- return 1;
-}
-
-/*****************************************************************************
- * Vout control
- *****************************************************************************/
-static int vlclua_fullscreen( lua_State *L )
-{
- vout_thread_t *p_vout;
- int i_ret;
-
- input_thread_t * p_input = vlclua_get_input_internal( L );
- if( !p_input ) return vlclua_error( L );
-
- p_vout = vlc_object_find( p_input, VLC_OBJECT_VOUT, FIND_CHILD );
- if( !p_vout ) return vlclua_error( L );
-
- i_ret = vlclua_var_toggle_or_set( L, p_vout, "fullscreen" );
- vlc_object_release( p_vout );
- vlc_object_release( p_input );
- return i_ret;
-}
-
-static int vlc_osd_icon_from_string( const char *psz_name )
-{
- static const struct
- {
- int i_icon;
- const char *psz_name;
- } pp_icons[] =
- { { OSD_PAUSE_ICON, "pause" },
- { OSD_PLAY_ICON, "play" },
- { OSD_SPEAKER_ICON, "speaker" },
- { OSD_MUTE_ICON, "mute" },
- { 0, NULL } };
- int i;
- for( i = 0; pp_icons[i].psz_name; i++ )
- {
- if( !strcmp( psz_name, pp_icons[i].psz_name ) )
- return pp_icons[i].i_icon;
- }
- return 0;
-}
-
-static int vlclua_osd_icon( lua_State *L )
-{
- const char *psz_icon = luaL_checkstring( L, 1 );
- int i_icon = vlc_osd_icon_from_string( psz_icon );
- int i_chan = luaL_optint( L, 2, DEFAULT_CHAN );
- if( !i_icon )
- return luaL_error( L, "\"%s\" is not a valid osd icon.", psz_icon );
- else
- {
- vlc_object_t *p_this = vlclua_get_this( L );
- vout_OSDIcon( p_this, i_chan, i_icon );
- return 0;
- }
-}
-
-static int vlclua_osd_message( lua_State *L )
-{
- const char *psz_message = luaL_checkstring( L, 1 );
- int i_chan = luaL_optint( L, 2, DEFAULT_CHAN );
- vlc_object_t *p_this = vlclua_get_this( L );
- vout_OSDMessage( p_this, i_chan, psz_message );
- return 0;
-}
-
-static int vlc_osd_slider_type_from_string( const char *psz_name )
-{
- static const struct
- {
- int i_type;
- const char *psz_name;
- } pp_types[] =
- { { OSD_HOR_SLIDER, "horizontal" },
- { OSD_VERT_SLIDER, "vertical" },
- { 0, NULL } };
- int i;
- for( i = 0; pp_types[i].psz_name; i++ )
- {
- if( !strcmp( psz_name, pp_types[i].psz_name ) )
- return pp_types[i].i_type;
- }
- return 0;
-}
-
-static int vlclua_osd_slider( lua_State *L )
-{
- int i_position = luaL_checkint( L, 1 );
- const char *psz_type = luaL_checkstring( L, 2 );
- int i_type = vlc_osd_slider_type_from_string( psz_type );
- int i_chan = luaL_optint( L, 3, DEFAULT_CHAN );
- if( !i_type )
- return luaL_error( L, "\"%s\" is not a valid slider type.",
- psz_type );
- else
- {
- vlc_object_t *p_this = vlclua_get_this( L );
- vout_OSDSlider( p_this, i_chan, i_position, i_type );
- return 0;
- }
-}
-
-static int vlclua_spu_channel_register( lua_State *L )
-{
- int i_chan;
- vlc_object_t *p_this = vlclua_get_this( L );
- vout_thread_t *p_vout = vlc_object_find( p_this, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
- if( !p_vout )
- return luaL_error( L, "Unable to find vout." );
-
- spu_Control( p_vout->p_spu, SPU_CHANNEL_REGISTER, &i_chan );
- vlc_object_release( p_vout );
- lua_pushinteger( L, i_chan );
- return 1;
-}
-
-static int vlclua_spu_channel_clear( lua_State *L )
-{
- int i_chan = luaL_checkint( L, 1 );
- vlc_object_t *p_this = vlclua_get_this( L );
- vout_thread_t *p_vout = vlc_object_find( p_this, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
- if( !p_vout )
- return luaL_error( L, "Unable to find vout." );
-
- spu_Control( p_vout->p_spu, SPU_CHANNEL_CLEAR, i_chan );
- vlc_object_release( p_vout );
- return 0;
-}
+static void Run( intf_thread_t *p_intf );
/*****************************************************************************
- * Playlist control
+ *
*****************************************************************************/
-static int vlclua_get_playlist( lua_State *L )
-{
- playlist_t *p_playlist = vlclua_get_playlist_internal( L );
- if( p_playlist )
- {
- vlclua_push_vlc_object( L, p_playlist, vlclua_gc_release );
- }
- else lua_pushnil( L );
- return 1;
-}
-
-static int vlclua_playlist_prev( lua_State * L )
-{
- playlist_t *p_playlist = vlclua_get_playlist_internal( L );
- playlist_Prev( p_playlist );
- vlc_object_release( p_playlist );
- return 0;
-}
-
-static int vlclua_playlist_next( lua_State * L )
-{
- playlist_t *p_playlist = vlclua_get_playlist_internal( L );
- playlist_Next( p_playlist );
- vlc_object_release( p_playlist );
- return 0;
-}
-
-static int vlclua_playlist_skip( lua_State * L )
-{
- int i_skip = luaL_checkint( L, 1 );
- playlist_t *p_playlist = vlclua_get_playlist_internal( L );
- playlist_Skip( p_playlist, i_skip );
- vlc_object_release( p_playlist );
- return 0;
-}
-
-static int vlclua_playlist_play( lua_State * L )
-{
- playlist_t *p_playlist = vlclua_get_playlist_internal( L );
- playlist_Play( p_playlist );
- vlc_object_release( p_playlist );
- return 0;
-}
-
-static int vlclua_playlist_pause( lua_State * L )
-{
- playlist_t *p_playlist = vlclua_get_playlist_internal( L );
- playlist_Pause( p_playlist );
- vlc_object_release( p_playlist );
- return 0;
-}
-
-static int vlclua_playlist_stop( lua_State * L )
-{
- playlist_t *p_playlist = vlclua_get_playlist_internal( L );
- playlist_Stop( p_playlist );
- vlc_object_release( p_playlist );
- return 0;
-}
-
-static int vlclua_playlist_clear( lua_State * L )
-{
- playlist_t *p_playlist = vlclua_get_playlist_internal( L );
- playlist_Stop( p_playlist ); /* Isn't this already implied by Clear? */
- playlist_Clear( p_playlist, VLC_FALSE );
- vlc_object_release( p_playlist );
- return 0;
-}
-
-static int vlclua_playlist_repeat( lua_State * L )
-{
- playlist_t *p_playlist = vlclua_get_playlist_internal( L );
- int i_ret = vlclua_var_toggle_or_set( L, p_playlist, "repeat" );
- vlc_object_release( p_playlist );
- return i_ret;
-}
-
-static int vlclua_playlist_loop( lua_State * L )
-{
- playlist_t *p_playlist = vlclua_get_playlist_internal( L );
- int i_ret = vlclua_var_toggle_or_set( L, p_playlist, "loop" );
- vlc_object_release( p_playlist );
- return i_ret;
-}
-
-static int vlclua_playlist_random( lua_State * L )
-{
- playlist_t *p_playlist = vlclua_get_playlist_internal( L );
- int i_ret = vlclua_var_toggle_or_set( L, p_playlist, "random" );
- vlc_object_release( p_playlist );
- return i_ret;
-}
-
-static int vlclua_playlist_goto( lua_State * L )
-{
- int i_id = luaL_checkint( L, 1 );
- playlist_t *p_playlist = vlclua_get_playlist_internal( L );
- int i_ret = playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
- VLC_TRUE, NULL,
- playlist_ItemGetById( p_playlist, i_id,
- VLC_TRUE ) );
- vlc_object_release( p_playlist );
- return vlclua_push_ret( L, i_ret );
-}
-
-static int vlclua_playlist_add( lua_State *L )
-{
- int i_count;
- vlc_object_t *p_this = vlclua_get_this( L );
- playlist_t *p_playlist = vlclua_get_playlist_internal( L );
- i_count = vlclua_playlist_add_internal( p_this, L, p_playlist,
- NULL, VLC_TRUE );
- vlc_object_release( p_playlist );
- lua_pushinteger( L, i_count );
- return 1;
-}
-
-static int vlclua_playlist_enqueue( lua_State *L )
-{
- int i_count;
- vlc_object_t *p_this = vlclua_get_this( L );
- playlist_t *p_playlist = vlclua_get_playlist_internal( L );
- i_count = vlclua_playlist_add_internal( p_this, L, p_playlist,
- NULL, VLC_FALSE );
- vlc_object_release( p_playlist );
- lua_pushinteger( L, i_count );
- return 1;
-}
-
-static void push_playlist_item( lua_State *L, playlist_item_t *p_item );
-static void push_playlist_item( lua_State *L, playlist_item_t *p_item )
-{
- input_item_t *p_input = p_item->p_input;
- int i_flags = p_item->i_flags;
- lua_newtable( L );
- lua_pushinteger( L, p_item->i_id );
- lua_setfield( L, -2, "id" );
- lua_newtable( L );
-#define CHECK_AND_SET_FLAG( name, label ) \
- if( i_flags & PLAYLIST_ ## name ## _FLAG ) \
- { \
- lua_pushboolean( L, 1 ); \
- lua_setfield( L, -2, #label ); \
- }
- CHECK_AND_SET_FLAG( SAVE, save )
- CHECK_AND_SET_FLAG( SKIP, skip )
- CHECK_AND_SET_FLAG( DBL, disabled )
- CHECK_AND_SET_FLAG( RO, ro )
- CHECK_AND_SET_FLAG( REMOVE, remove )
- CHECK_AND_SET_FLAG( EXPANDED, expanded )
-#undef CHECK_AND_SET_FLAG
- lua_setfield( L, -2, "flags" );
- if( p_input )
- {
- lua_pushstring( L, p_input->psz_name );
- lua_setfield( L, -2, "name" );
- lua_pushstring( L, p_input->psz_uri );
- lua_setfield( L, -2, "path" );
- if( p_input->i_duration < 0 )
- lua_pushnumber( L, -1 );
- else
- lua_pushnumber( L, ((double)p_input->i_duration)*1e-6 );
- lua_setfield( L, -2, "duration" );
- lua_pushinteger( L, p_input->i_nb_played );
- lua_setfield( L, -2, "nb_played" );
- /* TODO: add (optional) info categories, meta, options, es */
- }
- if( p_item->i_children >= 0 )
- {
- int i;
- lua_createtable( L, p_item->i_children, 0 );
- for( i = 0; i < p_item->i_children; i++ )
- {
- push_playlist_item( L, p_item->pp_children[i] );
- lua_rawseti( L, -2, i+1 );
- }
- lua_setfield( L, -2, "children" );
- }
-}
-
-static int vlclua_playlist_get( lua_State *L )
-{
- playlist_t *p_playlist = vlclua_get_playlist_internal( L );
- int b_category = luaL_optboolean( L, 2, 1 ); /* Default to tree playlist (discared when 1st argument is a playlist_item's id) */
- playlist_item_t *p_item = NULL;
-
- if( lua_isnumber( L, 1 ) )
- {
- int i_id = lua_tointeger( L, 1 );
- p_item = playlist_ItemGetById( p_playlist, i_id, VLC_TRUE );
- if( !p_item )
- {
- vlc_object_release( p_playlist );
- return 0; /* Should we return an error instead? */
- }
- }
- else if( lua_isstring( L, 1 ) )
- {
- const char *psz_what = lua_tostring( L, 1 );
- if( !strcasecmp( psz_what, "normal" )
- || !strcasecmp( psz_what, "playlist" ) )
- p_item = b_category ? p_playlist->p_local_category
- : p_playlist->p_local_onelevel;
- else if( !strcasecmp( psz_what, "ml" )
- || !strcasecmp( psz_what, "media library" ) )
- p_item = b_category ? p_playlist->p_ml_category
- : p_playlist->p_ml_onelevel;
- else if( !strcasecmp( psz_what, "root" ) )
- p_item = b_category ? p_playlist->p_root_category
- : p_playlist->p_root_onelevel;
- else
- {
- int i;
- for( i = 0; i < p_playlist->i_sds; i++ )
- {
- if( !strcasecmp( psz_what,
- p_playlist->pp_sds[i]->p_sd->psz_module ) )
- {
- p_item = b_category ? p_playlist->pp_sds[i]->p_cat
- : p_playlist->pp_sds[i]->p_one;
- break;
- }
- }
- if( !p_item )
- {
- vlc_object_release( p_playlist );
- return 0; /* Should we return an error instead? */
- }
- }
- }
- else
- {
- p_item = b_category ? p_playlist->p_root_category
- : p_playlist->p_root_onelevel;
- }
- push_playlist_item( L, p_item );
- vlc_object_release( p_playlist );
- return 1;
-}
-
-static int vlclua_playlist_search( lua_State *L )
-{
- playlist_t *p_playlist = vlclua_get_playlist_internal( L );
- const char *psz_string = luaL_optstring( L, 1, "" );
- int b_category = luaL_optboolean( L, 2, 1 ); /* default to category */
- playlist_item_t *p_item = b_category ? p_playlist->p_root_category
- : p_playlist->p_root_onelevel;
- playlist_LiveSearchUpdate( p_playlist, p_item, psz_string );
- push_playlist_item( L, p_item );
- vlc_object_release( p_playlist );
- return 1;
-}
-
-static int vlc_sort_key_from_string( const char *psz_name )
-{
- static const struct
- {
- const char *psz_name;
- int i_key;
- } pp_keys[] =
- { { "id", SORT_ID },
- { "title", SORT_TITLE },
- { "title nodes first", SORT_TITLE_NODES_FIRST },
- { "artist", SORT_ARTIST },
- { "genre", SORT_GENRE },
- { "random", SORT_RANDOM },
- { "duration", SORT_DURATION },
- { "title numeric", SORT_TITLE_NUMERIC },
- { "album", SORT_ALBUM },
- { NULL, -1 } };
- int i;
- for( i = 0; pp_keys[i].psz_name; i++ )
- {
- if( !strcmp( psz_name, pp_keys[i].psz_name ) )
- return pp_keys[i].i_key;
- }
- return -1;
-}
-
-static int vlclua_playlist_sort( lua_State *L )
-{
- /* allow setting the different sort keys */
- int i_mode = vlc_sort_key_from_string( luaL_checkstring( L, 1 ) );
- if( i_mode == -1 )
- return luaL_error( L, "Invalid search key." );
- int i_type = luaL_optboolean( L, 2, 0 ) ? ORDER_REVERSE : ORDER_NORMAL;
- int b_category = luaL_optboolean( L, 3, 1 ); /* default to category */
- playlist_t *p_playlist = vlclua_get_playlist_internal( L );
- playlist_item_t *p_root = b_category ? p_playlist->p_local_category
- : p_playlist->p_local_onelevel;
- int i_ret = playlist_RecursiveNodeSort( p_playlist, p_root, i_mode,
- i_type );
- vlc_object_release( p_playlist );
- return vlclua_push_ret( L, i_ret );
-}
-
-/* FIXME: split this in 3 different functions? */
-static int vlclua_playlist_status( lua_State *L )
-{
- intf_thread_t *p_intf = (intf_thread_t *)vlclua_get_this( L );
- playlist_t *p_playlist = pl_Yield( p_intf );
- /*
- int i_count = 0;
- lua_settop( L, 0 );*/
- if( p_playlist->p_input )
- {
- /*char *psz_uri =
- input_item_GetURI( input_GetItem( p_playlist->p_input ) );
- lua_pushstring( L, psz_uri );
- free( psz_uri );
- lua_pushnumber( L, config_GetInt( p_intf, "volume" ) );*/
- vlc_mutex_lock( &p_playlist->object_lock );
- switch( p_playlist->status.i_status )
- {
- case PLAYLIST_STOPPED:
- lua_pushstring( L, "stopped" );
- break;
- case PLAYLIST_RUNNING:
- lua_pushstring( L, "playing" );
- break;
- case PLAYLIST_PAUSED:
- lua_pushstring( L, "paused" );
- break;
- default:
- lua_pushstring( L, "unknown" );
- break;
- }
- vlc_mutex_unlock( &p_playlist->object_lock );
- /*i_count += 3;*/
- }
- else
- {
- lua_pushstring( L, "stopped" );
- }
- vlc_object_release( p_playlist );
- return 1;
-}
-
-
-static int vlclua_lock_and_wait( lua_State *L )
-{
- vlc_object_t *p_this = vlclua_get_this( L );
- int b_quit = vlc_object_lock_and_wait( p_this );
- lua_pushboolean( L, b_quit );
- return 1;
-}
-
-static int vlclua_signal( lua_State *L )
-{
- vlc_object_t *p_this = vlclua_get_this( L );
- vlc_object_signal( p_this );
- return 0;
-}
-
-static int vlclua_mdate( lua_State *L )
-{
- lua_pushnumber( L, mdate() );
- return 1;
-}
-
-static int vlclua_intf_should_die( lua_State *L )
-{
- intf_thread_t *p_intf = (intf_thread_t*)vlclua_get_this( L );
- lua_pushboolean( L, intf_ShouldDie( p_intf ) );
- return 1;
-}
-
-static luaL_Reg p_reg[] =
-{
- { "input_info", vlclua_input_info },
- { "is_playing", vlclua_is_playing },
- { "get_title", vlclua_get_title },
-
- { "fullscreen", vlclua_fullscreen },
-
- { "mdate", vlclua_mdate },
-
- { "module_command", vlclua_module_command },
- { "libvlc_command", vlclua_libvlc_command },
-
- { "decode_uri", vlclua_decode_uri },
- { "resolve_xml_special_chars", vlclua_resolve_xml_special_chars },
- { "convert_xml_special_chars", vlclua_convert_xml_special_chars },
-
- { "lock_and_wait", vlclua_lock_and_wait },
- { "signal", vlclua_signal },
-
- { "version", vlclua_version },
- { "license", vlclua_license },
- { "copyright", vlclua_copyright },
- { "should_die", vlclua_intf_should_die },
- { "quit", vlclua_quit },
-
- { "homedir", vlclua_homedir },
- { "datadir", vlclua_datadir },
- { "configdir", vlclua_configdir },
- { "cachedir", vlclua_cachedir },
- { "datadir_list", vlclua_datadir_list },
-
- { NULL, NULL }
-};
-
-static luaL_Reg p_reg_object[] =
-{
- { "input", vlclua_get_input }, /* This is fast */
- { "playlist", vlclua_get_playlist }, /* This is fast */
- { "libvlc", vlclua_get_libvlc }, /* This is fast */
-
- { "find", vlclua_object_find }, /* This is slow */
- { "find_name", vlclua_object_find_name }, /* This is slow */
-
- { NULL, NULL }
-};
-
-static luaL_Reg p_reg_var[] =
-{
- { "get", vlclua_var_get },
- { "get_list", vlclua_var_get_list },
- { "set", vlclua_var_set },
- { "add_callback", vlclua_add_callback },
- { "del_callback", vlclua_del_callback },
-
- { NULL, NULL }
-};
-
-static luaL_Reg p_reg_config[] =
-{
- { "get", vlclua_config_get },
- { "set", vlclua_config_set },
-
- { NULL, NULL }
-};
-
-static luaL_Reg p_reg_msg[] =
-{
- { "dbg", vlclua_msg_dbg },
- { "warn", vlclua_msg_warn },
- { "err", vlclua_msg_err },
- { "info", vlclua_msg_info },
-
- { NULL, NULL }
-};
-
-static luaL_Reg p_reg_playlist[] =
-{
- { "prev", vlclua_playlist_prev },
- { "next", vlclua_playlist_next },
- { "skip", vlclua_playlist_skip },
- { "play", vlclua_playlist_play },
- { "pause", vlclua_playlist_pause },
- { "stop", vlclua_playlist_stop },
- { "clear", vlclua_playlist_clear },
- { "repeat_", vlclua_playlist_repeat },
- { "loop", vlclua_playlist_loop },
- { "random", vlclua_playlist_random },
- { "goto", vlclua_playlist_goto },
- { "status", vlclua_playlist_status },
- { "add", vlclua_playlist_add },
- { "enqueue", vlclua_playlist_enqueue },
- { "get", vlclua_playlist_get },
- { "search", vlclua_playlist_search },
- { "sort", vlclua_playlist_sort },
-
- { "stats", vlclua_input_stats },
-
- { NULL, NULL }
-};
-
-static luaL_Reg p_reg_sd[] =
-{
- { "get_services_names", vlclua_sd_get_services_names },
- { "add", vlclua_sd_add },
- { "remove", vlclua_sd_remove },
- { "is_loaded", vlclua_sd_is_loaded },
-
- { NULL, NULL }
-};
-
-static luaL_Reg p_reg_volume[] =
-{
- { "get", vlclua_volume_get },
- { "set", vlclua_volume_set },
- { "up", vlclua_volume_up },
- { "down", vlclua_volume_down },
-
- { NULL, NULL }
-};
-
-static luaL_Reg p_reg_osd[] =
-{
- { "icon", vlclua_osd_icon },
- { "message", vlclua_osd_message },
- { "slider", vlclua_osd_slider },
- { "channel_register", vlclua_spu_channel_register },
- { "channel_clear", vlclua_spu_channel_clear },
-
- { NULL, NULL }
-};
-
-static luaL_Reg p_reg_net[] =
-{
- { "url_parse", vlclua_url_parse },
- { "listen_tcp", vlclua_net_listen_tcp },
- { "listen_close", vlclua_net_listen_close },
- { "accept", vlclua_net_accept },
- { "close", vlclua_net_close },
- { "send", vlclua_net_send },
- { "recv", vlclua_net_recv },
- { "select", vlclua_net_select },
-
- { NULL, NULL }
-};
-
-static luaL_Reg p_reg_fd[] =
-{
-/* { "open", vlclua_fd_open },*/
- { "read", vlclua_fd_read },
- { "write", vlclua_fd_write },
- { "stat", vlclua_stat },
-
- { "opendir", vlclua_opendir },
-
- { "new_fd_set", vlclua_fd_set_new },
- { "fd_clr", vlclua_fd_clr },
- { "fd_isset", vlclua_fd_isset },
- { "fd_set", vlclua_fd_set },
- { "fd_zero", vlclua_fd_zero },
-
- { NULL, NULL }
-};
-
-static luaL_Reg p_reg_vlm[] =
-{
- { "new", vlclua_vlm_new },
- { "delete", vlclua_vlm_delete },
- { "execute_command", vlclua_vlm_execute_command },
-
- { NULL, NULL }
-};
-
-static luaL_Reg p_reg_httpd[] =
-{
- { "host_new", vlclua_httpd_tls_host_new },
- { "host_delete", vlclua_httpd_host_delete },
- { "handler_new", vlclua_httpd_handler_new },
- { "handler_delete", vlclua_httpd_handler_delete },
- { "file_new", vlclua_httpd_file_new },
- { "file_delete", vlclua_httpd_file_delete },
- { "redirect_new", vlclua_httpd_redirect_new },
- { "redirect_delete", vlclua_httpd_redirect_delete },
-
- { NULL, NULL }
-};
-
-static luaL_Reg p_reg_acl[] =
-{
- { "create", vlclua_acl_create },
- { "delete", vlclua_acl_delete },
- { "check", vlclua_acl_check },
- { "duplicate", vlclua_acl_duplicate },
- { "add_host", vlclua_acl_add_host },
- { "add_net", vlclua_acl_add_net },
- { "load_file", vlclua_acl_load_file },
-
- { NULL, NULL }
-};
-
-static void Run( intf_thread_t *p_intf );
-
-static char *FindFile( intf_thread_t *p_intf, const char *psz_name )
+static char *FindFile( const char *psz_name )
{
char *ppsz_dir_list[] = { NULL, NULL, NULL, NULL };
char **ppsz_dir;
- vlclua_dir_list( VLC_OBJECT(p_intf), "luaintf", ppsz_dir_list );
+ vlclua_dir_list( "intf", ppsz_dir_list );
for( ppsz_dir = ppsz_dir_list; *ppsz_dir; ppsz_dir++ )
{
char *psz_filename;
/* { "http", "http" }, */
{ NULL, NULL } };
-static vlc_bool_t WordInList( const char *psz_list, const char *psz_word )
+static bool WordInList( const char *psz_list, const char *psz_word )
{
const char *psz_str = strstr( psz_list, psz_word );
int i_len = strlen( psz_word );
/* it doesn't start in middle of a word */
/* it doest end in middle of a word */
&& ( psz_str[i_len] == '\0' || psz_str[i_len] == ',' ) )
- return VLC_TRUE;
+ return true;
psz_str = strstr( psz_str, psz_word );
}
- return VLC_FALSE;
+ return false;
}
-static const char *GetModuleName( intf_thread_t *p_intf )
+static char *GetModuleName( intf_thread_t *p_intf )
{
int i;
const char *psz_intf;
for( i = 0; pp_shortcuts[i].psz_name; i++ )
{
if( WordInList( psz_intf, pp_shortcuts[i].psz_shortcut ) )
- return pp_shortcuts[i].psz_name;
+ return strdup( pp_shortcuts[i].psz_name );
}
return config_GetPsz( p_intf, "lua-intf" );
}
-int E_(Open_LuaIntf)( vlc_object_t *p_this )
+static luaL_Reg p_reg[] = { { NULL, NULL } };
+
+int Open_LuaIntf( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t*)p_this;
intf_sys_t *p_sys;
lua_State *L;
- const char *psz_name = GetModuleName( p_intf );
+ char *psz_name = GetModuleName( p_intf );
const char *psz_config;
- vlc_bool_t b_config_set = VLC_FALSE;
- if( !psz_name ) psz_name = "dummy";
+ bool b_config_set = false;
+ if( !psz_name ) psz_name = strdup( "dummy" );
p_intf->p_sys = (intf_sys_t*)malloc( sizeof(intf_sys_t*) );
if( !p_intf->p_sys )
{
+ free( psz_name );
return VLC_ENOMEM;
}
p_sys = p_intf->p_sys;
- p_sys->psz_filename = FindFile( p_intf, psz_name );
+ p_sys->psz_filename = FindFile( psz_name );
if( !p_sys->psz_filename )
{
msg_Err( p_intf, "Couldn't find lua interface script \"%s\".",
psz_name );
+ free( psz_name );
+ free( p_sys );
return VLC_EGENERIC;
}
msg_Dbg( p_intf, "Found lua interface script: %s", p_sys->psz_filename );
if( !L )
{
msg_Err( p_intf, "Could not create new Lua State" );
+ free( psz_name );
free( p_sys );
return VLC_EGENERIC;
}
- luaL_openlibs( L ); /* FIXME: we don't want to have all the libs */
+ luaL_openlibs( L );
/* register our functions */
luaL_register( L, "vlc", p_reg );
- /* store a pointer to p_intf */
+
+ /* store a pointer to p_intf (FIXME: user could overwrite this) */
lua_pushlightuserdata( L, p_intf );
lua_setfield( L, -2, "private" );
+
/* register submodules */
- luaL_register_submodule( L, "object", p_reg_object );
- luaL_register_submodule( L, "var", p_reg_var );
- luaL_register_submodule( L, "config", p_reg_config );
- luaL_register_submodule( L, "msg", p_reg_msg );
- luaL_register_submodule( L, "playlist", p_reg_playlist );
- luaL_register_submodule( L, "sd", p_reg_sd );
- luaL_register_submodule( L, "volume", p_reg_volume );
- luaL_register_submodule( L, "osd", p_reg_osd );
- luaL_register_submodule( L, "net", p_reg_net );
- luaL_register_submodule( L, "fd", p_reg_fd );
- luaL_register_submodule( L, "vlm", p_reg_vlm );
- luaL_register_submodule( L, "httpd", p_reg_httpd );
- luaL_register_submodule( L, "acl", p_reg_acl );
+ luaopen_acl( L );
+ luaopen_config( L );
+ luaopen_volume( L );
+ luaopen_httpd( L );
+ luaopen_input( L );
+ luaopen_msg( L );
+ luaopen_misc( L );
+ luaopen_net( L );
+ luaopen_object( L );
+ luaopen_osd( L );
+ luaopen_playlist( L );
+ luaopen_sd( L );
+ luaopen_stream( L );
+ luaopen_strings( L );
+ luaopen_variables( L );
+ luaopen_video( L );
+ luaopen_vlm( L );
+ luaopen_volume( L );
+
/* clean up */
lua_pop( L, 1 );
if( lua_istable( L, -1 ) )
{
lua_setglobal( L, "config" );
- b_config_set = VLC_TRUE;
+ b_config_set = true;
}
}
}
}
- if( b_config_set == VLC_FALSE )
+ if( b_config_set == false )
{
lua_newtable( L );
lua_setglobal( L, "config" );
p_sys->L = L;
p_intf->pf_run = Run;
- p_intf->psz_header = strdup( psz_name ); /* Do I need to clean that up myself in E_(Close_LuaIntf)? */
+ p_intf->psz_header = strdup( psz_name ); /* Do I need to clean that up myself in Close_LuaIntf? */
+ free( psz_name );
return VLC_SUCCESS;
}
-void E_(Close_LuaIntf)( vlc_object_t *p_this )
+void Close_LuaIntf( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t*)p_this;
p_intf->p_sys->psz_filename,
lua_tostring( L, lua_gettop( L ) ) );
lua_pop( L, 1 );
- p_intf->b_die = VLC_TRUE;
+ p_intf->b_die = true;
return;
}
- p_intf->b_die = VLC_TRUE;
+ p_intf->b_die = true;
}
projects / vlc / blobdiff