Changeset 87c76c20237a663506a2deed9f8db9af732fee47

Timestamp:

11/12/07 23:00:47 (10 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1194904847 +0000

git-parent:

[8ca1085a0efc5838aabe9c84276eee1ea1c0d580]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1194904847 +0000

Message:

Add services discovery support and enhance playlist support for lua interface modules. Added "search", "sort" and "sd" commands to rc.lua. Restored true playlist functionality and sd selection in the lua http intf.

Files:

• modules/misc/lua/Modules.am (modified) (1 diff)
• modules/misc/lua/intf.c (modified) (9 diffs)
• modules/misc/lua/sd.c (added)
• modules/misc/lua/vlc.h (modified) (3 diffs)
• share/http-lua/dialogs/playlist (modified) (2 diffs)
• share/http-lua/requests/playlist.xml (modified) (1 diff)
• share/http-lua/requests/status.xml (modified) (2 diffs)
• share/luaintf/rc.lua (modified) (2 diffs)

modules/misc/lua/Modules.am

@@ -1 @@
-
+ sd.c

modules/misc/lua/intf.c

@@ -54 +54 @@
- * Internal lua<->vlc utils
- *****************************************************************************/
-static inline 
+
-{
-    vlc_object_t *p_this = vlclua_get_this( L );
@@ -356 +356 @@
-}
-
+static int vlclua_playlist_skip( lua_State * L )
+{
+    int i_skip = luaL_checkint( L, 1 );
+    playlist_t *p_playlist = vlclua_get_playlist_internal( L );
+    playlist_Skip( p_playlist, i_skip );
+    vlc_object_release( p_playlist );
+    return 0;
+}
+
-static int vlclua_playlist_play( lua_State * L )
-{
-    playlist_t *p_playlist = vlclua_get_playlist_internal( L );
-    playlist_Play( p_playlist );
+    vlc_object_release( p_playlist );
+    return 0;
+}
+
+static int vlclua_playlist_pause( lua_State * L )
+{
+    playlist_t *p_playlist = vlclua_get_playlist_internal( L );
+    playlist_Pause( p_playlist );
-    vlc_object_release( p_playlist );
-    return 0;
@@ -407 +424 @@
-static int vlclua_playlist_goto( lua_State * L )
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-}
-
@@ -464 +458 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        lua_pushstring( L, p_input->psz_name );
-        lua_setfield( L, -2, "name" );
@@ -493 +495 @@
-        lua_setfield( L, -2, "nb_played" );
-        /* TODO: add (optional) info categories, meta, options, es */
+    }
+    if( p_item->i_children >= 0 )
+    {
+        int i;
+        lua_createtable( L, p_item->i_children, 0 );
+        for( i = 0; i < p_item->i_children; i++ )
+        {
+            push_playlist_item( L, p_item->pp_children[i] );
+            lua_rawseti( L, -2, i+1 );
+        }
+        lua_setfield( L, -2, "children" );
+    }
+}
+
+static int vlclua_playlist_get( lua_State *L )
+{
+    playlist_t *p_playlist = vlclua_get_playlist_internal( L );
+    int b_category = luaL_optboolean( L, 2, 1 ); /* Default to tree playlist (discared when 1st argument is a playlist_item's id) */
+    playlist_item_t *p_item = NULL;
+
+    if( lua_isnumber( L, 1 ) )
+    {
+        int i_id = lua_tointeger( L, 1 );
+        p_item = playlist_ItemGetById( p_playlist, i_id, VLC_TRUE );
+        if( !p_item )
+        {
+            vlc_object_release( p_playlist );
+            return 0; /* Should we return an error instead? */
+        }
+    }
+    else if( lua_isstring( L, 1 ) )
+    {
+        const char *psz_what = lua_tostring( L, 1 );
+        if( !strcasecmp( psz_what, "normal" )
+         || !strcasecmp( psz_what, "playlist" ) )
+            p_item = b_category ? p_playlist->p_local_category
+                                : p_playlist->p_local_onelevel;
+        else if( !strcasecmp( psz_what, "ml" )
+              || !strcasecmp( psz_what, "media library" ) )
+            p_item = b_category ? p_playlist->p_ml_category
+                                : p_playlist->p_ml_onelevel;
+        else if( !strcasecmp( psz_what, "root" ) )
+            p_item = b_category ? p_playlist->p_root_category
+                                : p_playlist->p_root_onelevel;
+        else
+        {
+            int i;
+            for( i = 0; i < p_playlist->i_sds; i++ )
+            {
+                if( !strcasecmp( psz_what,
+                                 p_playlist->pp_sds[i]->p_sd->psz_module ) )
+                {
+                    p_item = b_category ? p_playlist->pp_sds[i]->p_cat
+                                        : p_playlist->pp_sds[i]->p_one;
+                    break;
+                }
+            }
+            if( !p_item )
+            {
+                vlc_object_release( p_playlist );
+                return 0; /* Should we return an error instead? */
+            }
+        }
+    }
+    else
+    {
+        p_item = b_category ? p_playlist->p_root_category
+                            : p_playlist->p_root_onelevel;
+    }
+    push_playlist_item( L, p_item );
+    vlc_object_release( p_playlist );
+    return 1;
+}
+#if 0
+    int s;
+    lua_createtable( L, 0, 2 + p_playlist->i_sds );
+    for( s = -2; s < p_playlist->i_sds; s++ )
+    {
+        playlist_item_t *p_root;
+        switch( s )
+        {
+            case -2:
+                /* local/normal playlist */
+                lua_pushstring( L, "local" );
+                p_root = p_playlist->p_local_onelevel;
+                break;
+            case -1:
+                /* media library */
+                lua_pushstring( L, "ml" );
+                p_root = p_playlist->p_ml_onelevel;
+                break;
+            default:
+                lua_pushstring( L, p_playlist->pp_sds[s]->p_sd->psz_module );
+                printf("%s\n", p_playlist->pp_sds[s]->p_sd->psz_module );
+                p_root = p_playlist->pp_sds[s]->p_one;
+                break;
+        }
+        printf("s = %d\n", s);
+        printf("children = %d\n", p_root->i_children );
+        push_playlist_item( L, p_root );
-        lua_settable( L, -3 );
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -502 +643 @@
-{
-    /* allow setting the different sort keys */
-
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -656 +808 @@
-    { "prev", vlclua_playlist_prev },
-    { "next", vlclua_playlist_next },
+    { "skip", vlclua_playlist_skip },
-    { "play", vlclua_playlist_play },
+    { "pause", vlclua_playlist_pause },
-    { "stop", vlclua_playlist_stop },
-    { "clear", vlclua_playlist_clear },
@@ -667 +821 @@
-    { "enqueue", vlclua_playlist_enqueue },
-    { "get", vlclua_playlist_get },
+    { "search", vlclua_playlist_search },
+    { "sort", vlclua_playlist_sort },
+
-    { "stats", vlclua_input_stats },
+
+    { NULL, NULL }
+};
+
+static luaL_Reg p_reg_sd[] =
+{
+    { "get_services_names", vlclua_sd_get_services_names },
+    { "add", vlclua_sd_add },
+    { "remove", vlclua_sd_remove },
+    { "is_loaded", vlclua_sd_is_loaded },
-
-    { NULL, NULL }
@@ -889 +1056 @@
-    luaL_register_submodule( L, "msg", p_reg_msg );
-    luaL_register_submodule( L, "playlist", p_reg_playlist );
+    luaL_register_submodule( L, "sd", p_reg_sd );
-    luaL_register_submodule( L, "volume", p_reg_volume );
-    luaL_register_submodule( L, "osd", p_reg_osd );

modules/misc/lua/vlc.h

@@ -87 +87 @@
-}
-
+static inline int luaL_optboolean( lua_State *L, int narg, int def )
+{
+    return luaL_opt( L, luaL_checkboolean, narg, def );
+}
+
-static inline const void *luaL_checklightuserdata( lua_State *L, int narg )
-{
@@ -120 +125 @@
-int vlclua_object_find_name( lua_State *L );
-
+vlc_object_t * vlclua_get_this( lua_State * );
+playlist_t *vlclua_get_playlist_internal( lua_State * );
+
-int vlclua_add_callback( lua_State * );
-int vlclua_del_callback( lua_State * );
@@ -164 +172 @@
-int vlclua_acl_load_file( lua_State * );
-
+int vlclua_sd_get_services_names( lua_State * );
+int vlclua_sd_add( lua_State * );
+int vlclua_sd_remove( lua_State * );
+int vlclua_sd_is_loaded( lua_State * );
+
-
-/*****************************************************************************
- * Lua function bridge
- *****************************************************************************/
-vlc_object_t * vlclua_get_this( lua_State * );
-#define vlclua_error( L ) luaL_error( L, "VLC lua error in file %s line %d (function %s)", __FILE__, __LINE__, __func__ )
-int vlclua_push_ret( lua_State *, int i_error );

share/http-lua/dialogs/playlist

@@ -62 +62 @@
-          </button>
-          <div id="menu_sort" class="menu" >
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-          </div>
-        </td>
@@ -78 +81 @@
-          </button>
-          <div id="menu_sd" class="menu" >
- --[[ FIXME
-<vlc id="rpn" param1="services_discovery" />
-<vlc id="foreach" param1="sd" param2="object" />
-<button onclick="pl_sd('<vlc id="value" param1="sd" />');hide_menu('menu_sd');" onmouseover="setclass(this,'menuover');" onmouseout="setclass(this,'menuout');" class="menuout" title="Toggle <vlc id="value" param1="sd.name" />" ><vlc id="value" param1="sd.name" /></button><br/>
-<vlc id="end" />
-]] 
+
+local sd = vlc.sd.get_services_names()
+for n,ln in pairs(sd) do
+  print([[<button onclick="pl_sd(']]..n..[[');hide_menu('menu_sd');" onmouseover="setclass(this,'menuover');" onmouseout="setclass(this,'menuout');" class="menuout" title="Toggle ]]..ln..[[" >]]..ln..[[</button><br/>]])
+end
+
-          </div>
-        </td>

share/http-lua/requests/playlist.xml

@@ -26 +26 @@
-]] ?>
-
-<node id="0" name="Undefined" ro="ro">
-<?vlc
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-end
+function a(t,pre)
+  local pre = pre or ""
+  for k,v in pairs(t) do
+    vlc.msg.err(pre..tostring(k).." : "..tostring(v))
+    if type(v) == "table" then
+      a(v,pre.."  ")
+    end
+  end
+end
+--[[
+for cat,pl in pairs(p) do
+  print("<node id=\"-1\" name=\""..cat.."\" ro=\"ro\">")
+  print_playlist(pl)
+  print("</node>")
+end
+--]]
+local p = vlc.playlist.get()
+-- a(p) Uncomment to debug
+print_playlist(p)
-?>
-</node>
-
-<?vlc --[[
+</node>
-<node id="9" name="Nevermind" ro="rw">
-<leaf id="10" current="current" uri="file:///mnt/stuff/media/Nirvana/Nevermind/01 - Smells Like Teen Spirit.mp3" name="Smells Like Teen Spirit" ro="rw" duration="-1"/>

share/http-lua/requests/status.xml

@@ -65 +65 @@
-  vlc.playlist.clear()
-elseif command == "pl_sort" then
-msg.err("FIXME: pl_sort unimplemented"
+playlist.sort( val, id > 0 
-elseif command == "pl_random" then
-  vlc.playlist.random()
@@ -73 +73 @@
-  vlc.playlist.repeat_()
-elseif command == "pl_sd" then
-
-
-
-
-
-
-
-
+
+
+
+
+
-elseif command == "fullscreen" then
-  vlc.fullscreen()

share/luaintf/rc.lua

@@ -165 +165 @@
-
-function playlist(name,client,arg)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    local playlist
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-end
-
@@ -339 +402 @@
-    { "enqueue"; { func = add; args = "XYZ"; help = "queue XYZ to playlist" } };
-    { "playlist"; { func = playlist; help = "show items currently in playlist" } };
+    { "search"; { func = playlist; args = "[string]"; help = "search for items in playlist (or reset search)" } };
+    { "sort"; { func = playlist_sort; args = "key"; help = "sort the playlist" } };
+    { "sd"; { func = services_discovery; args = "[sd]"; help = "show services discovery or toggle" } };
-    { "play"; { func = skip2(vlc.playlist.play); help = "play stream" } };
-    { "stop"; { func = skip2(vlc.playlist.stop); help = "stop stream" } };