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

[reimar]

Author: reimar
Date: Sat May  7 23:32:50 2011
New Revision: 33436

Log:
Make vcd_seek_to_track static, the GUI no longer needs to
call it directly.

Modified:
   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/vcd_read.h
==============================================================================
--- trunk/stream/vcd_read.h	Sat May  7 23:28:56 2011	(r33435)
+++ trunk/stream/vcd_read.h	Sat May  7 23:32:50 2011	(r33436)
@@ -62,7 +62,7 @@ static inline unsigned int vcd_get_msf(m
          vcd->entry.cdte_addr.msf.minute*60)*75 - 150;
 }
 
-int vcd_seek_to_track(mp_vcd_priv_t* vcd,int track){
+static int vcd_seek_to_track(mp_vcd_priv_t* vcd,int track){
   vcd->entry.cdte_format = CDROM_MSF;
   vcd->entry.cdte_track  = track;
   if (ioctl(vcd->fd, CDROMREADTOCENTRY, &vcd->entry)) {

Modified: trunk/stream/vcd_read_darwin.h
==============================================================================
--- trunk/stream/vcd_read_darwin.h	Sat May  7 23:28:56 2011	(r33435)
+++ trunk/stream/vcd_read_darwin.h	Sat May  7 23:32:50 2011	(r33436)
@@ -67,7 +67,7 @@ static inline unsigned int vcd_get_msf(m
   return CDConvertMSFToLBA(vcd->msf);
 }
 
-int vcd_seek_to_track(mp_vcd_priv_t* vcd, int track)
+static int vcd_seek_to_track(mp_vcd_priv_t* vcd, int track)
 {
 	struct CDTrackInfo entry;
 

Modified: trunk/stream/vcd_read_fbsd.h
==============================================================================
--- trunk/stream/vcd_read_fbsd.h	Sat May  7 23:28:56 2011	(r33435)
+++ trunk/stream/vcd_read_fbsd.h	Sat May  7 23:32:50 2011	(r33436)
@@ -136,7 +136,7 @@ read_toc_entry(mp_vcd_priv_t *vcd, int n
   return 1;
 }
 
-int
+static int
 vcd_seek_to_track(mp_vcd_priv_t* vcd, int track)
 {
   if (!read_toc_entry(vcd, track))

Modified: trunk/stream/vcd_read_os2.h
==============================================================================
--- trunk/stream/vcd_read_os2.h	Sat May  7 23:28:56 2011	(r33435)
+++ trunk/stream/vcd_read_os2.h	Sat May  7 23:32:50 2011	(r33436)
@@ -57,7 +57,7 @@ static inline unsigned vcd_get_msf(mp_vc
         (vcd->msfCurrent.bSecond + vcd->msfCurrent.bMinute * 60) * 75 - 150;
 }
 
-int vcd_seek_to_track(mp_vcd_priv_t *vcd, int track)
+static int vcd_seek_to_track(mp_vcd_priv_t *vcd, int track)
 {
     struct {
         UCHAR auchSign[4];

Modified: trunk/stream/vcd_read_win32.h
==============================================================================
--- trunk/stream/vcd_read_win32.h	Sat May  7 23:28:56 2011	(r33435)
+++ trunk/stream/vcd_read_win32.h	Sat May  7 23:32:50 2011	(r33436)
@@ -53,7 +53,7 @@ static inline unsigned vcd_get_msf(mp_vc
 	 vcd->toc.TrackData[index].Address[1] * 60) * 75 - 150;
 }
 
-int vcd_seek_to_track(mp_vcd_priv_t* vcd, int track)
+static int vcd_seek_to_track(mp_vcd_priv_t* vcd, int track)
 {
     unsigned sect;
     if (track < vcd->toc.FirstTrack || track > vcd->toc.LastTrack)