mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use speex_lib_get_mode instead of direct linking

Browse Source
This commit is contained in:
Thorvald Natvig 2009-10-25 12:03:13 +01:00
parent da6c5ecb8f
commit f05f8a133a
6 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
speexbuild/speex.def
View File

@ -127,7 +127,4 @@ speex_resampler_skip_zeros
speex_resampler_reset_mem
speex_resampler_strerror
speex_wb_mode
speex_uwb_mode
mumble_speex_init

2
src/mumble/AudioInput.cpp
View File

@ -107,7 +107,7 @@ AudioInput::AudioInput() {
speex_bits_init(&sbBits);
speex_bits_reset(&sbBits);
esSpeex = speex_encoder_init(&speex_uwb_mode);
esSpeex = speex_encoder_init(speex_lib_get_mode(SPEEX_MODEID_UWB));
speex_encoder_ctl(esSpeex,SPEEX_GET_FRAME_SIZE,&iFrameSize);
speex_encoder_ctl(esSpeex,SPEEX_GET_SAMPLING_RATE,&iSampleRate);

2
src/mumble/AudioOutput.cpp
View File

@ -386,7 +386,7 @@ AudioOutputSpeech::AudioOutputSpeech(ClientUser *user, unsigned int freq, Messag
} else {
speex_bits_init(&sbBits);
dsSpeex = speex_decoder_init(&speex_uwb_mode);
dsSpeex = speex_decoder_init(speex_lib_get_mode(SPEEX_MODEID_UWB));
int iArg=1;
speex_decoder_ctl(dsSpeex, SPEEX_SET_ENH, &iArg);
speex_decoder_ctl(dsSpeex, SPEEX_GET_FRAME_SIZE, &iFrameSize);

2
src/mumble11x/AudioConfigDialog.cpp
View File

@ -213,7 +213,7 @@ void AudioInputDialog::updateBitrate() {
float f = static_cast<float>(q);
void *es;
es = speex_encoder_init(&speex_wb_mode);
es = speex_encoder_init(speex_lib_get_mode(SPEEX_MODEID_WB));
speex_encoder_ctl(es,SPEEX_SET_VBR_QUALITY, &f);
speex_encoder_ctl(es,SPEEX_GET_BITRATE,&audiorate);
speex_encoder_destroy(es);

6
src/mumble11x/AudioInput.cpp
View File

@ -90,7 +90,7 @@ AudioInput::AudioInput() {
iSampleRate = SAMPLE_RATE;
esEncState=speex_encoder_init(&speex_wb_mode);
esEncState=speex_encoder_init(speex_lib_get_mode(SPEEX_MODEID_WB));
speex_encoder_ctl(esEncState,SPEEX_GET_FRAME_SIZE,&iFrameSize);
mumble_drft_init(&fftTable, iFrameSize);
@ -433,7 +433,7 @@ int AudioInput::getMaxBandwidth() {
void *es;
float f = static_cast<float>(g.s.iQuality);
es = speex_encoder_init(&speex_wb_mode);
es = speex_encoder_init(speex_lib_get_mode(SPEEX_MODEID_WB));
speex_encoder_ctl(es,SPEEX_SET_VBR_QUALITY, &f);
speex_encoder_ctl(es,SPEEX_GET_BITRATE,&audiorate);
speex_encoder_destroy(es);
@ -459,7 +459,7 @@ void AudioInput::setMaxBandwidth(int bytespersec) {
int baserate;
void *es;
es = speex_encoder_init(&speex_wb_mode);
es = speex_encoder_init(speex_lib_get_mode(SPEEX_MODEID_WB));
float f = static_cast<float>(g.s.iQuality);

6
src/mumble11x/AudioOutput.cpp
View File

@ -114,7 +114,7 @@ void AudioOutputPlayer::resizeBuffer(unsigned int newsize) {
}
AudioOutputSample::AudioOutputSample(const QString &filename, const QList<QByteArray> &packets, bool loop, unsigned int freq) : AudioOutputPlayer(filename) {
dsDecState=speex_decoder_init(&speex_wb_mode);
dsDecState=speex_decoder_init(speex_lib_get_mode(SPEEX_MODEID_WB));
int iArg=1;
int err;
@ -279,7 +279,7 @@ bool AudioOutputSample::needSamples(unsigned int snum) {
AudioOutputSpeech::AudioOutputSpeech(ClientPlayer *player, unsigned int freq) : AudioOutputPlayer(player->qsName) {
p = player;
dsDecState=speex_decoder_init(&speex_wb_mode);
dsDecState=speex_decoder_init(speex_lib_get_mode(SPEEX_MODEID_WB));
int iArg=1;
int err;
@ -436,7 +436,7 @@ bool AudioOutputSpeech::needSamples(unsigned int snum) {
AudioOutput::AudioOutput() {
void *ds=speex_decoder_init(&speex_wb_mode);
void *ds=speex_decoder_init(speex_lib_get_mode(SPEEX_MODEID_WB));
speex_decoder_ctl(ds, SPEEX_GET_FRAME_SIZE, &iFrameSize);
speex_decoder_destroy(ds);
bRunning = false;