[MPlayer-cvslog] r31023 - in trunk/stream: stream_vcd.c vcd_read.h vcd_read_darwin.h vcd_read_fbsd.h vcd_read_os2.h vcd_read_win32.h

[reimar]

Author: reimar
Date: Mon Apr  5 21:31:55 2010
New Revision: 31023

Log:
Try to fix VCD compilation on non-Linux systems.

Modified:
   trunk/stream/stream_vcd.c
   trunk/stream/vcd_read.h
   trunk/stream/vcd_read_darwin.h
   trunk/stream/vcd_read_fbsd.h
   trunk/stream/vcd_read_os2.h
   trunk/stream/vcd_read_win32.h

Modified: trunk/stream/stream_vcd.c
==============================================================================
--- trunk/stream/stream_vcd.c	Mon Apr  5 19:15:08 2010	(r31022)
+++ trunk/stream/stream_vcd.c	Mon Apr  5 21:31:55 2010	(r31023)
@@ -99,7 +99,7 @@ static int control(stream_t *stream, int
       mp_vcd_priv_t *vcd = vcd_read_toc(stream->fd);
       if (!vcd)
         break;
-      *(unsigned int *)arg = vcd->tochdr.cdth_trk1;
+      *(unsigned int *)arg = vcd_end_track(vcd);
       return STREAM_OK;
     }
     case STREAM_CTRL_SEEK_TO_CHAPTER:

Modified: trunk/stream/vcd_read.h
==============================================================================
--- trunk/stream/vcd_read.h	Mon Apr  5 19:15:08 2010	(r31022)
+++ trunk/stream/vcd_read.h	Mon Apr  5 21:31:55 2010	(r31023)
@@ -145,6 +145,11 @@ static mp_vcd_priv_t* vcd_read_toc(int f
   return vcd;
 }
 
+static int vcd_end_track(mp_vcd_priv_t* vcd)
+{
+  return vcd->tochdr.cdth_trk1;
+}
+
 static int vcd_read(mp_vcd_priv_t* vcd,char *mem){
 #if	defined(__linux__) || defined(__bsdi__)
   memcpy(vcd->buf,&vcd->entry.cdte_addr.msf,sizeof(struct cdrom_msf));

Modified: trunk/stream/vcd_read_darwin.h
==============================================================================
--- trunk/stream/vcd_read_darwin.h	Mon Apr  5 19:15:08 2010	(r31022)
+++ trunk/stream/vcd_read_darwin.h	Mon Apr  5 21:31:55 2010	(r31023)
@@ -208,6 +208,11 @@ static mp_vcd_priv_t* vcd_read_toc(int f
 	return vcd;
 }
 
+static int vcd_end_track(mp_vcd_priv_t* vcd)
+{
+	return vcd->hdr.lastTrackNumberInLastSessionLSB;
+}
+
 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)

Modified: trunk/stream/vcd_read_fbsd.h
==============================================================================
--- trunk/stream/vcd_read_fbsd.h	Mon Apr  5 19:15:08 2010	(r31022)
+++ trunk/stream/vcd_read_fbsd.h	Mon Apr  5 21:31:55 2010	(r31023)
@@ -212,6 +212,11 @@ vcd_read_toc(int fd)
   return vcd;
 }
 
+static int vcd_end_track(mp_vcd_priv_t* vcd)
+{
+  return vcd->tochdr.ending_track;
+}
+
 static int
 vcd_read(mp_vcd_priv_t* vcd, char *mem)
 {

Modified: trunk/stream/vcd_read_os2.h
==============================================================================
--- trunk/stream/vcd_read_os2.h	Mon Apr  5 19:15:08 2010	(r31022)
+++ trunk/stream/vcd_read_os2.h	Mon Apr  5 21:31:55 2010	(r31023)
@@ -188,6 +188,11 @@ static mp_vcd_priv_t *vcd_read_toc(int f
     return vcd;
 }
 
+static int vcd_end_track(mp_vcd_priv_t* vcd)
+{
+    return vcd->iLastTrack;
+}
+
 static int vcd_read(mp_vcd_priv_t *vcd, char *mem)
 {
     struct {

Modified: trunk/stream/vcd_read_win32.h
==============================================================================
--- trunk/stream/vcd_read_win32.h	Mon Apr  5 19:15:08 2010	(r31022)
+++ trunk/stream/vcd_read_win32.h	Mon Apr  5 21:31:55 2010	(r31023)
@@ -132,6 +132,11 @@ static mp_vcd_priv_t* vcd_read_toc(int f
     return vcd;
 }
 
+static int vcd_end_track(mp_vcd_priv_t* vcd)
+{
+    return vcd->toc.LastTrack;
+}
+
 static int vcd_read(mp_vcd_priv_t* vcd, char *mem)
 {
     DWORD dwBytesReturned;