static void PlaylistDestroy( intf_thread_t * );
static int PlaylistChanged( vlc_object_t *, const char *, vlc_value_t,
vlc_value_t, void * );
-static inline bool PlaylistIsPlaying( intf_thread_t *,
- playlist_item_t * );
-static void FindIndex ( intf_thread_t * );
+static inline bool PlaylistIsPlaying( playlist_t *, playlist_item_t * );
+static void FindIndex ( intf_thread_t *, playlist_t * );
static void SearchPlaylist ( intf_thread_t *, char * );
static int SubSearchPlaylist( intf_thread_t *, char *, int, int );
"This option allows you to specify the directory the ncurses filebrowser " \
"will show you initially.")
-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();
+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
struct pl_item_t **pp_plist;
int i_plist_entries;
bool b_need_update; /* for playlist view */
-
- int i_verbose; /* stores verbosity level */
};
static void DrawBox( WINDOW *win, int y, int x, int h, int w, const char *title, bool b_color );
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
intf_sys_t *p_sys;
- vlc_value_t val;
/* Allocate instance and initialize some members */
p_sys = p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
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 );
+// FIXME p_sys->p_sub = msg_Subscribe( p_intf );
p_sys->b_color = var_CreateGetBool( p_intf, "color" );
p_sys->b_color_started = false;
/* exported function */
p_intf->pf_run = Run;
- /* Remember verbosity level */
- var_Get( p_intf->p_libvlc, "verbose", &val );
- p_sys->i_verbose = val.i_int;
- /* Set quiet mode */
- val.i_int = -1;
- var_Set( p_intf->p_libvlc, "verbose", val );
+ /* Stop printing errors to the console */
+ freopen( "/dev/null", "wb", stderr );
/* Set defaul playlist view */
p_sys->i_current_view = VIEW_CATEGORY;
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 );
- }
+ 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( config_GetHomeDir() );
+ free( psz_tmp );
}
- free( val.psz_string );
-
p_sys->i_dir_entries = 0;
p_sys->pp_dir_entries = NULL;
p_sys->b_show_hidden_files = false;
/* Close the ncurses interface */
endwin();
- msg_Unsubscribe( p_intf, p_sys->p_sub );
-
- /* Restores initial verbose setting */
- vlc_value_t val;
- val.i_int = p_sys->i_verbose;
- var_Set( p_intf->p_libvlc, "verbose", val );
+// FIXME msg_Unsubscribe( p_intf, p_sys->p_sub );
/* Destroy structure */
free( p_sys );
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;
*/
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, "playlist-item-append", PlaylistChanged, p_intf );
var_AddCallback( p_playlist, "item-change", PlaylistChanged, p_intf );
while( vlc_object_alive( p_intf ) )
msleep( INTF_IDLE_SLEEP );
/* Update the input */
- 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_hold( p_sys->p_input );
- }
- }
+ p_sys->p_input = playlist_CurrentInput( p_playlist );
}
else if( p_sys->p_input->b_dead )
{
p_sys->f_slider = p_sys->f_slider_old = 0.0;
p_sys->b_box_cleared = false;
}
- PL_UNLOCK;
- if( p_sys->b_box_plidx_follow && p_playlist->status.p_item )
+ PL_LOCK;
+ if( p_sys->b_box_plidx_follow && playlist_CurrentPlayingItem(p_playlist) )
{
- FindIndex( p_intf );
+ PL_UNLOCK;
+ FindIndex( p_intf, p_playlist );
}
+ else
+ PL_UNLOCK;
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, "playlist-item-append", PlaylistChanged, p_intf );
var_DelCallback( p_playlist, "item-change", PlaylistChanged, p_intf );
vlc_restorecancel( canc );
}
#define ReturnTrue \
do { \
- vlc_object_release( p_playlist ); \
+ pl_Release( p_intf ); \
return 1; \
} while(0)
#define ReturnFalse \
do { \
- vlc_object_release( p_playlist ); \
+ pl_Release( p_intf ); \
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 )
{
/* Playlist navigation */
case 'g':
- FindIndex( p_intf );
+ FindIndex( p_intf, p_playlist );
break;
case KEY_HOME:
p_sys->i_box_plidx = 0;
int i_max = p_sys->i_plist_entries;
if( p_sys->i_box_plidx >= i_max ) p_sys->i_box_plidx = i_max - 1;
if( p_sys->i_box_plidx < 0 ) p_sys->i_box_plidx = 0;
- if( PlaylistIsPlaying( p_intf,
- p_sys->pp_plist[p_sys->i_box_plidx]->p_item ) )
+
+ PL_LOCK;
+ if( PlaylistIsPlaying( p_playlist,
+ p_sys->pp_plist[p_sys->i_box_plidx]->p_item ) )
b_box_plidx_follow = true;
+ PL_UNLOCK;
p_sys->b_box_plidx_follow = b_box_plidx_follow;
ReturnTrue;
}
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;
- if( !p_parent )
- p_parent = p_playlist->p_local_onelevel;
+ {
+ PL_LOCK;
+ p_parent = playlist_CurrentPlayingItem(p_playlist) ? playlist_CurrentPlayingItem(p_playlist)->p_parent : NULL;
+ PL_UNLOCK;
+ if( !p_parent )
+ p_parent = p_playlist->p_local_onelevel;
+ }
while( p_parent->p_parent && p_parent->p_parent->p_parent )
p_parent = p_parent->p_parent;
}
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:
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;
case 'q':
case 'Q':
case KEY_EXIT:
- vlc_object_kill( p_intf->p_libvlc );
+ libvlc_Quit( p_intf->p_libvlc );
ReturnFalse;
/* Box switching */
case '[':
if( p_sys->p_input )
- {
- val.b_bool = true;
- var_Set( p_sys->p_input, "prev-title", val );
- }
+ var_SetVoid( p_sys->p_input, "prev-title" );
ReturnTrue;
case ']':
if( p_sys->p_input )
- {
- val.b_bool = true;
- var_Set( p_sys->p_input, "next-title", val );
- }
+ var_SetVoid( p_sys->p_input, "next-title" );
ReturnTrue;
case '<':
if( p_sys->p_input )
- {
- val.b_bool = true;
- var_Set( p_sys->p_input, "prev-chapter", val );
- }
+ var_SetVoid( p_sys->p_input, "prev-chapter" );
ReturnTrue;
case '>':
if( p_sys->p_input )
- {
- val.b_bool = true;
- var_Set( p_sys->p_input, "next-chapter", val );
- }
+ var_SetVoid( p_sys->p_input, "next-chapter" );
ReturnTrue;
case 'p':
{
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;
{
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( val.i_int == BUFFERING_S )
- {
- mvnprintw( y++, 0, COLS, _(" State : Buffering %s"), psz_state );
- }
else if( val.i_int == PAUSE_S )
{
mvnprintw( y++, 0, COLS, _(" State : Paused %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 );
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 )
{
}
if( p_sys->b_box_plidx_follow )
{
- FindIndex( p_intf );
+ FindIndex( p_intf, p_playlist );
}
if( p_sys->i_box_plidx < 0 ) p_sys->i_box_plidx = 0;
playlist_item_t *p_item = p_sys->pp_plist[i_item]->p_item;
playlist_item_t *p_node = p_sys->p_node;
int c = ' ';
+ input_thread_t *p_input2 = playlist_CurrentInput( p_playlist );
+
+ PL_LOCK;
if( ( p_node && p_item->p_input == p_node->p_input ) ||
- ( !p_node && p_item->p_input ==
- p_playlist->status.p_node->p_input ) )
+ ( !p_node && p_input2 &&
+ p_item->p_input == playlist_CurrentPlayingItem(p_playlist)->p_input ) )
c = '*';
else if( p_item == p_node || ( p_item != p_node &&
- PlaylistIsPlaying( p_intf, p_item ) ) )
+ PlaylistIsPlaying( p_playlist, p_item ) ) )
c = '>';
+ PL_UNLOCK;
if( y >= y_end ) break;
if( b_selected )
refresh();
*t_last_refresh = time( 0 );
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
}
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 )
default:
p_item = p_playlist->p_root_onelevel;
}
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
return p_item;
}
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;
PL_UNLOCK;
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
}
static void PlaylistAddNode( intf_thread_t *p_intf, playlist_item_t *p_node,
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;
- vlc_object_release( p_playlist );
+ p_intf->p_sys->p_node = playlist_CurrentPlayingItem(p_playlist) ? playlist_CurrentPlayingItem(p_playlist)->p_parent : NULL;
+ pl_Release( p_intf );
return VLC_SUCCESS;
}
/* Playlist suxx */
-static inline bool PlaylistIsPlaying( intf_thread_t *p_intf,
- playlist_item_t *p_item )
+/* This function have to be called with the playlist locked */
+static inline bool PlaylistIsPlaying( playlist_t *p_playlist,
+ playlist_item_t *p_item )
{
- playlist_t *p_playlist = pl_Yield( p_intf );
- playlist_item_t *p_played_item = p_playlist->status.p_item;
- vlc_object_release( p_playlist );
+ playlist_item_t *p_played_item = playlist_CurrentPlayingItem( p_playlist );
return( p_item != NULL && p_played_item != NULL &&
p_item->p_input != NULL && p_played_item->p_input != NULL &&
p_item->p_input->i_id == p_played_item->p_input->i_id );
}
-static void FindIndex( intf_thread_t *p_intf )
+static void FindIndex( intf_thread_t *p_intf, playlist_t *p_playlist )
{
intf_sys_t *p_sys = p_intf->p_sys;
int i;
if( p_sys->i_box_plidx < p_sys->i_plist_entries && p_sys->i_box_plidx >= 0 )
{
playlist_item_t *p_item = p_sys->pp_plist[p_sys->i_box_plidx]->p_item;
+ PL_LOCK;
if( ( p_item->i_children == 0 && p_item == p_sys->p_node ) ||
- PlaylistIsPlaying( p_intf, p_item ) )
+ PlaylistIsPlaying( p_playlist, p_item ) )
+ {
+ PL_UNLOCK;
return;
+ }
}
for( i = 0; i < p_sys->i_plist_entries; i++ )
{
playlist_item_t *p_item = p_sys->pp_plist[i]->p_item;
if( ( p_item->i_children == 0 && p_item == p_sys->p_node ) ||
- PlaylistIsPlaying( p_intf, p_sys->pp_plist[i]->p_item ) )
+ PlaylistIsPlaying( p_playlist, p_sys->pp_plist[i]->p_item ) )
{
p_sys->i_box_plidx = i;
break;
}
}
+ PL_UNLOCK;
}
static void PlaylistDestroy( 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 );
+ pl_Release( p_intf );
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 )
{
if( psz_device == NULL )
{
+ pl_Release( p_intf );
return;
}
}
free( psz_device );
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
return;
}
struct stat stat_data;
#endif
struct dir_entry_t *p_dir_entry;
- int i_size_entry = strlen( p_sys->psz_current_dir ) +
- strlen( psz_entry ) + 2;
char *psz_uri;
if( p_sys->b_show_hidden_files == false &&
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 )
else
playlist_Play( p_playlist );
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
}
/****************************************************************************
projects / vlc / blobdiff