X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fncurses.c;h=4d8d03fce416af7b2f21a2d0d2669a3cfa63674b;hb=ba714bedc852cc4a04c422b1dce3fa69e083a236;hp=20049e78d62089ab5f2a961b0384cde594635fed;hpb=cdd517525b71b7b5390bfff52db183b09b00f7fe;p=vlc

diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index 20049e78d6..4d8d03fce4 100644
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -38,7 +38,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #ifdef HAVE_NCURSESW
@@ -57,6 +57,8 @@
 #include <vlc_playlist.h>
 #include <vlc_meta.h>
 
+#include <assert.h>
+
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>
 #endif
@@ -121,7 +123,7 @@ static void start_color_and_pairs ( intf_thread_t * );
 
 vlc_module_begin();
     set_shortname( "Ncurses" );
-    set_description( _("Ncurses interface") );
+    set_description( N_("Ncurses interface") );
     set_capability( "interface", 10 );
     set_category( CAT_INTERFACE );
     set_subcategory( SUBCAT_INTERFACE_MAIN );
@@ -244,6 +246,8 @@ static int Open( vlc_object_t *p_this )
 
     /* Allocate instance and initialize some members */
     p_sys = p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
+    if( !p_sys )
+        return VLC_ENOMEM;
     p_sys->p_node = NULL;
     p_sys->p_input = NULL;
     p_sys->f_slider = 0.0;
@@ -318,7 +322,7 @@ static int Open( vlc_object_t *p_this )
     }
     else
     {
-        p_sys->psz_current_dir = strdup( p_intf->p_libvlc->psz_homedir );
+        p_sys->psz_current_dir = strdup( config_GetHomeDir() );
     }
 
     free( val.psz_string );
@@ -397,6 +401,7 @@ static void Run( intf_thread_t *p_intf )
     PlaylistRebuild( p_intf );
     var_AddCallback( p_playlist, "intf-change", PlaylistChanged, p_intf );
     var_AddCallback( p_playlist, "item-append", PlaylistChanged, p_intf );
