X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdvdnav.c;h=b424e46eaa099a9a7826e440dd4cfb9829c59aba;hb=1e01594c3a24a56aae41d4e4530d01506c8e6ffb;hp=2c36c5e9cb3435090d57219a1a8c72e714a3cc82;hpb=a1dcb3633c582bb810f5575d6b81d5b1e9c7b744;p=vlc diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c index 2c36c5e9cb..b424e46eaa 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,7 +18,7 @@ * * 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. *****************************************************************************/ /***************************************************************************** @@ -28,6 +28,7 @@ #include #include +#include #ifdef HAVE_UNISTD_H # include @@ -58,16 +59,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") @@ -176,13 +177,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 = strdup( p_demux->psz_path ); #ifdef WIN32 if( psz_name[0] && psz_name[1] == ':' && @@ -206,17 +207,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 ) ); + STANDARD_DEMUX_INIT; 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 = 0; + p_sys->b_spu_change = VLC_FALSE; if( 1 ) { @@ -295,6 +293,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, VLC_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; @@ -536,6 +537,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_SetTitle( p_meta, title_name ); + return VLC_SUCCESS; + } + return VLC_EGENERIC; + } + /* TODO implement others */ default: return VLC_EGENERIC; @@ -634,7 +649,7 @@ static int Demux( demux_t *p_demux ) event->physical_pan_scan ); ESSubtitleUpdate( p_demux ); - p_sys->b_spu_change = 1; + p_sys->b_spu_change = VLC_TRUE; /* HACK to get the SPU tracks registered in the right order */ for( i = 0; i < 0x1f; i++ ) @@ -708,11 +723,11 @@ 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="I64Fd, event->cell_length ); + msg_Dbg( p_demux, " - pg_length="I64Fd, event->pg_length ); + msg_Dbg( p_demux, " - pgc_length="I64Fd, event->pgc_length ); + msg_Dbg( p_demux, " - cell_start="I64Fd, event->cell_start ); + msg_Dbg( p_demux, " - pg_start="I64Fd, event->pg_start ); /* Store the lenght in time of the current PGC */ p_sys->i_pgc_length = event->pgc_length / 90 * 1000; @@ -743,8 +758,11 @@ static int Demux( demux_t *p_demux ) * - ... */ DemuxBlock( p_demux, packet, i_len ); - if( p_sys->b_spu_change ) ButtonUpdate( p_demux, 0 ); - p_sys->b_spu_change = 0; + if( p_sys->b_spu_change ) + { + ButtonUpdate( p_demux, VLC_FALSE ); + p_sys->b_spu_change = VLC_FALSE; + } break; } @@ -762,7 +780,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, 0 ); + ButtonUpdate( p_demux, VLC_FALSE ); break; } @@ -963,7 +981,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, 0 ); + ButtonUpdate( p_demux, VLC_FALSE ); dvdnav_current_title_info( p_sys->dvdnav, &i_title, &i_part ); if( i_title > 0 ) return; @@ -1177,7 +1195,7 @@ static void ESNew( demux_t *p_demux, int i_id ) } tk->b_seen = VLC_TRUE; - if( tk->fmt.i_cat == VIDEO_ES ) ButtonUpdate( p_demux, 0 ); + if( tk->fmt.i_cat == VIDEO_ES ) ButtonUpdate( p_demux, VLC_FALSE ); } /***************************************************************************** @@ -1201,7 +1219,7 @@ static int EventThread( vlc_object_t *p_this ) p_ev->b_still = VLC_FALSE; /* catch all key event */ - var_AddCallback( p_ev->p_vlc, "key-pressed", EventKey, p_ev ); + var_AddCallback( p_ev->p_libvlc, "key-pressed", EventKey, p_ev ); /* main loop */ while( !p_ev->b_die ) @@ -1214,11 +1232,11 @@ static int EventThread( vlc_object_t *p_this ) 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; + struct hotkey *p_hotkeys = p_ev->p_libvlc->p_hotkeys; int i, i_action = -1; vlc_mutex_lock( &p_ev->lock ); - var_Get( p_ev->p_vlc, "key-pressed", &valk ); + var_Get( p_ev->p_libvlc, "key-pressed", &valk ); for( i = 0; p_hotkeys[i].psz_action != NULL; i++ ) { if( p_hotkeys[i].i_key == valk.i_int ) @@ -1322,7 +1340,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-pressed", EventKey, p_ev ); vlc_mutex_destroy( &p_ev->lock ); @@ -1365,6 +1383,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 */