Mercurial > hg > svcore

changeset 619:268c5431936d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Update for oggz 1.1.0 API
author Chris Cannam
date Fri, 12 Mar 2010 12:04:39 +0000
parents b1dc68507e46
children 3e139b2dfe5e
files data/fileio/OggVorbisFileReader.cpp data/fileio/OggVorbisFileReader.h
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/data/fileio/OggVorbisFileReader.cpp	Thu Oct 22 15:54:21 2009 +0000
+++ b/data/fileio/OggVorbisFileReader.cpp	Fri Mar 12 12:04:39 2010 +0000
@@ -138,15 +138,15 @@
 } 
 
 int
-OggVorbisFileReader::readPacket(OGGZ *, ogg_packet *packet, long, void *data)
+OggVorbisFileReader::readPacket(OGGZ *, oggz_packet *packet, long, void *data)
 {
     OggVorbisFileReader *reader = (OggVorbisFileReader *)data;
     FishSound *fs = reader->m_fishSound;
 
-    fish_sound_prepare_truncation(fs, packet->granulepos, packet->e_o_s);
-    fish_sound_decode(fs, packet->packet, packet->bytes);
+    fish_sound_prepare_truncation(fs, packet->op.granulepos, packet->op.e_o_s);
+    fish_sound_decode(fs, packet->op.packet, packet->op.bytes);
 
-    reader->m_bytesRead += packet->bytes;
+    reader->m_bytesRead += packet->op.bytes;
 
     // The number of bytes read by this function is smaller than
     // the file size because of the packet headers
--- a/data/fileio/OggVorbisFileReader.h	Thu Oct 22 15:54:21 2009 +0000
+++ b/data/fileio/OggVorbisFileReader.h	Fri Mar 12 12:04:39 2010 +0000
@@ -82,7 +82,7 @@
     bool m_cancelled;
     int m_completion;
  
-    static int readPacket(OGGZ *, ogg_packet *, long, void *);
+    static int readPacket(OGGZ *, oggz_packet *, long, void *);
     static int acceptFrames(FishSound *, float **, long, void *);
 
     class DecodeThread : public Thread