# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#ifdef HAVE_NCURSESW
# define _XOPEN_SOURCE_EXTENDED 1
#include <vlc_playlist.h>
#include <vlc_meta.h>
+#include <assert.h>
+
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
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 );
/* 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;
p_sys->b_box_cleared = false;
p_sys->i_box_plidx = 0;
p_sys->i_box_bidx = 0;
- p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL );
+ p_sys->p_sub = msg_Subscribe( p_intf );
p_sys->b_color = var_CreateGetBool( p_intf, "color" );
p_sys->b_color_started = false;
if( val.psz_string && *val.psz_string )
{
p_sys->psz_current_dir = strdup( val.psz_string );
- free( val.psz_string );
}
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 );
+
p_sys->i_dir_entries = 0;
p_sys->pp_dir_entries = NULL;
p_sys->b_show_hidden_files = false;
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
intf_sys_t *p_sys = p_intf->p_sys;
- int i;
PlaylistDestroy( p_intf );
- for( i = 0; i < p_sys->i_dir_entries; i++ )
+ while( p_sys->i_dir_entries )
{
- struct dir_entry_t *p_dir_entry = p_sys->pp_dir_entries[i];
+ struct dir_entry_t *p_dir_entry = p_sys->pp_dir_entries[0];
free( p_dir_entry->psz_path );
- REMOVE_ELEM( p_sys->pp_dir_entries, p_sys->i_dir_entries, i );
+ REMOVE_ELEM( p_sys->pp_dir_entries, p_sys->i_dir_entries, 0 );
free( p_dir_entry );
}
p_sys->pp_dir_entries = NULL;
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 ) )
{
{
FindIndex( p_intf );
}
-
+
while( ( i_key = wgetch( p_sys->w ) ) != -1 )
{
/*
}
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 */
{
intf_sys_t *p_sys = p_intf->p_sys;
vlc_value_t val;
-
+
#define ReturnTrue \
+ do { \
vlc_object_release( p_playlist ); \
- return 1
-
+ return 1; \
+ } while(0)
+
#define ReturnFalse \
+ do { \
vlc_object_release( p_playlist ); \
- return 0
+ return 0; \
+ } while(0)
playlist_t *p_playlist = pl_Yield( p_intf );
while( p_parent->p_parent )
p_parent = p_parent->p_parent;
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
- true, p_parent, p_item );
+ false, p_parent, p_item );
}
else if( p_sys->pp_plist[p_sys->i_box_plidx]->p_item->i_children
== 0 )
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, false,
p_sys->pp_plist[p_sys->i_box_plidx]->p_item, NULL );
}
b_box_plidx_follow = true;
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 );
* 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.
*
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 )
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 );
char *p_buf = NULL;
int i_len;
+ if( w <= 0 )
+ return;
+
va_start( vl_args, p_fmt );
if( vasprintf( &p_buf, p_fmt, vl_args ) == -1 )
return;
va_end( vl_args );
- if( ( p_buf == NULL ) || ( w <= 0 ) )
- return;
-
i_len = strlen( p_buf );
#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 );
size_t i_width; /* number of columns */
if( i_char_len == (size_t)-1 )
- /* an invalid character was encountered */
+ /* an invalid character was encountered */
+ {
+ free( p_buf );
return;
+ }
else
{
i_width = wcswidth( psz_wide, i_char_len );
mvprintw( y, x, "%s", p_buf );
mvhline( y, x + i_width, ' ', w - i_width );
}
+
+ free( p_buf );
#else
if( i_len > w )
{
return;
va_end( vl_args );
- if( p_buf == NULL )
- {
- return;
- }
-
mvnprintw( p_sys->i_box_y + l - p_sys->i_box_start, x, COLS - x - 1, "%s", p_buf );
+ free( p_buf );
}
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,
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 )
int h;
int y_end;
- clear();
-
/* Title */
attrset( A_REVERSE );
int i_len = strlen( "VLC media player "PACKAGE_VERSION );
{
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 );
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",
}
DrawBox( p_sys->w, y++, 0, h, COLS, psz_title, p_sys->b_color );
+ free( psz_title );
if( p_sys->b_need_update || p_sys->pp_plist == NULL )
{
{
case VIEW_CATEGORY:
p_item = p_playlist->p_root_category;
+ break;
default:
p_item = p_playlist->p_root_onelevel;
}
p_sys->b_need_update = false;
PL_UNLOCK;
-
+
vlc_object_release( p_playlist );
}
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 );
static void PlaylistDestroy( intf_thread_t *p_intf )
{
intf_sys_t *p_sys = p_intf->p_sys;
- int i;
- for( i = 0; i < p_sys->i_plist_entries; i++ )
+ while( p_sys->i_plist_entries )
{
- struct pl_item_t *p_pl_item = p_sys->pp_plist[i];
+ struct pl_item_t *p_pl_item = p_sys->pp_plist[0];
free( p_pl_item->psz_display );
- REMOVE_ELEM( p_sys->pp_plist, p_sys->i_plist_entries, i );
+ REMOVE_ELEM( p_sys->pp_plist, p_sys->i_plist_entries, 0 );
free( p_pl_item );
}
p_sys->pp_plist = NULL;
- p_sys->i_plist_entries = 0;
}
static void Eject( intf_thread_t *p_intf )