/*****************************************************************************
* dvdread.c : DvdRead input module for vlc
*****************************************************************************
- * Copyright (C) 2001-2004 the VideoLAN team
+ * Copyright (C) 2001-2006 the VideoLAN team
* $Id$
*
- * Authors: St�hane Borel <stef@via.ecp.fr>
+ * Authors: Stéphane Borel <stef@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdio.h>
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h> /* strdup() */
#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_input.h>
+#include <vlc_access.h>
+
+#include <vlc_interface.h>
#include "iso_lang.h"
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <string.h>
#include <dvdread/dvd_reader.h>
#include <dvdread/ifo_types.h>
"libcss.\n" \
"The default method is: key.")
-static char *psz_css_list[] = { "title", "disc", "key" };
-static char *psz_css_list_text[] = { N_("title"), N_("Disc"), N_("Key") };
+static const char *psz_css_list[] = { "title", "disc", "key" };
+static const char *psz_css_list_text[] = { N_("title"), N_("Disc"), N_("Key") };
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
if( !(p_dvdread = DVDOpen( psz_name )) )
{
msg_Err( p_demux, "DVDRead cannot open source: %s", psz_name );
+ intf_UserFatal( p_demux, VLC_FALSE, _("Playback failure"),
+ _("DVDRead could not open disk \"%s\"."), psz_name );
free( psz_name );
return VLC_EGENERIC;
}
msg_Dbg( p_demux, "VMG opened" );
/* 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;
ps_track_init( p_sys->tk );
p_sys->i_aspect = -1;
i_micro_second += (int64_t)(BCD2D(dtime->minute)) * 60 * 1000000;
i_micro_second += (int64_t)(BCD2D(dtime->second)) * 1000000;
- switch((dtime->frame_u & 0xc0) >> 6)
+ switch((dtime->frame_u & 0xc0) >> 6)
{
case 1:
f_fps = 25.0;
pi64 = (int64_t*)va_arg( args, int64_t * );
if( p_demux->info.i_title >= 0 && p_demux->info.i_title < p_sys->i_titles )
{
- *pi64 = (int64_t) dvdtime_to_time( &p_sys->p_cur_pgc->playback_time, 0 ) /
+ *pi64 = (int64_t) dvdtime_to_time( &p_sys->p_cur_pgc->playback_time, 0 ) /
p_sys->i_title_blocks * p_sys->i_title_offset;
return VLC_SUCCESS;
}
1, p_buffer ) != 1 )
{
msg_Err( p_demux, "read failed for block %d", p_sys->i_next_vobu );
+ intf_UserWarn( p_demux, _("Playback failure"),
+ _("DVDRead could not read block %d."),
+ p_sys->i_next_vobu );
return -1;
}
{
msg_Err( p_demux, "read failed for %d/%d blocks at 0x%02x",
i_read, i_blocks_once, p_sys->i_cur_block );
+ intf_UserFatal( p_demux, VLC_FALSE, _("Playback failure"),
+ _("DVDRead could not read %d/%d blocks at 0x%02x."),
+ i_read, i_blocks_once, p_sys->i_cur_block );
return -1;
}
p_sys->dsi_pack.dsi_gi.vobu_c_idn,
dvdtime_to_time( &p_sys->dsi_pack.dsi_gi.c_eltm, 0 ) );
- msg_Dbg( p_demux, "cell duration: %lld",
+ msg_Dbg( p_demux, "cell duration: %lld",
(mtime_t)dvdtime_to_time( &p_sys->p_cur_pgc->cell_playback[p_sys->i_cur_cell].playback_time, 0 ) );
msg_Dbg( p_demux, "cat 0x%02x ilvu_ea %d ilvu_sa %d size %d",