X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fncurses.c;h=67afea88991a953f8e2d594ba8a08b6580a4a825;hb=08d89300a6a09b812a406ecdf12c598fdf581d5d;hp=f533ff43fc3fdd15692292afc3550fb05f65034c;hpb=6cf973e6fb09b9033440754f9b3813f1804c94e0;p=vlc diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c index f533ff43fc..67afea8899 100644 --- a/modules/gui/ncurses.c +++ b/modules/gui/ncurses.c @@ -38,10 +38,12 @@ # include "config.h" #endif -#include +#include +#include #ifdef HAVE_NCURSESW # define _XOPEN_SOURCE_EXTENDED 1 +# include #endif #include @@ -51,9 +53,12 @@ #include #include #include +#include #include #include +#include + #ifdef HAVE_SYS_STAT_H # include #endif @@ -96,9 +101,8 @@ static void PlaylistAddNode( intf_thread_t *, playlist_item_t *, int, const 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 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 ); @@ -116,16 +120,16 @@ static void start_color_and_pairs ( intf_thread_t * ); "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, VLC_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 @@ -167,7 +171,7 @@ enum }; struct dir_entry_t { - vlc_bool_t b_file; + bool b_file; char *psz_path; }; struct pl_item_t @@ -178,9 +182,10 @@ struct pl_item_t struct intf_sys_t { input_thread_t *p_input; + playlist_t *p_playlist; - vlc_bool_t b_color; - vlc_bool_t b_color_started; + bool b_color; + bool b_color_started; float f_slider; float f_slider_old; @@ -215,17 +220,15 @@ struct intf_sys_t char *psz_current_dir; int i_dir_entries; struct dir_entry_t **pp_dir_entries; - vlc_bool_t b_show_hidden_files; + bool b_show_hidden_files; int i_current_view; /* playlist view */ struct pl_item_t **pp_plist; int i_plist_entries; - vlc_bool_t b_need_update; /* for playlist view */ - - int i_verbose; /* stores verbosity level */ + bool b_need_update; /* for playlist view */ }; -static void DrawBox( WINDOW *win, int y, int x, int h, int w, const char *title, vlc_bool_t b_color ); +static void DrawBox( WINDOW *win, int y, int x, int h, int w, const char *title, bool b_color ); static void DrawLine( WINDOW *win, int y, int x, int w ); static void DrawEmptyLine( WINDOW *win, int y, int x, int w ); @@ -236,10 +239,11 @@ static int Open( vlc_object_t *p_this ) { 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; @@ -248,13 +252,13 @@ static int Open( vlc_object_t *p_this ) p_sys->i_box_lines = 0; p_sys->i_box_start= 0; p_sys->i_box_lines_total = 0; - p_sys->b_box_plidx_follow = VLC_TRUE; - p_sys->b_box_cleared = VLC_FALSE; + p_sys->b_box_plidx_follow = true; + p_sys->b_box_cleared = false; p_sys->i_box_plidx = 0; p_sys->i_box_bidx = 0; - p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL ); - p_sys->b_color = p_this->p_libvlc->b_color; - p_sys->b_color_started = VLC_FALSE; +// FIXME p_sys->p_sub = msg_Subscribe( p_intf ); + p_sys->b_color = var_CreateGetBool( p_intf, "color" ); + p_sys->b_color_started = false; #ifndef HAVE_NCURSESW memset( p_sys->psz_partial_keys, 0, sizeof( p_sys->psz_partial_keys ) ); @@ -283,44 +287,36 @@ static int Open( vlc_object_t *p_this ) /* 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->pp_plist = NULL; p_sys->i_plist_entries = 0; - p_sys->b_need_update = VLC_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 = config_GetUserDir( VLC_HOME_DIR ); + free( psz_tmp ); } p_sys->i_dir_entries = 0; p_sys->pp_dir_entries = NULL; - p_sys->b_show_hidden_files = VLC_FALSE; + p_sys->b_show_hidden_files = false; ReadDir( p_intf ); return VLC_SUCCESS; @@ -333,19 +329,14 @@ static void Close( vlc_object_t *p_this ) { 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; @@ -364,12 +355,7 @@ static void Close( vlc_object_t *p_this ) /* 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 ); @@ -381,10 +367,12 @@ static void Close( vlc_object_t *p_this ) 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 @@ -394,41 +382,35 @@ static void Run( intf_thread_t *p_intf ) * 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 ) { vlc_object_release( p_sys->p_input ); p_sys->p_input = NULL; p_sys->f_slider = p_sys->f_slider_old = 0.0; - p_sys->b_box_cleared = VLC_FALSE; + 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 ) { /* @@ -444,7 +426,7 @@ static void Run( intf_thread_t *p_intf ) { clear(); Redraw( p_intf, &t_last_refresh ); - p_sys->b_box_cleared = VLC_TRUE; + p_sys->b_box_cleared = true; } /* @@ -456,6 +438,9 @@ static void Run( intf_thread_t *p_intf ) 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 */ @@ -465,7 +450,7 @@ static void start_color_and_pairs( intf_thread_t *p_intf ) if( !has_colors() ) { - p_intf->p_sys->b_color = VLC_FALSE; + p_intf->p_sys->b_color = false; msg_Warn( p_intf, "Terminal doesn't support colors" ); return; } @@ -508,7 +493,7 @@ static void start_color_and_pairs( intf_thread_t *p_intf ) /* Folder (BOX_BROWSE) */ init_pair( C_FOLDER, COLOR_RED, COLOR_BLACK ); - p_intf->p_sys->b_color_started = VLC_TRUE; + p_intf->p_sys->b_color_started = true; } #ifndef HAVE_NCURSESW @@ -563,47 +548,41 @@ static inline int RemoveLastUTF8Entity( char *psz, int len ) static int HandleKey( intf_thread_t *p_intf, int i_key ) { intf_sys_t *p_sys = p_intf->p_sys; - vlc_value_t val; - playlist_t *p_playlist = pl_Get( p_intf ); + int i_ret = 1; + + playlist_t *p_playlist = pl_Hold( p_intf ); if( p_sys->i_box_type == BOX_PLAYLIST ) { - int b_ret = VLC_TRUE; - vlc_bool_t b_box_plidx_follow = VLC_FALSE; + int b_ret = true; + bool b_box_plidx_follow = false; 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': playlist_RecursiveNodeSort( p_playlist, PlaylistGetRoot( p_intf ), SORT_TITLE_NODES_FIRST, ORDER_NORMAL ); - p_sys->b_need_update = VLC_TRUE; - return 1; + p_sys->b_need_update = true; + goto end; case 'O': playlist_RecursiveNodeSort( p_playlist, PlaylistGetRoot( p_intf ), SORT_TITLE_NODES_FIRST, ORDER_REVERSE ); - p_sys->b_need_update = VLC_TRUE; - return 1; + p_sys->b_need_update = true; + goto end; /* Playlist view */ case 'v': @@ -615,13 +594,13 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) default: p_sys->i_current_view = VIEW_CATEGORY; } - //p_sys->b_need_update = VLC_TRUE; + //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; @@ -658,12 +637,12 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) if( p_item->i_children == -1 ) { playlist_DeleteFromInput( p_playlist, - p_item->p_input->i_id, VLC_TRUE ); + p_item->p_input, pl_Locked ); } else { playlist_NodeDelete( p_playlist, p_item, - VLC_TRUE , VLC_FALSE ); + true , false ); } PL_UNLOCK; PlaylistRebuild( p_intf ); @@ -675,7 +654,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) case '\n': if( !p_sys->pp_plist[p_sys->i_box_plidx] ) { - b_ret = VLC_FALSE; + b_ret = false; break; } if( p_sys->pp_plist[p_sys->i_box_plidx]->p_item->i_children @@ -690,7 +669,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) while( p_parent->p_parent ) p_parent = p_parent->p_parent; playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, - VLC_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 ) @@ -701,13 +680,13 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) else { p_sys->p_node = p_sys->pp_plist[p_sys->i_box_plidx]->p_item; - playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VLC_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 = VLC_TRUE; + b_box_plidx_follow = true; break; default: - b_ret = VLC_FALSE; + b_ret = false; break; } @@ -716,16 +695,19 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) 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 ) ) - b_box_plidx_follow = VLC_TRUE; + + 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 ) { - vlc_bool_t b_ret = VLC_TRUE; + bool b_ret = true; /* Browser navigation */ switch( i_key ) { @@ -752,7 +734,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) break; case '.': /* Toggle show hidden files */ p_sys->b_show_hidden_files = ( p_sys->b_show_hidden_files == - VLC_TRUE ? VLC_FALSE : VLC_TRUE ); + true ? false : true ); ReadDir( p_intf ); break; @@ -762,53 +744,55 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) 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 - , VLC_FALSE ); + , false ); p_sys->i_box_type = BOX_PLAYLIST; free( psz_uri ); } 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: - b_ret = VLC_FALSE; + b_ret = false; break; } if( b_ret ) { 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 || @@ -819,33 +803,33 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) { 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; } @@ -857,24 +841,24 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) 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; @@ -888,7 +872,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) case KEY_CLEAR: case 0x0c: /* ^l */ clear(); - return 1; + goto end; case KEY_ENTER: case '\r': case '\n': @@ -901,7 +885,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) 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. @@ -912,16 +896,19 @@ static int HandleKey( intf_thread_t *p_intf, int i_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 ); @@ -953,7 +940,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) 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 ) { @@ -964,37 +951,42 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) 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 - , VLC_FALSE ); + , false ); - p_sys->b_box_plidx_follow = VLC_TRUE; + 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 ); @@ -1020,10 +1012,9 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) free( psz_utf8 ); } #endif - break; } } - return 1; + goto end; } @@ -1032,12 +1023,16 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) { 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': @@ -1046,49 +1041,49 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) 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 ) @@ -1096,44 +1091,42 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) 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 = VLC_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': @@ -1145,84 +1138,69 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) VLC_OBJECT_VOUT, FIND_CHILD ); if( p_vout ) { - var_Get( p_vout, "fullscreen", &val ); - val.b_bool = !val.b_bool; - var_Set( p_vout, "fullscreen", val ); + var_ToggleBool( p_vout, "fullscreen" ); vlc_object_release( p_vout ); } else { - var_Get( p_playlist, "fullscreen", &val ); - val.b_bool = !val.b_bool; - var_Set( p_playlist, "fullscreen", val ); + var_ToggleBool( p_playlist, "fullscreen" ); } } - 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 = VLC_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 = VLC_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 = VLC_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 = VLC_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 @@ -1230,11 +1208,15 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) case KEY_CLEAR: case 0x0c: /* ^l */ clear(); - return 1; + break; default: - return 0; + i_ret = 0; } + +end: + pl_Release( p_intf ); + return i_ret; } static void ManageSlider( intf_thread_t *p_intf ) @@ -1325,27 +1307,30 @@ static void mvnprintw( int y, int x, int w, const char *p_fmt, ... ) 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 ); @@ -1412,6 +1397,7 @@ static void mvnprintw( int y, int x, int w, const char *p_fmt, ... ) mvprintw( y, x, "%s", p_buf ); mvhline( y, x + i_width, ' ', w - i_width ); } + #else if( i_len > w ) { @@ -1442,6 +1428,7 @@ static void mvnprintw( int y, int x, int w, const char *p_fmt, ... ) 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, ... ) { @@ -1460,47 +1447,39 @@ 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)", + /*if( p_obj->psz_object_name ) + 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 ); - 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++ ) + p_obj ); + else*/ + 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_Get( 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 ); @@ -1533,7 +1512,6 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) 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 ) ); @@ -1550,10 +1528,6 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) { 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 ); @@ -1573,29 +1547,23 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) 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 : %d/%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 : %d/%d"), val.i_int, i_chapter_count ); } } else @@ -1785,14 +1753,8 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) /* Meta data box */ int l = 0; - int i_len = strlen( VLC_META_INFO_CAT ); - char psz_title[i_len + 3]; - psz_title[0] = ' '; - psz_title[1] = '\0'; - strcat( &psz_title[1], VLC_META_INFO_CAT ); - psz_title[i_len + 1] = ' '; - psz_title[i_len + 2] = '\0'; - DrawBox( p_sys->w, y++, 0, h, COLS, psz_title, p_sys->b_color ); + DrawBox( p_sys->w, y++, 0, h, COLS, _("Meta-information"), + p_sys->b_color ); if( p_input ) { @@ -1817,9 +1779,9 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) case 3: psz_meta_title = VLC_META_COPYRIGHT; break; case 4: - psz_meta_title = VLC_META_COLLECTION; break; + psz_meta_title = VLC_META_ALBUM; break; case 5: - psz_meta_title = VLC_META_SEQ_NUM; break; + psz_meta_title = VLC_META_TRACK_NUMBER; break; case 6: psz_meta_title = VLC_META_DESCRIPTION; break; case 7: @@ -1876,12 +1838,15 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) } 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 ); @@ -1903,7 +1868,7 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) 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", @@ -1917,6 +1882,7 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) 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 ) { @@ -1954,7 +1920,7 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) for( i_item = i_start; i_item < i_stop; i_item++ ) { - vlc_bool_t b_selected = ( p_sys->i_box_bidx == i_item ); + bool b_selected = ( p_sys->i_box_bidx == i_item ); if( y >= y_end ) break; if( b_selected ) @@ -1963,7 +1929,7 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) } if( p_sys->b_color && !p_sys->pp_dir_entries[i_item]->b_file ) wcolor_set( p_sys->w, C_FOLDER, NULL ); - 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 == true ? ' ' : '+', p_sys->pp_dir_entries[i_item]->psz_path ); if( p_sys->b_color && !p_sys->pp_dir_entries[i_item]->b_file ) wcolor_set( p_sys->w, C_DEFAULT, NULL ); @@ -2001,54 +1967,111 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) vlc_mutex_lock( &p_item->lock ); vlc_mutex_lock( &p_item->p_stats->lock ); + int i_audio = 0; + int i_video = 0; + int i; + + if( !p_item->i_es ) + i_video = i_audio = 1; + else + for( i = 0; i < p_item->i_es ; i++ ) + { + i_audio += ( p_item->es[i]->i_cat == AUDIO_ES ); + i_video += ( p_item->es[i]->i_cat == VIDEO_ES ); + } + + int l = 0; + +#define SHOW_ACS(x,c) \ + if(l >= p_sys->i_box_start && l - p_sys->i_box_start < p_sys->i_box_lines) \ + mvaddch( p_sys->i_box_y - p_sys->i_box_start + l, x, c ) + /* Input */ if( p_sys->b_color ) wcolor_set( p_sys->w, C_CATEGORY, NULL ); - mvnprintw( y++, 1, COLS-2, _("+-[Incoming]")); + 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 ); - mvnprintw( y++, 1, COLS-2, _("| input bytes read : %8.0f kB"), + MainBoxWrite( p_intf, l, 1, _("| input bytes read : %8.0f kB"), (float)(p_item->p_stats->i_read_bytes)/1000 ); - mvnprintw( y++, 1, COLS-2, _("| input bitrate : %6.0f kb/s"), + 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 ); - mvnprintw( y++, 1, COLS-2,_("| demux bytes read : %8.0f kB"), + MainBoxWrite( p_intf, l, 1, _("| demux bytes read : %8.0f kB"), (float)(p_item->p_stats->i_demux_read_bytes)/1000 ); - mvnprintw( y++, 1, COLS-2,_("| demux bitrate : %6.0f kb/s"), + 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 ); - mvnprintw( y++, 1, COLS-2,"|"); + 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( p_sys->b_color ) wcolor_set( p_sys->w, C_CATEGORY, NULL ); - mvnprintw( y++, 1, COLS-2,_("+-[Video Decoding]")); - if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL ); - mvnprintw( y++, 1, COLS-2,_("| video decoded : %5i"), - p_item->p_stats->i_decoded_video ); - mvnprintw( y++, 1, COLS-2,_("| frames displayed : %5i"), - p_item->p_stats->i_displayed_pictures ); - mvnprintw( y++, 1, COLS-2,_("| frames lost : %5i"), - p_item->p_stats->i_lost_pictures ); - mvnprintw( y++, 1, COLS-2,"|"); + if( i_video ) + { + if( p_sys->b_color ) wcolor_set( p_sys->w, C_CATEGORY, NULL ); + 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"), + p_item->p_stats->i_decoded_video ); + SHOW_ACS( 1, ACS_VLINE ); l++; + MainBoxWrite( p_intf, l, 1, _("| frames displayed : %5i"), + p_item->p_stats->i_displayed_pictures ); + SHOW_ACS( 1, ACS_VLINE ); l++; + MainBoxWrite( p_intf, l, 1, _("| frames lost : %5i"), + p_item->p_stats->i_lost_pictures ); + 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( p_sys->b_color ) wcolor_set( p_sys->w, C_CATEGORY, NULL ); - mvnprintw( y++, 1, COLS-2,_("+-[Audio Decoding]")); - if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL ); - mvnprintw( y++, 1, COLS-2,_("| audio decoded : %5i"), - p_item->p_stats->i_decoded_audio ); - mvnprintw( y++, 1, COLS-2,_("| buffers played : %5i"), - p_item->p_stats->i_played_abuffers ); - mvnprintw( y++, 1, COLS-2,_("| buffers lost : %5i"), - p_item->p_stats->i_lost_abuffers ); - mvnprintw( y++, 1, COLS-2,"|"); + if( i_audio ) + { + if( p_sys->b_color ) wcolor_set( p_sys->w, C_CATEGORY, NULL ); + 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"), + p_item->p_stats->i_decoded_audio ); + SHOW_ACS( 1, ACS_VLINE ); l++; + MainBoxWrite( p_intf, l, 1, _("| buffers played : %5i"), + p_item->p_stats->i_played_abuffers ); + SHOW_ACS( 1, ACS_VLINE ); l++; + MainBoxWrite( p_intf, l, 1, _("| buffers lost : %5i"), + p_item->p_stats->i_lost_abuffers ); + 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 ); - mvnprintw( y++, 1, COLS-2,_("+-[Streaming]")); + MainBoxWrite( p_intf, l, 1, _("+-[Streaming]")); + SHOW_ACS( 1, ACS_LTEE ); SHOW_ACS( 2, ACS_HLINE ); l++; if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL ); - mvnprintw( y++, 1, COLS-2,_("| packets sent : %5i"), p_item->p_stats->i_sent_packets ); - mvnprintw( y++, 1, COLS-2,_("| bytes sent : %8.0f kB"), + 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 ); - mvnprintw( y++, 1, COLS-2,_("| sending bitrate : %6.0f kb/s"), + 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 ); + SHOW_ACS( 1, ACS_LLCORNER ); l++; if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL ); +#undef SHOW_ACS + + p_sys->i_box_lines_total = l; + if( p_sys->i_box_start >= p_sys->i_box_lines_total ) + p_sys->i_box_start = p_sys->i_box_lines_total - 1; + + if( l - p_sys->i_box_start < p_sys->i_box_lines ) + y += l - p_sys->i_box_start; + else + y += p_sys->i_box_lines; + vlc_mutex_unlock( &p_item->p_stats->lock ); vlc_mutex_unlock( &p_item->lock ); + } } else if( p_sys->i_box_type == BOX_PLAYLIST || @@ -2073,6 +2096,7 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) } 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 ) { @@ -2080,7 +2104,7 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) } 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; @@ -2113,17 +2137,26 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) for( i_item = i_start; i_item < i_stop; i_item++ ) { - vlc_bool_t b_selected = ( p_sys->i_box_plidx == i_item ); + bool b_selected = ( p_sys->i_box_plidx == i_item ); 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 ) @@ -2181,26 +2214,31 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) refresh(); *t_last_refresh = time( 0 ); + 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_Get( p_intf ); + playlist_t *p_playlist = pl_Hold( 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; } + 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_Get( p_intf ); + playlist_t *p_playlist = pl_Hold( p_intf ); PL_LOCK; @@ -2210,9 +2248,11 @@ static void PlaylistRebuild( intf_thread_t *p_intf ) /* Build the new one */ PlaylistAddNode( p_intf, PlaylistGetRoot( p_intf ), 0, "" ); - p_sys->b_need_update = VLC_FALSE; + p_sys->b_need_update = false; PL_UNLOCK; + + pl_Release( p_intf ); } static void PlaylistAddNode( intf_thread_t *p_intf, playlist_item_t *p_node, @@ -2226,12 +2266,7 @@ static void PlaylistAddNode( intf_thread_t *p_intf, playlist_item_t *p_node, { 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 ) { @@ -2259,7 +2294,7 @@ static void PlaylistAddNode( intf_thread_t *p_intf, playlist_item_t *p_node, 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 ); @@ -2273,24 +2308,25 @@ static int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable, 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_Get( p_intf ); - p_intf->p_sys->b_need_update = VLC_TRUE; - p_intf->p_sys->p_node = p_playlist->status.p_node; + playlist_t *p_playlist = pl_Hold( p_intf ); + p_intf->p_sys->b_need_update = true; + 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 vlc_bool_t 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; @@ -2298,37 +2334,40 @@ static void FindIndex( intf_thread_t *p_intf ) 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 ) @@ -2341,16 +2380,17 @@ static void Eject( intf_thread_t *p_intf ) * If it's neither of these, then return */ - playlist_t * p_playlist = pl_Get( 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; + 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 ) { @@ -2406,11 +2446,11 @@ static void Eject( intf_thread_t *p_intf ) if( psz_device == NULL ) { + pl_Release( p_intf ); return; } /* Remove what we have after @ */ - psz_parser = psz_device; for( psz_parser = psz_device ; *psz_parser ; psz_parser++ ) { if( *psz_parser == '@' ) @@ -2429,6 +2469,7 @@ static void Eject( intf_thread_t *p_intf ) } free( psz_device ); + pl_Release( p_intf ); return; } @@ -2485,11 +2526,9 @@ static void ReadDir( intf_thread_t *p_intf ) 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 == VLC_FALSE && + if( p_sys->b_show_hidden_files == false && ( strlen( psz_entry ) && psz_entry[0] == '.' ) && strcmp( psz_entry, ".." ) ) { @@ -2497,8 +2536,12 @@ static void ReadDir( intf_thread_t *p_intf ) 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) ) ) ) { @@ -2517,14 +2560,14 @@ static void ReadDir( intf_thread_t *p_intf ) #endif { p_dir_entry->psz_path = strdup( psz_entry ); - p_dir_entry->b_file = VLC_FALSE; + p_dir_entry->b_file = 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( psz_entry ); - p_dir_entry->b_file = VLC_TRUE; + p_dir_entry->b_file = true; INSERT_ELEM( p_sys->pp_dir_entries, p_sys->i_dir_entries, p_sys->i_dir_entries, p_dir_entry ); } @@ -2550,7 +2593,7 @@ static void ReadDir( intf_thread_t *p_intf ) static void PlayPause( intf_thread_t *p_intf ) { input_thread_t *p_input = p_intf->p_sys->p_input; - playlist_t *p_playlist = pl_Get( p_intf ); + playlist_t *p_playlist = pl_Hold( p_intf ); vlc_value_t val; if( p_input ) @@ -2568,12 +2611,14 @@ static void PlayPause( intf_thread_t *p_intf ) } else playlist_Play( p_playlist ); + + pl_Release( p_intf ); } /**************************************************************************** * ****************************************************************************/ -static void DrawBox( WINDOW *win, int y, int x, int h, int w, const char *title, vlc_bool_t b_color ) +static void DrawBox( WINDOW *win, int y, int x, int h, int w, const char *title, bool b_color ) { int i; int i_len;