RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Simplify track length calculation 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23881 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2007-07-27 18:47:44 +00:00
parent fec1bd1a56
commit 63e8a30682
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
stream/vcd_read_fbsd.h
View File

@ -135,7 +135,7 @@ vcd_read_toc(int fd)
{ {
struct ioc_toc_header tochdr; struct ioc_toc_header tochdr;
mp_vcd_priv_t* vcd; mp_vcd_priv_t* vcd;
int i, min = 0, sec = 0, frame = 0; int i, last_startsect;
if (ioctl(fd, CDIOREADTOCHEADER, &tochdr) == -1) { if (ioctl(fd, CDIOREADTOCHEADER, &tochdr) == -1) {
mp_msg(MSGT_OPEN,MSGL_ERR,"read CDROM toc header: %s\n",strerror(errno)); mp_msg(MSGT_OPEN,MSGL_ERR,"read CDROM toc header: %s\n",strerror(errno));
return NULL; return NULL;
@ -170,26 +170,19 @@ vcd_read_toc(int fd)
if (mp_msg_test(MSGT_IDENTIFY, MSGL_INFO)) if (mp_msg_test(MSGT_IDENTIFY, MSGL_INFO))
{ {
int startsect = vcd_get_msf(vcd);
if (i > tochdr.starting_track) if (i > tochdr.starting_track)
{ {
min = TOCADDR(vcd->entry).msf.minute - min; // convert duraion to MSF
sec = TOCADDR(vcd->entry).msf.second - sec; vcd_set_msf(vcd, startsect - last_startsect);
frame = TOCADDR(vcd->entry).msf.frame - frame; mp_msg(MSGT_IDENTIFY, MSGL_INFO,
if ( frame < 0 ) "ID_VCD_TRACK_%d_MSF=%02d:%02d:%02d\n",
{ i - 1,
frame += 75; TOCADDR(vcd->entry).msf.minute,
sec --; TOCADDR(vcd->entry).msf.second,
} TOCADDR(vcd->entry).msf.frame);
if ( sec < 0 )
{
sec += 60;
min --;
}
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VCD_TRACK_%d_MSF=%02d:%02d:%02d\n", i - 1, min, sec, frame);
} }
min = TOCADDR(vcd->entry).msf.minute; last_startsect = startsect;
sec = TOCADDR(vcd->entry).msf.second;
frame = TOCADDR(vcd->entry).msf.frame;
} }
} }
return vcd; return vcd;