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

diff --git a/Makefile.am b/Makefile.am
index 62b768ba70122cdc68573f87947116d6ba8fc394..d5fa56857c5fb47928cddff699c982c50b56d51b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -424,21 +424,21 @@ VLC-release.app: vlc
          for i in $(srcdir)/src/.libs/*.dylib ; do \
            $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/`basename $${i}` ; \
          done ;
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist
-       for i in $(srcdir)/share/luaplaylist/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist/`basename $${i}` ; \
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist
+       for i in $(srcdir)/share/lua/playlist/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist/`basename $${i}` ; \
        done ; \
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luameta
-       for i in $(srcdir)/share/luameta/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luameta/`basename $${i}` ; \
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/meta
+       for i in $(srcdir)/share/lua/meta/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/meta/`basename $${i}` ; \
        done ; \
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf
-       for i in $(srcdir)/share/luaintf/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf/`basename $${i}` ; \
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf
+       for i in $(srcdir)/share/lua/intf/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf/`basename $${i}` ; \
        done ; \
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf/modules
-       for i in $(srcdir)/share/luaintf/modules/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf/modules/`basename $${i}` ; \
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf/modules
+       for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf/modules/`basename $${i}` ; \
        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/js
@@ -779,21 +779,21 @@ package-win32-base-debug: package-win-common
          cp $$i $(top_builddir)/vlc-$(VERSION)/skins/ || true ; \
        done
 
-       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luaplaylist
-       for i in $(srcdir)/share/luaplaylist/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luaplaylist/`basename $${i}` ; \
+       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/playlist
+       for i in $(srcdir)/share/lua/playlist/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/playlist/`basename $${i}` ; \
        done ;
-       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luameta
-       for i in $(srcdir)/share/luameta/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luameta/`basename $${i}` ; \
+       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/meta
+       for i in $(srcdir)/share/lua/meta/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/meta/`basename $${i}` ; \
        done ;
-       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luaintf
-       for i in $(srcdir)/share/luaintf/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luaintf/`basename $${i}` ; \
+       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/intf
+       for i in $(srcdir)/share/lua/intf/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/intf/`basename $${i}` ; \
        done ;
-       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luaintf/modules
-       for i in $(srcdir)/share/luaintf/modules/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luaintf/modules/`basename $${i}` ; \
+       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules
+       for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules/`basename $${i}` ; \
        done ;
 
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/osdmenu"

diff --git a/NEWS b/NEWS
index 2555388948db71d2c5019b17bad0aaf56f98116c..3b70d2caf178b19b0bdaf7b978164dc19d9e3a1f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -49,10 +49,10 @@ Playlist:
     * Shoutcast TV listings
     * Audioscrobbler/last.fm 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)
  * User definable Lua metadata and album art fetcher scripts. See
-   share/luameta/README.txt
+   share/lua/meta/README.txt
 
 Input/Demuxers:
   * UDP-Lite transport for RTP/AVP

diff --git a/modules/misc/lua/intf.c b/modules/misc/lua/intf.c
index 2f63a9fd8160e363304c3b6edcfaf1acd554d71e..ceb26f4f3d2bbe687451697ad30efb14c4e96bce 100644 (file)
--- a/modules/misc/lua/intf.c
+++ b/modules/misc/lua/intf.c
@@ -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;
-    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++ )
     {
         char *psz_filename;

diff --git a/modules/misc/lua/meta.c b/modules/misc/lua/meta.c
index e7a1ca65ca7feea8e3dfc4c9ac3c4f02b2b4d109..704a8cbeca08dfea740262598530da0ea41a1b13 100644 (file)
--- a/modules/misc/lua/meta.c
+++ b/modules/misc/lua/meta.c
@@ -287,7 +287,7 @@ int E_(FindMeta)( vlc_object_t *p_this )
     input_item_t *p_item = p_me->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 );
     return i_ret;
 }
@@ -301,7 +301,7 @@ int E_(FindArt)( vlc_object_t *p_this )
     input_item_t *p_item = (input_item_t *)(p_playlist->p_private);
     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 );
     return i_ret;
 }

diff --git a/modules/misc/lua/playlist.c b/modules/misc/lua/playlist.c
index 7a98733e291024d57c4b3fe5d4fbbe111ae20c49..0a793ce2068700faf16ba4068841cdcb80540f1b 100644 (file)
--- a/modules/misc/lua/playlist.c
+++ b/modules/misc/lua/playlist.c
@@ -224,7 +224,7 @@ int E_(Import_LuaPlaylist)( vlc_object_t *p_this )
 
     lua_pop( L, 1 );
 
-    ret = vlclua_scripts_batch_execute( p_this, "luaplaylist",
+    ret = vlclua_scripts_batch_execute( p_this, "playlist",
                                         &probe_luascript, L, NULL );
     if( ret )
         E_(Close_LuaPlaylist)( p_this );

diff --git a/modules/misc/lua/vlc.c b/modules/misc/lua/vlc.c
index ff712c848e8d4271278560ddbab03891bdd9fece..4a7e6e78790440d69ca63c41a654bde0addd0c5d 100644 (file)
--- a/modules/misc/lua/vlc.c
+++ b/modules/misc/lua/vlc.c
@@ -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,
                      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 )
         return VLC_ENOMEM;
 
 #   if defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32)
     {
         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 )
             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 )
             return VLC_ENOMEM;
     }
 #   else
     if( asprintf( &ppsz_dir_list[1],
-                  "share" DIR_SEP "%s", luadirname ) < 0 )
+                  "share" DIR_SEP "lua" DIR_SEP "%s", luadirname ) < 0 )
         return VLC_ENOMEM;
 
 #   ifdef HAVE_SYS_STAT_H
@@ -432,7 +432,7 @@ int vlclua_dir_list( vlc_object_t *p_this, const char *luadirname,
             || !S_ISDIR( stat_info.st_mode ) )
         {
             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 )
                 return VLC_ENOMEM;
         }

diff --git a/share/Makefile.am b/share/Makefile.am
index 8cb1a0618e808e34661cb5e967f58ba1d6dda3fc..5d69a9485569e01330bf7b39b03fd91b2ba7d490 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -249,29 +249,29 @@ DIST_osdmenu_minimal = \
        osdmenu/minimal/fs_panel_mockup.png
 
 DIST_lua= \
-       luameta/README.txt \
-       luameta/googleimage.lua \
-       luaplaylist/README.txt \
-       luaplaylist/appletrailers.lua \
-       luaplaylist/break.lua \
-       luaplaylist/dailymotion.lua \
-       luaplaylist/joox.lua \
-       luaplaylist/lelombrik.lua \
-       luaplaylist/youtube.lua \
-       luaplaylist/youtube_homepage.lua \
-       luaplaylist/megavideo.lua \
-       luaplaylist/metacafe.lua \
-       luaplaylist/googlevideo.lua \
-       luaintf/http.lua \
-       luaintf/rc.lua \
-       luaintf/hotkeys.lua \
-       luaintf/modules/common.lua \
-       luaintf/modules/host.lua \
-       luaintf/modules/httpd.lua \
-       luaintf/modules/acl.lua \
-       luaintf/modules/sandbox.lua \
-       luaintf/telnet.lua \
-       luaintf/dummy.lua
+       lua/meta/README.txt \
+       lua/meta/googleimage.lua \
+       lua/playlist/README.txt \
+       lua/playlist/appletrailers.lua \
+       lua/playlist/break.lua \
+       lua/playlist/dailymotion.lua \
+       lua/playlist/joox.lua \
+       lua/playlist/lelombrik.lua \
+       lua/playlist/youtube.lua \
+       lua/playlist/youtube_homepage.lua \
+       lua/playlist/megavideo.lua \
+       lua/playlist/metacafe.lua \
+       lua/playlist/googlevideo.lua \
+       lua/intf/http.lua \
+       lua/intf/rc.lua \
+       lua/intf/hotkeys.lua \
+       lua/intf/modules/common.lua \
+       lua/intf/modules/host.lua \
+       lua/intf/modules/httpd.lua \
+       lua/intf/modules/acl.lua \
+       lua/intf/modules/sandbox.lua \
+       lua/intf/telnet.lua \
+       lua/intf/dummy.lua
 
 DIST_http_lua = \
        http-lua/.hosts \

diff --git a/share/luaintf/dummy.lua b/share/lua/intf/dummy.lua
similarity index 100%
rename from share/luaintf/dummy.lua
rename to share/lua/intf/dummy.lua

diff --git a/share/luaintf/hotkeys.lua b/share/lua/intf/hotkeys.lua
similarity index 100%
rename from share/luaintf/hotkeys.lua
rename to share/lua/intf/hotkeys.lua

diff --git a/share/luaintf/http.lua b/share/lua/intf/http.lua
similarity index 100%
rename from share/luaintf/http.lua
rename to share/lua/intf/http.lua

diff --git a/share/luaintf/modules/acl.lua b/share/lua/intf/modules/acl.lua
similarity index 100%
rename from share/luaintf/modules/acl.lua
rename to share/lua/intf/modules/acl.lua

diff --git a/share/luaintf/modules/common.lua b/share/lua/intf/modules/common.lua
similarity index 100%
rename from share/luaintf/modules/common.lua
rename to share/lua/intf/modules/common.lua

diff --git a/share/luaintf/modules/host.lua b/share/lua/intf/modules/host.lua
similarity index 100%
rename from share/luaintf/modules/host.lua
rename to share/lua/intf/modules/host.lua

diff --git a/share/luaintf/modules/httpd.lua b/share/lua/intf/modules/httpd.lua
similarity index 100%
rename from share/luaintf/modules/httpd.lua
rename to share/lua/intf/modules/httpd.lua

diff --git a/share/luaintf/modules/sandbox.lua b/share/lua/intf/modules/sandbox.lua
similarity index 100%
rename from share/luaintf/modules/sandbox.lua
rename to share/lua/intf/modules/sandbox.lua

diff --git a/share/luaintf/rc.lua b/share/lua/intf/rc.lua
similarity index 100%
rename from share/luaintf/rc.lua
rename to share/lua/intf/rc.lua

diff --git a/share/luaintf/telnet.lua b/share/lua/intf/telnet.lua
similarity index 100%
rename from share/luaintf/telnet.lua
rename to share/lua/intf/telnet.lua

diff --git a/share/luameta/README.txt b/share/lua/meta/README.txt
similarity index 97%
rename from share/luameta/README.txt
rename to share/lua/meta/README.txt
index 351f7e5729635c4a57ebe0f6ea26b0a852fbfb7d..42eed1c6efb1bcda74b327fa4022ab4abeacae56 100644 (file)
--- a/share/luameta/README.txt
+++ b/share/lua/meta/README.txt
@@ -48,7 +48,7 @@ VLC defines a global vlc object with the following members:
  * vlc.msg_info( <string> ): print an info message.
 
 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.
 
 Lua documentation is available on http://www.lua.org .

diff --git a/share/luameta/googleimage.lua b/share/lua/meta/googleimage.lua
similarity index 100%
rename from share/luameta/googleimage.lua
rename to share/lua/meta/googleimage.lua

diff --git a/share/luaplaylist/README.txt b/share/lua/playlist/README.txt
similarity index 97%
rename from share/luaplaylist/README.txt
rename to share/lua/playlist/README.txt
index c6c3b5996738287ca132138b9cea93e04124b380..c2f800fa431f5a1116c28feaff1a9c40e4d24540 100644 (file)
--- a/share/luaplaylist/README.txt
+++ b/share/lua/playlist/README.txt
@@ -54,7 +54,7 @@ VLC defines a global vlc object with the following members:
  * vlc.msg_info( <string> ): print an info message.
 
 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.
 
 Lua documentation is available on http://www.lua.org .

diff --git a/share/luaplaylist/appletrailers.lua b/share/lua/playlist/appletrailers.lua
similarity index 100%
rename from share/luaplaylist/appletrailers.lua
rename to share/lua/playlist/appletrailers.lua

diff --git a/share/luaplaylist/break.lua b/share/lua/playlist/break.lua
similarity index 100%
rename from share/luaplaylist/break.lua
rename to share/lua/playlist/break.lua

diff --git a/share/luaplaylist/canalplus.lua b/share/lua/playlist/canalplus.lua
similarity index 100%
rename from share/luaplaylist/canalplus.lua
rename to share/lua/playlist/canalplus.lua

diff --git a/share/luaplaylist/dailymotion.lua b/share/lua/playlist/dailymotion.lua
similarity index 100%
rename from share/luaplaylist/dailymotion.lua
rename to share/lua/playlist/dailymotion.lua

diff --git a/share/luaplaylist/googlevideo.lua b/share/lua/playlist/googlevideo.lua
similarity index 100%
rename from share/luaplaylist/googlevideo.lua
rename to share/lua/playlist/googlevideo.lua

diff --git a/share/luaplaylist/joox.lua b/share/lua/playlist/joox.lua
similarity index 100%
rename from share/luaplaylist/joox.lua
rename to share/lua/playlist/joox.lua

diff --git a/share/luaplaylist/lelombrik.lua b/share/lua/playlist/lelombrik.lua
similarity index 100%
rename from share/luaplaylist/lelombrik.lua
rename to share/lua/playlist/lelombrik.lua

diff --git a/share/luaplaylist/megavideo.lua b/share/lua/playlist/megavideo.lua
similarity index 100%
rename from share/luaplaylist/megavideo.lua
rename to share/lua/playlist/megavideo.lua

diff --git a/share/luaplaylist/metacafe.lua b/share/lua/playlist/metacafe.lua
similarity index 100%
rename from share/luaplaylist/metacafe.lua
rename to share/lua/playlist/metacafe.lua

diff --git a/share/luaplaylist/youtube.lua b/share/lua/playlist/youtube.lua
similarity index 100%
rename from share/luaplaylist/youtube.lua
rename to share/lua/playlist/youtube.lua

diff --git a/share/luaplaylist/youtube_homepage.lua b/share/lua/playlist/youtube_homepage.lua
similarity index 100%
rename from share/luaplaylist/youtube_homepage.lua
rename to share/lua/playlist/youtube_homepage.lua