Changeset fc3815a7114f9fef7eb47e38903f33bfb10597b7

Timestamp:

03/16/08 03:47:07 (6 months ago)

Author:

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

git-committer:

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

git-parent:

[ba7e4ce0f12026c1736097f43cfbd96096b98f23]

git-author:

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

Message:

Better stats box in ncurses

Fix scrolling
Use ACS_* characters to be nicer
Only show video & audio if there is an es (or show both if there is no es, mp3 has no es)
TODO: show sout only when needed

Files:

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

modules/gui/ncurses.c

@@ -52 +52 @@
-#include <vlc_charset.h>
-#include <vlc_input.h>
+#include <vlc_es.h>
-#include <vlc_playlist.h>
-#include <vlc_meta.h>
@@ -2002 +2003 @@
-            vlc_mutex_lock( &p_item->p_stats->lock );
-
+            int i_audio = 0;
+            int i_video = 0;
+            int i;
+
+            if( !p_item->i_es )
+                i_video = i_audio = 1;
+            else
+                for( i = 0; i < p_item->i_es ; i++ )
+                {
+                    printf( "XXX %d\n", p_item->es[i]->i_cat );
+                    i_audio += ( p_item->es[i]->i_cat == AUDIO_ES );
+                    i_video += ( p_item->es[i]->i_cat == VIDEO_ES );
+                }
+
+            int l = 0;
+
+#define SHOW_ACS(x,c) \
+    if(l >= p_sys->i_box_start && l - p_sys->i_box_start < p_sys->i_box_lines) \
+        mvaddch( p_sys->i_box_y - p_sys->i_box_start + l, x, c )
+
-            /* Input */
-            if( p_sys->b_color ) wcolor_set( p_sys->w, C_CATEGORY, NULL );
-
+
+
-            if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL );
-mvnprintw( y++, 1, COLS-2
+MainBoxWrite( p_intf, l, 1
-                    (float)(p_item->p_stats->i_read_bytes)/1000 );
-
+
+
-                    (float)(p_item->p_stats->f_input_bitrate)*8000 );
-mvnprintw( y++, 1, COLS-2,
+MainBoxWrite( p_intf, l, 1, 
-                    (float)(p_item->p_stats->i_demux_read_bytes)/1000 );
-
+
+
-                    (float)(p_item->p_stats->f_demux_bitrate)*8000 );
-
+
+
-            /* Video */
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            /* Audio*/
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            /* Sout */
-            if( p_sys->b_color ) wcolor_set( p_sys->w, C_CATEGORY, NULL );
-
+
+
-            if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL );
-
-
+
+
+
-                    (float)(p_item->p_stats->i_sent_bytes)/1000 );
-
+
+
-                    (float)(p_item->p_stats->f_send_bitrate*8)*1000 );
+            SHOW_ACS( 1, ACS_LLCORNER ); l++;
-            if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL );
+
+#undef SHOW_ACS
+
+            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;
-
-            vlc_mutex_unlock( &p_item->p_stats->lock );
-            vlc_mutex_unlock( &p_item->lock );
+
-        }
-    }