Changeset aaf50f16cfb838418703d90ee3e62bd0e649b978

Timestamp:

15/01/08 11:40:47 (11 months ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1200393647 +0000

git-parent:

[ab8ac15710d38ae627b8269436470205b908fcb8]

git-author:

Rafaël Carré <funman@videolan.org> 1200393647 +0000

Message:

ncurses: new box representing the vlc objects hierarchy (similar to rc's "tree" command)

Files:

• modules/gui/ncurses.c (modified) (6 diffs)

modules/gui/ncurses.c

@@ -137 +137 @@
-    BOX_OPEN,
-    BOX_BROWSE,
-
+
+
-};
-enum
@@ -807 +808 @@
-    }
-    else if( p_sys->i_box_type == BOX_HELP || p_sys->i_box_type == BOX_INFO ||
-
+|| p_sys->i_box_type == BOX_OBJECTS 
-    {
-        switch( i_key )
@@ -1069 +1070 @@
-                p_sys->i_box_type = BOX_BROWSE;
-            return 1;
+        case 'x':
+            if( p_sys->i_box_type == BOX_OBJECTS )
+                p_sys->i_box_type = BOX_NONE;
+            else
+                p_sys->i_box_type = BOX_OBJECTS;
+            return 1;
-        case 'c':
-            p_sys->b_color = !p_sys->b_color;
@@ -1453 +1460 @@
-}
-
+static void DumpObject( intf_thread_t *p_intf, int *l, vlc_object_t *p_obj, int i_level )
+{
+    vlc_object_yield( p_obj );
+
+    if( p_obj->psz_object_name )
+        MainBoxWrite( p_intf, (*l)++, 1 + 2 * i_level, "%s \"%s\" (%d)",
+                p_obj->psz_object_type, p_obj->psz_object_name,
+                p_obj->i_object_id );
+    else
+        MainBoxWrite( p_intf, (*l)++, 1 + 2 * i_level, "%s (%d)",
+                p_obj->psz_object_type, p_obj->i_object_id );
+    int i;
+    for( i = 0; i < p_obj->i_children ; i++ )
+    {
+        MainBoxWrite( p_intf, *l, 1 + 2 * i_level, 
+            i == p_obj->i_children - 1 ? "`-" : "|-" );
+        DumpObject( p_intf, l, p_obj->pp_children[i], i_level + 1 );
+    }
+
+    vlc_object_release( p_obj );
+}
+
-static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh )
-{
@@ -1605 +1634 @@
-        MainBoxWrite( p_intf, l++, 1, _("     P           Show/Hide playlist box") );
-        MainBoxWrite( p_intf, l++, 1, _("     B           Show/Hide filebrowser") );
+        MainBoxWrite( p_intf, l++, 1, _("     x           Show/Hide objects box") );
-        MainBoxWrite( p_intf, l++, 1, _("     c           Switch color on/off") );
-        MainBoxWrite( p_intf, l++, 1, _("     Esc         Close Add/Search entry") );
@@ -1936 +1966 @@
-
-    }
+    else if( p_sys->i_box_type == BOX_OBJECTS )
+    {
+        int l = 0;
+        DrawBox( p_sys->w, y++, 0, h, COLS, _(" Objects "), p_sys->b_color );
+        DumpObject( p_intf, &l, VLC_OBJECT( p_intf->p_libvlc ), 0 );
+
+        p_sys->i_box_lines_total = l;
+        if( p_sys->i_box_start >= p_sys->i_box_lines_total )
+            p_sys->i_box_start = p_sys->i_box_lines_total - 1;
+
+        if( l - p_sys->i_box_start < p_sys->i_box_lines )
+            y += l - p_sys->i_box_start;
+        else
+            y += p_sys->i_box_lines;
+    }
-    else if( p_sys->i_box_type == BOX_PLAYLIST ||
-               p_sys->i_box_type == BOX_SEARCH ||