1 |
aballier 09/11/04 10:26:13 |
2 |
|
3 |
Added: sonic-visualiser-1.7.1-liboggz11.patch |
4 |
Log: |
5 |
version bump |
6 |
(Portage version: 2.2_rc48/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 media-sound/sonic-visualiser/files/sonic-visualiser-1.7.1-liboggz11.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/sonic-visualiser/files/sonic-visualiser-1.7.1-liboggz11.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/sonic-visualiser/files/sonic-visualiser-1.7.1-liboggz11.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: sonic-visualiser-1.7.1-liboggz11.patch |
15 |
=================================================================== |
16 |
Index: sonic-visualiser-1.7.1/data/fileio/OggVorbisFileReader.cpp |
17 |
=================================================================== |
18 |
--- sonic-visualiser-1.7.1.orig/data/fileio/OggVorbisFileReader.cpp |
19 |
+++ sonic-visualiser-1.7.1/data/fileio/OggVorbisFileReader.cpp |
20 |
@@ -138,15 +138,15 @@ OggVorbisFileReader::DecodeThread::run() |
21 |
} |
22 |
|
23 |
int |
24 |
-OggVorbisFileReader::readPacket(OGGZ *, ogg_packet *packet, long, void *data) |
25 |
+OggVorbisFileReader::readPacket(OGGZ *, oggz_packet *packet, long, void *data) |
26 |
{ |
27 |
OggVorbisFileReader *reader = (OggVorbisFileReader *)data; |
28 |
FishSound *fs = reader->m_fishSound; |
29 |
|
30 |
- fish_sound_prepare_truncation(fs, packet->granulepos, packet->e_o_s); |
31 |
- fish_sound_decode(fs, packet->packet, packet->bytes); |
32 |
+ fish_sound_prepare_truncation(fs, packet->op.granulepos, packet->op.e_o_s); |
33 |
+ fish_sound_decode(fs, packet->op.packet, packet->op.bytes); |
34 |
|
35 |
- reader->m_bytesRead += packet->bytes; |
36 |
+ reader->m_bytesRead += packet->op.bytes; |
37 |
|
38 |
// The number of bytes read by this function is smaller than |
39 |
// the file size because of the packet headers |
40 |
Index: sonic-visualiser-1.7.1/data/fileio/OggVorbisFileReader.h |
41 |
=================================================================== |
42 |
--- sonic-visualiser-1.7.1.orig/data/fileio/OggVorbisFileReader.h |
43 |
+++ sonic-visualiser-1.7.1/data/fileio/OggVorbisFileReader.h |
44 |
@@ -82,7 +82,7 @@ protected: |
45 |
bool m_cancelled; |
46 |
int m_completion; |
47 |
|
48 |
- static int readPacket(OGGZ *, ogg_packet *, long, void *); |
49 |
+ static int readPacket(OGGZ *, oggz_packet *, long, void *); |
50 |
static int acceptFrames(FishSound *, float **, long, void *); |
51 |
|
52 |
class DecodeThread : public Thread |