int i_titles;
input_title_t *title[99]; /* No more that 99 track in a cd-audio */
- /* */
+ /* Current position */
int i_sector; /* Current Sector */
int * p_sectors; /* Track sectors */
/* Wave header for the output data */
WAVEHEADER waveheader;
-
+ vlc_bool_t b_header;
};
static block_t *Block( access_t * );
access_t *p_access = (access_t*)p_this;
access_sys_t *p_sys;
- char *psz_dup = strdup( p_access->psz_path );
- char *psz;
- int i;
- int i_title = 0;
vcddev_t *vcddev;
+ char *psz_name;
+ int i;
- /* Command line: cdda://[dev_path][@title] */
- if( ( psz = strchr( psz_dup, '@' ) ) )
- {
- *psz++ = '\0';
-
- i_title = strtol( psz, NULL, 0 );
- }
-
- if( *psz_dup == '\0' )
+ if( !p_access->psz_path || !*p_access->psz_path )
{
- free( psz_dup );
-
/* Only when selected */
- if( strcmp( p_access->psz_access, "cdda" ) )
- return VLC_EGENERIC;
+ if( !p_this->b_force ) return VLC_EGENERIC;
-
- psz_dup = var_CreateGetString( p_access, "cd-audio" );
- if( *psz_dup == '\0' )
+ psz_name = var_CreateGetString( p_this, "cd-audio" );
+ if( !psz_name || !*psz_name )
{
- free( psz_dup );
+ if( psz_name ) free( psz_name );
return VLC_EGENERIC;
}
}
+ else psz_name = strdup( p_access->psz_path );
/* Open CDDA */
- if( (vcddev = ioctl_Open( VLC_OBJECT(p_access), psz_dup )) == NULL )
+ if( (vcddev = ioctl_Open( VLC_OBJECT(p_access), psz_name )) == NULL )
{
- msg_Warn( p_access, "could not open %s", psz_dup );
- free( psz_dup );
+ msg_Warn( p_access, "could not open %s", psz_name );
+ free( psz_name );
return VLC_EGENERIC;
}
- free( psz_dup );
+ free( psz_name );
/* Set up p_access */
p_access->pf_read = NULL;
p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) );
memset( p_sys, 0, sizeof( access_sys_t ) );
p_sys->vcddev = vcddev;
+ p_sys->b_header = VLC_FALSE;
/* We read the Table Of Content information */
p_sys->i_titles = ioctl_GetTracksMap( VLC_OBJECT(p_access),
{
input_title_t *t = p_sys->title[i] = vlc_input_title_New();
- fprintf( stderr, "title[%d] start=%d\n", i, p_sys->p_sectors[i] );
- fprintf( stderr, "title[%d] end=%d\n", i, p_sys->p_sectors[i+1] );
+ msg_Dbg( p_access, "title[%d] start=%d", i, p_sys->p_sectors[i] );
+ msg_Dbg( p_access, "title[%d] end=%d", i, p_sys->p_sectors[i+1] );
- t->i_size = sizeof( WAVEHEADER ) +
- ( p_sys->p_sectors[i+1] - p_sys->p_sectors[i] ) *
+ asprintf( &t->psz_name, _("Track %i"), i + 1 );
+ t->i_size = ( p_sys->p_sectors[i+1] - p_sys->p_sectors[i] ) *
(int64_t)CDDA_DATA_SIZE;
t->i_length = I64C(1000000) * t->i_size / 44100 / 4;
}
- /* Starting title and sector */
- if( i_title >= p_sys->i_titles )
- i_title = 0;
- p_sys->i_sector = p_sys->p_sectors[i_title];
- p_access->info.i_title = i_title;
- p_access->info.i_size = p_sys->title[i_title]->i_size;
+ p_sys->i_sector = p_sys->p_sectors[0];
+ p_access->info.i_size = p_sys->title[0]->i_size;
/* Build a WAV header for the output data */
memset( &p_sys->waveheader, 0, sizeof(WAVEHEADER) );
p_sys->waveheader.DataChunkID = VLC_FOURCC('d', 'a', 't', 'a');
p_sys->waveheader.DataLength = 0; /* we just don't know */
- /* Pts delay */
- var_Create( p_access, "cdda-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ /* PTS delay */
+ var_Create( p_access, "cdda-caching", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
return VLC_SUCCESS;
error:
static block_t *Block( access_t *p_access )
{
access_sys_t *p_sys = p_access->p_sys;
- block_t *p_block;
- int i_blocks;
- int i_read;
- int i;
+ int i_blocks = CDDA_BLOCKS_ONCE;
+ block_t *p_block;
- if( p_access->info.b_eof )
- return NULL;
+ /* Check end of file */
+ if( p_access->info.b_eof ) return NULL;
- if( p_access->info.i_pos < sizeof( WAVEHEADER ) )
+ if( !p_sys->b_header )
{
/* Return only the header */
p_block = block_New( p_access, sizeof( WAVEHEADER ) );
memcpy( p_block->p_buffer, &p_sys->waveheader, sizeof(WAVEHEADER) );
-
- p_block->i_buffer -= p_access->info.i_pos;
- p_block->p_buffer += p_access->info.i_pos;
-
- p_access->info.i_pos += p_block->i_buffer;
+ p_sys->b_header = VLC_TRUE;
return p_block;
}
- /* Read raw data */
- i_blocks = CDDA_BLOCKS_ONCE;
- if( p_sys->i_sector + i_blocks >= p_sys->p_sectors[p_access->info.i_title + 1 ] )
+ /* Check end of title */
+ while( p_sys->i_sector >= p_sys->p_sectors[p_access->info.i_title + 1] )
{
- i_blocks = p_sys->p_sectors[p_access->info.i_title + 1 ] - p_sys->i_sector;
- if( i_blocks <= 0 ) i_blocks = 1; /* Should never occur */
- }
-
- p_block = block_New( p_access, i_blocks * CDDA_DATA_SIZE );
-
- if( ioctl_ReadSectors( VLC_OBJECT(p_access), p_sys->vcddev, p_sys->i_sector,
- p_block->p_buffer, i_blocks, CDDA_TYPE ) < 0 )
- {
- msg_Err( p_access, "cannot read a sector" );
- block_Release( p_block );
+ if( p_access->info.i_title + 1 >= p_sys->i_titles )
+ {
+ p_access->info.b_eof = VLC_TRUE;
+ return NULL;
+ }
- p_block = NULL;
- i_blocks = 1; /* Next sector */
+ p_access->info.i_update |= INPUT_UPDATE_TITLE | INPUT_UPDATE_SIZE;
+ p_access->info.i_title++;
+ p_access->info.i_size = p_sys->title[p_access->info.i_title]->i_size;
+ p_access->info.i_pos = 0;
}
- i_read = 0;
- for( i = 0; i < i_blocks; i++ )
+ /* Don't read after the end of a title */
+ if( p_sys->i_sector + i_blocks >=
+ p_sys->p_sectors[p_access->info.i_title + 1] )
{
- /* A good sector read */
- i_read++;
- p_sys->i_sector++;
-
- /* Check end of title */
- if( p_sys->i_sector >= p_sys->p_sectors[p_access->info.i_title + 1] )
- {
- if( p_access->info.i_title + 1 >= p_sys->i_titles )
- {
- p_access->info.b_eof = VLC_TRUE;
- break;
- }
- p_access->info.i_update |= INPUT_UPDATE_TITLE|INPUT_UPDATE_SIZE;
- p_access->info.i_title++;
- p_access->info.i_size = p_sys->title[p_access->info.i_title]->i_size;
- p_access->info.i_pos = sizeof( WAVEHEADER );
- }
+ i_blocks = p_sys->p_sectors[p_access->info.i_title + 1 ] -
+ p_sys->i_sector;
}
- if( i_read <= 0 )
+ /* Do the actual reading */
+ if( !( p_block = block_New( p_access, i_blocks * CDDA_DATA_SIZE ) ) )
{
- block_Release( p_block );
+ msg_Err( p_access, "cannot get a new block of size: %i",
+ i_blocks * CDDA_DATA_SIZE );
return NULL;
}
- if( p_block )
+ if( ioctl_ReadSectors( VLC_OBJECT(p_access), p_sys->vcddev,
+ p_sys->i_sector, p_block->p_buffer, i_blocks, CDDA_TYPE ) < 0 )
{
- int i_skip = ( p_access->info.i_pos - sizeof( WAVEHEADER ) ) % CDDA_DATA_SIZE;
-
- /* Really read data */
- p_block->i_buffer = i_read * CDDA_DATA_SIZE;
- /* */
- p_block->i_buffer -= i_skip;
- p_block->p_buffer += i_skip;
+ msg_Err( p_access, "cannot read sector %i", p_sys->i_sector );
+ block_Release( p_block );
- p_access->info.i_pos += p_block->i_buffer;
+ /* Try to skip one sector (in case of bad sectors) */
+ p_sys->i_sector++;
+ p_access->info.i_pos += CDDA_DATA_SIZE;
+ return NULL;
}
+ /* Update a few values */
+ p_sys->i_sector += i_blocks;
+ p_access->info.i_pos += p_block->i_buffer;
+
return p_block;
}
****************************************************************************/
static int Seek( access_t *p_access, int64_t i_pos )
{
- access_sys_t * p_sys = p_access->p_sys;
+ access_sys_t *p_sys = p_access->p_sys;
+ /* Next sector to read */
+ p_sys->i_sector = p_sys->p_sectors[p_access->info.i_title] +
+ i_pos / CDDA_DATA_SIZE;
p_access->info.i_pos = i_pos;
- if( i_pos >= sizeof( WAVEHEADER ) )
- {
- /* Fix sector */
- p_sys->i_sector = p_sys->p_sectors[p_access->info.i_title] +
- ( i_pos - sizeof( WAVEHEADER ) ) / (int64_t)CDDA_DATA_SIZE;
- if( p_sys->i_sector >= p_sys->p_sectors[p_access->info.i_title + 1] )
- {
- p_sys->i_sector = p_sys->p_sectors[p_access->info.i_title + 1] - 1;
- }
- }
- else
- p_sys->i_sector = p_sys->p_sectors[p_access->info.i_title];
-
- p_access->info.b_eof = VLC_FALSE;
return VLC_SUCCESS;
}
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = (int64_t)var_GetInteger( p_access, "cdda-caching" ) * I64C(1000);
+ *pi_64 = var_GetInteger( p_access, "cdda-caching" ) * 1000;
break;
/* */
case ACCESS_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* )) = 1; /* Title offset */
/* Duplicate title infos */
*pi_int = p_sys->i_titles;
- *ppp_title = malloc( sizeof( input_title_t ** ) * p_sys->i_titles );
+ *ppp_title = malloc(sizeof( input_title_t **) * p_sys->i_titles );
for( i = 0; i < p_sys->i_titles; i++ )
{
(*ppp_title)[i] = vlc_input_title_Duplicate( p_sys->title[i] );
if( i != p_access->info.i_title )
{
/* Update info */
- p_access->info.i_update |= INPUT_UPDATE_TITLE|INPUT_UPDATE_SIZE;
+ p_access->info.i_update |=
+ INPUT_UPDATE_TITLE|INPUT_UPDATE_SIZE;
p_access->info.i_title = i;
p_access->info.i_size = p_sys->title[i]->i_size;
- p_access->info.i_pos = sizeof(WAVEHEADER);
+ p_access->info.i_pos = 0;
/* Next sector to read */
p_sys->i_sector = p_sys->p_sectors[i];
break;
case ACCESS_SET_SEEKPOINT:
+ case ACCESS_SET_PRIVATE_ID_STATE:
return VLC_EGENERIC;
default:
- msg_Err( p_access, "unimplemented query in control" );
+ msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
-
-
projects / vlc / blobdiff