X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fncurses.c;h=d93d0a7deefd672fa244674277b3f6b5129f4517;hb=495380d82636394506080f2be6603f4b56666916;hp=cba2405aa6cab3fcbb0f96515dfad9e215e10ac0;hpb=86c84715d3aff267e7a9c80854ec5394bdd8cfc5;p=vlc

diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index cba2405aa6..d93d0a7dee 100644
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -246,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;
@@ -677,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
                 {
@@ -709,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 )
@@ -720,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;
@@ -1250,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 )
@@ -1431,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 )
     {
@@ -1462,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, ... )
 {
@@ -1558,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 );