X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fncurses.c;h=a9122115f664dbb99bc9b2407aa6611049bef046;hb=3890f30a863e18a1a8ca7114c2285ddcdf0349f9;hp=8f55d68b9fae731113369c973122950fc7d89ed1;hpb=e02432e597acb3511d14433ae3303ff4da3742f9;p=vlc diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c index 8f55d68b9f..a9122115f6 100644 --- a/modules/gui/ncurses.c +++ b/modules/gui/ncurses.c @@ -1,13 +1,14 @@ /***************************************************************************** - * ncurses.c : NCurses plugin for vlc + * ncurses.c : NCurses interface for vlc ***************************************************************************** - * Copyright (C) 2001-2006 the VideoLAN team + * Copyright (C) 2001-2007 the VideoLAN team * $Id$ * * Authors: Sam Hocevar * Laurent Aimar * Yoann Peronneau * Derk-Jan Hartman + * Rafaël Carré * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,7 +33,11 @@ #include /* ENOMEM */ #include -#include +#ifdef HAVE_NCURSESW +# define _XOPEN_SOURCE_EXTENDED 1 +#endif + +#include #include #include @@ -40,6 +45,7 @@ #include #include #include +#include #ifdef HAVE_SYS_STAT_H # include @@ -58,7 +64,7 @@ #ifdef HAVE_VCDX #define VCD_MRL "vcdx://" #else -#define VCD_MRL "vcdx://" +#define VCD_MRL "vcd://" #endif #define SEARCH_CHAIN_SIZE 20 @@ -124,7 +130,8 @@ enum BOX_PLAYLIST, BOX_SEARCH, BOX_OPEN, - BOX_BROWSE + BOX_BROWSE, + BOX_META }; enum { @@ -159,7 +166,6 @@ struct intf_sys_t int i_box_plidx; /* Playlist index */ int b_box_plidx_follow; - playlist_item_t *p_plnode; /* Playlist node */ int i_box_bidx; /* browser index */ int b_box_cleared; @@ -181,7 +187,9 @@ struct intf_sys_t 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 */ + vlc_bool_t 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 ); @@ -210,7 +218,6 @@ static int Open( vlc_object_t *p_this ) p_sys->b_box_plidx_follow = VLC_TRUE; p_sys->b_box_cleared = VLC_FALSE; p_sys->i_box_plidx = 0; - p_sys->p_plnode = NULL; p_sys->i_box_bidx = 0; p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL ); memset( p_sys->psz_partial_keys, 0, sizeof( p_sys->psz_partial_keys ) ); @@ -233,6 +240,9 @@ 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 ); @@ -317,6 +327,11 @@ static void Close( vlc_object_t *p_this ) 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 ); + /* Destroy structure */ free( p_sys ); } @@ -412,10 +427,9 @@ static void Run( intf_thread_t *p_intf ) } /* following functions are local */ - static char *KeyToUTF8( int i_key, char *psz_part ) { - char *psz_utf8, *psz; + char *psz_utf8; int len = strlen( psz_part ); if( len == 6 ) { @@ -426,10 +440,14 @@ static char *KeyToUTF8( int i_key, char *psz_part ) psz_part[len] = (char)i_key; +#ifdef HAVE_NCURSESW + psz_utf8 = strdup( psz_part ); +#else psz_utf8 = FromLocaleDup( psz_part ); /* Ugly check for incomplete bytes sequences * (in case of non-UTF8 multibyte local encoding) */ + char *psz; for( psz = psz_utf8; *psz; psz++ ) if( ( *psz == '?' ) && ( *psz_utf8 != '?' ) ) { @@ -445,6 +463,7 @@ static char *KeyToUTF8( int i_key, char *psz_part ) free( psz_utf8 ); return NULL; } +#endif memset( psz_part, 0, 6 ); return psz_utf8; @@ -521,6 +540,11 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) case KEY_HOME: p_sys->i_box_plidx = 0; break; +#ifdef __FreeBSD__ +/* workaround for FreeBSD + xterm: + * see http://www.nabble.com/curses-vs.-xterm-key-mismatch-t3574377.html */ + case KEY_SELECT: +#endif case KEY_END: p_sys->i_box_plidx = p_sys->p_playlist->items.i_size - 1; break; @@ -556,19 +580,45 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) VLC_TRUE , VLC_FALSE ); } vlc_mutex_unlock( &p_playlist->object_lock ); - p_sys->b_need_update = VLC_TRUE; - + PlaylistRebuild( p_intf ); break; } case KEY_ENTER: case 0x0d: + if( !p_sys->pp_plist || !p_sys->pp_plist[p_sys->i_box_plidx] ) + { + b_ret = VLC_FALSE; + break; + } if( p_sys->pp_plist[p_sys->i_box_plidx]->p_item->i_children == -1 ) { + playlist_item_t *p_item, *p_parent; + p_item = p_parent = + p_sys->pp_plist[p_sys->i_box_plidx]->p_item; + + if( !p_parent ) + p_parent = p_sys->p_playlist->p_root_onelevel; + while( p_parent->p_parent ) + p_parent = p_parent->p_parent; playlist_Control( p_sys->p_playlist, PLAYLIST_VIEWPLAY, - VLC_TRUE, NULL, - p_sys->pp_plist[p_sys->i_box_plidx]->p_item ); + VLC_TRUE, p_parent, p_item ); + } + else if( p_sys->pp_plist[p_sys->i_box_plidx]->p_item->i_children + == 0 ) + { /* We only want to set the current node */ + vlc_object_lock( p_sys->p_playlist ); + + p_sys->p_playlist->request.p_node = + p_sys->pp_plist[p_sys->i_box_plidx]->p_item; + p_sys->p_playlist->request.i_skip = 0; + p_sys->p_playlist->request.p_item = + p_sys->p_playlist->status.p_item; + p_sys->p_playlist->request.b_request = VLC_TRUE; + p_sys->p_playlist->request.i_status = PLAYLIST_STOPPED; + + vlc_object_unlock( p_sys->p_playlist ); } else { @@ -605,6 +655,9 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) case KEY_HOME: p_sys->i_box_bidx = 0; break; +#ifdef __FreeBSD__ + case KEY_SELECT: +#endif case KEY_END: p_sys->i_box_bidx = p_sys->i_dir_entries - 1; break; @@ -636,11 +689,19 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) char *psz_uri = (char *)malloc( sizeof(char)*i_size_entry); sprintf( psz_uri, "%s/%s", p_sys->psz_current_dir, p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path ); - /* XXX - playlist_Add( p_sys->p_playlist, psz_uri, - psz_uri, - PLAYLIST_APPEND, PLAYLIST_END ); - */ + + playlist_item_t *p_parent = p_sys->p_playlist->status.p_node; + if( !p_parent ) + p_parent = p_sys->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_sys->p_playlist, psz_uri, NULL, + PLAYLIST_APPEND, PLAYLIST_END, + p_parent->p_input == + p_sys->p_playlist->p_local_onelevel->p_input + , VLC_FALSE ); p_sys->i_box_type = BOX_PLAYLIST; free( psz_uri ); } @@ -668,13 +729,17 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) return 1; } } - else if( p_sys->i_box_type == BOX_HELP || p_sys->i_box_type == BOX_INFO ) + else if( p_sys->i_box_type == BOX_HELP || p_sys->i_box_type == BOX_INFO || + p_sys->i_box_type == BOX_META ) { switch( i_key ) { case KEY_HOME: p_sys->i_box_start = 0; return 1; +#ifdef __FreeBSD__ + case KEY_SELECT: +#endif case KEY_END: p_sys->i_box_start = p_sys->i_box_lines_total - 1; return 1; @@ -710,6 +775,9 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) p_sys->f_slider = 0; ManageSlider( p_intf ); return 1; +#ifdef __FreeBSD__ + case KEY_SELECT: +#endif case KEY_END: p_sys->f_slider = 99.9; ManageSlider( p_intf ); @@ -795,11 +863,19 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) case 0x0d: if( p_playlist && i_chain_len > 0 ) { - /* - playlist_Add( p_playlist, p_sys->psz_open_chain, - p_sys->psz_open_chain, - PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END ); - */ + playlist_item_t *p_parent = p_sys->p_playlist->status.p_node; + + if( !p_parent ) + p_parent = p_sys->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, p_sys->psz_open_chain, NULL, + PLAYLIST_APPEND|PLAYLIST_GO, PLAYLIST_END, + p_parent->p_input == + p_sys->p_playlist->p_local_onelevel->p_input + , VLC_FALSE ); p_sys->b_box_plidx_follow = VLC_TRUE; } p_sys->i_box_type = BOX_PLAYLIST; @@ -847,6 +923,13 @@ static int HandleKey( intf_thread_t *p_intf, int i_key ) p_sys->i_box_type = BOX_INFO; p_sys->i_box_lines_total = 0; return 1; + 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; case 'L': if( p_sys->i_box_type == BOX_LOG ) p_sys->i_box_type = BOX_NONE; @@ -1117,45 +1200,122 @@ static void mvnprintw( int y, int x, int w, const char *p_fmt, ... ) int i_len; va_start( vl_args, p_fmt ); - vasprintf( &p_buf, p_fmt, vl_args ); + if( vasprintf( &p_buf, p_fmt, vl_args ) == -1 ) + return; va_end( vl_args ); - if( p_buf == NULL ) - { + if( ( p_buf == NULL ) || ( w <= 0 ) ) return; - } - if( w > 0 ) - { - if( ( i_len = strlen( p_buf ) ) > w ) - { - char *psz_local; - int i_cut = i_len - w; - int x1 = i_len/2 - i_cut/2; - int x2 = x1 + i_cut; - if( i_len > x2 ) + 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 */ + abort(); + else + { + i_width = wcswidth( psz_wide, i_char_len ); + if( i_width == (size_t)-1 ) + { + /* a non printable character was encountered */ + unsigned int i; + int i_cwidth; + i_width = 0; + for( i = 0 ; i < i_char_len ; i++ ) { - memmove( &p_buf[x1], &p_buf[x2], i_len - x2 ); + i_cwidth = wcwidth( psz_wide[i] ); + if( i_cwidth != -1 ) + i_width += i_cwidth; } - p_buf[w] = '\0'; - if( w > 7 ) + } + } + if( i_width > (size_t)w ) + { + int i_total_width = 0; + int i = 0; + while( i_total_width < w ) + { + i_total_width += wcwidth( psz_wide[i] ); + if( w > 7 && i_total_width >= w/2 ) { - p_buf[w/2-1] = '.'; - p_buf[w/2 ] = '.'; - p_buf[w/2+1] = '.'; + psz_wide[i ] = '.'; + psz_wide[i+1] = '.'; + i_total_width -= wcwidth( psz_wide[i] ) - 2; + if( i > 0 ) + { + /* we require this check only if at least one character + * 4 or more columns wide exists (which i doubt) */ + psz_wide[i-1] = '.'; + i_total_width -= wcwidth( psz_wide[i-1] ) - 1; + } + + /* find the widest string */ + int j, i_2nd_width = 0; + for( j = i_char_len - 1; i_2nd_width < w - i_total_width; j-- ) + i_2nd_width += wcwidth( psz_wide[j] ); + + /* we already have i_total_width columns filled, and we can't + * have more than w columns */ + if( i_2nd_width > w - i_total_width ) + j++; + + wmemmove( &psz_wide[i+2], &psz_wide[j+1], i_char_len - j - 1 ); + psz_wide[i + 2 + i_char_len - j - 1] = '\0'; + break; } - psz_local = ToLocale( p_buf ); - mvprintw( y, x, "%s", psz_local ); - LocaleFree( p_buf ); + i++; } - else + if( w <= 7 ) /* we don't add the '...' else we lose too much chars */ + psz_wide[i] = '\0'; + + size_t i_wlen = wcslen( psz_wide ) * 6 + 1; /* worst case */ + char psz_ellipsized[i_wlen]; + wcstombs( psz_ellipsized, psz_wide, i_wlen ); + mvprintw( y, x, "%s", psz_ellipsized ); + } + else + { + mvprintw( y, x, "%s", p_buf ); + mvhline( y, x + i_width, ' ', w - i_width ); + } +#else + if( i_len > w ) + { + int i_cut = i_len - w; + int x1 = i_len/2 - i_cut/2; + int x2 = x1 + i_cut; + + if( i_len > x2 ) + { + memmove( &p_buf[x1], &p_buf[x2], i_len - x2 ); + } + p_buf[w] = '\0'; + if( w > 7 ) { - char *psz_local = ToLocale( p_buf ); - mvprintw( y, x, "%s", psz_local ); - LocaleFree( p_buf ); - mvhline( y, x + i_len, ' ', w - i_len ); + p_buf[w/2-1] = '.'; + p_buf[w/2 ] = '.'; + p_buf[w/2+1] = '.'; } + char *psz_local = ToLocale( p_buf ); + mvprintw( y, x, "%s", psz_local ); + LocaleFree( p_buf ); } + else + { + char *psz_local = ToLocale( p_buf ); + mvprintw( y, x, "%s", psz_local ); + LocaleFree( p_buf ); + mvhline( y, x + i_len, ' ', w - i_len ); + } +#endif } static void MainBoxWrite( intf_thread_t *p_intf, int l, int x, const char *p_fmt, ... ) { @@ -1170,7 +1330,8 @@ static void MainBoxWrite( intf_thread_t *p_intf, int l, int x, const char *p_fmt } va_start( vl_args, p_fmt ); - vasprintf( &p_buf, p_fmt, vl_args ); + if( vasprintf( &p_buf, p_fmt, vl_args ) == -1 ) + return; va_end( vl_args ); if( p_buf == NULL ) @@ -1193,11 +1354,30 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) /* Title */ attrset( A_REVERSE ); - mvnprintw( y, 0, COLS, "VLC media player" " (ncurses interface) [ h for help ]" ); + int i_len = strlen( "VLC media player [ h for help ]" ); + int mid = ( COLS - i_len ) / 2; + if( mid < 0 ) + mid = 0; + int i_size = ( COLS > i_len + 1 ) ? COLS : i_len + 1; + char psz_title[i_size]; + memset( psz_title, ' ', mid ); + snprintf( &psz_title[mid], i_size, "VLC media player [ h for help ]" ); + mvnprintw( y, 0, COLS, "%s", psz_title ); attroff( A_REVERSE ); y += 2; /* Infos */ + + char psz_state[25]; + /* strlen( "[Repeat] [Random] [Loop]" ) == 24, + '\0' */ + psz_state[0] = '\0'; + if( var_GetBool( p_sys->p_playlist, "repeat" ) ) + strcat( psz_state, "[Repeat] " ); + if( var_GetBool( p_sys->p_playlist, "random" ) ) + strcat( psz_state, "[Random] " ); + if( var_GetBool( p_sys->p_playlist, "loop" ) ) + strcat( psz_state, "[Loop]" ); + if( p_input && !p_input->b_dead ) { char buf1[MSTRTIME_MAX_SIZE]; @@ -1214,24 +1394,21 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) var_Get( p_input, "state", &val ); if( val.i_int == PLAYING_S ) { - mvnprintw( y++, 0, COLS, " State : Playing" ); + mvnprintw( y++, 0, COLS, " State : Playing %s", psz_state ); } else if( val.i_int == OPENING_S ) { - mvnprintw( y++, 0, COLS, " State : Openning/Connecting" ); + mvnprintw( y++, 0, COLS, " State : Opening/Connecting %s", psz_state ); } else if( val.i_int == BUFFERING_S ) { - mvnprintw( y++, 0, COLS, " State : Buffering" ); + mvnprintw( y++, 0, COLS, " State : Buffering %s", psz_state ); } else if( val.i_int == PAUSE_S ) { - mvnprintw( y++, 0, COLS, " State : Paused" ); - } - else - { - y++; + mvnprintw( y++, 0, COLS, " State : Paused %s", psz_state ); } + if( val.i_int != INIT_S && val.i_int != END_S ) { audio_volume_t i_volume; @@ -1278,7 +1455,7 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) } else { - mvnprintw( y++, 0, COLS, "Source: " ); + mvnprintw( y++, 0, COLS, "Source: %s", psz_state ); DrawEmptyLine( p_sys->w, y++, 0, COLS ); DrawEmptyLine( p_sys->w, y++, 0, COLS ); DrawEmptyLine( p_sys->w, y++, 0, COLS ); @@ -1304,6 +1481,7 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) MainBoxWrite( p_intf, l++, 1, "[Display]" ); MainBoxWrite( p_intf, l++, 1, " h,H Show/Hide help box" ); MainBoxWrite( p_intf, l++, 1, " i Show/Hide info box" ); + MainBoxWrite( p_intf, l++, 1, " m Show/Hide metadata box" ); MainBoxWrite( p_intf, l++, 1, " L Show/Hide messages box" ); MainBoxWrite( p_intf, l++, 1, " P Show/Hide playlist box" ); MainBoxWrite( p_intf, l++, 1, " B Show/Hide filebrowser" ); @@ -1324,9 +1502,9 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) MainBoxWrite( p_intf, l++, 1, "" ); MainBoxWrite( p_intf, l++, 1, "[Playlist]" ); - MainBoxWrite( p_intf, l++, 1, " r Random" ); - MainBoxWrite( p_intf, l++, 1, " l Loop Playlist" ); - MainBoxWrite( p_intf, l++, 1, " R Repeat item" ); + MainBoxWrite( p_intf, l++, 1, " r Toggle Random playing" ); + MainBoxWrite( p_intf, l++, 1, " l Toggle Loop Playlist" ); + MainBoxWrite( p_intf, l++, 1, " R Toggle Repeat item" ); MainBoxWrite( p_intf, l++, 1, " o Order Playlist by title" ); MainBoxWrite( p_intf, l++, 1, " O Reverse order Playlist by title" ); MainBoxWrite( p_intf, l++, 1, " / Look for an item" ); @@ -1411,6 +1589,96 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) y += p_sys->i_box_lines; } } + else if( p_sys->i_box_type == BOX_META ) + { + /* 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 ); + + if( p_input ) + { + int i; + input_item_t *p_item = input_GetItem( p_input ); + vlc_mutex_lock( &p_item->lock ); + for( i=0; i= y_end ) break; + char *psz_meta = p_item->p_meta->ppsz_meta[i]; + if( psz_meta && *psz_meta ) + { + const char *psz_meta_title; + switch( i ) + { + case 0: + psz_meta_title = VLC_META_TITLE; break; + case 1: + psz_meta_title = VLC_META_ARTIST; break; + case 2: + psz_meta_title = VLC_META_GENRE ; break; + case 3: + psz_meta_title = VLC_META_COPYRIGHT; break; + case 4: + psz_meta_title = VLC_META_COLLECTION; break; + case 5: + psz_meta_title = VLC_META_SEQ_NUM; break; + case 6: + psz_meta_title = VLC_META_DESCRIPTION; break; + case 7: + psz_meta_title = VLC_META_RATING; break; + case 8: + psz_meta_title = VLC_META_DATE; break; + case 9: + psz_meta_title = VLC_META_SETTING; break; + case 10: + psz_meta_title = VLC_META_URL; break; + case 11: + psz_meta_title = VLC_META_LANGUAGE; break; + case 12: + psz_meta_title = VLC_META_NOW_PLAYING; break; + case 13: + psz_meta_title = VLC_META_PUBLISHER; break; + case 14: + psz_meta_title = VLC_META_ENCODED_BY; break; + case 15: + psz_meta_title = VLC_META_ART_URL; break; + case 16: + psz_meta_title = VLC_META_TRACKID; break; + default: + psz_meta_title = ""; break; + } + MainBoxWrite( p_intf, l++, 1, " [%s]", psz_meta_title ); + MainBoxWrite( p_intf, l++, 1, " %s", psz_meta ); + } + } + vlc_mutex_unlock( &p_item->lock ); + } + else + { + MainBoxWrite( p_intf, l++, 1, "No item currently playing" ); + } + 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; + } + } else if( p_sys->i_box_type == BOX_LOG ) { int i_line = 0; @@ -1564,8 +1832,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 ); - int c = ( PlaylistIsPlaying( p_intf, - p_sys->pp_plist[i_item]->p_item ) ) ? '>' : ' '; + int c = ' '; + if( p_sys->pp_plist[i_item]->p_item->p_input == + p_sys->p_playlist->status.p_node->p_input ) + c = '*'; + else if( PlaylistIsPlaying( p_intf, + p_sys->pp_plist[i_item]->p_item ) ) + c = '>'; if( y >= y_end ) break; if( b_selected ) @@ -1909,12 +2182,8 @@ static void ReadDir( intf_thread_t *p_intf ) if( p_current_dir == NULL ) { /* something went bad, get out of here ! */ -#ifdef HAVE_ERRNO_H - msg_Warn( p_intf, "cannot open directory `%s' (%s)", - p_sys->psz_current_dir, strerror(errno)); -#else - msg_Warn( p_intf, "cannot open directory `%s'", p_sys->psz_current_dir ); -#endif + msg_Warn( p_intf, "cannot open directory `%s' (%m)", + p_sys->psz_current_dir ); return; }