X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fncurses.c;h=d93d0a7deefd672fa244674277b3f6b5129f4517;hb=de587c237065de4696d9d035d0504cdf34990d87;hp=f1da1448b09dfcaba67ffa84b0d21258c3bc6734;hpb=13ae40b0efc4f1b1ce205d9a057537047fcab3f4;p=vlc

diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index f1da1448b0..d93d0a7dee 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
@@ -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 ) )
     {
@@ -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 */
@@ -673,7 +679,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key )
                 if( p_item->i_children == -1 )
                 {
                     playlist_DeleteFromInput( p_playlist,
-                                              p_item->p_input->i_id, true );
+                                              p_item->p_input->i_id, pl_Locked );
                 }
                 else
                 {
@@ -705,7 +711,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key )
                     while( p_parent->p_parent )
                         p_parent = p_parent->p_parent;
                     playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
-                                      true, p_parent, p_item );
+                                      pl_Unlocked, p_parent, p_item );
                 }
                 else if( p_sys->pp_plist[p_sys->i_box_plidx]->p_item->i_children
                         == 0 )
@@ -716,7 +722,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key )
                 else
                 {
                     p_sys->p_node = p_sys->pp_plist[p_sys->i_box_plidx]->p_item;
-                    playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true,
+                    playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Unlocked,
                         p_sys->pp_plist[p_sys->i_box_plidx]->p_item, NULL );
                 }
                 b_box_plidx_follow = true;
@@ -1246,6 +1252,8 @@ static int HandleKey( intf_thread_t *p_intf, int i_key )
         default:
             ReturnFalse;
     }
+#undef ReturnFalse
+#undef ReturnTrue
 }
 
 static void ManageSlider( intf_thread_t *p_intf )
@@ -1427,7 +1435,6 @@ static void mvnprintw( int y, int x, int w, const char *p_fmt, ... )
         mvhline( y, x + i_width, ' ', w - i_width );
     }
 
-    free( p_buf );
 #else
     if( i_len > w )
     {
@@ -1458,6 +1465,7 @@ static void mvnprintw( int y, int x, int w, const char *p_fmt, ... )
         mvhline( y, x + i_len, ' ', w - i_len );
     }
 #endif
+    free( p_buf );
 }
 static void MainBoxWrite( intf_thread_t *p_intf, int l, int x, const char *p_fmt, ... )
 {
@@ -1491,14 +1499,13 @@ static void DumpObject( intf_thread_t *p_intf, int *l, vlc_object_t *p_obj, int
                 p_obj->psz_object_type, p_obj->i_object_id );
 
     vlc_list_t *list = vlc_list_children( p_obj );
-    vlc_object_release( p_obj );
     for( int i = 0; i < list->i_count ; i++ )
     {
         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_list_release( list );
 }
 
 static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh )
@@ -1555,6 +1562,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 );
@@ -1982,7 +1993,6 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh )
     {
         int l = 0;
         DrawBox( p_sys->w, y++, 0, h, COLS, _(" Objects "), p_sys->b_color );
-        vlc_object_yield( p_intf->p_libvlc );
         DumpObject( p_intf, &l, VLC_OBJECT( p_intf->p_libvlc ), 0 );
 
         p_sys->i_box_lines_total = l;