luameta.c: Fix a message

vlclua.c:  get rid of an empty module and fix descriptions

diff --git a/modules/misc/lua/luameta.c b/modules/misc/lua/luameta.c
index 7022fad4d42165fcff884261af962c7ba554fb4f..c82001a67b9185273db6a3fa1f2f57f285d6a2f8 100644 (file)
--- a/modules/misc/lua/luameta.c
+++ b/modules/misc/lua/luameta.c
@@ -180,7 +180,7 @@ static int fetch_art( vlc_object_t *p_this, const char * psz_filename,
         }
         else
         {
-            msg_Err( p_this, "Lua playlist script %s: "
+            msg_Err( p_this, "Lua art fetcher script %s: "
                  "didn't return a string", psz_filename );
         }
     }

diff --git a/modules/misc/lua/vlclua.c b/modules/misc/lua/vlclua.c
index 7e49854659b401f4223a1583ba9d11a88dee98a8..9324c718377189b120b09a3880366c64ef33ac4e 100644 (file)
--- a/modules/misc/lua/vlclua.c
+++ b/modules/misc/lua/vlclua.c
@@ -43,21 +43,20 @@
  *****************************************************************************/
 
 vlc_module_begin();
-    add_shortcut( "lua" );
+    add_shortcut( "luameta" );
+    set_shortname( N_( "Lua Meta" ) );
+    set_description( _("Fetch metadata using lua scripts") );
+    set_capability( "meta fetcher", 10 );
+    set_callbacks( E_(FindMeta), NULL );
     add_submodule();
-        add_shortcut( "luameta" );
-        set_shortname( N_( "Lua Meta" ) );
-        set_description( _("Fetch Artwork using lua scripts") );
-        set_capability( "meta fetcher", 10 );
-        set_callbacks( E_(FindMeta), NULL );
-        add_submodule();
-            set_capability( "art finder", 10 );
-            set_callbacks( E_(FindArt), NULL );
+        set_shortname( N_( "Lua Art" ) );
+        set_description( _("Fetch artwork using lua scripts") );
+        set_capability( "art finder", 10 );
+        set_callbacks( E_(FindArt), NULL );
     add_submodule();
         add_shortcut( "luaplaylist" );
         set_category( CAT_INPUT );
         set_subcategory( SUBCAT_INPUT_DEMUX );
-
         set_shortname( _("Lua Playlist") );
         set_description( _("Lua Playlist Parser Interface") );
         set_capability( "demux2", 9 );