+    var_AddCallback( p_playlist, "item-change", PlaylistChanged, p_intf );
 
     while( !intf_ShouldDie( p_intf ) )
     {
@@ -428,7 +433,7 @@ static void Run( intf_thread_t *p_intf )
         {
             FindIndex( p_intf );
         }
-    
+
         while( ( i_key = wgetch( p_sys->w ) ) != -1 )
         {
             /*
@@ -458,6 +463,7 @@ static void Run( intf_thread_t *p_intf )
     }
     var_DelCallback( p_playlist, "intf-change", PlaylistChanged, p_intf );
     var_DelCallback( p_playlist, "item-append", PlaylistChanged, p_intf );
+    var_DelCallback( p_playlist, "item-change", PlaylistChanged, p_intf );
 }
 
 /* following functions are local */
@@ -566,13 +572,13 @@ static int HandleKey( intf_thread_t *p_intf, int i_key )
 {
     intf_sys_t *p_sys = p_intf->p_sys;
     vlc_value_t val;
-    
+
     #define ReturnTrue \
     do { \
     vlc_object_release( p_playlist ); \
     return 1; \
     } while(0)
-    
+
     #define ReturnFalse \
     do { \
     vlc_object_release( p_playlist ); \
@@ -795,7 +801,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key )
 
                     playlist_Add( p_playlist, psz_uri, NULL, PLAYLIST_APPEND,
                                   PLAYLIST_END,
-                                  p_parent->p_input == 
+                                  p_parent->p_input ==
                                     p_playlist->p_local_onelevel->p_input
                                   , false );
 
@@ -927,7 +933,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key )
                  * man 3X curs_getch says:
                  *
                  * Use of the escape key by a programmer for a single
-                 * character function is discouraged, as it will cause a delay 
+                 * character function is discouraged, as it will cause a delay
                  * of up to one second while the keypad code looks for a
                  * following function-key sequence.
                  *
@@ -981,12 +987,12 @@ static int HandleKey( intf_thread_t *p_intf, int i_key )
                 clear();
                 ReturnTrue;
             case KEY_ENTER:
-            case '\r': 
+            case '\r':
             case '\n':
                 if( i_chain_len > 0 )
                 {
                     playlist_item_t *p_parent = p_sys->p_node;
-                   
+
                     if( !p_parent )
                     p_parent = p_playlist->status.p_node;
                     if( !p_parent )
@@ -997,7 +1003,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key )
 
                     playlist_Add( p_playlist, p_sys->psz_open_chain, NULL,
                                   PLAYLIST_APPEND|PLAYLIST_GO, PLAYLIST_END,
-                                  p_parent->p_input == 
+                                  p_parent->p_input ==
                                     p_playlist->p_local_onelevel->p_input
                                   , false );
 
@@ -1348,7 +1354,7 @@ static void mvnprintw( int y, int x, int w, const char *p_fmt, ... )
 
 #ifdef HAVE_NCURSESW
     wchar_t psz_wide[i_len + 1];
-    
+
     EnsureUTF8( p_buf );
     size_t i_char_len = mbstowcs( psz_wide, p_buf, i_len );
 
@@ -1482,8 +1488,6 @@ static void MainBoxWrite( intf_thread_t *p_intf, int l, int x, const char *p_fmt
 
 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,
@@ -1491,15 +1495,15 @@ static void DumpObject( intf_thread_t *p_intf, int *l, vlc_object_t *p_obj, int
     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++ )
+
+    vlc_list_t *list = vlc_list_children( p_obj );
+    for( int i = 0; i < list->i_count ; 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 );
+        MainBoxWrite( p_intf, *l, 1 + 2 * i_level,
+            i == list->i_count - 1 ? "`-" : "|-" );
+        DumpObject( p_intf, l, list->p_values[i].p_object, i_level + 1 );
     }
-
-    vlc_object_release( p_obj );
+    vlc_list_release( list );
 }
 
 static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh )
@@ -1511,8 +1515,6 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh )
     int h;
     int y_end;
 
-    clear();
-
     /* Title */
     attrset( A_REVERSE );
     int i_len = strlen( "VLC media player "PACKAGE_VERSION );
@@ -1558,6 +1560,10 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh )
         {
             mvnprintw( y++, 0, COLS, _(" State    : Playing %s"), psz_state );
         }
+        else if( val.i_int == STOP_S )
+        {
+            mvnprintw( y++, 0, COLS, _(" State    : Stopped %s"), psz_state );
+        }
         else if( val.i_int == OPENING_S )
         {
             mvnprintw( y++, 0, COLS, _(" State    : Opening/Connecting %s"), psz_state );
@@ -1909,7 +1915,7 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh )
                 break;
             }
             if( p_sys->b_color )
-                wcolor_set( p_sys->w, 
+                wcolor_set( p_sys->w,
                     p_sys->p_sub->p_msg[i_stop].i_type + C_INFO,
                     NULL );
             mvnprintw( y + h-2-i_line, 1, COLS - 2, "   [%s] %s",
@@ -2276,7 +2282,7 @@ static void PlaylistRebuild( intf_thread_t *p_intf )
     p_sys->b_need_update = false;
 
     PL_UNLOCK;
-    
+
     vlc_object_release( p_playlist );
 }
 
@@ -2324,7 +2330,7 @@ static void PlaylistAddNode( intf_thread_t *p_intf, playlist_item_t *p_node,
             char *psz_tmp;
             if( asprintf( &psz_tmp, "%s%c ", c,
                      k == p_node->i_children - 1 ? ' ' : '|' ) == -1 )
-                return; 
+                return;
             PlaylistAddNode( p_intf, p_child, i,
                              strlen( c ) ? psz_tmp : " " );
             free( psz_tmp );