X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdvdnav.c;h=99644665da29c6d53c01fabd7ad39439675e5c00;hb=5d313c65e44d8963262fdbc5d5d52f5169f3f787;hp=2bbca7798fda11fcf89725fb7090b8d715f2d517;hpb=236ca7aea13a438f92c245565208c9bb6ff9e11c;p=vlc diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c index 2bbca7798f..99644665da 100644 --- a/modules/access/dvdnav.c +++ b/modules/access/dvdnav.c @@ -1,7 +1,7 @@ /***************************************************************************** * dvdnav.c: DVD module using the dvdnav library. ***************************************************************************** - * Copyright (C) 2004 VideoLAN + * Copyright (C) 2004 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -18,16 +18,25 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include +#include + +#include #ifdef HAVE_UNISTD_H # include @@ -43,10 +52,10 @@ #endif #include "vlc_keys.h" -#include "iso_lang.h" +#include "vlc_iso_lang.h" /* FIXME we should find a better way than including that */ -#include "../../src/misc/iso-639_def.h" +#include "../../src/text/iso-639_def.h" #include @@ -58,16 +67,16 @@ *****************************************************************************/ #define ANGLE_TEXT N_("DVD angle") #define ANGLE_LONGTEXT N_( \ - "Allows you to select the default DVD angle." ) + "Default DVD angle." ) #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Allows you to modify the default caching value for DVDnav streams. This "\ - "value should be set in millisecond units." ) + "Caching value for DVDs. This "\ + "value should be set in milliseconds." ) #define MENU_TEXT N_("Start directly in menu") #define MENU_LONGTEXT N_( \ - "Allows you to start the DVD directly in the main menu. This "\ - "will try to skip all the useless warnings introductions." ) + "Start the DVD directly in the main menu. This "\ + "will try to skip all the useless warning introductions." ) #define LANGUAGE_DEFAULT ("en") @@ -75,16 +84,16 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); vlc_module_begin(); - set_shortname( _("DVD with menus") ); - set_description( _("DVDnav Input") ); + set_shortname( N_("DVD with menus") ); + set_description( N_("DVDnav Input") ); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_ACCESS ); add_integer( "dvdnav-angle", 1, NULL, ANGLE_TEXT, - ANGLE_LONGTEXT, VLC_FALSE ); + ANGLE_LONGTEXT, false ); add_integer( "dvdnav-caching", DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); - add_bool( "dvdnav-menu", VLC_TRUE, NULL, - MENU_TEXT, MENU_LONGTEXT, VLC_FALSE ); + CACHING_TEXT, CACHING_LONGTEXT, true ); + add_bool( "dvdnav-menu", true, NULL, + MENU_TEXT, MENU_LONGTEXT, false ); set_capability( "access_demux", 5 ); add_shortcut( "dvd" ); add_shortcut( "dvdnav" ); @@ -104,11 +113,11 @@ typedef struct demux_t *p_demux; vlc_mutex_t lock; - vlc_bool_t b_moved; - vlc_bool_t b_clicked; - vlc_bool_t b_key; + bool b_moved; + bool b_clicked; + int i_key_action; - vlc_bool_t b_still; + bool b_still; int64_t i_still_end; } event_thread_t; @@ -129,15 +138,19 @@ struct demux_sys_t /* event */ event_thread_t *p_ev; - /* FIXME */ - uint8_t alpha[4]; - uint32_t clut[16]; + /* palette for menus */ + uint32_t clut[16]; + uint8_t palette[4][4]; + bool b_spu_change; /* */ int i_aspect; int i_title; input_title_t **title; + + /* lenght of program group chain */ + mtime_t i_pgc_length; }; static int Control( demux_t *, int, va_list ); @@ -146,12 +159,12 @@ static int DemuxBlock( demux_t *, uint8_t *, int ); static void DemuxTitles( demux_t * ); static void ESSubtitleUpdate( demux_t * ); -static void ButtonUpdate( demux_t * ); +static void ButtonUpdate( demux_t *, bool ); static void ESNew( demux_t *, int ); static int ProbeDVD( demux_t *, char * ); -static char *DemuxGetLanguageCode( demux_t *p_demux, char *psz_var ); +static char *DemuxGetLanguageCode( demux_t *p_demux, const char *psz_var ); /***************************************************************************** * DemuxOpen: @@ -172,13 +185,13 @@ static int Open( vlc_object_t *p_this ) if( !p_this->b_force ) return VLC_EGENERIC; psz_name = var_CreateGetString( p_this, "dvd" ); - if( !psz_name || !*psz_name ) + if( !psz_name ) { - if( psz_name ) free( psz_name ); - return VLC_EGENERIC; + psz_name = strdup(""); } } - else psz_name = strdup( p_demux->psz_path ); + else + psz_name = ToLocaleDup( p_demux->psz_path ); #ifdef WIN32 if( psz_name[0] && psz_name[1] == ':' && @@ -202,15 +215,14 @@ static int Open( vlc_object_t *p_this ) free( psz_name ); /* Fill p_demux field */ - p_demux->pf_demux = Demux; - p_demux->pf_control = Control; - p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) ); - memset( p_sys, 0, sizeof( demux_sys_t ) ); + DEMUX_INIT_COMMON(); p_sys = p_demux->p_sys; p_sys->dvdnav = p_dvdnav; ps_track_init( p_sys->tk ); p_sys->i_aspect = -1; p_sys->i_mux_rate = 0; + p_sys->i_pgc_length = 0; + p_sys->b_spu_change = false; if( 1 ) { @@ -243,34 +255,35 @@ static int Open( vlc_object_t *p_this ) } /* Set menu language ("en") - * XXX: maybe it would be better to set it like audio/spu or to create a --menu-language option */ - if( dvdnav_menu_language_select( p_sys->dvdnav,LANGUAGE_DEFAULT ) != DVDNAV_STATUS_OK ) + * XXX: maybe it would be better to set it like audio/spu + * or to create a --menu-language option */ + if( dvdnav_menu_language_select( p_sys->dvdnav, LANGUAGE_DEFAULT ) != + DVDNAV_STATUS_OK ) { - msg_Warn( p_demux, "something failed while setting menu '%s' language (%s)", - LANGUAGE_DEFAULT, - dvdnav_err_to_string( p_sys->dvdnav ) ); + msg_Warn( p_demux, "can't set menu language to '%s' (%s)", + LANGUAGE_DEFAULT, dvdnav_err_to_string( p_sys->dvdnav ) ); } /* Set audio language */ psz_code = DemuxGetLanguageCode( p_demux, "audio-language" ); - if( dvdnav_audio_language_select(p_sys->dvdnav, psz_code ) != DVDNAV_STATUS_OK ) + if( dvdnav_audio_language_select( p_sys->dvdnav, psz_code ) != + DVDNAV_STATUS_OK ) { - msg_Warn( p_demux, "something failed while setting audio '%s' language (%s)", - psz_code, - dvdnav_err_to_string( p_sys->dvdnav ) ); + msg_Warn( p_demux, "can't set audio language to '%s' (%s)", + psz_code, dvdnav_err_to_string( p_sys->dvdnav ) ); /* We try to fall back to 'en' */ if( strcmp( psz_code, LANGUAGE_DEFAULT ) ) - dvdnav_audio_language_select(p_sys->dvdnav, LANGUAGE_DEFAULT ); + dvdnav_audio_language_select( p_sys->dvdnav, LANGUAGE_DEFAULT ); } free( psz_code ); /* Set spu language */ - psz_code = DemuxGetLanguageCode( p_demux, "spu-language" ); - if( dvdnav_spu_language_select( p_sys->dvdnav,psz_code ) != DVDNAV_STATUS_OK ) + psz_code = DemuxGetLanguageCode( p_demux, "sub-language" ); + if( dvdnav_spu_language_select( p_sys->dvdnav, psz_code ) != + DVDNAV_STATUS_OK ) { - msg_Warn( p_demux, "something failed while setting spu '%s' language (%s)", - psz_code, - dvdnav_err_to_string( p_sys->dvdnav ) ); + msg_Warn( p_demux, "can't set spu language to '%s' (%s)", + psz_code, dvdnav_err_to_string( p_sys->dvdnav ) ); /* We try to fall back to 'en' */ if( strcmp( psz_code, LANGUAGE_DEFAULT ) ) dvdnav_spu_language_select(p_sys->dvdnav, LANGUAGE_DEFAULT ); @@ -287,13 +300,22 @@ static int Open( vlc_object_t *p_this ) if( dvdnav_title_play( p_sys->dvdnav, 1 ) != DVDNAV_STATUS_OK ) { - msg_Warn( p_demux, "cannot set title" ); + msg_Err( p_demux, "cannot set title (can't decrypt DVD?)" ); + intf_UserFatal( p_demux, false, _("Playback failure"), + _("VLC cannot set the DVD's title. It possibly " + "cannot decrypt the entire disk.") ); + dvdnav_close( p_sys->dvdnav ); + free( p_sys ); + return VLC_EGENERIC; } if( dvdnav_menu_call( p_sys->dvdnav, DVD_MENU_Title ) != DVDNAV_STATUS_OK ) { - msg_Warn( p_demux, "cannot go to dvd menu" ); + /* Try going to menu root */ + if( dvdnav_menu_call( p_sys->dvdnav, DVD_MENU_Root ) != + DVDNAV_STATUS_OK ) + msg_Warn( p_demux, "cannot go to dvd menu" ); } } @@ -312,7 +334,7 @@ static int Open( vlc_object_t *p_this ) var_Create( p_sys->p_input, "x-end", VLC_VAR_INTEGER ); var_Create( p_sys->p_input, "y-end", VLC_VAR_INTEGER ); var_Create( p_sys->p_input, "color", VLC_VAR_ADDRESS ); - var_Create( p_sys->p_input, "contrast", VLC_VAR_ADDRESS ); + var_Create( p_sys->p_input, "menu-palette", VLC_VAR_ADDRESS ); var_Create( p_sys->p_input, "highlight", VLC_VAR_BOOL ); var_Create( p_sys->p_input, "highlight-mutex", VLC_VAR_MUTEX ); @@ -320,7 +342,7 @@ static int Open( vlc_object_t *p_this ) p_sys->p_ev = vlc_object_create( p_demux, sizeof( event_thread_t ) ); p_sys->p_ev->p_demux = p_demux; vlc_thread_create( p_sys->p_ev, "dvdnav event thread handler", EventThread, - VLC_THREAD_PRIORITY_LOW, VLC_FALSE ); + VLC_THREAD_PRIORITY_LOW, false ); return VLC_SUCCESS; } @@ -335,9 +357,9 @@ static void Close( vlc_object_t *p_this ) int i; /* stop the event handler */ - p_sys->p_ev->b_die = VLC_TRUE; + vlc_object_kill( p_sys->p_ev ); vlc_thread_join( p_sys->p_ev ); - vlc_object_destroy( p_sys->p_ev ); + vlc_object_release( p_sys->p_ev ); var_Destroy( p_sys->p_input, "highlight-mutex" ); var_Destroy( p_sys->p_input, "highlight" ); @@ -346,7 +368,7 @@ static void Close( vlc_object_t *p_this ) var_Destroy( p_sys->p_input, "y-start" ); var_Destroy( p_sys->p_input, "y-end" ); var_Destroy( p_sys->p_input, "color" ); - var_Destroy( p_sys->p_input, "contrast" ); + var_Destroy( p_sys->p_input, "menu-palette" ); vlc_object_release( p_sys->p_input ); @@ -371,7 +393,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) { demux_sys_t *p_sys = p_demux->p_sys; double f, *pf; - vlc_bool_t *pb; + bool *pb; int64_t *pi64; input_title_t ***ppp_title; int *pi_int; @@ -410,20 +432,18 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) else if( i_query == DEMUX_GET_TIME ) { pi64 = (int64_t*)va_arg( args, int64_t * ); - if( p_sys->i_mux_rate > 0 ) + if( p_sys->i_pgc_length > 0 ) { - *pi64 = (int64_t)1000000 * 2048 * pos / 50 / - p_sys->i_mux_rate; + *pi64 = p_sys->i_pgc_length * pos / len; return VLC_SUCCESS; } } else if( i_query == DEMUX_GET_LENGTH ) { pi64 = (int64_t*)va_arg( args, int64_t * ); - if( p_sys->i_mux_rate > 0 ) + if( p_sys->i_pgc_length > 0 ) { - *pi64 = (int64_t)1000000 * len * 2048 / 50 / - p_sys->i_mux_rate; + *pi64 = (int64_t)p_sys->i_pgc_length; return VLC_SUCCESS; } } @@ -433,10 +453,11 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) /* Special for access_demux */ case DEMUX_CAN_PAUSE: + case DEMUX_CAN_SEEK: case DEMUX_CAN_CONTROL_PACE: /* TODO */ - pb = (vlc_bool_t*)va_arg( args, vlc_bool_t * ); - *pb = VLC_TRUE; + pb = (bool*)va_arg( args, bool * ); + *pb = true; return VLC_SUCCESS; case DEMUX_SET_PAUSE_STATE: @@ -525,6 +546,20 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) *pi64 = (int64_t)var_GetInteger( p_demux, "dvdnav-caching" ) *1000; return VLC_SUCCESS; + case DEMUX_GET_META: + { + const char *title_name = NULL; + + dvdnav_get_title_string(p_sys->dvdnav, &title_name); + if( (NULL != title_name) && ('\0' != title_name[0]) ) + { + vlc_meta_t *p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* ); + vlc_meta_Set( p_meta, vlc_meta_Title, title_name ); + return VLC_SUCCESS; + } + return VLC_EGENERIC; + } + /* TODO implement others */ default: return VLC_EGENERIC; @@ -574,7 +609,7 @@ static int Demux( demux_t *p_demux ) { msg_Dbg( p_demux, "DVDNAV_STILL_FRAME" ); msg_Dbg( p_demux, " - length=0x%x", event->length ); - p_sys->p_ev->b_still = VLC_TRUE; + p_sys->p_ev->b_still = true; if( event->length == 0xff ) { p_sys->p_ev->i_still_end = 0; @@ -623,6 +658,7 @@ static int Demux( demux_t *p_demux ) event->physical_pan_scan ); ESSubtitleUpdate( p_demux ); + p_sys->b_spu_change = true; /* HACK to get the SPU tracks registered in the right order */ for( i = 0; i < 0x1f; i++ ) @@ -670,7 +706,7 @@ static int Demux( demux_t *p_demux ) es_format_Clean( &tk->fmt ); if( tk->es ) es_out_Del( p_demux->out, tk->es ); } - tk->b_seen = VLC_FALSE; + tk->b_seen = false; } if( dvdnav_current_title_info( p_sys->dvdnav, &i_title, @@ -696,11 +732,14 @@ static int Demux( demux_t *p_demux ) msg_Dbg( p_demux, "DVDNAV_CELL_CHANGE" ); msg_Dbg( p_demux, " - cellN=%d", event->cellN ); msg_Dbg( p_demux, " - pgN=%d", event->pgN ); - msg_Dbg( p_demux, " - cell_length=%lld", event->cell_length ); - msg_Dbg( p_demux, " - pg_length=%lld", event->pg_length ); - msg_Dbg( p_demux, " - pgc_length=%lld", event->pgc_length ); - msg_Dbg( p_demux, " - cell_start=%lld", event->cell_start ); - msg_Dbg( p_demux, " - pg_start=%lld", event->pg_start ); + msg_Dbg( p_demux, " - cell_length=%"PRId64, event->cell_length ); + msg_Dbg( p_demux, " - pg_length=%"PRId64, event->pg_length ); + msg_Dbg( p_demux, " - pgc_length=%"PRId64, event->pgc_length ); + msg_Dbg( p_demux, " - cell_start=%"PRId64, event->cell_start ); + msg_Dbg( p_demux, " - pg_start=%"PRId64, event->pg_start ); + + /* Store the lenght in time of the current PGC */ + p_sys->i_pgc_length = event->pgc_length / 90 * 1000; /* FIXME is it correct or there is better way to know chapter change */ if( dvdnav_current_title_info( p_sys->dvdnav, &i_title, @@ -728,11 +767,20 @@ static int Demux( demux_t *p_demux ) * - ... */ DemuxBlock( p_demux, packet, i_len ); + if( p_sys->b_spu_change ) + { + ButtonUpdate( p_demux, false ); + p_sys->b_spu_change = false; + } break; } case DVDNAV_STOP: /* EOF */ msg_Dbg( p_demux, "DVDNAV_STOP" ); + +#if DVD_READ_CACHE + dvdnav_free_cache_block( p_sys->dvdnav, packet ); +#endif return 0; case DVDNAV_HIGHLIGHT: @@ -741,7 +789,7 @@ static int Demux( demux_t *p_demux ) msg_Dbg( p_demux, "DVDNAV_HIGHLIGHT" ); msg_Dbg( p_demux, " - display=%d", event->display ); msg_Dbg( p_demux, " - buttonN=%d", event->buttonN ); - ButtonUpdate( p_demux ); + ButtonUpdate( p_demux, false ); break; } @@ -753,6 +801,8 @@ static int Demux( demux_t *p_demux ) case DVDNAV_WAIT: msg_Dbg( p_demux, "DVDNAV_WAIT" ); + /* reset PCR */ + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); dvdnav_wait_skip( p_sys->dvdnav ); break; @@ -771,16 +821,16 @@ static int Demux( demux_t *p_demux ) /* Get a 2 char code * FIXME: partiallyy duplicated from src/input/es_out.c */ -static char *DemuxGetLanguageCode( demux_t *p_demux, char *psz_var ) +static char *DemuxGetLanguageCode( demux_t *p_demux, const char *psz_var ) { const iso639_lang_t *pl; char *psz_lang; char *p; psz_lang = var_CreateGetString( p_demux, psz_var ); - /* XXX: we will use only the first value (and ignore other ones in case of a list) */ - if( ( p = strchr( psz_lang, "," ) ) ) - *p = '\0'; + /* XXX: we will use only the first value + * (and ignore other ones in case of a list) */ + if( ( p = strchr( psz_lang, ',' ) ) ) *p = '\0'; for( pl = p_languages; pl->psz_iso639_1 != NULL; pl++ ) { @@ -810,7 +860,7 @@ static void DemuxTitles( demux_t *p_demux ) /* Menu */ t = vlc_input_title_New(); - t->b_menu = VLC_TRUE; + t->b_menu = true; t->psz_name = strdup( "DVD Menu" ); s = vlc_seekpoint_New(); @@ -866,7 +916,7 @@ static void DemuxTitles( demux_t *p_demux ) /***************************************************************************** * Update functions: *****************************************************************************/ -static void ButtonUpdate( demux_t *p_demux ) +static void ButtonUpdate( demux_t *p_demux, bool b_mode ) { demux_sys_t *p_sys = p_demux->p_sys; vlc_value_t val; @@ -879,6 +929,7 @@ static void ButtonUpdate( demux_t *p_demux ) vlc_mutex_t *p_mutex = val.p_address; dvdnav_highlight_area_t hl; int32_t i_button; + bool b_button_ok; if( dvdnav_get_current_highlight( p_sys->dvdnav, &i_button ) != DVDNAV_STATUS_OK ) @@ -887,17 +938,26 @@ static void ButtonUpdate( demux_t *p_demux ) return; } + b_button_ok = false; if( i_button > 0 && i_title == 0 ) { pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav ); - dvdnav_get_highlight_area( pci, i_button, 1, &hl ); + b_button_ok = dvdnav_get_highlight_area( pci, i_button, b_mode, &hl ) == DVDNAV_STATUS_OK; + } + if( b_button_ok ) + { + int i; + for( i = 0; i < 4; i++ ) + { + uint32_t i_yuv = p_sys->clut[(hl.palette>>(16+i*4))&0x0f]; + uint8_t i_alpha = ( (hl.palette>>(i*4))&0x0f ) * 0xff / 0xf; - /* I fear it is plain wrong */ - p_sys->alpha[0] = hl.palette&0x0f; - p_sys->alpha[1] = (hl.palette>>4)&0x0f; - p_sys->alpha[2] = (hl.palette>>8)&0x0f; - p_sys->alpha[3] = (hl.palette>>12)&0x0f; + p_sys->palette[i][0] = (i_yuv >> 16) & 0xff; + p_sys->palette[i][1] = (i_yuv >> 0) & 0xff; + p_sys->palette[i][2] = (i_yuv >> 8) & 0xff; + p_sys->palette[i][3] = i_alpha; + } vlc_mutex_lock( p_mutex ); val.i_int = hl.sx; var_Set( p_sys->p_input, "x-start", val ); @@ -905,10 +965,10 @@ static void ButtonUpdate( demux_t *p_demux ) val.i_int = hl.sy; var_Set( p_sys->p_input, "y-start", val ); val.i_int = hl.ey; var_Set( p_sys->p_input, "y-end", val ); - val.p_address = (void *)p_sys->alpha; - var_Set( p_sys->p_input, "contrast", val ); + val.p_address = (void *)p_sys->palette; + var_Set( p_sys->p_input, "menu-palette", val ); - val.b_bool = VLC_TRUE; var_Set( p_sys->p_input, "highlight", val ); + val.b_bool = true; var_Set( p_sys->p_input, "highlight", val ); vlc_mutex_unlock( p_mutex ); msg_Dbg( p_demux, "buttonUpdate %d", i_button ); @@ -920,7 +980,7 @@ static void ButtonUpdate( demux_t *p_demux ) /* Show all */ vlc_mutex_lock( p_mutex ); - val.b_bool = VLC_FALSE; + val.b_bool = false; var_Set( p_sys->p_input, "highlight", val ); vlc_mutex_unlock( p_mutex ); } @@ -933,7 +993,7 @@ static void ESSubtitleUpdate( demux_t *p_demux ) int i_spu = dvdnav_get_active_spu_stream( p_sys->dvdnav ); int32_t i_title, i_part; - ButtonUpdate( p_demux ); + ButtonUpdate( p_demux, false ); dvdnav_current_title_info( p_sys->dvdnav, &i_title, &i_part ); if( i_title > 0 ) return; @@ -946,7 +1006,7 @@ static void ESSubtitleUpdate( demux_t *p_demux ) /* be sure to unselect it (reset) */ es_out_Control( p_demux->out, ES_OUT_SET_ES_STATE, tk->es, - (vlc_bool_t)VLC_FALSE ); + (bool)false ); /* now select it */ es_out_Control( p_demux->out, ES_OUT_SET_ES, tk->es ); @@ -959,7 +1019,7 @@ static void ESSubtitleUpdate( demux_t *p_demux ) if( tk->b_seen ) { es_out_Control( p_demux->out, ES_OUT_SET_ES_STATE, tk->es, - (vlc_bool_t)VLC_FALSE ); + (bool)false ); } } } @@ -1059,7 +1119,7 @@ static void ESNew( demux_t *p_demux, int i_id ) { demux_sys_t *p_sys = p_demux->p_sys; ps_track_t *tk = &p_sys->tk[PS_ID_TO_TK(i_id)]; - vlc_bool_t b_select = VLC_FALSE; + bool b_select = false; if( tk->b_seen ) return; @@ -1072,11 +1132,14 @@ static void ESNew( demux_t *p_demux, int i_id ) /* Add a new ES */ if( tk->fmt.i_cat == VIDEO_ES ) { - if( p_sys->i_aspect >= 0 ) + switch( p_sys->i_aspect ) { - tk->fmt.video.i_aspect = p_sys->i_aspect; + /* TODO Any docs somewhere ? */ + default: + tk->fmt.video.i_aspect = 0; + break; } - b_select = VLC_TRUE; + b_select = true; } else if( tk->fmt.i_cat == AUDIO_ES ) { @@ -1110,7 +1173,7 @@ static void ESNew( demux_t *p_demux, int i_id ) } if( dvdnav_get_active_audio_stream( p_sys->dvdnav ) == i_audio ) { - b_select = VLC_TRUE; + b_select = true; } } } @@ -1136,7 +1199,7 @@ static void ESNew( demux_t *p_demux, int i_id ) if( i_title > 0 && dvdnav_get_active_spu_stream( p_sys->dvdnav ) == (i_id&0x1f) ) { - b_select = VLC_TRUE; + b_select = true; } } @@ -1145,9 +1208,9 @@ static void ESNew( demux_t *p_demux, int i_id ) { es_out_Control( p_demux->out, ES_OUT_SET_ES, tk->es ); } - tk->b_seen = VLC_TRUE; + tk->b_seen = true; - if( tk->fmt.i_cat == VIDEO_ES ) ButtonUpdate( p_demux ); + if( tk->fmt.i_cat == VIDEO_ES ) ButtonUpdate( p_demux, false ); } /***************************************************************************** @@ -1164,40 +1227,27 @@ static int EventThread( vlc_object_t *p_this ) demux_sys_t *p_sys = p_ev->p_demux->p_sys; vlc_object_t *p_vout = NULL; - vlc_mutex_init( p_ev, &p_ev->lock ); - p_ev->b_moved = VLC_FALSE; - p_ev->b_clicked = VLC_FALSE; - p_ev->b_key = VLC_FALSE; - p_ev->b_still = VLC_FALSE; + vlc_mutex_init( &p_ev->lock ); + p_ev->b_moved = false; + p_ev->b_clicked = false; + p_ev->i_key_action = 0; + p_ev->b_still = false; /* catch all key event */ - var_AddCallback( p_ev->p_vlc, "key-pressed", EventKey, p_ev ); + var_AddCallback( p_ev->p_libvlc, "key-action", EventKey, p_ev ); /* main loop */ - while( !p_ev->b_die ) + while( vlc_object_alive (p_ev) ) { - vlc_bool_t b_activated = VLC_FALSE; + bool b_activated = false; /* KEY part */ - if( p_ev->b_key ) + if( p_ev->i_key_action != 0 ) { pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav ); - vlc_value_t valk; - struct hotkey *p_hotkeys = p_ev->p_vlc->p_hotkeys; - int i, i_action = -1; - vlc_mutex_lock( &p_ev->lock ); - var_Get( p_ev->p_vlc, "key-pressed", &valk ); - for( i = 0; p_hotkeys[i].psz_action != NULL; i++ ) - { - if( p_hotkeys[i].i_key == valk.i_int ) - { - i_action = p_hotkeys[i].i_action; - } - } - - switch( i_action ) + switch( p_ev->i_key_action ) { case ACTIONID_NAV_LEFT: dvdnav_left_button_select( p_sys->dvdnav, pci ); @@ -1212,13 +1262,14 @@ static int EventThread( vlc_object_t *p_this ) dvdnav_lower_button_select( p_sys->dvdnav, pci ); break; case ACTIONID_NAV_ACTIVATE: - b_activated = VLC_TRUE; + b_activated = true; dvdnav_button_activate( p_sys->dvdnav, pci ); + ButtonUpdate( p_ev->p_demux, true ); break; default: break; } - p_ev->b_key = VLC_FALSE; + p_ev->i_key_action = 0; vlc_mutex_unlock( &p_ev->lock ); } @@ -1239,16 +1290,17 @@ static int EventThread( vlc_object_t *p_this ) } if( p_ev->b_clicked ) { - b_activated = VLC_TRUE; + b_activated = true; dvdnav_mouse_activate( p_sys->dvdnav, pci, valx.i_int, valy.i_int ); + ButtonUpdate( p_ev->p_demux, true ); } - p_ev->b_moved = VLC_FALSE; - p_ev->b_clicked = VLC_FALSE; + p_ev->b_moved = false; + p_ev->b_clicked = false; vlc_mutex_unlock( &p_ev->lock ); } - if( p_vout && p_vout->b_die ) + if( p_vout && !vlc_object_alive (p_vout) ) { var_DelCallback( p_vout, "mouse-moved", EventMouse, p_ev ); var_DelCallback( p_vout, "mouse-clicked", EventMouse, p_ev ); @@ -1273,7 +1325,7 @@ static int EventThread( vlc_object_t *p_this ) if( /* b_activated || // This breaks menus */ ( p_ev->i_still_end > 0 && p_ev->i_still_end < mdate() )) { - p_ev->b_still = VLC_FALSE; + p_ev->b_still = false; dvdnav_still_skip( p_sys->dvdnav ); } } @@ -1290,7 +1342,7 @@ static int EventThread( vlc_object_t *p_this ) var_DelCallback( p_vout, "mouse-clicked", EventMouse, p_ev ); vlc_object_release( p_vout ); } - var_DelCallback( p_ev->p_vlc, "key-pressed", EventKey, p_ev ); + var_DelCallback( p_ev->p_libvlc, "key-action", EventKey, p_ev ); vlc_mutex_destroy( &p_ev->lock ); @@ -1303,9 +1355,9 @@ static int EventMouse( vlc_object_t *p_this, char const *psz_var, event_thread_t *p_ev = p_data; vlc_mutex_lock( &p_ev->lock ); if( psz_var[6] == 'c' ) - p_ev->b_clicked = VLC_TRUE; + p_ev->b_clicked = true; else if( psz_var[6] == 'm' ) - p_ev->b_moved = VLC_TRUE; + p_ev->b_moved = true; vlc_mutex_unlock( &p_ev->lock ); return VLC_SUCCESS; @@ -1316,7 +1368,7 @@ static int EventKey( vlc_object_t *p_this, char const *psz_var, { event_thread_t *p_ev = p_data; vlc_mutex_lock( &p_ev->lock ); - p_ev->b_key = VLC_TRUE; + p_ev->i_key_action = newval.i_int; vlc_mutex_unlock( &p_ev->lock ); return VLC_SUCCESS; @@ -1333,6 +1385,12 @@ static int ProbeDVD( demux_t *p_demux, char *psz_name ) uint16_t i_tag_id = 0; int i_fd, i_ret; + if( !*psz_name ) + { + /* Triggers libdvdcss autodetection */ + return VLC_SUCCESS; + } + if( stat( psz_name, &stat_info ) || !S_ISREG( stat_info.st_mode ) ) { /* Let dvdnav_open() do the probing */