# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_plugin.h>
#ifdef HAVE_NCURSESW
#include <vlc_playlist.h>
#include <vlc_meta.h>
+#include <assert.h>
+
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
"This option allows you to specify the directory the ncurses filebrowser " \
"will show you initially.")
-vlc_module_begin();
- set_shortname( "Ncurses" );
- set_description( _("Ncurses interface") );
- set_capability( "interface", 10 );
- set_category( CAT_INTERFACE );
- set_subcategory( SUBCAT_INTERFACE_MAIN );
- set_callbacks( Open, Close );
- add_shortcut( "curses" );
- add_directory( "browse-dir", NULL, NULL, BROWSE_TEXT, BROWSE_LONGTEXT, false );
-vlc_module_end();
+vlc_module_begin ()
+ set_shortname( "Ncurses" )
+ set_description( N_("Ncurses interface") )
+ set_capability( "interface", 10 )
+ set_category( CAT_INTERFACE )
+ set_subcategory( SUBCAT_INTERFACE_MAIN )
+ set_callbacks( Open, Close )
+ add_shortcut( "curses" )
+ add_directory( "browse-dir", NULL, NULL, BROWSE_TEXT, BROWSE_LONGTEXT, false )
+vlc_module_end ()
/*****************************************************************************
* intf_sys_t: description and status of ncurses interface
/* 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 );
+// FIXME p_sys->p_sub = msg_Subscribe( p_intf );
p_sys->b_color = var_CreateGetBool( p_intf, "color" );
p_sys->b_color_started = false;
p_sys->b_need_update = false;
/* Initialize search chain */
- p_sys->psz_search_chain = (char *)malloc( SEARCH_CHAIN_SIZE + 1 );
+ p_sys->psz_search_chain = malloc( SEARCH_CHAIN_SIZE + 1 );
p_sys->psz_old_search = NULL;
p_sys->i_before_search = 0;
/* Initialize open chain */
- p_sys->psz_open_chain = (char *)malloc( OPEN_CHAIN_SIZE + 1 );
+ p_sys->psz_open_chain = malloc( OPEN_CHAIN_SIZE + 1 );
/* Initialize browser options */
- var_Create( p_intf, "browse-dir", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
- var_Get( p_intf, "browse-dir", &val);
-
- if( val.psz_string && *val.psz_string )
- {
- p_sys->psz_current_dir = strdup( val.psz_string );
- free( val.psz_string );
- }
+ char* psz_tmp = var_CreateGetString( p_intf, "browse-dir" );
+ if( psz_tmp && *psz_tmp )
+ p_sys->psz_current_dir = psz_tmp;
else
{
- p_sys->psz_current_dir = strdup( p_intf->p_libvlc->psz_homedir );
+ p_sys->psz_current_dir = strdup( config_GetHomeDir() );
+ free( psz_tmp );
}
p_sys->i_dir_entries = 0;
{
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;
/* Close the ncurses interface */
endwin();
- msg_Unsubscribe( p_intf, p_sys->p_sub );
+// FIXME msg_Unsubscribe( p_intf, p_sys->p_sub );
/* Restores initial verbose setting */
vlc_value_t val;
static void Run( intf_thread_t *p_intf )
{
intf_sys_t *p_sys = p_intf->p_sys;
- playlist_t *p_playlist = pl_Yield( p_intf );
+ playlist_t *p_playlist = pl_Hold( p_intf );
p_sys->p_playlist = p_playlist;
int i_key;
time_t t_last_refresh;
+ int canc = vlc_savecancel();
/*
* force drawing the interface for the first time
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 ) )
+ while( vlc_object_alive( p_intf ) )
{
msleep( INTF_IDLE_SLEEP );
PL_LOCK;
if( p_sys->p_input == NULL )
{
- p_sys->p_input = p_playlist->p_input;
- if( p_sys->p_input )
- {
- if( !p_sys->p_input->b_dead )
- {
- vlc_object_yield( p_sys->p_input );
- }
- }
+ p_sys->p_input = playlist_CurrentInput( p_playlist );
}
else if( p_sys->p_input->b_dead )
{
}
PL_UNLOCK;
- if( p_sys->b_box_plidx_follow && p_playlist->status.p_item )
+ if( p_sys->b_box_plidx_follow && playlist_CurrentPlayingItem(p_playlist) )
{
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 );
+ vlc_restorecancel( canc );
}
/* 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; \
} while(0)
-
+
#define ReturnFalse \
do { \
vlc_object_release( p_playlist ); \
return 0; \
} while(0)
- playlist_t *p_playlist = pl_Yield( p_intf );
+ playlist_t *p_playlist = pl_Hold( p_intf );
if( p_sys->i_box_type == BOX_PLAYLIST )
{
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
{
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 )
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;
case ' ':
if( p_sys->pp_dir_entries[p_sys->i_box_bidx]->b_file || i_key == ' ' )
{
- int i_size_entry = strlen( "directory://" ) +
- strlen( p_sys->psz_current_dir ) +
- strlen( p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path ) + 2;
- char *psz_uri = (char *)malloc( sizeof(char)*i_size_entry);
-
- sprintf( psz_uri, "directory://%s/%s", p_sys->psz_current_dir, p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path );
+ char* psz_uri;
+ if( asprintf( &psz_uri, "directory://%s/%s", p_sys->psz_current_dir, p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path ) == -1 )
+ psz_uri = NULL;
playlist_item_t *p_parent = p_sys->p_node;
if( !p_parent )
- p_parent = p_playlist->status.p_node;
+ p_parent = playlist_CurrentPlayingItem(p_playlist) ? playlist_CurrentPlayingItem(p_playlist)->p_parent : NULL;
if( !p_parent )
p_parent = p_playlist->p_local_onelevel;
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 );
}
else
{
- int i_size_entry = strlen( p_sys->psz_current_dir ) +
- strlen( p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path ) + 2;
- char *psz_uri = (char *)malloc( sizeof(char)*i_size_entry);
-
- sprintf( psz_uri, "%s/%s", p_sys->psz_current_dir, p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path );
-
- p_sys->psz_current_dir = strdup( psz_uri );
- ReadDir( p_intf );
- free( psz_uri );
+ if( asprintf( &(p_sys->psz_current_dir), "%s/%s", p_sys->psz_current_dir,
+ p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path ) != -1 )
+ ReadDir( p_intf );
}
break;
default:
* 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;
+ p_parent = playlist_CurrentPlayingItem(p_playlist) ? playlist_CurrentPlayingItem(p_playlist)->p_parent : NULL;
if( !p_parent )
p_parent = p_playlist->p_local_onelevel;
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 );
default:
ReturnFalse;
}
+#undef ReturnFalse
+#undef ReturnTrue
}
static void ManageSlider( intf_thread_t *p_intf )
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 );
}
+
#else
if( i_len > w )
{
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, ... )
{
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)",
+ MainBoxWrite( p_intf, (*l)++, 1 + 2 * i_level, "%s \"%s\" (%p)",
p_obj->psz_object_type, p_obj->psz_object_name,
- p_obj->i_object_id );
+ p_obj );
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++ )
+ MainBoxWrite( p_intf, (*l)++, 1 + 2 * i_level, "%s (%o)",
+ p_obj->psz_object_type, p_obj );
+
+ 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 )
{
intf_sys_t *p_sys = p_intf->p_sys;
input_thread_t *p_input = p_sys->p_input;
- playlist_t *p_playlist = pl_Yield( p_intf );
+ playlist_t *p_playlist = pl_Hold( p_intf );
int y = 0;
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 );
}
else if( p_sys->i_box_type == BOX_LOG )
{
+#warning Deprecated API
+#if 0
int i_line = 0;
int i_stop;
int i_start;
DrawBox( p_sys->w, y++, 0, h, COLS, _(" Logs "), p_sys->b_color );
+
i_start = p_intf->p_sys->p_sub->i_start;
vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
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",
p_intf->p_sys->p_sub->i_start = i_stop;
vlc_mutex_unlock( p_intf->p_sys->p_sub->p_lock );
y = y_end;
+#endif
}
else if( p_sys->i_box_type == BOX_BROWSE )
{
}
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 )
{
int c = ' ';
if( ( p_node && p_item->p_input == p_node->p_input ) ||
( !p_node && p_item->p_input ==
- p_playlist->status.p_node->p_input ) )
+ playlist_CurrentPlayingItem(p_playlist)->p_input ) )
c = '*';
else if( p_item == p_node || ( p_item != p_node &&
PlaylistIsPlaying( p_intf, p_item ) ) )
static playlist_item_t *PlaylistGetRoot( intf_thread_t *p_intf )
{
intf_sys_t *p_sys = p_intf->p_sys;
- playlist_t *p_playlist = pl_Yield( p_intf );
+ playlist_t *p_playlist = pl_Hold( p_intf );
playlist_item_t *p_item;
switch( p_sys->i_current_view )
{
case VIEW_CATEGORY:
p_item = p_playlist->p_root_category;
+ break;
default:
p_item = p_playlist->p_root_onelevel;
}
static void PlaylistRebuild( intf_thread_t *p_intf )
{
intf_sys_t *p_sys = p_intf->p_sys;
- playlist_t *p_playlist = pl_Yield( p_intf );
+ playlist_t *p_playlist = pl_Hold( p_intf );
PL_LOCK;
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 );
VLC_UNUSED(p_this); VLC_UNUSED(psz_variable);
VLC_UNUSED(oval); VLC_UNUSED(nval);
intf_thread_t *p_intf = (intf_thread_t *)param;
- playlist_t *p_playlist = pl_Yield( p_intf );
+ playlist_t *p_playlist = pl_Hold( p_intf );
p_intf->p_sys->b_need_update = true;
- p_intf->p_sys->p_node = p_playlist->status.p_node;
+ p_intf->p_sys->p_node = playlist_CurrentPlayingItem(p_playlist) ? playlist_CurrentPlayingItem(p_playlist)->p_parent : NULL;
vlc_object_release( p_playlist );
return VLC_SUCCESS;
}
static inline bool PlaylistIsPlaying( intf_thread_t *p_intf,
playlist_item_t *p_item )
{
- playlist_t *p_playlist = pl_Yield( p_intf );
- playlist_item_t *p_played_item = p_playlist->status.p_item;
+ playlist_t *p_playlist = pl_Hold( p_intf );
+ playlist_item_t *p_played_item = playlist_CurrentPlayingItem(p_playlist);
vlc_object_release( p_playlist );
return( p_item != NULL && p_played_item != NULL &&
p_item->p_input != NULL && p_played_item->p_input != NULL &&
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 )
* If it's neither of these, then return
*/
- playlist_t * p_playlist = pl_Yield( p_intf );
+ playlist_t * p_playlist = pl_Hold( p_intf );
PL_LOCK;
- if( p_playlist->status.p_item == NULL )
+ if( playlist_CurrentPlayingItem(p_playlist) == NULL )
{
PL_UNLOCK;
vlc_object_release( p_playlist );
return;
}
- psz_name = p_playlist->status.p_item->p_input->psz_name;
+ psz_name = playlist_CurrentPlayingItem(p_playlist)->p_input->psz_name;
if( psz_name )
{
continue;
}
- psz_uri = (char *)malloc( sizeof(char)*i_size_entry);
- sprintf( psz_uri, "%s/%s", p_sys->psz_current_dir, psz_entry );
+ asprintf( &psz_uri, "%s/%s", p_sys->psz_current_dir, psz_entry );
if( !( p_dir_entry = malloc( sizeof( struct dir_entry_t) ) ) )
{
static void PlayPause( intf_thread_t *p_intf )
{
input_thread_t *p_input = p_intf->p_sys->p_input;
- playlist_t *p_playlist = pl_Yield( p_intf );
+ playlist_t *p_playlist = pl_Hold( p_intf );
vlc_value_t val;
if( p_input )
projects / vlc / blobdiff