# 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_es.h>
#include <vlc_playlist.h>
#include <vlc_meta.h>
+#include <vlc_fs.h>
+
+#include <assert.h>
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-#if (!defined( WIN32 ) || defined(__MINGW32__))
-/* Mingw has its own version of dirent */
-# include <dirent.h>
-#endif
-
-#ifdef HAVE_CDDAX
-#define CDDA_MRL "cddax://"
-#else
-#define CDDA_MRL "cdda://"
-#endif
-
-#ifdef HAVE_VCDX
-#define VCD_MRL "vcdx://"
-#else
-#define VCD_MRL "vcd://"
-#endif
#define SEARCH_CHAIN_SIZE 20
#define OPEN_CHAIN_SIZE 50
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( _("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 intf_sys_t
{
input_thread_t *p_input;
+ playlist_t *p_playlist;
bool b_color;
bool b_color_started;
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 ) );
+ 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;
/* 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 );
- 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 = config_GetUserDir( VLC_HOME_DIR );
+ 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;
- playlist_t *p_playlist = pl_Get( p_intf );
- int i;
-
- var_DelCallback( p_playlist, "intf-change", PlaylistChanged, p_intf );
- var_DelCallback( p_playlist, "item-append", PlaylistChanged, p_intf );
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;
{
vlc_object_release( p_sys->p_input );
}
- pl_Release( p_intf );
/* 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_Get( 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
* force building of the playlist array
*/
PlaylistRebuild( p_intf );
+ var_AddCallback( p_playlist, "intf-change", PlaylistChanged, p_intf );
+ var_AddCallback( p_playlist, "playlist-item-append", PlaylistChanged, p_intf );
- while( !intf_ShouldDie( p_intf ) )
+ while( vlc_object_alive( p_intf ) )
{
msleep( INTF_IDLE_SLEEP );
/* Update the input */
- var_AddCallback( p_playlist, "intf-change", PlaylistChanged, p_intf );
- var_AddCallback( p_playlist, "item-append", PlaylistChanged, p_intf );
-
- 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 )
{
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 )
{
/*
Redraw( p_intf, &t_last_refresh );
}
}
+ var_DelCallback( p_playlist, "intf-change", PlaylistChanged, p_intf );
+ var_DelCallback( p_playlist, "playlist-item-append", PlaylistChanged, p_intf );
+ vlc_restorecancel( canc );
}
/* following functions are local */
static int HandleKey( intf_thread_t *p_intf, int i_key )
{
intf_sys_t *p_sys = p_intf->p_sys;
- vlc_value_t val;
+ int i_ret = 1;
+
playlist_t *p_playlist = pl_Get( p_intf );
if( p_sys->i_box_type == BOX_PLAYLIST )
switch( i_key )
{
- vlc_value_t val;
/* Playlist Settings */
case 'r':
- var_Get( p_playlist, "random", &val );
- val.b_bool = !val.b_bool;
- var_Set( p_playlist, "random", val );
- return 1;
+ var_ToggleBool( p_playlist, "random" );
+ goto end;
case 'l':
- var_Get( p_playlist, "loop", &val );
- val.b_bool = !val.b_bool;
- var_Set( p_playlist, "loop", val );
- return 1;
+ var_ToggleBool( p_playlist, "loop" );
+ goto end;
case 'R':
- var_Get( p_playlist, "repeat", &val );
- val.b_bool = !val.b_bool;
- var_Set( p_playlist, "repeat", val );
- return 1;
+ var_ToggleBool( p_playlist, "repeat" );
+ goto end;
/* Playlist sort */
case 'o':
PlaylistGetRoot( p_intf ),
SORT_TITLE_NODES_FIRST, ORDER_NORMAL );
p_sys->b_need_update = true;
- return 1;
+ goto end;
case 'O':
playlist_RecursiveNodeSort( p_playlist,
PlaylistGetRoot( p_intf ),
SORT_TITLE_NODES_FIRST, ORDER_REVERSE );
p_sys->b_need_update = true;
- return 1;
+ goto end;
/* Playlist view */
case 'v':
}
//p_sys->b_need_update = true;
PlaylistRebuild( p_intf );
- return 1;
+ goto end;
/* Playlist navigation */
case 'g':
- FindIndex( p_intf );
+ FindIndex( p_intf, p_playlist );
break;
case KEY_HOME:
p_sys->i_box_plidx = 0;
if( p_item->i_children == -1 )
{
playlist_DeleteFromInput( p_playlist,
- p_item->p_input->i_id, true );
+ p_item->p_input, 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;
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;
- return 1;
+ goto end;
}
}
if( p_sys->i_box_type == BOX_BROWSE )
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, "%s://%s/%s",
+ p_sys->pp_dir_entries[p_sys->i_box_bidx]->b_file ?
+ "file" : "directory",
+ 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;
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:
{
if( p_sys->i_box_bidx >= p_sys->i_dir_entries ) p_sys->i_box_bidx = p_sys->i_dir_entries - 1;
if( p_sys->i_box_bidx < 0 ) p_sys->i_box_bidx = 0;
- return 1;
+ goto end;
}
}
else if( p_sys->i_box_type == BOX_HELP || p_sys->i_box_type == BOX_INFO ||
{
case KEY_HOME:
p_sys->i_box_start = 0;
- return 1;
+ goto end;
#ifdef __FreeBSD__
case KEY_SELECT:
#endif
case KEY_END:
p_sys->i_box_start = p_sys->i_box_lines_total - 1;
- return 1;
+ goto end;
case KEY_UP:
if( p_sys->i_box_start > 0 ) p_sys->i_box_start--;
- return 1;
+ goto end;
case KEY_DOWN:
if( p_sys->i_box_start < p_sys->i_box_lines_total - 1 )
{
p_sys->i_box_start++;
}
- return 1;
+ goto end;
case KEY_PPAGE:
p_sys->i_box_start -= p_sys->i_box_lines;
if( p_sys->i_box_start < 0 ) p_sys->i_box_start = 0;
- return 1;
+ goto end;
case KEY_NPAGE:
p_sys->i_box_start += p_sys->i_box_lines;
if( p_sys->i_box_start >= p_sys->i_box_lines_total )
{
p_sys->i_box_start = p_sys->i_box_lines_total - 1;
}
- return 1;
+ goto end;
default:
break;
}
case KEY_HOME:
p_sys->f_slider = 0;
ManageSlider( p_intf );
- return 1;
+ goto end;
#ifdef __FreeBSD__
case KEY_SELECT:
#endif
case KEY_END:
p_sys->f_slider = 99.9;
ManageSlider( p_intf );
- return 1;
+ goto end;
case KEY_UP:
p_sys->f_slider += 5.0;
if( p_sys->f_slider >= 99.0 ) p_sys->f_slider = 99.0;
ManageSlider( p_intf );
- return 1;
+ goto end;
case KEY_DOWN:
p_sys->f_slider -= 5.0;
if( p_sys->f_slider < 0.0 ) p_sys->f_slider = 0.0;
ManageSlider( p_intf );
- return 1;
+ goto end;
default:
break;
case KEY_CLEAR:
case 0x0c: /* ^l */
clear();
- return 1;
+ goto end;
case KEY_ENTER:
case '\r':
case '\n':
SearchPlaylist( p_intf, p_sys->psz_old_search );
}
p_sys->i_box_type = BOX_PLAYLIST;
- return 1;
+ goto end;
case 0x1b: /* ESC */
/* Alt+key combinations return 2 keys in the terminal keyboard:
* ESC, and the 2nd key.
* 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.
*
*/
if( wgetch( p_sys->w ) != ERR )
- return 0;
+ {
+ i_ret = 0;
+ goto end;
+ }
p_sys->i_box_plidx = p_sys->i_before_search;
p_sys->i_box_type = BOX_PLAYLIST;
- return 1;
+ goto end;
case KEY_BACKSPACE:
case 0x7f:
RemoveLastUTF8Entity( p_sys->psz_search_chain, i_chain_len );
free( p_sys->psz_old_search );
p_sys->psz_old_search = NULL;
SearchPlaylist( p_intf, p_sys->psz_search_chain );
- return 1;
+ goto end;
}
else if( p_sys->i_box_type == BOX_OPEN && p_sys->psz_open_chain )
{
case KEY_CLEAR:
case 0x0c: /* ^l */
clear();
- return 1;
+ break;
case KEY_ENTER:
- case '\r':
+ case '\r':
case '\n':
if( i_chain_len > 0 )
{
playlist_item_t *p_parent = p_sys->p_node;
-
+
+ PL_LOCK;
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;
while( p_parent->p_parent && p_parent->p_parent->p_parent )
p_parent = p_parent->p_parent;
+ PL_UNLOCK;
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 );
p_sys->b_box_plidx_follow = true;
}
p_sys->i_box_type = BOX_PLAYLIST;
- return 1;
+ break;
case 0x1b: /* ESC */
if( wgetch( p_sys->w ) != ERR )
- return 0;
+ {
+ i_ret = 0;
+ break;
+ }
p_sys->i_box_type = BOX_PLAYLIST;
- return 1;
+ break;
case KEY_BACKSPACE:
case 0x7f:
RemoveLastUTF8Entity( p_sys->psz_open_chain, i_chain_len );
free( psz_utf8 );
}
#endif
- break;
}
}
- return 1;
+ goto end;
}
{
case 0x1b: /* ESC */
if( wgetch( p_sys->w ) != ERR )
- return 0;
+ {
+ i_ret = 0;
+ break;
+ }
case 'q':
case 'Q':
case KEY_EXIT:
- vlc_object_kill( p_intf->p_libvlc );
- return 0;
+ libvlc_Quit( p_intf->p_libvlc );
+ i_ret = 0;
+ break;
/* Box switching */
case 'i':
else
p_sys->i_box_type = BOX_INFO;
p_sys->i_box_lines_total = 0;
- return 1;
+ break;
case 'm':
if( p_sys->i_box_type == BOX_META )
p_sys->i_box_type = BOX_NONE;
else
p_sys->i_box_type = BOX_META;
p_sys->i_box_lines_total = 0;
- return 1;
+ break;
case 'L':
if( p_sys->i_box_type == BOX_LOG )
p_sys->i_box_type = BOX_NONE;
else
p_sys->i_box_type = BOX_LOG;
- return 1;
+ break;
case 'P':
if( p_sys->i_box_type == BOX_PLAYLIST )
p_sys->i_box_type = BOX_NONE;
else
p_sys->i_box_type = BOX_PLAYLIST;
- return 1;
+ break;
case 'B':
if( p_sys->i_box_type == BOX_BROWSE )
p_sys->i_box_type = BOX_NONE;
else
p_sys->i_box_type = BOX_BROWSE;
- return 1;
+ break;
case 'x':
if( p_sys->i_box_type == BOX_OBJECTS )
p_sys->i_box_type = BOX_NONE;
else
p_sys->i_box_type = BOX_OBJECTS;
- return 1;
+ break;
case 'S':
if( p_sys->i_box_type == BOX_STATS )
p_sys->i_box_type = BOX_NONE;
else
p_sys->i_box_type = BOX_STATS;
- return 1;
+ break;
case 'c':
p_sys->b_color = !p_sys->b_color;
if( p_sys->b_color && !p_sys->b_color_started )
start_color_and_pairs( p_intf );
- return 1;
+ break;
case 'h':
case 'H':
if( p_sys->i_box_type == BOX_HELP )
else
p_sys->i_box_type = BOX_HELP;
p_sys->i_box_lines_total = 0;
- return 1;
+ break;
case '/':
if( p_sys->i_box_type != BOX_SEARCH )
{
- if( p_sys->psz_search_chain == NULL )
+ if( p_sys->psz_search_chain )
{
- return 1;
+ p_sys->psz_search_chain[0] = '\0';
+ p_sys->b_box_plidx_follow = false;
+ p_sys->i_before_search = p_sys->i_box_plidx;
+ p_sys->i_box_type = BOX_SEARCH;
}
- p_sys->psz_search_chain[0] = '\0';
- p_sys->b_box_plidx_follow = false;
- p_sys->i_before_search = p_sys->i_box_plidx;
- p_sys->i_box_type = BOX_SEARCH;
}
- return 1;
+ break;
case 'A': /* Open */
if( p_sys->i_box_type != BOX_OPEN )
{
- if( p_sys->psz_open_chain == NULL )
+ if( p_sys->psz_open_chain )
{
- return 1;
+ p_sys->psz_open_chain[0] = '\0';
+ p_sys->i_box_type = BOX_OPEN;
}
- p_sys->psz_open_chain[0] = '\0';
- p_sys->i_box_type = BOX_OPEN;
}
- return 1;
+ break;
/* Navigation */
case KEY_RIGHT:
p_sys->f_slider += 1.0;
if( p_sys->f_slider > 99.9 ) p_sys->f_slider = 99.9;
ManageSlider( p_intf );
- return 1;
+ break;
case KEY_LEFT:
p_sys->f_slider -= 1.0;
if( p_sys->f_slider < 0.0 ) p_sys->f_slider = 0.0;
ManageSlider( p_intf );
- return 1;
+ break;
/* Common control */
case 'f':
{
+ bool fs = var_ToggleBool( p_playlist, "fullscreen" );
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 );
+ vout_thread_t *p_vout = input_GetVout( p_intf->p_sys->p_input );
if( p_vout )
{
- var_Get( p_vout, "fullscreen", &val );
- val.b_bool = !val.b_bool;
- var_Set( p_vout, "fullscreen", val );
+ var_SetBool( p_vout, "fullscreen", fs );
vlc_object_release( p_vout );
}
- else
- {
- var_Get( p_playlist, "fullscreen", &val );
- val.b_bool = !val.b_bool;
- var_Set( p_playlist, "fullscreen", val );
- }
}
- return 0;
+ i_ret = 0;
+ break;
}
case ' ':
PlayPause( p_intf );
- return 1;
+ break;
case 's':
playlist_Stop( p_playlist );
- return 1;
+ break;
case 'e':
Eject( p_intf );
- return 1;
+ break;
case '[':
if( p_sys->p_input )
- {
- val.b_bool = true;
- var_Set( p_sys->p_input, "prev-title", val );
- }
- return 1;
+ var_TriggerCallback( p_sys->p_input, "prev-title" );
+ break;
case ']':
if( p_sys->p_input )
- {
- val.b_bool = true;
- var_Set( p_sys->p_input, "next-title", val );
- }
- return 1;
+ var_TriggerCallback( p_sys->p_input, "next-title" );
+ break;
case '<':
if( p_sys->p_input )
- {
- val.b_bool = true;
- var_Set( p_sys->p_input, "prev-chapter", val );
- }
- return 1;
+ var_TriggerCallback( p_sys->p_input, "prev-chapter" );
+ break;
case '>':
if( p_sys->p_input )
- {
- val.b_bool = true;
- var_Set( p_sys->p_input, "next-chapter", val );
- }
- return 1;
+ var_TriggerCallback( p_sys->p_input, "next-chapter" );
+ break;
case 'p':
playlist_Prev( p_playlist );
clear();
- return 1;
+ break;
case 'n':
playlist_Next( p_playlist );
clear();
- return 1;
+ break;
case 'a':
- aout_VolumeUp( p_intf, 1, NULL );
+ aout_VolumeUp( p_playlist, 1, NULL );
clear();
- return 1;
+ break;
case 'z':
- aout_VolumeDown( p_intf, 1, NULL );
+ aout_VolumeDown( p_playlist, 1, NULL );
clear();
- return 1;
+ break;
/*
* ^l should clear and redraw the screen
case KEY_CLEAR:
case 0x0c: /* ^l */
clear();
- return 1;
+ break;
default:
- return 0;
+ i_ret = 0;
}
+
+end:
+ return i_ret;
}
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)",
- p_obj->psz_object_type, p_obj->psz_object_name,
- p_obj->i_object_id );
- 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++ )
+ char *psz_name = vlc_object_get_name( p_obj );
+ if( psz_name )
{
- 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, "%s \"%s\" (%p)",
+ p_obj->psz_object_type, psz_name, p_obj );
+ free( psz_name );
}
+ else
+ MainBoxWrite( p_intf, (*l)++, 1 + 2 * i_level, "%s (%o)",
+ p_obj->psz_object_type, p_obj );
- vlc_object_release( 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 == list->i_count - 1 ? "`-" : "|-" );
+ DumpObject( p_intf, l, list->p_values[i].p_object, i_level + 1 );
+ }
+ 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 );
memset( psz_title, ' ', mid );
if( p_sys->b_color )
wcolor_set( p_sys->w, C_TITLE, NULL );
- snprintf( &psz_title[mid], i_size, "VLC media player "PACKAGE_VERSION );
+ strlcpy( &psz_title[mid], "VLC media player "PACKAGE_VERSION, i_size );
mvnprintw( y, 0, COLS, "%s", psz_title );
attroff( A_REVERSE );
y += 2;
char buf1[MSTRTIME_MAX_SIZE];
char buf2[MSTRTIME_MAX_SIZE];
vlc_value_t val;
- vlc_value_t val_list;
/* Source */
char *psz_uri = input_item_GetURI( input_GetItem( p_input ) );
{
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 );
/* Position */
var_Get( p_input, "time", &val );
- msecstotimestr( buf1, val.i_time / 1000 );
+ secstotimestr( buf1, val.i_time / CLOCK_FREQ );
var_Get( p_input, "length", &val );
- msecstotimestr( buf2, val.i_time / 1000 );
+ secstotimestr( buf2, val.i_time / CLOCK_FREQ );
mvnprintw( y++, 0, COLS, _(" Position : %s/%s (%.2f%%)"), buf1, buf2, p_sys->f_slider );
/* Volume */
- aout_VolumeGet( p_intf, &i_volume );
+ aout_VolumeGet( p_playlist, &i_volume );
mvnprintw( y++, 0, COLS, _(" Volume : %i%%"), i_volume*200/AOUT_VOLUME_MAX );
/* Title */
if( !var_Get( p_input, "title", &val ) )
{
- var_Change( p_input, "title", VLC_VAR_GETCHOICES, &val_list, NULL );
- if( val_list.p_list->i_count > 0 )
- {
- mvnprintw( y++, 0, COLS, _(" Title : %d/%d"), val.i_int, val_list.p_list->i_count );
- }
- var_Change( p_input, "title", VLC_VAR_FREELIST, &val_list, NULL );
+ int i_title_count = var_CountChoices( p_input, "title" );
+ if( i_title_count > 0 )
+ mvnprintw( y++, 0, COLS, _(" Title : %"PRId64"/%d"),
+ val.i_int, i_title_count );
}
/* Chapter */
if( !var_Get( p_input, "chapter", &val ) )
{
- var_Change( p_input, "chapter", VLC_VAR_GETCHOICES, &val_list, NULL );
- if( val_list.p_list->i_count > 0 )
- {
- mvnprintw( y++, 0, COLS, _(" Chapter : %d/%d"), val.i_int, val_list.p_list->i_count );
- }
- var_Change( p_input, "chapter", VLC_VAR_FREELIST, &val_list, NULL );
+ int i_chapter_count = var_CountChoices( p_input, "chapter" );
+ if( i_chapter_count > 0 )
+ mvnprintw( y++, 0, COLS, _(" Chapter : %"PRId64"/%d"),
+ val.i_int, i_chapter_count );
}
}
else
for( i=0; i<VLC_META_TYPE_COUNT; i++ )
{
if( y >= y_end ) break;
- char *psz_meta = p_item->p_meta->ppsz_meta[i];
+ const char *psz_meta = vlc_meta_Get( p_item->p_meta, i );
if( psz_meta && *psz_meta )
{
const char *psz_meta_title;
}
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 )
{
MainBoxWrite( p_intf, l, 1, _("+-[Incoming]"));
SHOW_ACS( 1, ACS_ULCORNER ); SHOW_ACS( 2, ACS_HLINE ); l++;
if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL );
- MainBoxWrite( p_intf, l, 1, _("| input bytes read : %8.0f kB"),
- (float)(p_item->p_stats->i_read_bytes)/1000 );
+ MainBoxWrite( p_intf, l, 1, _("| input bytes read : %8.0f KiB"),
+ (float)(p_item->p_stats->i_read_bytes)/1024 );
SHOW_ACS( 1, ACS_VLINE ); l++;
MainBoxWrite( p_intf, l, 1, _("| input bitrate : %6.0f kb/s"),
(float)(p_item->p_stats->f_input_bitrate)*8000 );
- MainBoxWrite( p_intf, l, 1, _("| demux bytes read : %8.0f kB"),
- (float)(p_item->p_stats->i_demux_read_bytes)/1000 );
+ MainBoxWrite( p_intf, l, 1, _("| demux bytes read : %8.0f KiB"),
+ (float)(p_item->p_stats->i_demux_read_bytes)/1024 );
SHOW_ACS( 1, ACS_VLINE ); l++;
MainBoxWrite( p_intf, l, 1, _("| demux bitrate : %6.0f kb/s"),
(float)(p_item->p_stats->f_demux_bitrate)*8000 );
- SHOW_ACS( 1, ACS_VLINE ); l++; SHOW_ACS( 1, ACS_VLINE ); l++;
+ SHOW_ACS( 1, ACS_VLINE ); l++;
+ DrawEmptyLine( p_sys->w, p_sys->i_box_y + l - p_sys->i_box_start, 1, COLS - 2 );
+ SHOW_ACS( 1, ACS_VLINE ); l++;
/* Video */
if( i_video )
MainBoxWrite( p_intf, l, 1, _("+-[Video Decoding]"));
SHOW_ACS( 1, ACS_LTEE ); SHOW_ACS( 2, ACS_HLINE ); l++;
if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL );
- MainBoxWrite( p_intf, l, 1, _("| video decoded : %5i"),
+ MainBoxWrite( p_intf, l, 1, _("| video decoded : %"PRId64),
p_item->p_stats->i_decoded_video );
SHOW_ACS( 1, ACS_VLINE ); l++;
- MainBoxWrite( p_intf, l, 1, _("| frames displayed : %5i"),
+ MainBoxWrite( p_intf, l, 1, _("| frames displayed : %"PRId64),
p_item->p_stats->i_displayed_pictures );
SHOW_ACS( 1, ACS_VLINE ); l++;
- MainBoxWrite( p_intf, l, 1, _("| frames lost : %5i"),
+ MainBoxWrite( p_intf, l, 1, _("| frames lost : %"PRId64),
p_item->p_stats->i_lost_pictures );
- SHOW_ACS( 1, ACS_VLINE ); l++; SHOW_ACS( 1, ACS_VLINE ); l++;
+ SHOW_ACS( 1, ACS_VLINE ); l++;
+ DrawEmptyLine( p_sys->w, p_sys->i_box_y + l - p_sys->i_box_start, 1, COLS - 2 );
+ SHOW_ACS( 1, ACS_VLINE ); l++;
}
/* Audio*/
if( i_audio )
MainBoxWrite( p_intf, l, 1, _("+-[Audio Decoding]"));
SHOW_ACS( 1, ACS_LTEE ); SHOW_ACS( 2, ACS_HLINE ); l++;
if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL );
- MainBoxWrite( p_intf, l, 1, _("| audio decoded : %5i"),
+ MainBoxWrite( p_intf, l, 1, _("| audio decoded : %"PRId64),
p_item->p_stats->i_decoded_audio );
SHOW_ACS( 1, ACS_VLINE ); l++;
- MainBoxWrite( p_intf, l, 1, _("| buffers played : %5i"),
+ MainBoxWrite( p_intf, l, 1, _("| buffers played : %"PRId64),
p_item->p_stats->i_played_abuffers );
SHOW_ACS( 1, ACS_VLINE ); l++;
- MainBoxWrite( p_intf, l, 1, _("| buffers lost : %5i"),
+ MainBoxWrite( p_intf, l, 1, _("| buffers lost : %"PRId64),
p_item->p_stats->i_lost_abuffers );
- SHOW_ACS( 1, ACS_VLINE ); l++; SHOW_ACS( 1, ACS_VLINE ); l++;
+ SHOW_ACS( 1, ACS_VLINE ); l++;
+ DrawEmptyLine( p_sys->w, p_sys->i_box_y + l - p_sys->i_box_start, 1, COLS - 2 );
+ SHOW_ACS( 1, ACS_VLINE ); l++;
}
/* Sout */
if( p_sys->b_color ) wcolor_set( p_sys->w, C_CATEGORY, NULL );
if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL );
MainBoxWrite( p_intf, l, 1, _("| packets sent : %5i"), p_item->p_stats->i_sent_packets );
SHOW_ACS( 1, ACS_VLINE ); l++;
- MainBoxWrite( p_intf, l, 1, _("| bytes sent : %8.0f kB"),
- (float)(p_item->p_stats->i_sent_bytes)/1000 );
+ MainBoxWrite( p_intf, l, 1, _("| bytes sent : %8.0f KiB"),
+ (float)(p_item->p_stats->i_sent_bytes)/1024 );
SHOW_ACS( 1, ACS_VLINE ); l++;
MainBoxWrite( p_intf, l, 1, _("\\ sending bitrate : %6.0f kb/s"),
(float)(p_item->p_stats->f_send_bitrate*8)*1000 );
}
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 )
{
}
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;
+ assert( p_item );
+ playlist_item_t *p_current_playing_item = playlist_CurrentPlayingItem(p_playlist);
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_current_playing_item &&
+ p_item->p_input == p_current_playing_item->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( p_input2 )
+ vlc_object_release( p_input2 );
if( y >= y_end ) break;
if( b_selected )
DrawEmptyLine( p_sys->w, 7, 1, COLS-2 );
if( p_sys->psz_search_chain )
{
- if( strlen( p_sys->psz_search_chain ) == 0 &&
+ if( *p_sys->psz_search_chain == '\0' &&
p_sys->psz_old_search != NULL )
{
/* Searching next entry */
{
intf_sys_t *p_sys = p_intf->p_sys;
playlist_t *p_playlist = pl_Get( p_intf );
+ playlist_item_t *p_item;
switch( p_sys->i_current_view )
{
case VIEW_CATEGORY:
- return p_playlist->p_root_category;
+ p_item = p_playlist->p_root_category;
+ break;
default:
- return p_playlist->p_root_onelevel;
+ p_item = p_playlist->p_root_onelevel;
}
+ return p_item;
}
static void PlaylistRebuild( intf_thread_t *p_intf )
{
char *psz_display;
p_child = p_node->pp_children[k];
- char *psz_name = input_item_GetTitle( p_child->p_input );
- if( !psz_name || !*psz_name )
- {
- free( psz_name );
- psz_name = input_item_GetName( p_child->p_input );
- }
+ char *psz_name = input_item_GetTitleFbName( p_child->p_input );
if( c && *c )
{
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 );
intf_thread_t *p_intf = (intf_thread_t *)param;
playlist_t *p_playlist = pl_Get( 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;
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_Get( p_intf );
- playlist_item_t *p_played_item = p_playlist->status.p_item;
+ 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 )
{
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 )
playlist_t * p_playlist = pl_Get( p_intf );
PL_LOCK;
- if( p_playlist->status.p_item == NULL )
+ if( playlist_CurrentPlayingItem(p_playlist) == NULL )
{
PL_UNLOCK;
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( !strncmp(psz_name, "dvd://", 4) )
+ if( !strncmp(psz_name, "dvd://", 6) )
{
- switch( psz_name[strlen("dvd://")] )
+ switch( psz_name[6] )
{
case '\0':
case '@':
break;
}
}
- else if( !strncmp(psz_name, VCD_MRL, strlen(VCD_MRL)) )
+ else if( !strncmp(psz_name, "vcd://", 6) )
{
- switch( psz_name[strlen(VCD_MRL)] )
+ switch( psz_name[6] )
{
case '\0':
case '@':
- psz_device = config_GetPsz( p_intf, VCD_MRL );
+ psz_device = config_GetPsz( p_intf, "vcd" );
break;
default:
/* Omit the beginning MRL-selector characters */
- psz_device = strdup( psz_name + strlen(VCD_MRL) );
+ psz_device = strdup( psz_name + 6 );
break;
}
}
- else if( !strncmp(psz_name, CDDA_MRL, strlen(CDDA_MRL) ) )
+ else if( !strncmp(psz_name, "cdda://", 7 ) )
{
- switch( psz_name[strlen(CDDA_MRL)] )
+ switch( psz_name[7] )
{
case '\0':
case '@':
break;
default:
/* Omit the beginning MRL-selector characters */
- psz_device = strdup( psz_name + strlen(CDDA_MRL) );
+ psz_device = strdup( psz_name + 7 );
break;
}
}
}
/* Remove what we have after @ */
- psz_parser = psz_device;
for( psz_parser = psz_device ; *psz_parser ; psz_parser++ )
{
if( *psz_parser == '@' )
}
free( psz_device );
- return;
}
static int comp_dir_entries( const void *pp_dir_entry1,
char *psz_entry;
/* Open the dir */
- p_current_dir = utf8_opendir( p_sys->psz_current_dir );
+ p_current_dir = vlc_opendir( p_sys->psz_current_dir );
if( p_current_dir == NULL )
{
p_sys->i_dir_entries = 0;
/* while we still have entries in the directory */
- while( ( psz_entry = utf8_readdir( p_current_dir ) ) != NULL )
+ while( ( psz_entry = vlc_readdir( p_current_dir ) ) != 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( 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 );
+ if( asprintf( &psz_uri, "%s/%s", p_sys->psz_current_dir,
+ psz_entry ) == -1)
+ {
+ free( psz_entry );
+ continue;
+ }
if( !( p_dir_entry = malloc( sizeof( struct dir_entry_t) ) ) )
{
}
#if defined( S_ISDIR )
- if( !utf8_stat( psz_uri, &stat_data )
+ if( !vlc_stat( psz_uri, &stat_data )
&& S_ISDIR(stat_data.st_mode) )
/*#elif defined( DT_DIR )
if( p_dir_content->d_type & DT_DIR )*/