X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdvdnav.c;h=b226b56a8709a6c77511b158f02d6fe99fb5dd5d;hb=a323173f0b9ba5374b420e94421379ec08d34ae3;hp=0ce6fc72e024956e88089e10450b27154a6deba5;hpb=0597403277c49d3fc23da19fb6f6954e984bae86;p=vlc diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c index 0ce6fc72e0..b226b56a87 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 the VideoLAN team + * Copyright (C) 2004-2009 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -16,9 +16,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * 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., + * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -29,6 +29,7 @@ # include "config.h" #endif +#include #include #include #include @@ -36,7 +37,7 @@ #include #include -#include +#include #ifdef HAVE_UNISTD_H # include @@ -51,8 +52,8 @@ # include #endif -#include "vlc_keys.h" -#include "vlc_iso_lang.h" +#include +#include /* FIXME we should find a better way than including that */ #include "../../src/text/iso-639_def.h" @@ -89,15 +90,15 @@ vlc_module_begin () set_category( CAT_INPUT ) set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "dvdnav-angle", 1, NULL, ANGLE_TEXT, - ANGLE_LONGTEXT, false ); + ANGLE_LONGTEXT, false ) add_integer( "dvdnav-caching", DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, true ); + CACHING_TEXT, CACHING_LONGTEXT, true ) add_bool( "dvdnav-menu", true, NULL, - MENU_TEXT, MENU_LONGTEXT, false ); + MENU_TEXT, MENU_LONGTEXT, false ) set_capability( "access_demux", 5 ) add_shortcut( "dvd" ) add_shortcut( "dvdnav" ) - add_shortcut( "file" ); + add_shortcut( "file" ) set_callbacks( Open, Close ) vlc_module_end () @@ -107,28 +108,21 @@ vlc_module_end () /***************************************************************************** * Local prototypes *****************************************************************************/ -typedef struct -{ - VLC_COMMON_MEMBERS - - demux_t *p_demux; - vlc_mutex_t lock; - - bool b_moved; - bool b_clicked; - int i_key_action; - - bool b_still; - int64_t i_still_end; - -} event_thread_t; - -static void* EventThread( vlc_object_t * ); - struct demux_sys_t { dvdnav_t *dvdnav; + /* */ + bool b_reset_pcr; + + struct + { + bool b_created; + bool b_enabled; + vlc_mutex_t lock; + vlc_timer_t timer; + } still; + /* track */ ps_track_t tk[PS_TK_COUNT]; int i_mux_rate; @@ -137,7 +131,7 @@ struct demux_sys_t input_thread_t *p_input; /* event */ - event_thread_t *p_ev; + vlc_object_t *p_vout; /* palette for menus */ uint32_t clut[16]; @@ -169,6 +163,15 @@ static char *DemuxGetLanguageCode( demux_t *p_demux, const char *psz_var ); static int ControlInternal( demux_t *, int, ... ); +static void StillTimer( void * ); + +static int EventKey( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); +static int EventMouse( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); +static int EventIntf( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); + /***************************************************************************** * DemuxOpen: *****************************************************************************/ @@ -220,6 +223,7 @@ static int Open( vlc_object_t *p_this ) /* Fill p_demux field */ DEMUX_INIT_COMMON(); p_sys = p_demux->p_sys; p_sys->dvdnav = p_dvdnav; + p_sys->b_reset_pcr = false; ps_track_init( p_sys->tk ); p_sys->i_aspect = -1; @@ -308,9 +312,9 @@ static int Open( vlc_object_t *p_this ) if( dvdnav_title_play( p_sys->dvdnav, 1 ) != DVDNAV_STATUS_OK ) { msg_Err( p_demux, "cannot set title (can't decrypt DVD?)" ); - intf_UserFatal( p_demux, false, _("Playback failure"), + dialog_Fatal( p_demux, _("Playback failure"), "%s", _("VLC cannot set the DVD's title. It possibly " - "cannot decrypt the entire disk.") ); + "cannot decrypt the entire disc.") ); dvdnav_close( p_sys->dvdnav ); free( p_sys ); return VLC_EGENERIC; @@ -345,11 +349,15 @@ static int Open( vlc_object_t *p_this ) var_Create( p_sys->p_input, "highlight", VLC_VAR_BOOL ); var_Create( p_sys->p_input, "highlight-mutex", VLC_VAR_MUTEX ); - /* Now create our event thread catcher */ - 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 ); + /* catch all key event */ + var_AddCallback( p_demux->p_libvlc, "key-action", EventKey, p_demux ); + /* catch vout creation event */ + var_AddCallback( p_sys->p_input, "intf-event", EventIntf, p_demux ); + + p_sys->still.b_enabled = false; + vlc_mutex_init( &p_sys->still.lock ); + if( !vlc_timer_create( &p_sys->still.timer, StillTimer, p_sys ) ) + p_sys->still.b_created = true; return VLC_SUCCESS; } @@ -363,10 +371,22 @@ static void Close( vlc_object_t *p_this ) demux_sys_t *p_sys = p_demux->p_sys; int i; - /* stop the event handler */ - vlc_object_kill( p_sys->p_ev ); - vlc_thread_join( p_sys->p_ev ); - vlc_object_release( p_sys->p_ev ); + /* Stop vout event handler */ + var_DelCallback( p_sys->p_input, "intf-event", EventIntf, p_demux ); + if( p_sys->p_vout != NULL ) + { /* Should not happen, but better be safe than sorry. */ + msg_Warn( p_sys->p_vout, "removing dangling mouse DVD callbacks" ); + var_DelCallback( p_sys->p_vout, "mouse-moved", EventMouse, p_demux ); + var_DelCallback( p_sys->p_vout, "mouse-clicked", EventMouse, p_demux ); + } + + /* Stop key event handler (FIXME: should really be per-vout too) */ + var_DelCallback( p_demux->p_libvlc, "key-action", EventKey, p_demux ); + + /* Stop still image handler */ + if( p_sys->still.b_created ) + vlc_timer_destroy( p_sys->still.timer ); + vlc_mutex_destroy( &p_sys->still.lock ); var_Destroy( p_sys->p_input, "highlight-mutex" ); var_Destroy( p_sys->p_input, "highlight" ); @@ -399,11 +419,7 @@ static void Close( vlc_object_t *p_this ) 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; - bool *pb; - int64_t *pi64; input_title_t ***ppp_title; - int *pi_int; int i; switch( i_query ) @@ -420,41 +436,37 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) return VLC_EGENERIC; } - if( i_query == DEMUX_GET_POSITION ) + switch( i_query ) { - pf = (double*)va_arg( args, double* ); - *pf = (double)pos / (double)len; + case DEMUX_GET_POSITION: + *va_arg( args, double* ) = (double)pos / (double)len; return VLC_SUCCESS; - } - else if( i_query == DEMUX_SET_POSITION ) - { - f = (double)va_arg( args, double ); - pos = f * len; + + case DEMUX_SET_POSITION: + pos = va_arg( args, double ) * len; if( dvdnav_sector_search( p_sys->dvdnav, pos, SEEK_SET ) == DVDNAV_STATUS_OK ) { return VLC_SUCCESS; } - } - else if( i_query == DEMUX_GET_TIME ) - { - pi64 = (int64_t*)va_arg( args, int64_t * ); + break; + + case DEMUX_GET_TIME: if( p_sys->i_pgc_length > 0 ) { - *pi64 = p_sys->i_pgc_length * pos / len; + *va_arg( args, int64_t * ) = 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 * ); + break; + + case DEMUX_GET_LENGTH: if( p_sys->i_pgc_length > 0 ) { - *pi64 = (int64_t)p_sys->i_pgc_length; + *va_arg( args, int64_t * ) = (int64_t)p_sys->i_pgc_length; return VLC_SUCCESS; } + break; } - return VLC_EGENERIC; } @@ -463,21 +475,19 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) case DEMUX_CAN_SEEK: case DEMUX_CAN_CONTROL_PACE: /* TODO */ - pb = (bool*)va_arg( args, bool * ); - *pb = true; + *va_arg( args, bool * ) = true; return VLC_SUCCESS; case DEMUX_SET_PAUSE_STATE: return VLC_SUCCESS; case DEMUX_GET_TITLE_INFO: - ppp_title = (input_title_t***)va_arg( args, input_title_t*** ); - pi_int = (int*)va_arg( args, int* ); - *((int*)va_arg( args, int* )) = 0; /* Title offset */ - *((int*)va_arg( args, int* )) = 1; /* Chapter offset */ + ppp_title = va_arg( args, input_title_t*** ); + *va_arg( args, int* ) = p_sys->i_title; + *va_arg( args, int* ) = 0; /* Title offset */ + *va_arg( args, int* ) = 1; /* Chapter offset */ /* Duplicate title infos */ - *pi_int = p_sys->i_title; *ppp_title = malloc( sizeof( input_title_t ** ) * p_sys->i_title ); for( i = 0; i < p_sys->i_title; i++ ) { @@ -502,40 +512,21 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) return VLC_SUCCESS; case DEMUX_SET_SEEKPOINT: - i = (int)va_arg( args, int ); + i = va_arg( args, int ); if( p_demux->info.i_title == 0 ) { - int i_ret; - /* Special case */ - switch( i ) - { - case 0: - i_ret = dvdnav_menu_call( p_sys->dvdnav, DVD_MENU_Escape ); - break; - case 1: - i_ret = dvdnav_menu_call( p_sys->dvdnav, DVD_MENU_Root ); - break; - case 2: - i_ret = dvdnav_menu_call( p_sys->dvdnav, DVD_MENU_Title ); - break; - case 3: - i_ret = dvdnav_menu_call( p_sys->dvdnav, DVD_MENU_Part ); - break; - case 4: - i_ret = dvdnav_menu_call( p_sys->dvdnav, - DVD_MENU_Subpicture ); - break; - case 5: - i_ret = dvdnav_menu_call( p_sys->dvdnav, DVD_MENU_Audio ); - break; - case 6: - i_ret = dvdnav_menu_call( p_sys->dvdnav, DVD_MENU_Angle ); - break; - default: - return VLC_EGENERIC; - } - - if( i_ret != DVDNAV_STATUS_OK ) + static const int argtab[] = { + DVD_MENU_Escape, + DVD_MENU_Root, + DVD_MENU_Title, + DVD_MENU_Part, + DVD_MENU_Subpicture, + DVD_MENU_Audio, + DVD_MENU_Angle + }; + enum { numargs = sizeof(argtab)/sizeof(int) }; + if( (unsigned)i >= numargs || DVDNAV_STATUS_OK != + dvdnav_menu_call(p_sys->dvdnav,argtab[i]) ) return VLC_EGENERIC; } else if( dvdnav_part_play( p_sys->dvdnav, p_demux->info.i_title, @@ -549,8 +540,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) return VLC_SUCCESS; case DEMUX_GET_PTS_DELAY: - pi64 = (int64_t*)va_arg( args, int64_t * ); - *pi64 = (int64_t)var_GetInteger( p_demux, "dvdnav-caching" ) *1000; + *va_arg( args, int64_t * ) + = (int64_t)var_GetInteger( p_demux, "dvdnav-caching" ) *1000; return VLC_SUCCESS; case DEMUX_GET_META: @@ -617,7 +608,14 @@ static int Demux( demux_t *p_demux ) switch( i_event ) { case DVDNAV_BLOCK_OK: /* mpeg block */ - p_sys->p_ev->b_still = false; + vlc_mutex_lock( &p_sys->still.lock ); + p_sys->still.b_enabled = false; + vlc_mutex_unlock( &p_sys->still.lock ); + if( p_sys->b_reset_pcr ) + { + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); + p_sys->b_reset_pcr = false; + } DemuxBlock( p_demux, packet, i_len ); break; @@ -628,8 +626,26 @@ static int Demux( demux_t *p_demux ) case DVDNAV_STILL_FRAME: { dvdnav_still_event_t *event = (dvdnav_still_event_t*)packet; - vlc_mutex_lock( &p_sys->p_ev->lock ); - if( !p_sys->p_ev->b_still ) + bool b_still_init = false; + + vlc_mutex_lock( &p_sys->still.lock ); + if( !p_sys->still.b_enabled ) + { + msg_Dbg( p_demux, "DVDNAV_STILL_FRAME" ); + msg_Dbg( p_demux, " - length=0x%x", event->length ); + p_sys->still.b_enabled = true; + + if( event->length != 0xff && p_sys->still.b_created ) + { + mtime_t delay = event->length * CLOCK_FREQ; + vlc_timer_schedule( p_sys->still.timer, false, delay, 0 ); + } + + b_still_init = true; + } + vlc_mutex_unlock( &p_sys->still.lock ); + + if( b_still_init ) { /* We send a dummy mpeg2 end of sequence to force still frame display */ static const uint8_t buffer[] = { @@ -639,20 +655,10 @@ static int Demux( demux_t *p_demux ) }; DemuxBlock( p_demux, buffer, sizeof(buffer) ); - msg_Dbg( p_demux, "DVDNAV_STILL_FRAME" ); - msg_Dbg( p_demux, " - length=0x%x", event->length ); - p_sys->p_ev->b_still = true; - if( event->length == 0xff ) - { - p_sys->p_ev->i_still_end = 0; - } - else - { - p_sys->p_ev->i_still_end = (int64_t)event->length * - 1000000 + mdate(); - } + bool b_empty; + es_out_Control( p_demux->out, ES_OUT_GET_EMPTY, &b_empty ); + p_sys->b_reset_pcr = true; } - vlc_mutex_unlock( &p_sys->p_ev->lock ); msleep( 40000 ); break; } @@ -827,15 +833,23 @@ static int Demux( demux_t *p_demux ) case DVDNAV_HOP_CHANNEL: msg_Dbg( p_demux, "DVDNAV_HOP_CHANNEL" ); - /* We should try to flush all our internal buffer */ + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); break; 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 ); + bool b_empty; + es_out_Control( p_demux->out, ES_OUT_GET_EMPTY, &b_empty ); + if( !b_empty ) + { + msleep( 40*1000 ); + } + else + { + dvdnav_wait_skip( p_sys->dvdnav ); + p_sys->b_reset_pcr = true; + } break; default: @@ -868,7 +882,7 @@ static char *DemuxGetLanguageCode( demux_t *p_demux, const char *psz_var ) if( ( p = strchr( psz_lang, ',' ) ) ) *p = '\0'; - for( pl = p_languages; pl->psz_iso639_1 != NULL; pl++ ) + for( pl = p_languages; pl->psz_eng_name != NULL; pl++ ) { if( *psz_lang == '\0' ) continue; @@ -882,7 +896,7 @@ static char *DemuxGetLanguageCode( demux_t *p_demux, const char *psz_var ) free( psz_lang ); - if( pl->psz_iso639_1 != NULL ) + if( pl->psz_eng_name != NULL ) return strdup( pl->psz_iso639_1 ); return strdup(LANGUAGE_DEFAULT); @@ -981,8 +995,10 @@ static void ButtonUpdate( demux_t *p_demux, bool b_mode ) { pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav ); - b_button_ok = dvdnav_get_highlight_area( pci, i_button, b_mode, &hl ) == DVDNAV_STATUS_OK; + b_button_ok = DVDNAV_STATUS_OK == + dvdnav_get_highlight_area( pci, i_button, b_mode, &hl ); } + if( b_button_ok ) { int i; @@ -998,15 +1014,14 @@ static void ButtonUpdate( demux_t *p_demux, bool b_mode ) } vlc_mutex_lock( p_mutex ); - val.i_int = hl.sx; var_Set( p_sys->p_input, "x-start", val ); - val.i_int = hl.ex; var_Set( p_sys->p_input, "x-end", val ); - 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 ); + var_SetInteger( p_sys->p_input, "x-start", hl.sx ); + var_SetInteger( p_sys->p_input, "x-end", hl.ex ); + var_SetInteger( p_sys->p_input, "y-start", hl.sy ); + var_SetInteger( p_sys->p_input, "y-end", hl.ey ); - val.p_address = (void *)p_sys->palette; - var_Set( p_sys->p_input, "menu-palette", val ); + var_SetAddress( p_sys->p_input, "menu-palette", p_sys->palette ); - val.b_bool = true; var_Set( p_sys->p_input, "highlight", val ); + var_SetBool( p_sys->p_input, "highlight", true ); vlc_mutex_unlock( p_mutex ); msg_Dbg( p_demux, "buttonUpdate %d", i_button ); @@ -1018,8 +1033,7 @@ static void ButtonUpdate( demux_t *p_demux, bool b_mode ) /* Show all */ vlc_mutex_lock( p_mutex ); - val.b_bool = false; - var_Set( p_sys->p_input, "highlight", val ); + var_SetBool( p_sys->p_input, "highlight", false ); vlc_mutex_unlock( p_mutex ); } } @@ -1109,7 +1123,7 @@ static int DemuxBlock( demux_t *p_demux, const uint8_t *pkt, int i_pkt ) int i_mux_rate; if( !ps_pkt_parse_pack( p_pkt, &i_scr, &i_mux_rate ) ) { - es_out_Control( p_demux->out, ES_OUT_SET_PCR, i_scr ); + es_out_Control( p_demux->out, ES_OUT_SET_PCR, i_scr + 1 ); if( i_mux_rate > 0 ) p_sys->i_mux_rate = i_mux_rate; } block_Release( p_pkt ); @@ -1255,167 +1269,104 @@ static void ESNew( demux_t *p_demux, int i_id ) } /***************************************************************************** - * Event handler code + * Still image end *****************************************************************************/ -static int EventMouse( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); -static int EventKey ( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); - -static void* EventThread( vlc_object_t *p_this ) +static void StillTimer( void *p_data ) { - event_thread_t *p_ev = (event_thread_t*)p_this; - demux_sys_t *p_sys = p_ev->p_demux->p_sys; - vlc_object_t *p_vout = NULL; + demux_sys_t *p_sys = p_data; - 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; + vlc_mutex_lock( &p_sys->still.lock ); + assert( p_sys->still.b_enabled ); + p_sys->still.b_enabled = false; + dvdnav_still_skip( p_sys->dvdnav ); + vlc_mutex_unlock( &p_sys->still.lock ); +} - int canc = vlc_savecancel (); +static int EventMouse( vlc_object_t *p_vout, char const *psz_var, + vlc_value_t oldval, vlc_value_t val, void *p_data ) +{ + demux_t *p_demux = p_data; + demux_sys_t *p_sys = p_demux->p_sys; - /* catch all key event */ - var_AddCallback( p_ev->p_libvlc, "key-action", EventKey, p_ev ); + /* FIXME? PCI usage thread safe? */ + pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav ); + int x = var_GetInteger( p_vout, "mouse-x" ); + int y = var_GetInteger( p_vout, "mouse-y" ); - /* main loop */ - while( vlc_object_alive (p_ev) ) + if( psz_var[6] == 'm' ) /* mouse-moved */ + dvdnav_mouse_select( p_sys->dvdnav, pci, x, y ); + else { - bool b_activated = false; - - /* KEY part */ - if( p_ev->i_key_action != 0 ) - { - pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav ); - - vlc_mutex_lock( &p_ev->lock ); - switch( p_ev->i_key_action ) - { - case ACTIONID_NAV_LEFT: - dvdnav_left_button_select( p_sys->dvdnav, pci ); - break; - case ACTIONID_NAV_RIGHT: - dvdnav_right_button_select( p_sys->dvdnav, pci ); - break; - case ACTIONID_NAV_UP: - dvdnav_upper_button_select( p_sys->dvdnav, pci ); - break; - case ACTIONID_NAV_DOWN: - dvdnav_lower_button_select( p_sys->dvdnav, pci ); - break; - case ACTIONID_NAV_ACTIVATE: - b_activated = true; - ButtonUpdate( p_ev->p_demux, true ); - dvdnav_button_activate( p_sys->dvdnav, pci ); - break; - default: - break; - } - p_ev->i_key_action = 0; - vlc_mutex_unlock( &p_ev->lock ); - } - - /* VOUT part */ - if( p_vout && ( p_ev->b_moved || p_ev->b_clicked ) ) - { - pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav ); - vlc_value_t valx, valy; - - vlc_mutex_lock( &p_ev->lock ); - var_Get( p_vout, "mouse-x", &valx ); - var_Get( p_vout, "mouse-y", &valy ); + assert( psz_var[6] == 'c' ); /* mouse-clicked */ - if( p_ev->b_moved ) - { - dvdnav_mouse_select( p_sys->dvdnav, pci, valx.i_int, - valy.i_int ); - } - if( p_ev->b_clicked ) - { - b_activated = true; - ButtonUpdate( p_ev->p_demux, true ); - dvdnav_mouse_activate( p_sys->dvdnav, pci, valx.i_int, - valy.i_int ); - } + ButtonUpdate( p_demux, true ); + dvdnav_mouse_activate( p_sys->dvdnav, pci, x, y ); + } - p_ev->b_moved = false; - p_ev->b_clicked = false; - vlc_mutex_unlock( &p_ev->lock ); - } - 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 ); - vlc_object_release( p_vout ); - p_vout = NULL; - } - if( p_vout == NULL ) - { - p_vout = vlc_object_find( p_sys->p_input, VLC_OBJECT_VOUT, - FIND_CHILD ); - if( p_vout) - { - var_AddCallback( p_vout, "mouse-moved", EventMouse, p_ev ); - var_AddCallback( p_vout, "mouse-clicked", EventMouse, p_ev ); - } - } + (void)oldval; (void)val; + return VLC_SUCCESS; +} - /* Still part */ - vlc_mutex_lock( &p_ev->lock ); - if( p_ev->b_still ) - { - if( /* b_activated || // This breaks menus */ - ( p_ev->i_still_end > 0 && p_ev->i_still_end < mdate() )) - { - p_ev->b_still = false; - dvdnav_still_skip( p_sys->dvdnav ); - } - } - vlc_mutex_unlock( &p_ev->lock ); +static int EventKey( vlc_object_t *p_this, char const *psz_var, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) +{ + demux_t *p_demux = p_data; + demux_sys_t *p_sys = p_demux->p_sys; - /* Wait a bit */ - msleep( 10000 ); - } + /* FIXME: thread-safe ? */ + pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav ); - /* Release callback */ - if( p_vout ) + switch( newval.i_int ) { - var_DelCallback( p_vout, "mouse-moved", EventMouse, p_ev ); - var_DelCallback( p_vout, "mouse-clicked", EventMouse, p_ev ); - vlc_object_release( p_vout ); + case ACTIONID_NAV_LEFT: + dvdnav_left_button_select( p_sys->dvdnav, pci ); + break; + case ACTIONID_NAV_RIGHT: + dvdnav_right_button_select( p_sys->dvdnav, pci ); + break; + case ACTIONID_NAV_UP: + dvdnav_upper_button_select( p_sys->dvdnav, pci ); + break; + case ACTIONID_NAV_DOWN: + dvdnav_lower_button_select( p_sys->dvdnav, pci ); + break; + case ACTIONID_NAV_ACTIVATE: + ButtonUpdate( p_demux, true ); + dvdnav_button_activate( p_sys->dvdnav, pci ); + break; } - var_DelCallback( p_ev->p_libvlc, "key-action", EventKey, p_ev ); - vlc_restorecancel (canc); - vlc_mutex_destroy( &p_ev->lock ); - return NULL; + (void)p_this; (void)psz_var; (void)oldval; + return VLC_SUCCESS; } -static int EventMouse( vlc_object_t *p_this, char const *psz_var, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) +static int EventIntf( vlc_object_t *p_input, char const *psz_var, + vlc_value_t oldval, vlc_value_t val, void *p_data ) { - (void)p_this; (void)oldval; (void)newval; (void)p_data; - event_thread_t *p_ev = p_data; - vlc_mutex_lock( &p_ev->lock ); - if( psz_var[6] == 'c' ) - p_ev->b_clicked = true; - else if( psz_var[6] == 'm' ) - p_ev->b_moved = true; - vlc_mutex_unlock( &p_ev->lock ); + demux_t *p_demux = p_data; + demux_sys_t *p_sys = p_demux->p_sys; - return VLC_SUCCESS; -} + if (val.i_int == INPUT_EVENT_VOUT) + { + vlc_object_t *p_vout; -static int EventKey( vlc_object_t *p_this, char const *psz_var, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) -{ - (void)p_this; (void)psz_var; (void)oldval; - event_thread_t *p_ev = p_data; - vlc_mutex_lock( &p_ev->lock ); - p_ev->i_key_action = newval.i_int; - vlc_mutex_unlock( &p_ev->lock ); + p_vout = p_sys->p_vout; + if( p_vout != NULL ) + { + var_DelCallback( p_vout, "mouse-moved", EventMouse, p_demux ); + var_DelCallback( p_vout, "mouse-clicked", EventMouse, p_demux ); + vlc_object_release( p_vout ); + } + p_vout = (vlc_object_t *)input_GetVout( (input_thread_t *)p_input ); + p_sys->p_vout = p_vout; + if( p_vout != NULL ) + { + var_AddCallback( p_vout, "mouse-moved", EventMouse, p_demux ); + var_AddCallback( p_vout, "mouse-clicked", EventMouse, p_demux ); + } + } + (void) psz_var; (void) oldval; return VLC_SUCCESS; } @@ -1436,24 +1387,30 @@ static int ProbeDVD( demux_t *p_demux, char *psz_name ) return VLC_SUCCESS; } - if( (i_fd = open( psz_name, O_RDONLY )) == -1 ) + if( !strcmp( psz_name, "-" ) ) /* stdin -> file access */ + return VLC_EGENERIC; + + if( (i_fd = utf8_open( psz_name, O_RDONLY |O_NONBLOCK, 0666 )) == -1 ) { return VLC_SUCCESS; /* Let dvdnav_open() do the probing */ } + i_ret = VLC_EGENERIC; + if( fstat( i_fd, &stat_info ) || !S_ISREG( stat_info.st_mode ) ) { - close( i_fd ); - return VLC_SUCCESS; /* Let dvdnav_open() do the probing */ + if( !S_ISFIFO( stat_info.st_mode ) ) + i_ret = VLC_SUCCESS; /* Let dvdnav_open() do the probing */ + goto bailout; } /* Try to find the anchor (2 bytes at LBA 256) */ - i_ret = VLC_EGENERIC; if( lseek( i_fd, 256 * DVD_VIDEO_LB_LEN, SEEK_SET ) != -1 && read( i_fd, pi_anchor, 2 ) == 2 && GetWLE( pi_anchor ) == 2 ) i_ret = VLC_SUCCESS; /* Found a potential anchor */ +bailout: close( i_fd ); return i_ret;