Mercurial > mplayer.hg
changeset 30670:fbd6ba7e0e14
Mark vcd_get_track_end () and vcd_read_toc() as static.
They are only used within the respective files.
| author | diego |
|---|---|
| date | Mon, 22 Feb 2010 16:32:03 +0000 |
| parents | 44837471a711 |
| children | 38daf6b55b45 |
| files | stream/vcd_read.h stream/vcd_read_darwin.h stream/vcd_read_fbsd.h stream/vcd_read_win32.h |
| diffstat | 4 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/stream/vcd_read.h Mon Feb 22 15:35:53 2010 +0000 +++ b/stream/vcd_read.h Mon Feb 22 16:32:03 2010 +0000 @@ -72,7 +72,7 @@ return VCD_SECTOR_DATA*vcd_get_msf(vcd); } -int vcd_get_track_end(mp_vcd_priv_t* vcd,int track){ +static int vcd_get_track_end(mp_vcd_priv_t* vcd,int track){ vcd->entry.cdte_format = CDROM_MSF; vcd->entry.cdte_track = track<vcd->tochdr.cdth_trk1?(track+1):CDROM_LEADOUT; if (ioctl(vcd->fd, CDROMREADTOCENTRY, &vcd->entry)) { @@ -82,7 +82,7 @@ return VCD_SECTOR_DATA*vcd_get_msf(vcd); } -mp_vcd_priv_t* vcd_read_toc(int fd){ +static mp_vcd_priv_t* vcd_read_toc(int fd){ struct cdrom_tochdr tochdr; mp_vcd_priv_t* vcd; int i, min = 0, sec = 0, frame = 0;
--- a/stream/vcd_read_darwin.h Mon Feb 22 15:35:53 2010 +0000 +++ b/stream/vcd_read_darwin.h Mon Feb 22 16:32:03 2010 +0000 @@ -86,7 +86,7 @@ return VCD_SECTOR_DATA*vcd_get_msf(vcd); } -int vcd_get_track_end(mp_vcd_priv_t* vcd, int track) +static int vcd_get_track_end(mp_vcd_priv_t* vcd, int track) { struct CDTrackInfo entry; @@ -117,7 +117,7 @@ return VCD_SECTOR_DATA*vcd_get_msf(vcd); } -mp_vcd_priv_t* vcd_read_toc(int fd) +static mp_vcd_priv_t* vcd_read_toc(int fd) { dk_cd_read_disc_info_t tochdr; struct CDDiscInfo hdr;
--- a/stream/vcd_read_fbsd.h Mon Feb 22 15:35:53 2010 +0000 +++ b/stream/vcd_read_fbsd.h Mon Feb 22 16:32:03 2010 +0000 @@ -144,7 +144,7 @@ return VCD_SECTOR_DATA * vcd_get_msf(vcd); } -int +static int vcd_get_track_end(mp_vcd_priv_t* vcd, int track) { if (!read_toc_entry(vcd, @@ -153,7 +153,7 @@ return VCD_SECTOR_DATA * vcd_get_msf(vcd); } -mp_vcd_priv_t* +static mp_vcd_priv_t* vcd_read_toc(int fd) { struct ioc_toc_header tochdr;
--- a/stream/vcd_read_win32.h Mon Feb 22 15:35:53 2010 +0000 +++ b/stream/vcd_read_win32.h Mon Feb 22 16:32:03 2010 +0000 @@ -63,14 +63,14 @@ return VCD_SECTOR_DATA * (sect + 2); } -int vcd_get_track_end(mp_vcd_priv_t* vcd, int track) +static int vcd_get_track_end(mp_vcd_priv_t* vcd, int track) { if (track < vcd->toc.FirstTrack || track > vcd->toc.LastTrack) return -1; return VCD_SECTOR_DATA * (vcd_get_msf(vcd, track + 1)); } -mp_vcd_priv_t* vcd_read_toc(int fd) +static mp_vcd_priv_t* vcd_read_toc(int fd) { DWORD dwBytesReturned; HANDLE hd;