comparison data/fileio/OggVorbisFileReader.cpp @ 620:3e139b2dfe5e

* Simpler & better fix for oggz 1.1.0 compatibility

 
     FishSoundInfo fsinfo;
     m_fishSound = fish_sound_new(FISH_SOUND_DECODE, &fsinfo);
 
     fish_sound_set_decoded_callback(m_fishSound, acceptFrames, this);
-    oggz_set_read_callback(m_oggz, -1, readPacket, this);
+    oggz_set_read_callback(m_oggz, -1, (OggzReadPacket)readPacket, this);
 
     if (decodeMode == DecodeAtOnce) {
 
         if (m_reporter) {
             connect(m_reporter, SIGNAL(cancelled()), this, SLOT(cancelled()));

 
     m_reader->endSerialised();
 } 
 
 int
-OggVorbisFileReader::readPacket(OGGZ *, oggz_packet *packet, long, void *data)
+OggVorbisFileReader::readPacket(OGGZ *, ogg_packet *packet, long, void *data)
 {
     OggVorbisFileReader *reader = (OggVorbisFileReader *)data;
     FishSound *fs = reader->m_fishSound;
 
-    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->op.bytes;
+    fish_sound_prepare_truncation(fs, packet->granulepos, packet->e_o_s);
+    fish_sound_decode(fs, packet->packet, packet->bytes);
+
+    reader->m_bytesRead += packet->bytes;
 
     // The number of bytes read by this function is smaller than
     // the file size because of the packet headers
     int p = lrint(double(reader->m_bytesRead) * 114 /
                   double(reader->m_fileSize));