#include <vlc_common.h>
#include <vlc_meta.h>
-#include <vlc_charset.h>
#include <vlc_playlist.h>
#include "playlist.h"
#include "../vlc.h"
#include "../libs.h"
+#include "../extension.h"
static const luaL_Reg vlclua_input_reg[];
static const luaL_Reg vlclua_input_item_reg[];
+static input_item_t* vlclua_input_item_get_internal( lua_State *L );
+
input_thread_t * vlclua_get_input_internal( lua_State *L )
{
+ extension_t *p_extension = vlclua_extension_get( L );
+ if( p_extension )
+ {
+ input_thread_t *p_input = p_extension->p_sys->p_input;
+ if( p_input )
+ {
+ vlc_object_hold(p_input);
+ return p_input;
+ }
+ }
playlist_t *p_playlist = vlclua_get_playlist_internal( L );
input_thread_t *p_input = playlist_CurrentInput( p_playlist );
- vlclua_release_playlist_internal( p_playlist );
return p_input;
}
-static int vlclua_input_info( lua_State *L )
+static int vlclua_input_item_info( lua_State *L )
{
- input_thread_t * p_input = vlclua_get_input_internal( L );
+ input_item_t *p_item = vlclua_input_item_get_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;
+ i_cat = p_item->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];
+ info_category_t *p_category = p_item->pp_categories[i];
int i_infos = p_category->i_infos;
int j;
lua_pushstring( L, p_category->psz_name );
}
lua_settable( L, -3 );
}
- vlc_object_release( p_input );
return 1;
}
return 1;
}
-static int vlclua_input_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_metas_internal( lua_State *L, input_item_t *p_item )
{
if( !p_item )
const char *meta = vlc_meta_GetExtra(p_item->p_meta, names[i]);
lua_pushstring( L, meta );
lua_setfield( L, -2, names[i] );
- printf("setting %s=%s\n", names[i], meta);
free(names[i]);
}
free(names);
return 1;
}
-static int vlclua_input_metas( lua_State *L )
+static int vlclua_input_item_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;
- vlclua_input_metas_internal( L, p_item );
- if( p_input )
- 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;
+ input_item_t *p_item = vlclua_input_item_get_internal( L );
lua_newtable( L );
if( p_item )
{
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_packets )
STATS_INT( read_bytes )
STATS_FLOAT( input_bitrate )
+ STATS_FLOAT( average_input_bitrate )
+ STATS_INT( demux_read_packets )
STATS_INT( demux_read_bytes )
STATS_FLOAT( demux_bitrate )
+ STATS_FLOAT( average_demux_bitrate )
STATS_INT( demux_corrupted )
STATS_INT( demux_discontinuity )
+ STATS_INT( decoded_audio )
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 )
+ STATS_INT( played_abuffers )
+ STATS_INT( lost_abuffers )
#undef STATS_INT
#undef STATS_FLOAT
vlc_mutex_unlock( &p_item->p_stats->lock );
}
- if( p_input )
- vlc_object_release( p_input );
return 1;
}
static int vlclua_input_item_get( lua_State *L, input_item_t *p_item )
{
vlc_gc_incref( p_item );
- input_item_t **pp = lua_newuserdata( L, sizeof( void* ) );
+ input_item_t **pp = lua_newuserdata( L, sizeof( input_item_t* ) );
*pp = p_item;
if( luaL_newmetatable( L, "input_item" ) )
return 1;
}
+static int vlclua_input_item_is_preparsed( lua_State *L )
+{
+ lua_pushboolean( L, input_item_IsPreparsed( vlclua_input_item_get_internal( L ) ) );
+ return 1;
+}
+
+static int vlclua_input_item_uri( lua_State *L )
+{
+ lua_pushstring( L, input_item_GetURI( vlclua_input_item_get_internal( L ) ) );
+ return 1;
+}
+
+static int vlclua_input_item_name( lua_State *L )
+{
+ lua_pushstring( L, input_item_GetName( vlclua_input_item_get_internal( L ) ) );
+ return 1;
+}
+
+static int vlclua_input_item_duration( lua_State *L )
+{
+ mtime_t duration = input_item_GetDuration( vlclua_input_item_get_internal( L ) );
+ lua_pushnumber( L, ((double)duration)/1000000. );
+ return 1;
+}
+
static int vlclua_input_item_set_meta( lua_State *L )
{
input_item_t *p_item = vlclua_input_item_get_internal( L );
const char *psz_name = luaL_checkstring( L, 2 ),
*psz_value = luaL_checkstring( L, 3 );
-#define META_TYPE( n ) { #n, vlc_meta_ ## n }
+#define META_TYPE( n, s ) { s, vlc_meta_ ## n },
static const struct
{
const char *psz_name;
vlc_meta_type_t type;
} pp_meta_types[] = {
- META_TYPE( Title ),
- META_TYPE( Artist ),
- META_TYPE( Genre ),
- META_TYPE( Copyright ),
- META_TYPE( Album ),
- META_TYPE( TrackNumber ),
- META_TYPE( Description ),
- META_TYPE( Rating ),
- META_TYPE( Date ),
- META_TYPE( Setting ),
- META_TYPE( URL ),
- META_TYPE( Language ),
- META_TYPE( NowPlaying ),
- META_TYPE( Publisher ),
- META_TYPE( EncodedBy ),
- META_TYPE( ArtworkURL ),
- META_TYPE( TrackID ),
+ META_TYPE( Title, "title" )
+ META_TYPE( Artist, "artist" )
+ META_TYPE( Genre, "genre" )
+ META_TYPE( Copyright, "copyright" )
+ META_TYPE( Album, "album" )
+ META_TYPE( TrackNumber, "track_number" )
+ META_TYPE( Description, "description" )
+ META_TYPE( Rating, "rating" )
+ META_TYPE( Date, "date" )
+ META_TYPE( Setting, "setting" )
+ META_TYPE( URL, "url" )
+ META_TYPE( Language, "language" )
+ META_TYPE( NowPlaying, "now_playing" )
+ META_TYPE( Publisher, "publisher" )
+ META_TYPE( EncodedBy, "encoded_by" )
+ META_TYPE( ArtworkURL, "artwork_url" )
+ META_TYPE( TrackID, "track_id" )
};
#undef META_TYPE
vlc_meta_type_t type = vlc_meta_Title;
- bool ok = false;
for( unsigned i = 0; i < VLC_META_TYPE_COUNT; i++ )
{
if( !strcasecmp( pp_meta_types[i].psz_name, psz_name ) )
{
type = pp_meta_types[i].type;
- ok = true;
+ input_item_SetMeta( p_item, type, psz_value );
+ return 1;
}
}
- if( !ok ) {
- vlc_meta_AddExtra( p_item->p_meta, psz_name, psz_value );
- return 1;
- }
-
- input_item_SetMeta( p_item, type, psz_value );
+ vlc_meta_AddExtra( p_item->p_meta, psz_name, psz_value );
return 1;
}
* Lua bindings
*****************************************************************************/
static const luaL_Reg vlclua_input_reg[] = {
- { "info", vlclua_input_info },
{ "is_playing", vlclua_input_is_playing },
- { "get_title", vlclua_input_get_title },
- { "metas", vlclua_input_metas },
{ "item", vlclua_input_item_get_current },
- { "stats", vlclua_input_stats },
{ "add_subtitle", vlclua_input_add_subtitle },
{ NULL, NULL }
};
}
static const luaL_Reg vlclua_input_item_reg[] = {
+ { "is_preparsed", vlclua_input_item_is_preparsed },
{ "metas", vlclua_input_item_metas },
{ "set_meta", vlclua_input_item_set_meta },
+ { "uri", vlclua_input_item_uri },
+ { "name", vlclua_input_item_name },
+ { "duration", vlclua_input_item_duration },
+ { "stats", vlclua_input_item_stats },
+ { "info", vlclua_input_item_info },
{ NULL, NULL }
};
projects / vlc / blobdiff