--- wvstreams-4.0.2/oggspeex/wvspeex.cc- 2005-04-30 01:03:06 +0400 +++ wvstreams-4.0.2/oggspeex/wvspeex.cc 2005-04-30 01:11:03 +0400 @@ -20,7 +20,7 @@ * "modeid" is the suggested mode * "samplingrate" is the sampling rate */ -static SpeexMode *get_speex_mode(WvSpeex::CodecMode modeid, +const static SpeexMode *get_speex_mode(WvSpeex::CodecMode modeid, int samplingrate) { // use the suggested mode if it is valid @@ -28,7 +28,7 @@ static SpeexMode *get_speex_mode(WvSpeex return speex_mode_list[modeid]; // otherwise determine a suitable default - SpeexMode *mode; + const SpeexMode *mode; assert(samplingrate <= 48000 || ! "sampling rate too high"); assert(samplingrate >= 6000 || ! "sampling rate too low"); if (samplingrate > 25000) --- wvstreams-4.0.2/oggspeex/wvoggspeex.cc- 2005-04-30 01:03:06 +0400 +++ wvstreams-4.0.2/oggspeex/wvoggspeex.cc 2005-04-30 01:23:12 +0400 @@ -174,7 +174,7 @@ bool WvOggSpeexEncoder::write_headers(OB // generate stream header ogg_packet header; SpeexHeader spxheader; - SpeexMode *spxmode = speex_mode_list[mode()]; + const SpeexMode *spxmode = speex_mode_list[mode()]; speex_init_header(&spxheader, samplingrate(), channels(), spxmode); spxheader.vbr = vbr(); spxheader.bitrate = nominalbitrate(); --- wvstreams-4.0.2/include/wvspeex.h- 2005-03-24 05:01:23 +0300 +++ wvstreams-4.0.2/include/wvspeex.h 2005-04-30 01:21:00 +0400 @@ -148,7 +148,7 @@ class WvSpeexEncoder : public WvAudioEnc { void *spxstate; SpeexBits *spxbits; - SpeexMode *spxmode; + const SpeexMode *spxmode; unsigned int _channels; size_t _samplesperframe; @@ -264,7 +264,7 @@ class WvSpeexDecoder : public WvAudioDec void *spxstate; SpeexBits *spxbits; - SpeexMode *spxmode; + const SpeexMode *spxmode; size_t _samplesperframe; public: