/*****************************************************************************
* dvdnav.c: DVD module using the dvdnav library.
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* 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.
*****************************************************************************/
/*****************************************************************************
*****************************************************************************/
#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")
/* palette for menus */
uint32_t clut[16];
uint8_t palette[4][4];
+ vlc_bool_t b_spu_change;
/* */
int i_aspect;
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] == ':' &&
p_sys->i_aspect = -1;
p_sys->i_mux_rate = 0;
p_sys->i_pgc_length = 0;
+ p_sys->b_spu_change = VLC_FALSE;
if( 1 )
{
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?)" );
+ dvdnav_close( p_sys->dvdnav );
+ free( p_sys );
+ return VLC_EGENERIC;
}
if( dvdnav_menu_call( p_sys->dvdnav, DVD_MENU_Title ) !=
*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 **pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** );
+ vlc_meta_t *meta;
+ *pp_meta = meta = vlc_meta_New();
+ vlc_meta_Add( meta, VLC_META_TITLE, title_name );
+ return VLC_SUCCESS;
+ }
+ return VLC_EGENERIC;
+ }
+
/* TODO implement others */
default:
return VLC_EGENERIC;
event->physical_pan_scan );
ESSubtitleUpdate( p_demux );
+ p_sys->b_spu_change = VLC_TRUE;
/* HACK to get the SPU tracks registered in the right order */
for( i = 0; i < 0x1f; i++ )
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;
* - ...
*/
DemuxBlock( p_demux, packet, i_len );
+ if( p_sys->b_spu_change )
+ {
+ ButtonUpdate( p_demux, VLC_FALSE );
+ p_sys->b_spu_change = VLC_FALSE;
+ }
break;
}
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;
}
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;
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;
}
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 );
}
/*****************************************************************************
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 */