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.

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"

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

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;

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;
 }

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 );

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;
         }

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 \

share/luameta/README.txt → 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 .

share/luaplaylist/README.txt → 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 .