/*****************************************************************************
* ncurses.c : NCurses plugin for vlc
*****************************************************************************
- * Copyright (C) 2001-2004 VideoLAN
+ * Copyright (C) 2001-2006 the VideoLAN team
* $Id$
*
* Authors: Sam Hocevar <sam@zoy.org>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
+#define _GNU_SOURCE
#include <stdlib.h> /* malloc(), free() */
#include <string.h>
#include <errno.h> /* ENOMEM */
#include <curses.h>
#include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include <vlc/vout.h>
-#include <vlc/aout.h>
+#include <vlc_interface.h>
+#include <vlc_vout.h>
+#include <vlc_aout.h>
+#include <vlc_charset.h>
+#include <vlc_input.h>
+#include <vlc_playlist.h>
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
static int HandleKey ( intf_thread_t *, int );
static void Redraw ( intf_thread_t *, time_t * );
+
+static playlist_item_t *PlaylistGetRoot( intf_thread_t * );
static void PlaylistRebuild( intf_thread_t * );
static void PlaylistAddNode( intf_thread_t *, playlist_item_t *, int, char *);
static void PlaylistDestroy( intf_thread_t * );
static int PlaylistChanged( vlc_object_t *, const char *, vlc_value_t,
vlc_value_t, void * );
+static inline vlc_bool_t PlaylistIsPlaying( intf_thread_t *,
+ playlist_item_t * );
static void FindIndex ( intf_thread_t * );
static void SearchPlaylist ( intf_thread_t *, char * );
static int SubSearchPlaylist( intf_thread_t *, char *, int, int );
+
static void ManageSlider ( intf_thread_t * );
static void ReadDir ( intf_thread_t * );
"will show you initially.")
vlc_module_begin();
- set_shorname( _("Ncurses"));
+ set_shortname( "Ncurses" );
set_description( _("Ncurses interface") );
set_capability( "interface", 10 );
set_category( CAT_INTERFACE );
- set_subcategory( SUBCAT_INTERFACE_GENERAL );
+ set_subcategory( SUBCAT_INTERFACE_MAIN );
set_callbacks( Open, Close );
add_shortcut( "curses" );
add_directory( "browse-dir", NULL, NULL, BROWSE_TEXT, BROWSE_LONGTEXT, VLC_FALSE );
BOX_OPEN,
BOX_BROWSE
};
+enum
+{
+ VIEW_CATEGORY,
+ VIEW_ONELEVEL
+};
struct dir_entry_t
{
vlc_bool_t b_file;
int i_before_search;
char *psz_open_chain;
+ char psz_partial_keys[7];
char *psz_current_dir;
int i_dir_entries;
struct dir_entry_t **pp_dir_entries;
+ vlc_bool_t b_show_hidden_files;
int i_current_view; /* playlist view */
struct pl_item_t **pp_plist;
vlc_bool_t b_need_update; /* for playlist view */
};
-static void DrawBox( WINDOW *win, int y, int x, int h, int w, char *title );
+static void DrawBox( WINDOW *win, int y, int x, int h, int w, const char *title );
static void DrawLine( WINDOW *win, int y, int x, int w );
static void DrawEmptyLine( WINDOW *win, int y, int x, int w );
p_sys->i_box_plidx = 0;
p_sys->p_plnode = NULL;
p_sys->i_box_bidx = 0;
- p_sys->p_sub = msg_Subscribe( p_intf );
+ p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL );
+ memset( p_sys->psz_partial_keys, 0, sizeof( p_sys->psz_partial_keys ) );
/* Initialize the curses library */
p_sys->w = initscr();
/* Set quiet mode */
val.i_int = -1;
- var_Set( p_intf->p_vlc, "verbose", val );
+ var_Set( p_intf->p_libvlc, "verbose", val );
/* Set defaul playlist view */
- p_sys->i_current_view = VIEW_SIMPLE;
+ p_sys->i_current_view = VIEW_CATEGORY;
p_sys->pp_plist = NULL;
p_sys->i_plist_entries = 0;
p_sys->b_need_update = VLC_FALSE;
if( val.psz_string && *val.psz_string )
{
- p_sys->psz_current_dir = strdup( 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_vlc->psz_homedir );
+ p_sys->psz_current_dir = strdup( p_intf->p_libvlc->psz_homedir );
}
p_sys->i_dir_entries = 0;
p_sys->pp_dir_entries = NULL;
+ p_sys->b_show_hidden_files = VLC_FALSE;
ReadDir( p_intf );
return VLC_SUCCESS;
*/
t_last_refresh = ( time( 0 ) - 1);
- while( !p_intf->b_die )
+ while( !intf_ShouldDie( p_intf ) )
{
msleep( INTF_IDLE_SLEEP );
vlc_mutex_unlock( &p_sys->p_playlist->object_lock );
}
- if( p_sys->b_box_plidx_follow && p_sys->p_playlist->i_index >= 0 )
+ if( p_sys->b_box_plidx_follow && p_sys->p_playlist->status.p_item )
{
FindIndex( p_intf );
}
- while( ( i_key = getch()) != -1 )
+ while( ( i_key = getch() ) != -1 )
{
/*
* HandleKey returns 1 if the screen needs to be redrawn
/* following functions are local */
+static char *KeyToUTF8( int i_key, char *psz_part )
+{
+ char *psz_utf8, *psz;
+ int len = strlen( psz_part );
+ if( len == 6 )
+ {
+ /* overflow error - should not happen */
+ memset( psz_part, 0, 6 );
+ return NULL;
+ }
+
+ psz_part[len] = (char)i_key;
+
+ psz_utf8 = FromLocaleDup( psz_part );
+
+ /* Ugly check for incomplete bytes sequences
+ * (in case of non-UTF8 multibyte local encoding) */
+ for( psz = psz_utf8; *psz; psz++ )
+ if( ( *psz == '?' ) && ( *psz_utf8 != '?' ) )
+ {
+ /* incomplete bytes sequence detected
+ * (VLC core inserted dummy question marks) */
+ free( psz_utf8 );
+ return NULL;
+ }
+
+ /* Check for incomplete UTF8 bytes sequence */
+ if( EnsureUTF8( psz_utf8 ) == NULL )
+ {
+ free( psz_utf8 );
+ return NULL;
+ }
+
+ memset( psz_part, 0, 6 );
+ return psz_utf8;
+}
+
+static inline int RemoveLastUTF8Entity( char *psz, int len )
+{
+ while( len && ( (psz[--len] & 0xc0) == 0x80 ) );
+ /* UTF8 continuation byte */
+
+ psz[len] = '\0';
+ return len;
+}
+
static int HandleKey( intf_thread_t *p_intf, int i_key )
{
intf_sys_t *p_sys = p_intf->p_sys;
if( p_sys->i_box_type == BOX_PLAYLIST && p_sys->p_playlist )
{
int b_ret = VLC_TRUE;
+ vlc_bool_t b_box_plidx_follow = VLC_FALSE;
switch( i_key )
{
/* Playlist sort */
case 'o':
- playlist_Sort( p_sys->p_playlist, SORT_TITLE, ORDER_NORMAL );
+ playlist_RecursiveNodeSort( p_sys->p_playlist,
+ PlaylistGetRoot( p_intf ),
+ SORT_TITLE_NODES_FIRST, ORDER_NORMAL );
+ p_sys->b_need_update = VLC_TRUE;
return 1;
case 'O':
- playlist_Sort( p_sys->p_playlist, SORT_TITLE, ORDER_REVERSE );
+ playlist_RecursiveNodeSort( p_sys->p_playlist,
+ PlaylistGetRoot( p_intf ),
+ SORT_TITLE_NODES_FIRST, ORDER_REVERSE );
+ p_sys->b_need_update = VLC_TRUE;
return 1;
/* Playlist view */
case 'v':
switch( p_sys->i_current_view )
{
- case VIEW_SIMPLE:
- p_sys->i_current_view = VIEW_CATEGORY;
- break;
case VIEW_CATEGORY:
- p_sys->i_current_view = VIEW_ALL;
+ p_sys->i_current_view = VIEW_ONELEVEL;
break;
default:
- p_sys->i_current_view = VIEW_SIMPLE;
+ p_sys->i_current_view = VIEW_CATEGORY;
}
+ //p_sys->b_need_update = VLC_TRUE;
PlaylistRebuild( p_intf );
- FindIndex( p_intf );
return 1;
/* Playlist navigation */
p_sys->i_box_plidx = 0;
break;
case KEY_END:
- p_sys->i_box_plidx = p_sys->p_playlist->i_size - 1;
+ p_sys->i_box_plidx = p_sys->p_playlist->items.i_size - 1;
break;
case KEY_UP:
p_sys->i_box_plidx--;
case KEY_BACKSPACE:
case KEY_DC:
{
- int i_item = p_sys->p_playlist->i_index;
+ playlist_t *p_playlist = p_sys->p_playlist;
+ playlist_item_t *p_item;
- playlist_LockDelete( p_sys->p_playlist, p_sys->i_box_plidx );
- if( i_item < p_sys->p_playlist->i_size &&
- i_item != p_sys->p_playlist->i_index )
+ vlc_mutex_lock( &p_playlist->object_lock );
+ p_item = p_sys->pp_plist[p_sys->i_box_plidx]->p_item;
+ if( p_item->i_children == -1 )
+ {
+ playlist_DeleteFromInput( p_playlist,
+ p_item->p_input->i_id, VLC_TRUE );
+ }
+ else
{
- playlist_Goto( p_sys->p_playlist, i_item );
+ playlist_NodeDelete( p_playlist, p_item,
+ VLC_TRUE , VLC_FALSE );
}
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ p_sys->b_need_update = VLC_TRUE;
+
break;
}
case KEY_ENTER:
case 0x0d:
- if( p_sys->i_current_view == VIEW_ALL )
+ if( p_sys->pp_plist[p_sys->i_box_plidx]->p_item->i_children
+ == -1 )
{
- playlist_Goto( p_sys->p_playlist, p_sys->i_box_plidx );
+ playlist_Control( p_sys->p_playlist, PLAYLIST_VIEWPLAY,
+ VLC_TRUE, NULL,
+ p_sys->pp_plist[p_sys->i_box_plidx]->p_item );
}
else
{
- if( p_sys->pp_plist[p_sys->i_box_plidx]->p_item->i_children
- == -1 )
- {
- playlist_Control( p_sys->p_playlist, PLAYLIST_ITEMPLAY,
- p_sys->pp_plist[p_sys->i_box_plidx]->p_item );
- }
- else
- {
- playlist_Control( p_sys->p_playlist, PLAYLIST_VIEWPLAY,
- p_sys->i_current_view,
- p_sys->pp_plist[p_sys->i_box_plidx]->p_item,
- NULL );
- }
+ playlist_Control( p_sys->p_playlist, PLAYLIST_VIEWPLAY,
+ VLC_TRUE,
+ p_sys->pp_plist[p_sys->i_box_plidx]->p_item,
+ NULL );
}
- p_sys->b_box_plidx_follow = VLC_TRUE;
+ b_box_plidx_follow = VLC_TRUE;
break;
default:
b_ret = VLC_FALSE;
if( b_ret )
{
int i_max = p_sys->i_plist_entries;
- if( p_sys->i_current_view == VIEW_ALL )
- i_max = p_sys->p_playlist->i_size;
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( p_sys->i_current_view == VIEW_ALL )
- {
- if( p_sys->i_box_plidx == p_sys->p_playlist->i_index )
- p_sys->b_box_plidx_follow = VLC_TRUE;
- else
- p_sys->b_box_plidx_follow = VLC_FALSE;
- }
- else
- {
- if( p_sys->pp_plist[p_sys->i_box_plidx]->p_item ==
- p_sys->p_playlist->status.p_item )
- p_sys->b_box_plidx_follow = VLC_TRUE;
- else
- p_sys->b_box_plidx_follow = VLC_FALSE;
- }
+ if( PlaylistIsPlaying( p_intf,
+ p_sys->pp_plist[p_sys->i_box_plidx]->p_item ) )
+ b_box_plidx_follow = VLC_TRUE;
+ p_sys->b_box_plidx_follow = b_box_plidx_follow;
return 1;
}
}
case KEY_NPAGE:
p_sys->i_box_bidx += p_sys->i_box_lines;
break;
+ case '.': /* Toggle show hidden files */
+ p_sys->b_show_hidden_files = ( p_sys->b_show_hidden_files ==
+ VLC_TRUE ? VLC_FALSE : VLC_TRUE );
+ ReadDir( p_intf );
+ break;
case KEY_ENTER:
case 0x0d:
- if( p_sys->pp_dir_entries[p_sys->i_box_bidx]->b_file )
+ case ' ':
+ if( p_sys->pp_dir_entries[p_sys->i_box_bidx]->b_file || i_key == ' ' )
{
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 );
+ /* XXX
playlist_Add( p_sys->p_playlist, psz_uri,
psz_uri,
PLAYLIST_APPEND, PLAYLIST_END );
+ */
p_sys->i_box_type = BOX_PLAYLIST;
free( psz_uri );
}
p_sys->i_box_type = BOX_PLAYLIST;
return 1;
case KEY_BACKSPACE:
- if( i_chain_len > 0 )
- {
- p_sys->psz_search_chain[ i_chain_len - 1 ] = '\0';
- }
+ RemoveLastUTF8Entity( p_sys->psz_search_chain, i_chain_len );
break;
default:
- if( i_chain_len < SEARCH_CHAIN_SIZE )
+ {
+ char *psz_utf8 = KeyToUTF8( i_key, p_sys->psz_partial_keys );
+
+ if( psz_utf8 != NULL )
{
- p_sys->psz_search_chain[ i_chain_len++ ] = i_key;
- p_sys->psz_search_chain[ i_chain_len ] = 0;
+ if( i_chain_len + strlen( psz_utf8 ) < SEARCH_CHAIN_SIZE )
+ {
+ strcpy( p_sys->psz_search_chain + i_chain_len,
+ psz_utf8 );
+ }
+ free( psz_utf8 );
}
break;
+ }
}
if( p_sys->psz_old_search )
{
case 0x0d:
if( p_playlist && i_chain_len > 0 )
{
+ /*
playlist_Add( p_playlist, p_sys->psz_open_chain,
p_sys->psz_open_chain,
PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END );
+ */
p_sys->b_box_plidx_follow = VLC_TRUE;
}
p_sys->i_box_type = BOX_PLAYLIST;
p_sys->i_box_type = BOX_PLAYLIST;
return 1;
case KEY_BACKSPACE:
- if( i_chain_len > 0 )
- {
- p_sys->psz_open_chain[ i_chain_len - 1 ] = '\0';
- }
+ RemoveLastUTF8Entity( p_sys->psz_open_chain, i_chain_len );
break;
default:
- if( i_chain_len < OPEN_CHAIN_SIZE )
+ {
+ char *psz_utf8 = KeyToUTF8( i_key, p_sys->psz_partial_keys );
+
+ if( psz_utf8 != NULL )
{
- p_sys->psz_open_chain[ i_chain_len++ ] = i_key;
- p_sys->psz_open_chain[ i_chain_len ] = 0;
+ if( i_chain_len + strlen( psz_utf8 ) < OPEN_CHAIN_SIZE )
+ {
+ strcpy( p_sys->psz_open_chain + i_chain_len,
+ psz_utf8 );
+ }
+ free( psz_utf8 );
}
break;
+ }
}
return 1;
}
case 'q':
case 'Q':
case 0x1b: /* Esc */
- p_intf->p_vlc->b_die = VLC_TRUE;
+ vlc_object_kill( p_intf->p_libvlc );
return 0;
/* Box switching */
/* Common control */
case 'f':
{
- vout_thread_t *p_vout;
if( p_intf->p_sys->p_input )
{
+ vout_thread_t *p_vout;
p_vout = vlc_object_find( p_intf->p_sys->p_input,
VLC_OBJECT_VOUT, FIND_CHILD );
if( p_vout )
{
- p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
+ var_Get( p_vout, "fullscreen", &val );
+ val.b_bool = !val.b_bool;
+ var_Set( p_vout, "fullscreen", val );
vlc_object_release( p_vout );
}
+ else
+ {
+ playlist_t *p_playlist;
+ p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist )
+ {
+ var_Get( p_playlist, "fullscreen", &val );
+ val.b_bool = !val.b_bool;
+ var_Set( p_playlist, "fullscreen", val );
+ vlc_object_release( p_playlist );
+ }
+ }
}
return 0;
}
int i_first = 0 ;
int i_item = -1;
intf_sys_t *p_sys = p_intf->p_sys;
- playlist_t *p_playlist = p_sys->p_playlist;
if( p_sys->i_before_search >= 0 )
{
return;
}
- i_max = p_sys->i_current_view == VIEW_ALL ?
- p_playlist->i_size : p_sys->i_plist_entries;
+ i_max = p_sys->i_plist_entries;
i_item = SubSearchPlaylist( p_intf, psz_searchstring, i_first + 1, i_max );
if( i_item < 0 )
int i_start, int i_stop )
{
intf_sys_t *p_sys = p_intf->p_sys;
- playlist_t *p_playlist = p_sys->p_playlist;
int i, i_item = -1;
- if( p_sys->i_current_view == VIEW_ALL )
- {
- for( i = i_start + 1; i < i_stop; i++ )
- {
- if( strcasestr( p_playlist->pp_items[i]->input.psz_name,
- psz_searchstring ) != NULL
- || strcasestr( p_playlist->pp_items[i]->input.psz_uri,
- psz_searchstring ) != NULL )
- {
- i_item = i;
- break;
- }
- }
- }
- else
+ for( i = i_start + 1; i < i_stop; i++ )
{
- for( i = i_start + 1; i < i_stop; i++ )
+ if( strcasestr( p_sys->pp_plist[i]->psz_display,
+ psz_searchstring ) != NULL )
{
- if( strcasestr( p_sys->pp_plist[i]->psz_display,
- psz_searchstring ) != NULL )
- {
- i_item = i;
- break;
- }
+ i_item = i;
+ break;
}
}
{
if( ( i_len = strlen( p_buf ) ) > w )
{
+ char *psz_local;
int i_cut = i_len - w;
int x1 = i_len/2 - i_cut/2;
int x2 = x1 + i_cut;
p_buf[w/2 ] = '.';
p_buf[w/2+1] = '.';
}
- mvprintw( y, x, "%s", p_buf );
+ psz_local = ToLocale( p_buf );
+ mvprintw( y, x, "%s", psz_local );
+ LocaleFree( p_buf );
}
else
{
- mvprintw( y, x, "%s", p_buf );
+ char *psz_local = ToLocale( p_buf );
+ mvprintw( y, x, "%s", psz_local );
+ LocaleFree( p_buf );
mvhline( y, x + i_len, ' ', w - i_len );
}
}
int h;
int y_end;
- //clear();
+ clear();
/* Title */
attrset( A_REVERSE );
/* Source */
mvnprintw( y++, 0, COLS, " Source : %s",
- p_input->input.p_item->psz_uri );
+ input_GetItem(p_input)->psz_uri );
/* State */
var_Get( p_input, "state", &val );
{
mvnprintw( y++, 0, COLS, " State : Playing" );
}
+ else if( val.i_int == OPENING_S )
+ {
+ mvnprintw( y++, 0, COLS, " State : Openning/Connecting" );
+ }
+ else if( val.i_int == BUFFERING_S )
+ {
+ mvnprintw( y++, 0, COLS, " State : Buffering" );
+ }
else if( val.i_int == PAUSE_S )
{
mvnprintw( y++, 0, COLS, " State : Paused" );
MainBoxWrite( p_intf, l++, 1, " <backspace> Delete an entry" );
MainBoxWrite( p_intf, l++, 1, "" );
+ MainBoxWrite( p_intf, l++, 1, "[Filebrowser]" );
+ MainBoxWrite( p_intf, l++, 1, " <enter> Add the selected file to the playlist" );
+ MainBoxWrite( p_intf, l++, 1, " <space> Add the selected directory to the playlist" );
+ MainBoxWrite( p_intf, l++, 1, " . Show/Hide hidden files" );
+ MainBoxWrite( p_intf, l++, 1, "" );
+
MainBoxWrite( p_intf, l++, 1, "[Boxes]" );
MainBoxWrite( p_intf, l++, 1, " <up>,<down> Navigate through the box line by line" );
MainBoxWrite( p_intf, l++, 1, " <pgup>,<pgdown> Navigate through the box page by page" );
if( p_input )
{
int i,j;
- vlc_mutex_lock( &p_input->input.p_item->lock );
- for( i = 0; i < p_input->input.p_item->i_categories; i++ )
+ vlc_mutex_lock( &input_GetItem(p_input)->lock );
+ for( i = 0; i < input_GetItem(p_input)->i_categories; i++ )
{
- info_category_t *p_category = p_input->input.p_item->pp_categories[i];
+ info_category_t *p_category = input_GetItem(p_input)->pp_categories[i];
if( y >= y_end ) break;
MainBoxWrite( p_intf, l++, 1, " [%s]", p_category->psz_name );
for( j = 0; j < p_category->i_infos; j++ )
MainBoxWrite( p_intf, l++, 1, " %s: %s", p_info->psz_name, p_info->psz_value );
}
}
- vlc_mutex_unlock( &p_input->input.p_item->lock );
+ vlc_mutex_unlock( &input_GetItem(p_input)->lock );
}
else
{
{
attrset( A_REVERSE );
}
- mvnprintw( y++, 1, COLS - 2, "%c %s", p_sys->pp_dir_entries[i_item]->b_file == VLC_TRUE ? '-' : '+',
+ mvnprintw( y++, 1, COLS - 2, " %c %s", p_sys->pp_dir_entries[i_item]->b_file == VLC_TRUE ? ' ' : '+',
p_sys->pp_dir_entries[i_item]->psz_path );
if( b_selected )
{
p_sys->i_box_type == BOX_OPEN ) && p_sys->p_playlist )
{
/* Playlist box */
- playlist_t *p_playlist = p_sys->p_playlist;
int i_start, i_stop, i_max = p_sys->i_plist_entries;
int i_item;
char *psz_title;
switch( p_sys->i_current_view )
{
- case VIEW_ALL:
- psz_title = strdup( " Playlist (All, unsorted) " );
- i_max = p_playlist->i_size;
+ case VIEW_ONELEVEL:
+ psz_title = strdup( " Playlist (All, one level) " );
break;
case VIEW_CATEGORY:
psz_title = strdup( " Playlist (By category) " );
DrawBox( p_sys->w, y++, 0, h, COLS, psz_title );
- if( p_sys->i_current_view != VIEW_ALL &&
- ( p_sys->b_need_update || p_sys->pp_plist == NULL ) )
+ if( p_sys->b_need_update || p_sys->pp_plist == NULL )
{
PlaylistRebuild( p_intf );
}
}
if( p_sys->i_box_plidx < 0 ) p_sys->i_box_plidx = 0;
+ if( p_sys->i_box_plidx < 0 ) p_sys->i_box_plidx = 0;
+ if( p_sys->i_box_plidx >= i_max ) p_sys->i_box_plidx = i_max - 1;
if( p_sys->i_box_plidx < (h - 2)/2 )
{
i_stop = i_max;
}
- if( p_sys->i_current_view == VIEW_ALL )
- {
-
for( i_item = i_start; i_item < i_stop; i_item++ )
{
vlc_bool_t b_selected = ( p_sys->i_box_plidx == i_item );
- int c = p_playlist->i_index == i_item ? '>' : ' ';
-
- if( y >= y_end ) break;
- if( b_selected )
- {
- attrset( A_REVERSE );
- }
- if( !strcmp( p_playlist->pp_items[i_item]->input.psz_name,
- p_playlist->pp_items[i_item]->input.psz_uri ) )
- {
- mvnprintw( y++, 1, COLS - 2, "%c %d - '%s'",
- c,
- i_item,
- p_playlist->pp_items[i_item]->input.psz_uri );
- }
- else
- {
- mvnprintw( y++, 1, COLS - 2, "%c %d - '%s' (%s)",
- c,
- i_item,
- p_playlist->pp_items[i_item]->input.psz_uri,
- p_playlist->pp_items[i_item]->input.psz_name );
- }
- if( b_selected )
- {
- attroff( A_REVERSE );
- }
- }
-
- }
- else
- {
-
- for( i_item = i_start; i_item < i_stop; i_item++ )
- {
- vlc_bool_t b_selected = ( p_sys->i_box_plidx == i_item );
- int c = ( p_playlist->status.p_item ==
- p_sys->pp_plist[i_item]->p_item ) ? '>' : ' ';
+ int c = ( PlaylistIsPlaying( p_intf,
+ p_sys->pp_plist[i_item]->p_item ) ) ? '>' : ' ';
if( y >= y_end ) break;
if( b_selected )
}
}
- }
}
else
{
*t_last_refresh = time( 0 );
}
+static playlist_item_t *PlaylistGetRoot( intf_thread_t *p_intf )
+{
+ intf_sys_t *p_sys = p_intf->p_sys;
+ playlist_t *p_playlist = p_sys->p_playlist;
+
+ if( p_playlist == NULL )
+ {
+ return NULL;
+ }
+
+ switch( p_sys->i_current_view )
+ {
+ case VIEW_CATEGORY:
+ return p_playlist->p_root_category;
+ default:
+ return p_playlist->p_root_onelevel;
+ }
+}
+
static void PlaylistRebuild( intf_thread_t *p_intf )
{
intf_sys_t *p_sys = p_intf->p_sys;
- playlist_view_t *p_view;
playlist_t *p_playlist = p_sys->p_playlist;
if( p_playlist == NULL )
vlc_mutex_lock( &p_playlist->object_lock );
- p_view = playlist_ViewFind( p_playlist, p_intf->p_sys->i_current_view );
-
/* First clear the old one */
PlaylistDestroy( p_intf );
/* Build the new one */
- PlaylistAddNode( p_intf, p_view->p_root, 0, "" );
+ PlaylistAddNode( p_intf, PlaylistGetRoot( p_intf ), 0, "" );
p_sys->b_need_update = VLC_FALSE;
int i_size;
p_child = p_node->pp_children[k];
- i_size = strlen( c ) + strlen( p_child->input.psz_name ) + 4;
+ i_size = strlen( c ) + strlen( p_child->p_input->psz_name ) + 4;
buff = (char *)malloc( sizeof( char ) * i_size );
p_pl_item = (struct pl_item_t *)malloc( sizeof( struct pl_item_t ) );
- if( p_pl_item == NULL || buff == NULL ) return;
+ if( p_pl_item == NULL || buff == NULL ) return;
if( strlen( c ) )
{
sprintf( buff, "%s%c-%s", c, k == p_node->i_children - 1 ?
- '`' : '|', p_child->input.psz_name );
+ '`' : '|', p_child->p_input->psz_name );
}
else
{
- sprintf( buff, " %s", p_child->input.psz_name );
+ sprintf( buff, " %s", p_child->p_input->psz_name );
}
p_pl_item->psz_display = strdup( buff );
p_pl_item->p_item = p_child;
return VLC_SUCCESS;
}
+/* Playlist suxx */
+static inline vlc_bool_t PlaylistIsPlaying( intf_thread_t *p_intf,
+ playlist_item_t *p_item )
+{
+ playlist_item_t *p_played_item = p_intf->p_sys->p_playlist->status.p_item;
+ 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 )
{
intf_sys_t *p_sys = p_intf->p_sys;
int i;
- if( p_sys->i_current_view == VIEW_ALL )
+ if( p_sys->i_box_plidx < p_sys->i_plist_entries &&
+ p_sys->i_box_plidx >= 0 &&
+ PlaylistIsPlaying( p_intf,
+ p_sys->pp_plist[p_sys->i_box_plidx]->p_item ) )
{
- p_sys->i_box_plidx = p_sys->p_playlist->i_index;
+ return;
}
- else if( ( p_sys->i_box_plidx < p_sys->i_plist_entries &&
- p_sys->pp_plist[p_sys->i_box_plidx]->p_item !=
- p_sys->p_playlist->status.p_item ) )
+
+ for( i = 0; i < p_sys->i_plist_entries; i++ )
{
- for( i = 0; i < p_sys->i_plist_entries; i++ )
+ if( PlaylistIsPlaying( p_intf, p_sys->pp_plist[i]->p_item ) )
{
- if( p_sys->pp_plist[i]->p_item ==
- p_sys->p_playlist->status.p_item )
- {
- p_sys->i_box_plidx = i;
- break;
- }
+ p_sys->i_box_plidx = i;
+ break;
}
}
}
vlc_mutex_lock( &p_playlist->object_lock );
- if( p_playlist->i_index < 0 )
+ if( p_playlist->status.p_item == NULL )
{
vlc_mutex_unlock( &p_playlist->object_lock );
vlc_object_release( p_playlist );
return;
}
- psz_name = p_playlist->pp_items[ p_playlist->i_index ]->input.psz_name;
+ psz_name = p_playlist->status.p_item->p_input->psz_name;
if( psz_name )
{
return;
}
+static int comp_dir_entries( const void *pp_dir_entry1,
+ const void *pp_dir_entry2 )
+{
+ struct dir_entry_t *p_dir_entry1 = *(struct dir_entry_t**)pp_dir_entry1;
+ struct dir_entry_t *p_dir_entry2 = *(struct dir_entry_t**)pp_dir_entry2;
+ if ( p_dir_entry1->b_file == p_dir_entry2->b_file ) {
+ return strcasecmp( p_dir_entry1->psz_path, p_dir_entry2->psz_path );
+ }
+ else
+ {
+ return ( p_dir_entry1->b_file ? 1 : -1 );
+ }
+}
+
static void ReadDir( intf_thread_t *p_intf )
{
- intf_sys_t *p_sys = p_intf->p_sys;
- DIR * p_current_dir;
- struct dirent * p_dir_content;
+ intf_sys_t *p_sys = p_intf->p_sys;
+ DIR *p_current_dir;
int i;
if( p_sys->psz_current_dir && *p_sys->psz_current_dir )
{
+ const char *psz_entry;
+
/* Open the dir */
- p_current_dir = opendir( p_sys->psz_current_dir );
+ p_current_dir = utf8_opendir( p_sys->psz_current_dir );
if( p_current_dir == NULL )
{
p_sys->i_dir_entries = 0;
/* get the first directory entry */
- p_dir_content = readdir( p_current_dir );
+ psz_entry = utf8_readdir( p_current_dir );
/* while we still have entries in the directory */
- while( p_dir_content != NULL )
+ while( psz_entry != NULL )
{
#if defined( S_ISDIR )
struct stat stat_data;
#endif
struct dir_entry_t *p_dir_entry;
int i_size_entry = strlen( p_sys->psz_current_dir ) +
- strlen( p_dir_content->d_name ) + 2;
- char *psz_uri = (char *)malloc( sizeof(char)*i_size_entry);
+ strlen( psz_entry ) + 2;
+ char *psz_uri;
- sprintf( psz_uri, "%s/%s", p_sys->psz_current_dir,
- p_dir_content->d_name );
+ if( p_sys->b_show_hidden_files == VLC_FALSE &&
+ ( strlen( psz_entry ) && psz_entry[0] == '.' ) &&
+ strcmp( psz_entry, ".." ) )
+ {
+ free( psz_entry );
+ psz_entry = utf8_readdir( p_current_dir );
+ continue;
+ }
+
+ psz_uri = (char *)malloc( sizeof(char)*i_size_entry);
+ sprintf( psz_uri, "%s/%s", p_sys->psz_current_dir, psz_entry );
if( !( p_dir_entry = malloc( sizeof( struct dir_entry_t) ) ) )
{
}
#if defined( S_ISDIR )
- stat( psz_uri, &stat_data );
+ utf8_stat( psz_uri, &stat_data );
if( S_ISDIR(stat_data.st_mode) )
-#elif defined( DT_DIR )
- if( p_dir_content->d_type & DT_DIR )
+/*#elif defined( DT_DIR )
+ if( p_dir_content->d_type & DT_DIR )*/
#else
if( 0 )
#endif
{
- p_dir_entry->psz_path = strdup( p_dir_content->d_name );
+ p_dir_entry->psz_path = strdup( psz_entry );
p_dir_entry->b_file = VLC_FALSE;
INSERT_ELEM( p_sys->pp_dir_entries, p_sys->i_dir_entries,
p_sys->i_dir_entries, p_dir_entry );
}
else
{
- p_dir_entry->psz_path = strdup( p_dir_content->d_name );
+ p_dir_entry->psz_path = strdup( psz_entry );
p_dir_entry->b_file = VLC_TRUE;
INSERT_ELEM( p_sys->pp_dir_entries, p_sys->i_dir_entries,
p_sys->i_dir_entries, p_dir_entry );
}
free( psz_uri );
+ free( psz_entry );
/* Read next entry */
- p_dir_content = readdir( p_current_dir );
+ psz_entry = utf8_readdir( p_current_dir );
}
+
+ /* Sort */
+ qsort( p_sys->pp_dir_entries, p_sys->i_dir_entries,
+ sizeof(struct dir_entry_t*), &comp_dir_entries );
+
closedir( p_current_dir );
return;
}
/****************************************************************************
*
****************************************************************************/
-static void DrawBox( WINDOW *win, int y, int x, int h, int w, char *title )
+static void DrawBox( WINDOW *win, int y, int x, int h, int w, const char *title )
{
int i;
int i_len;
projects / vlc / blobdiff