summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-07-27 08:49:14 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-07-27 08:49:14 +0000
commit647514eb733393b0e58f68e731817ca870662e1f (patch)
tree41c5d9b880f1c53e7be954bb6e9b175378701ad7 /stream
parentd10cfcf0159331e5ede8046c0038de6e6960ade6 (diff)
downloadmpv-647514eb733393b0e58f68e731817ca870662e1f.tar.bz2
mpv-647514eb733393b0e58f68e731817ca870662e1f.tar.xz
More VCD cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23871 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
-rw-r--r--stream/vcd_read_fbsd.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/stream/vcd_read_fbsd.h b/stream/vcd_read_fbsd.h
index b34c7e7aa3..f0a6022384 100644
--- a/stream/vcd_read_fbsd.h
+++ b/stream/vcd_read_fbsd.h
@@ -53,7 +53,7 @@ int
vcd_get_track_end(mp_vcd_priv_t* vcd, int track)
{
struct ioc_toc_header tochdr;
- if (ioctl(vcd->fd, CDIOREADTOCHEADER, &tochdr)==-1) {
+ if (ioctl(vcd->fd, CDIOREADTOCHEADER, &tochdr) == -1) {
mp_msg(MSGT_STREAM,MSGL_ERR,"read CDROM toc header: %s\n",strerror(errno));
return -1;
}
@@ -84,11 +84,11 @@ vcd_read_toc(int fd)
tocentry.track = i<=tochdr.ending_track ? i : CDROM_LEADOUT;
tocentry.address_format = CD_MSF_FORMAT;
- if (ioctl(fd,CDIOREADTOCENTRY,&tocentry)==-1) {
+ if (ioctl(fd, CDIOREADTOCENTRY, &tocentry) == -1) {
mp_msg(MSGT_OPEN,MSGL_ERR,"read CDROM toc entry: %s\n",strerror(errno));
return NULL;
}
-
+
if (i <= tochdr.ending_track)
mp_msg(MSGT_OPEN,MSGL_INFO,"track %02d: adr=%d ctrl=%d format=%d %02d:%02d:%02d\n",
(int)tocentry.track,
@@ -133,19 +133,19 @@ static int
vcd_read(mp_vcd_priv_t* vcd, char *mem)
{
- if (pread(vcd->fd,&vcd->buf,VCD_SECTOR_SIZE,vcd_get_msf(vcd)*VCD_SECTOR_SIZE)
- != VCD_SECTOR_SIZE) return 0; // EOF?
+ if (pread(vcd->fd,&vcd->buf,VCD_SECTOR_SIZE,vcd_get_msf(vcd)*VCD_SECTOR_SIZE)
+ != VCD_SECTOR_SIZE) return 0; // EOF?
- TOCADDR(vcd->entry).msf.frame++;
- if (TOCADDR(vcd->entry).msf.frame==75){
- TOCADDR(vcd->entry).msf.frame=0;
- TOCADDR(vcd->entry).msf.second++;
- if (TOCADDR(vcd->entry).msf.second==60){
- TOCADDR(vcd->entry).msf.second=0;
- TOCADDR(vcd->entry).msf.minute++;
- }
- }
- memcpy(mem,vcd->buf.data,VCD_SECTOR_DATA);
- return VCD_SECTOR_DATA;
+ TOCADDR(vcd->entry).msf.frame++;
+ if (TOCADDR(vcd->entry).msf.frame==75){
+ TOCADDR(vcd->entry).msf.frame=0;
+ TOCADDR(vcd->entry).msf.second++;
+ if (TOCADDR(vcd->entry).msf.second==60){
+ TOCADDR(vcd->entry).msf.second=0;
+ TOCADDR(vcd->entry).msf.minute++;
+ }
+ }
+ memcpy(mem,vcd->buf.data,VCD_SECTOR_DATA);
+ return VCD_SECTOR_DATA;
}