X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fncurses.c;h=9f16757a3ff4efba63a0bba96917002ee283c456;hb=06825f81dea463b28b7fd0e3b59f47f69d46c919;hp=5140fc0d50a958e89a879393447b9af2fb623ca8;hpb=fc3815a7114f9fef7eb47e38903f33bfb10597b7;p=vlc diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c index 5140fc0d50..9f16757a3f 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 @@ -55,6 +57,8 @@ #include #include +#include + #ifdef HAVE_SYS_STAT_H # include #endif @@ -97,7 +101,7 @@ 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 *, +static inline bool PlaylistIsPlaying( intf_thread_t *, playlist_item_t * ); static void FindIndex ( intf_thread_t * ); static void SearchPlaylist ( intf_thread_t *, char * ); @@ -117,16 +121,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 @@ -168,7 +172,7 @@ enum }; struct dir_entry_t { - vlc_bool_t b_file; + bool b_file; char *psz_path; }; struct pl_item_t @@ -179,9 +183,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; @@ -216,17 +221,17 @@ 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 */ + 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, 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 ); @@ -241,6 +246,8 @@ static int Open( vlc_object_t *p_this ) /* 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; @@ -249,13 +256,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 ) ); @@ -295,33 +302,29 @@ static int Open( vlc_object_t *p_this ) 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 = strdup( config_GetHomeDir() ); + 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; @@ -334,19 +337,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; @@ -365,7 +363,7 @@ static void Close( vlc_object_t *p_this ) /* Close the ncurses interface */ endwin(); - msg_Unsubscribe( p_intf, p_sys->p_sub ); +// FIXME msg_Unsubscribe( p_intf, p_sys->p_sub ); /* Restores initial verbose setting */ vlc_value_t val; @@ -382,10 +380,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 @@ -395,41 +395,34 @@ 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, "item-append", PlaylistChanged, p_intf ); + var_AddCallback( p_playlist, "item-change", PlaylistChanged, p_intf ); - while( !intf_ShouldDie( p_intf ) ) + while( vlc_object_alive( p_intf ) ) { msleep( INTF_IDLE_SLEEP ); /* 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 ) + if( p_sys->b_box_plidx_follow && playlist_CurrentPlayingItem(p_playlist) ) { FindIndex( p_intf ); } - + while( ( i_key = wgetch( p_sys->w ) ) != -1 ) { /* @@ -445,7 +438,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; } /* @@ -457,6 +450,10 @@ 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, "item-append", PlaylistChanged, p_intf ); + var_DelCallback( p_playlist, "item-change", PlaylistChanged, p_intf ); + vlc_restorecancel( canc ); } /* following functions are local */ @@ -466,7 +463,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; } @@ -509,7 +506,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 @@ -565,12 +562,25 @@ 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 ); + + #define ReturnTrue \ + do { \ + vlc_object_release( p_playlist ); \ + return 1; \ + } while(0) + + #define ReturnFalse \ + do { \ + vlc_object_release( p_playlist ); \ + return 0; \ + } while(0) + + playlist_t *p_playlist = pl_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 ) { @@ -580,31 +590,31 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) var_Get( p_playlist, "random", &val ); val.b_bool = !val.b_bool; var_Set( p_playlist, "random", val ); - return 1; + ReturnTrue; case 'l': var_Get( p_playlist, "loop", &val ); val.b_bool = !val.b_bool; var_Set( p_playlist, "loop", val ); - return 1; + ReturnTrue; case 'R': var_Get( p_playlist, "repeat", &val ); val.b_bool = !val.b_bool; var_Set( p_playlist, "repeat", val ); - return 1; + ReturnTrue; /* 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; + ReturnTrue; 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; + ReturnTrue; /* Playlist view */ case 'v': @@ -616,9 +626,9 @@ 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; + ReturnTrue; /* Playlist navigation */ case 'g': @@ -659,12 +669,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->i_id, pl_Locked ); } else { playlist_NodeDelete( p_playlist, p_item, - VLC_TRUE , VLC_FALSE ); + true , false ); } PL_UNLOCK; PlaylistRebuild( p_intf ); @@ -676,7 +686,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 @@ -691,7 +701,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 ) @@ -702,13 +712,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; } @@ -719,14 +729,14 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) 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; + b_box_plidx_follow = true; p_sys->b_box_plidx_follow = b_box_plidx_follow; - return 1; + ReturnTrue; } } if( p_sys->i_box_type == BOX_BROWSE ) { - vlc_bool_t b_ret = VLC_TRUE; + bool b_ret = true; /* Browser navigation */ switch( i_key ) { @@ -753,7 +763,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; @@ -763,16 +773,13 @@ 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, "directory://%s/%s", p_sys->psz_current_dir, p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path ) == -1 ) + psz_uri = NULL; playlist_item_t *p_parent = p_sys->p_node; if( !p_parent ) - p_parent = p_playlist->status.p_node; + p_parent = playlist_CurrentPlayingItem(p_playlist) ? playlist_CurrentPlayingItem(p_playlist)->p_parent : NULL; if( !p_parent ) p_parent = p_playlist->p_local_onelevel; @@ -781,35 +788,29 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) 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; + ReturnTrue; } } else if( p_sys->i_box_type == BOX_HELP || p_sys->i_box_type == BOX_INFO || @@ -820,33 +821,33 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) { case KEY_HOME: p_sys->i_box_start = 0; - return 1; + ReturnTrue; #ifdef __FreeBSD__ case KEY_SELECT: #endif case KEY_END: p_sys->i_box_start = p_sys->i_box_lines_total - 1; - return 1; + ReturnTrue; case KEY_UP: if( p_sys->i_box_start > 0 ) p_sys->i_box_start--; - return 1; + ReturnTrue; case KEY_DOWN: if( p_sys->i_box_start < p_sys->i_box_lines_total - 1 ) { p_sys->i_box_start++; } - return 1; + ReturnTrue; 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; + ReturnTrue; 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; + ReturnTrue; default: break; } @@ -858,24 +859,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; + ReturnTrue; #ifdef __FreeBSD__ case KEY_SELECT: #endif case KEY_END: p_sys->f_slider = 99.9; ManageSlider( p_intf ); - return 1; + ReturnTrue; 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; + ReturnTrue; 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; + ReturnTrue; default: break; @@ -889,7 +890,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) case KEY_CLEAR: case 0x0c: /* ^l */ clear(); - return 1; + ReturnTrue; case KEY_ENTER: case '\r': case '\n': @@ -902,7 +903,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; + ReturnTrue; case 0x1b: /* ESC */ /* Alt+key combinations return 2 keys in the terminal keyboard: * ESC, and the 2nd key. @@ -913,16 +914,16 @@ 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; + ReturnFalse; p_sys->i_box_plidx = p_sys->i_before_search; p_sys->i_box_type = BOX_PLAYLIST; - return 1; + ReturnTrue; case KEY_BACKSPACE: case 0x7f: RemoveLastUTF8Entity( p_sys->psz_search_chain, i_chain_len ); @@ -954,7 +955,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; + ReturnTrue; } else if( p_sys->i_box_type == BOX_OPEN && p_sys->psz_open_chain ) { @@ -965,16 +966,16 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) case KEY_CLEAR: case 0x0c: /* ^l */ clear(); - return 1; + ReturnTrue; case KEY_ENTER: - case '\r': + case '\r': case '\n': if( i_chain_len > 0 ) { playlist_item_t *p_parent = p_sys->p_node; - + if( !p_parent ) - p_parent = p_playlist->status.p_node; + p_parent = playlist_CurrentPlayingItem(p_playlist) ? playlist_CurrentPlayingItem(p_playlist)->p_parent : NULL; if( !p_parent ) p_parent = p_playlist->p_local_onelevel; @@ -983,19 +984,19 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) 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; + ReturnTrue; case 0x1b: /* ESC */ if( wgetch( p_sys->w ) != ERR ) - return 0; + ReturnFalse; p_sys->i_box_type = BOX_PLAYLIST; - return 1; + ReturnTrue; case KEY_BACKSPACE: case 0x7f: RemoveLastUTF8Entity( p_sys->psz_open_chain, i_chain_len ); @@ -1024,7 +1025,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) break; } } - return 1; + ReturnTrue; } @@ -1033,12 +1034,12 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) { case 0x1b: /* ESC */ if( wgetch( p_sys->w ) != ERR ) - return 0; + ReturnFalse; case 'q': case 'Q': case KEY_EXIT: vlc_object_kill( p_intf->p_libvlc ); - return 0; + ReturnFalse; /* Box switching */ case 'i': @@ -1047,49 +1048,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; + ReturnTrue; 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; + ReturnTrue; 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; + ReturnTrue; 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; + ReturnTrue; 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; + ReturnTrue; 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; + ReturnTrue; 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; + ReturnTrue; 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; + ReturnTrue; case 'h': case 'H': if( p_sys->i_box_type == BOX_HELP ) @@ -1097,44 +1098,40 @@ 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; + ReturnTrue; case '/': if( p_sys->i_box_type != BOX_SEARCH ) { if( p_sys->psz_search_chain == NULL ) - { - return 1; - } + ReturnTrue; p_sys->psz_search_chain[0] = '\0'; - p_sys->b_box_plidx_follow = VLC_FALSE; + 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; + ReturnTrue; case 'A': /* Open */ if( p_sys->i_box_type != BOX_OPEN ) { if( p_sys->psz_open_chain == NULL ) - { - return 1; - } + ReturnTrue; p_sys->psz_open_chain[0] = '\0'; p_sys->i_box_type = BOX_OPEN; } - return 1; + ReturnTrue; /* 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; + ReturnTrue; 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; + ReturnTrue; /* Common control */ case 'f': @@ -1158,72 +1155,72 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) var_Set( p_playlist, "fullscreen", val ); } } - return 0; + ReturnFalse; } case ' ': PlayPause( p_intf ); - return 1; + ReturnTrue; case 's': playlist_Stop( p_playlist ); - return 1; + ReturnTrue; case 'e': Eject( p_intf ); - return 1; + ReturnTrue; case '[': if( p_sys->p_input ) { - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_sys->p_input, "prev-title", val ); } - return 1; + ReturnTrue; case ']': if( p_sys->p_input ) { - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_sys->p_input, "next-title", val ); } - return 1; + ReturnTrue; case '<': if( p_sys->p_input ) { - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_sys->p_input, "prev-chapter", val ); } - return 1; + ReturnTrue; case '>': if( p_sys->p_input ) { - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_sys->p_input, "next-chapter", val ); } - return 1; + ReturnTrue; case 'p': playlist_Prev( p_playlist ); clear(); - return 1; + ReturnTrue; case 'n': playlist_Next( p_playlist ); clear(); - return 1; + ReturnTrue; case 'a': aout_VolumeUp( p_intf, 1, NULL ); clear(); - return 1; + ReturnTrue; case 'z': aout_VolumeDown( p_intf, 1, NULL ); clear(); - return 1; + ReturnTrue; /* * ^l should clear and redraw the screen @@ -1231,11 +1228,13 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) case KEY_CLEAR: case 0x0c: /* ^l */ clear(); - return 1; + ReturnTrue; default: - return 0; + ReturnFalse; } +#undef ReturnFalse +#undef ReturnTrue } static void ManageSlider( intf_thread_t *p_intf ) @@ -1326,27 +1325,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 ); @@ -1413,6 +1415,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 ) { @@ -1443,6 +1446,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, ... ) { @@ -1461,47 +1465,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)", + MainBoxWrite( p_intf, (*l)++, 1 + 2 * i_level, "%s \"%s\" (%p)", p_obj->psz_object_type, p_obj->psz_object_name, - p_obj->i_object_id ); + p_obj ); else - MainBoxWrite( p_intf, (*l)++, 1 + 2 * i_level, "%s (%d)", - p_obj->psz_object_type, p_obj->i_object_id ); - int i; - for( i = 0; i < p_obj->i_children ; i++ ) + MainBoxWrite( p_intf, (*l)++, 1 + 2 * i_level, "%s (%o)", + p_obj->psz_object_type, p_obj ); + + vlc_list_t *list = vlc_list_children( p_obj ); + for( int i = 0; i < list->i_count ; i++ ) { - MainBoxWrite( p_intf, *l, 1 + 2 * i_level, - i == p_obj->i_children - 1 ? "`-" : "|-" ); - DumpObject( p_intf, l, p_obj->pp_children[i], i_level + 1 ); + MainBoxWrite( p_intf, *l, 1 + 2 * i_level, + i == list->i_count - 1 ? "`-" : "|-" ); + DumpObject( p_intf, l, list->p_values[i].p_object, i_level + 1 ); } - - vlc_object_release( p_obj ); + vlc_list_release( list ); } static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) { intf_sys_t *p_sys = p_intf->p_sys; input_thread_t *p_input = p_sys->p_input; - playlist_t *p_playlist = pl_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 ); @@ -1551,10 +1547,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 ); @@ -1786,14 +1778,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 ) { @@ -1818,9 +1804,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: @@ -1877,12 +1863,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 ); @@ -1904,7 +1893,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", @@ -1918,6 +1907,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 ) { @@ -1955,7 +1945,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 ) @@ -1964,7 +1954,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 ); @@ -2011,7 +2001,6 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) else for( i = 0; i < p_item->i_es ; i++ ) { - printf( "XXX %d\n", p_item->es[i]->i_cat ); i_audio += ( p_item->es[i]->i_cat == AUDIO_ES ); i_video += ( p_item->es[i]->i_cat == VIDEO_ES ); } @@ -2126,6 +2115,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 ) { @@ -2166,13 +2156,13 @@ 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 = ' '; if( ( p_node && p_item->p_input == p_node->p_input ) || ( !p_node && p_item->p_input == - p_playlist->status.p_node->p_input ) ) + playlist_CurrentPlayingItem(p_playlist)->p_input ) ) c = '*'; else if( p_item == p_node || ( p_item != p_node && PlaylistIsPlaying( p_intf, p_item ) ) ) @@ -2234,26 +2224,31 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) refresh(); *t_last_refresh = time( 0 ); + vlc_object_release( p_playlist ); } 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; } + vlc_object_release( p_playlist ); + 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; @@ -2263,9 +2258,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; + + vlc_object_release( p_playlist ); } static void PlaylistAddNode( intf_thread_t *p_intf, playlist_item_t *p_node, @@ -2312,7 +2309,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 ); @@ -2326,18 +2323,20 @@ 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; + vlc_object_release( p_playlist ); return VLC_SUCCESS; } /* Playlist suxx */ -static inline vlc_bool_t PlaylistIsPlaying( intf_thread_t *p_intf, +static inline bool PlaylistIsPlaying( intf_thread_t *p_intf, 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_t *p_playlist = pl_Hold( p_intf ); + playlist_item_t *p_played_item = playlist_CurrentPlayingItem(p_playlist); + vlc_object_release( p_playlist ); return( p_item != NULL && p_played_item != NULL && p_item->p_input != NULL && p_played_item->p_input != NULL && p_item->p_input->i_id == p_played_item->p_input->i_id ); @@ -2371,17 +2370,15 @@ static void FindIndex( intf_thread_t *p_intf ) 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 ) @@ -2394,16 +2391,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; + vlc_object_release( p_playlist ); return; } - psz_name = p_playlist->status.p_item->p_input->psz_name; + psz_name = playlist_CurrentPlayingItem(p_playlist)->p_input->psz_name; if( psz_name ) { @@ -2482,6 +2480,7 @@ static void Eject( intf_thread_t *p_intf ) } free( psz_device ); + vlc_object_release( p_playlist ); return; } @@ -2542,7 +2541,7 @@ static void ReadDir( intf_thread_t *p_intf ) 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, ".." ) ) { @@ -2550,8 +2549,7 @@ 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 ); + asprintf( &psz_uri, "%s/%s", p_sys->psz_current_dir, psz_entry ); if( !( p_dir_entry = malloc( sizeof( struct dir_entry_t) ) ) ) { @@ -2570,14 +2568,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 ); } @@ -2603,7 +2601,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 ) @@ -2621,12 +2619,14 @@ static void PlayPause( intf_thread_t *p_intf ) } else playlist_Play( p_playlist ); + + vlc_object_release( p_playlist ); } /**************************************************************************** * ****************************************************************************/ -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;