Changeset 4bde22b6ed61c8610b140e7392d48c39fd568b94

Timestamp:

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

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

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

git-parent:

[2d3320dc962cca52a0388c0b3ff4c470e8ac830e]

git-author:

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

Message:

Fix problem with the search lua wrapper (it always returned the "category" playlist even when searching in "onelevel" mode).
Remove debug prints from the rc.lua module.

Files:

• modules/misc/lua/intf.c (modified) (2 diffs)
• share/luaintf/rc.lua (modified) (1 diff)

modules/misc/lua/intf.c

@@ -568 +568 @@
-    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 );
-    }
-    printf("done\n");
-#endif
-
-static int vlclua_playlist_search( lua_State *L )
@@ -605 +574 @@
-    const char *psz_string = luaL_optstring( L, 1, "" );
-    int b_category = luaL_optboolean( L, 2, 1 ); /* default to category */
-
-
-
-
-
+
+
+
+
-    vlc_object_release( p_playlist );
-    return 1;

share/luaintf/rc.lua

@@ -199 +199 @@
-    local playlist
-    local tree = playlist_is_tree(client)
-    print("tree",tree)
-    if name == "search" then
-        playlist = vlc.playlist.search(arg or "", tree)
-    else
-        if tonumber(arg) then
-            print "number"
-            playlist = vlc.playlist.get(tonumber(arg), tree)
-        elseif arg then
-            print "string"
-            playlist = vlc.playlist.get(arg, tree)
-        else