Commit 4ad218c2 authored by Antoine Cellerier's avatar Antoine Cellerier

Move lua{intf,playlist,meta} to lua/{intf,playlist,meta}. I haven't been able...

Move lua{intf,playlist,meta} to lua/{intf,playlist,meta}. I haven't been able to check the changes to the Win32 and Mac OS X specific Makefile.am parts.
parent a4a4609a
...@@ -424,21 +424,21 @@ VLC-release.app: vlc ...@@ -424,21 +424,21 @@ VLC-release.app: vlc
for i in $(srcdir)/src/.libs/*.dylib ; do \ for i in $(srcdir)/src/.libs/*.dylib ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/`basename $${i}` ; \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/`basename $${i}` ; \
done ; done ;
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist
for i in $(srcdir)/share/luaplaylist/*.* ; do \ for i in $(srcdir)/share/lua/playlist/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist/`basename $${i}` ; \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist/`basename $${i}` ; \
done ; \ done ; \
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luameta $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/meta
for i in $(srcdir)/share/luameta/*.* ; do \ for i in $(srcdir)/share/lua/meta/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luameta/`basename $${i}` ; \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/meta/`basename $${i}` ; \
done ; \ done ; \
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf
for i in $(srcdir)/share/luaintf/*.* ; do \ for i in $(srcdir)/share/lua/intf/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf/`basename $${i}` ; \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf/`basename $${i}` ; \
done ; \ done ; \
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf/modules $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf/modules
for i in $(srcdir)/share/luaintf/modules/*.* ; do \ for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf/modules/`basename $${i}` ; \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf/modules/`basename $${i}` ; \
done ; \ done ; \
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/dialogs $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/dialogs
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/js $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/js
...@@ -779,21 +779,21 @@ package-win32-base-debug: package-win-common ...@@ -779,21 +779,21 @@ package-win32-base-debug: package-win-common
cp $$i $(top_builddir)/vlc-$(VERSION)/skins/ || true ; \ cp $$i $(top_builddir)/vlc-$(VERSION)/skins/ || true ; \
done done
$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luaplaylist $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/playlist
for i in $(srcdir)/share/luaplaylist/*.* ; do \ for i in $(srcdir)/share/lua/playlist/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luaplaylist/`basename $${i}` ; \ $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/playlist/`basename $${i}` ; \
done ; done ;
$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luameta $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/meta
for i in $(srcdir)/share/luameta/*.* ; do \ for i in $(srcdir)/share/lua/meta/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luameta/`basename $${i}` ; \ $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/meta/`basename $${i}` ; \
done ; done ;
$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luaintf $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/intf
for i in $(srcdir)/share/luaintf/*.* ; do \ for i in $(srcdir)/share/lua/intf/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luaintf/`basename $${i}` ; \ $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/intf/`basename $${i}` ; \
done ; done ;
$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luaintf/modules $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules
for i in $(srcdir)/share/luaintf/modules/*.* ; do \ for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luaintf/modules/`basename $${i}` ; \ $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules/`basename $${i}` ; \
done ; done ;
mkdir -p "$(top_builddir)/vlc-$(VERSION)/osdmenu" mkdir -p "$(top_builddir)/vlc-$(VERSION)/osdmenu"
......
...@@ -49,10 +49,10 @@ Playlist: ...@@ -49,10 +49,10 @@ Playlist:
* Shoutcast TV listings * Shoutcast TV listings
* Audioscrobbler/last.fm support * Audioscrobbler/last.fm support
* Album art support * Album art support
* User definable Lua playlist scripts. See share/luaplaylist/README.txt * User definable Lua playlist scripts. See share/lua/playlist/README.txt
(Default scripts open YouTube, DailyMotion, metacafe and Google Video URLs) (Default scripts open YouTube, DailyMotion, metacafe and Google Video URLs)
* User definable Lua metadata and album art fetcher scripts. See * User definable Lua metadata and album art fetcher scripts. See
share/luameta/README.txt share/lua/meta/README.txt
Input/Demuxers: Input/Demuxers:
* UDP-Lite transport for RTP/AVP * UDP-Lite transport for RTP/AVP
......
...@@ -914,7 +914,7 @@ static char *FindFile( intf_thread_t *p_intf, const char *psz_name ) ...@@ -914,7 +914,7 @@ static char *FindFile( intf_thread_t *p_intf, const char *psz_name )
{ {
char *ppsz_dir_list[] = { NULL, NULL, NULL, NULL }; char *ppsz_dir_list[] = { NULL, NULL, NULL, NULL };
char **ppsz_dir; char **ppsz_dir;
vlclua_dir_list( VLC_OBJECT(p_intf), "luaintf", ppsz_dir_list ); vlclua_dir_list( VLC_OBJECT(p_intf), "intf", ppsz_dir_list );
for( ppsz_dir = ppsz_dir_list; *ppsz_dir; ppsz_dir++ ) for( ppsz_dir = ppsz_dir_list; *ppsz_dir; ppsz_dir++ )
{ {
char *psz_filename; char *psz_filename;
......
...@@ -287,7 +287,7 @@ int E_(FindMeta)( vlc_object_t *p_this ) ...@@ -287,7 +287,7 @@ int E_(FindMeta)( vlc_object_t *p_this )
input_item_t *p_item = p_me->p_item; input_item_t *p_item = p_me->p_item;
lua_State *L = vlclua_meta_init( p_this, p_item ); lua_State *L = vlclua_meta_init( p_this, p_item );
int i_ret = vlclua_scripts_batch_execute( p_this, "luameta", &fetch_meta, L, p_item ); int i_ret = vlclua_scripts_batch_execute( p_this, "meta", &fetch_meta, L, p_item );
lua_close( L ); lua_close( L );
return i_ret; return i_ret;
} }
...@@ -301,7 +301,7 @@ int E_(FindArt)( vlc_object_t *p_this ) ...@@ -301,7 +301,7 @@ int E_(FindArt)( vlc_object_t *p_this )
input_item_t *p_item = (input_item_t *)(p_playlist->p_private); input_item_t *p_item = (input_item_t *)(p_playlist->p_private);
lua_State *L = vlclua_meta_init( p_this, p_item ); lua_State *L = vlclua_meta_init( p_this, p_item );
int i_ret = vlclua_scripts_batch_execute( p_this, "luameta", &fetch_art, L, p_item ); int i_ret = vlclua_scripts_batch_execute( p_this, "meta", &fetch_art, L, p_item );
lua_close( L ); lua_close( L );
return i_ret; return i_ret;
} }
......
...@@ -224,7 +224,7 @@ int E_(Import_LuaPlaylist)( vlc_object_t *p_this ) ...@@ -224,7 +224,7 @@ int E_(Import_LuaPlaylist)( vlc_object_t *p_this )
lua_pop( L, 1 ); lua_pop( L, 1 );
ret = vlclua_scripts_batch_execute( p_this, "luaplaylist", ret = vlclua_scripts_batch_execute( p_this, "playlist",
&probe_luascript, L, NULL ); &probe_luascript, L, NULL );
if( ret ) if( ret )
E_(Close_LuaPlaylist)( p_this ); E_(Close_LuaPlaylist)( p_this );
......
...@@ -405,24 +405,24 @@ static int file_compare( const char **a, const char **b ) ...@@ -405,24 +405,24 @@ static int file_compare( const char **a, const char **b )
int vlclua_dir_list( vlc_object_t *p_this, const char *luadirname, int vlclua_dir_list( vlc_object_t *p_this, const char *luadirname,
char **ppsz_dir_list ) char **ppsz_dir_list )
{ {
if( asprintf( &ppsz_dir_list[0], "%s" DIR_SEP "%s", if( asprintf( &ppsz_dir_list[0], "%s" DIR_SEP "lua" DIR_SEP "%s",
p_this->p_libvlc->psz_datadir, luadirname ) < 0 ) p_this->p_libvlc->psz_datadir, luadirname ) < 0 )
return VLC_ENOMEM; return VLC_ENOMEM;
# if defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32) # if defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32)
{ {
const char *psz_vlcpath = config_GetDataDir(); const char *psz_vlcpath = config_GetDataDir();
if( asprintf( &ppsz_dir_list[1], "%s" DIR_SEP "%s", if( asprintf( &ppsz_dir_list[1], "%s" DIR_SEP "lua" DIR_SEP "%s",
psz_vlcpath, luadirname ) < 0 ) psz_vlcpath, luadirname ) < 0 )
return VLC_ENOMEM; return VLC_ENOMEM;
if( asprintf( &ppsz_dir_list[2], "%s" DIR_SEP "share" DIR_SEP "%s", if( asprintf( &ppsz_dir_list[2], "%s" DIR_SEP "share" DIR_SEP "lua" DIR_SEP "%s",
psz_vlcpath, luadirname ) < 0 ) psz_vlcpath, luadirname ) < 0 )
return VLC_ENOMEM; return VLC_ENOMEM;
} }
# else # else
if( asprintf( &ppsz_dir_list[1], if( asprintf( &ppsz_dir_list[1],
"share" DIR_SEP "%s", luadirname ) < 0 ) "share" DIR_SEP "lua" DIR_SEP "%s", luadirname ) < 0 )
return VLC_ENOMEM; return VLC_ENOMEM;
# ifdef HAVE_SYS_STAT_H # ifdef HAVE_SYS_STAT_H
...@@ -432,7 +432,7 @@ int vlclua_dir_list( vlc_object_t *p_this, const char *luadirname, ...@@ -432,7 +432,7 @@ int vlclua_dir_list( vlc_object_t *p_this, const char *luadirname,
|| !S_ISDIR( stat_info.st_mode ) ) || !S_ISDIR( stat_info.st_mode ) )
{ {
free(ppsz_dir_list[1]); free(ppsz_dir_list[1]);
if( asprintf( &ppsz_dir_list[1], "%s" DIR_SEP "%s", if( asprintf( &ppsz_dir_list[1], "%s" DIR_SEP "lua" DIR_SEP "%s",
config_GetDataDir (), luadirname ) < 0 ) config_GetDataDir (), luadirname ) < 0 )
return VLC_ENOMEM; return VLC_ENOMEM;
} }
......
...@@ -249,29 +249,29 @@ DIST_osdmenu_minimal = \ ...@@ -249,29 +249,29 @@ DIST_osdmenu_minimal = \
osdmenu/minimal/fs_panel_mockup.png osdmenu/minimal/fs_panel_mockup.png
DIST_lua= \ DIST_lua= \
luameta/README.txt \ lua/meta/README.txt \
luameta/googleimage.lua \ lua/meta/googleimage.lua \
luaplaylist/README.txt \ lua/playlist/README.txt \
luaplaylist/appletrailers.lua \ lua/playlist/appletrailers.lua \
luaplaylist/break.lua \ lua/playlist/break.lua \
luaplaylist/dailymotion.lua \ lua/playlist/dailymotion.lua \
luaplaylist/joox.lua \ lua/playlist/joox.lua \
luaplaylist/lelombrik.lua \ lua/playlist/lelombrik.lua \
luaplaylist/youtube.lua \ lua/playlist/youtube.lua \
luaplaylist/youtube_homepage.lua \ lua/playlist/youtube_homepage.lua \
luaplaylist/megavideo.lua \ lua/playlist/megavideo.lua \
luaplaylist/metacafe.lua \ lua/playlist/metacafe.lua \
luaplaylist/googlevideo.lua \ lua/playlist/googlevideo.lua \
luaintf/http.lua \ lua/intf/http.lua \
luaintf/rc.lua \ lua/intf/rc.lua \
luaintf/hotkeys.lua \ lua/intf/hotkeys.lua \
luaintf/modules/common.lua \ lua/intf/modules/common.lua \
luaintf/modules/host.lua \ lua/intf/modules/host.lua \
luaintf/modules/httpd.lua \ lua/intf/modules/httpd.lua \
luaintf/modules/acl.lua \ lua/intf/modules/acl.lua \
luaintf/modules/sandbox.lua \ lua/intf/modules/sandbox.lua \
luaintf/telnet.lua \ lua/intf/telnet.lua \
luaintf/dummy.lua lua/intf/dummy.lua
DIST_http_lua = \ DIST_http_lua = \
http-lua/.hosts \ http-lua/.hosts \
......
...@@ -48,7 +48,7 @@ VLC defines a global vlc object with the following members: ...@@ -48,7 +48,7 @@ VLC defines a global vlc object with the following members:
* vlc.msg_info( <string> ): print an info message. * vlc.msg_info( <string> ): print an info message.
Lua scripts are tried in alphabetical order in the user's VLC config Lua scripts are tried in alphabetical order in the user's VLC config
director luameta/ subdirectory, then in the global VLC luameta/ director lua/meta/ subdirectory, then in the global VLC lua/meta/
directory. directory.
Lua documentation is available on http://www.lua.org . Lua documentation is available on http://www.lua.org .
......
...@@ -54,7 +54,7 @@ VLC defines a global vlc object with the following members: ...@@ -54,7 +54,7 @@ VLC defines a global vlc object with the following members:
* vlc.msg_info( <string> ): print an info message. * vlc.msg_info( <string> ): print an info message.
Lua scripts are tried in alphabetical order in the user's VLC config Lua scripts are tried in alphabetical order in the user's VLC config
director luaplaylist/ subdirectory, then in the global VLC luaplaylist/ director lua/playlist/ subdirectory, then in the global VLC lua/playlist/
directory. directory.
Lua documentation is available on http://www.lua.org . Lua documentation is available on http://www.lua.org .
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment