[vlc-commits] Revert "lua: XML encode metadata before pushing it on the web interface ( closes #15866)"
Felix Paul Kühne
git at videolan.org
Tue Nov 24 16:54:03 CET 2015
vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Tue Nov 24 16:39:10 2015 +0100| [03159d8c43ea0820afa15b9a493973deebf3cc8b] | committer: Felix Paul Kühne
Revert "lua: XML encode metadata before pushing it on the web interface (closes #15866)"
This reverts commit 2e25c296dac7649effea50d294ac625f21da4530.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=03159d8c43ea0820afa15b9a493973deebf3cc8b
---
modules/lua/libs/input.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/modules/lua/libs/input.c b/modules/lua/libs/input.c
index af18b63..f251219 100644
--- a/modules/lua/libs/input.c
+++ b/modules/lua/libs/input.c
@@ -114,25 +114,18 @@ static int vlclua_input_metas_internal( lua_State *L, input_item_t *p_item )
}
lua_newtable( L );
- char *psz_name = NULL;
- const char *psz_meta = NULL;
- char *psz_meta_worker = NULL;
+ char *psz_name;
+ const char *psz_meta;
psz_name = input_item_GetName( p_item );
- if( psz_name != NULL )
- psz_name = convert_xml_special_chars( psz_name );
lua_pushstring( L, psz_name );
lua_setfield( L, -2, "filename" );
free( psz_name );
#define PUSH_META( n, m ) \
psz_meta = vlc_meta_Get( p_item->p_meta, vlc_meta_ ## n ); \
- if( psz_meta != NULL ) { \
- psz_meta_worker = convert_xml_special_chars( psz_meta ); \
- } \
- lua_pushstring( L, psz_meta_worker ); \
- lua_setfield( L, -2, m ); \
- FREENULL( psz_meta_worker )
+ lua_pushstring( L, psz_meta ); \
+ lua_setfield( L, -2, m )
vlc_mutex_lock(&p_item->lock);
More information about the vlc-commits
mailing list