diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 18:25:34 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 18:25:34 +0300 |
commit | 7795726e0f8c70edd6ecde7fd2137214af302f4f (patch) | |
tree | 87a087e69a0e2912183736de409676f824fb2248 /stream | |
parent | ba3b65b92f3f822fa75b0210b841557f5b20f6d1 (diff) | |
parent | e16f02fe4001f3056b8efd1a099a563569b73f5d (diff) | |
download | mpv-7795726e0f8c70edd6ecde7fd2137214af302f4f.tar.bz2 mpv-7795726e0f8c70edd6ecde7fd2137214af302f4f.tar.xz |
Merge svn changes up to r31033
Diffstat (limited to 'stream')
-rw-r--r-- | stream/cookies.c | 2 | ||||
-rw-r--r-- | stream/stream_vcd.c | 2 | ||||
-rw-r--r-- | stream/vcd_read.h | 5 | ||||
-rw-r--r-- | stream/vcd_read_darwin.h | 5 | ||||
-rw-r--r-- | stream/vcd_read_fbsd.h | 5 | ||||
-rw-r--r-- | stream/vcd_read_os2.h | 5 | ||||
-rw-r--r-- | stream/vcd_read_win32.h | 5 |
7 files changed, 26 insertions, 3 deletions
diff --git a/stream/cookies.c b/stream/cookies.c index b7e89c79e6..3b266a5ca2 100644 --- a/stream/cookies.c +++ b/stream/cookies.c @@ -158,8 +158,6 @@ static struct cookie_list_type *load_cookies_from(const char *filename, char *ptr; off_t length; - mp_msg(MSGT_NETWORK, MSGL_V, "Loading cookie file: %s\n", filename); - ptr = load_file(filename, &length); if (!ptr) return list; diff --git a/stream/stream_vcd.c b/stream/stream_vcd.c index 9d698fef15..094cd98fe8 100644 --- a/stream/stream_vcd.c +++ b/stream/stream_vcd.c @@ -98,7 +98,7 @@ static int control(stream_t *stream, int cmd, void *arg) { 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: diff --git a/stream/vcd_read.h b/stream/vcd_read.h index f94c7ea297..910561ad74 100644 --- a/stream/vcd_read.h +++ b/stream/vcd_read.h @@ -145,6 +145,11 @@ static mp_vcd_priv_t* vcd_read_toc(int fd){ 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)); diff --git a/stream/vcd_read_darwin.h b/stream/vcd_read_darwin.h index 20f1782049..927b659871 100644 --- a/stream/vcd_read_darwin.h +++ b/stream/vcd_read_darwin.h @@ -208,6 +208,11 @@ static mp_vcd_priv_t* vcd_read_toc(int fd) 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) diff --git a/stream/vcd_read_fbsd.h b/stream/vcd_read_fbsd.h index d6fa56dc6d..6e50ac9ac9 100644 --- a/stream/vcd_read_fbsd.h +++ b/stream/vcd_read_fbsd.h @@ -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) { diff --git a/stream/vcd_read_os2.h b/stream/vcd_read_os2.h index 7d37b33e23..0585d1d7d0 100644 --- a/stream/vcd_read_os2.h +++ b/stream/vcd_read_os2.h @@ -188,6 +188,11 @@ static mp_vcd_priv_t *vcd_read_toc(int fd) 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 { diff --git a/stream/vcd_read_win32.h b/stream/vcd_read_win32.h index 3b93a76b0a..0cdaea115f 100644 --- a/stream/vcd_read_win32.h +++ b/stream/vcd_read_win32.h @@ -132,6 +132,11 @@ static mp_vcd_priv_t* vcd_read_toc(int fd) 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; |