summaryrefslogtreecommitdiffstats
path: root/stream/stream_cddb.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-05-10 11:43:39 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-05-10 11:43:39 +0000
commit0cb679cfa68bc619eff152bf4255ef946b864e71 (patch)
tree9d8fd09ff37fb959d0d47750bd655cf4a38772b6 /stream/stream_cddb.c
parent49d90f4d53336ea85bcdbf874a27846e9c768ae0 (diff)
downloadmpv-0cb679cfa68bc619eff152bf4255ef946b864e71.tar.bz2
mpv-0cb679cfa68bc619eff152bf4255ef946b864e71.tar.xz
Fix track info being read for the wrong track introduced in r20598
Patch by kiriuja (mplayer-patches <at> en-directo net) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23287 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/stream_cddb.c')
-rw-r--r--stream/stream_cddb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/stream/stream_cddb.c b/stream/stream_cddb.c
index 27b037e811..9090a0d178 100644
--- a/stream/stream_cddb.c
+++ b/stream/stream_cddb.c
@@ -103,7 +103,7 @@ read_toc(const char *dev) {
}
for (i = first; i <= last; i++) {
struct cdrom_tocentry tocentry;
- tocentry.cdte_track = (i == last) ? 0xAA : i;
+ tocentry.cdte_track = (i == last) ? 0xAA : i + 1;
tocentry.cdte_format = CDROM_MSF;
ioctl(drive, CDROMREADTOCENTRY, &tocentry);
cdtoc[i].min = tocentry.cdte_addr.msf.minute;
@@ -118,7 +118,7 @@ read_toc(const char *dev) {
}
for (i = first; i <= last; i++) {
struct ioc_read_toc_single_entry tocentry;
- tocentry.track = (i == last) ? 0xAA : i;
+ tocentry.track = (i == last) ? 0xAA : i + 1;
tocentry.address_format = CD_MSF_FORMAT;
ioctl(drive, CDIOREADTOCENTRY, &tocentry);
cdtoc[i].min = tocentry.entry.addr.msf.minute;
@@ -134,7 +134,7 @@ read_toc(const char *dev) {
for (i = first; i <= last; i++) {
struct ioc_read_toc_entry tocentry;
struct cd_toc_entry toc_buffer;
- tocentry.starting_track = (i == last) ? 0xAA : i;
+ tocentry.starting_track = (i == last) ? 0xAA : i + 1;
tocentry.address_format = CD_MSF_FORMAT;
tocentry.data = &toc_buffer;
tocentry.data_len = sizeof(toc_buffer);