videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

Forgot that the lsn internal structure is 0-origin. 

Better really would be to remove lsn altogether from cdda_data_t.
This commit is contained in:
Rocky Bernstein 2004-12-08 12:44:09 +00:00
parent ca1b3a2cf1
commit b5896d4893
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/access/cdda/access.c
View File

@ -579,9 +579,11 @@ static int CDDAControl( access_t *p_access, int i_query, va_list args )
for( i = 0; i < p_cdda->i_titles; i++ )
{
if ( p_cdda->p_title[i] )
if ( p_cdda->p_title[i] ) {
(*ppp_title)[i] =
vlc_input_title_Duplicate( p_cdda->p_title[i] );
vlc_input_title_Duplicate( p_cdda->p_title[i] );
}
}
break;
}

16
modules/access/cdda/info.c
View File

@ -892,8 +892,9 @@ CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda,
p_cdda->i_titles = 1;
p_access->info.i_size =
(p_cdda->lsn[p_cdda->i_track]
- p_cdda->lsn[i_first_track+1]) * (int64_t) CDIO_CD_FRAMESIZE_RAW;
(p_cdda->lsn[p_cdda->i_track-1]
- p_cdda->lsn[i_first_track]) * (int64_t) CDIO_CD_FRAMESIZE_RAW;
p_access->info.i_update |= INPUT_UPDATE_TITLE|INPUT_UPDATE_SIZE;
p_item->input.i_duration =
(p_cdda->lsn[p_cdda->i_track]
- p_cdda->lsn[i_first_track+1]) / CDIO_CD_FRAMES_PER_SEC;
@ -921,12 +922,13 @@ CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda,
i_track, VLC_TRUE );
}
p_cdda->i_titles = p_cdda->i_tracks; /* should be +1 */
p_access->info.i_size =
(p_cdda->lsn[i_first_track + p_cdda->i_tracks]
- p_cdda->lsn[i_first_track]) * (int64_t) CDIO_CD_FRAMESIZE_RAW;
p_access->info.i_size =
(p_cdda->lsn[p_cdda->i_tracks]
- p_cdda->lsn[0]) * (int64_t) CDIO_CD_FRAMESIZE_RAW;
p_access->info.i_update |= INPUT_UPDATE_TITLE|INPUT_UPDATE_SIZE;
p_item->input.i_duration =
(p_cdda->lsn[i_first_track + p_cdda->i_tracks]
- p_cdda->lsn[i_first_track]) / CDIO_CD_FRAMES_PER_SEC;
(p_cdda->lsn[p_cdda->i_tracks]
- p_cdda->lsn[0]) / CDIO_CD_FRAMES_PER_SEC;
}
if( b_play )