From f05f8a133a01a6696f7df063300aaf9609a30d78 Mon Sep 17 00:00:00 2001
From: Thorvald Natvig <slicer@users.sourceforge.net>
Date: Sun, 25 Oct 2009 12:03:13 +0100
Subject: [PATCH] Use speex_lib_get_mode instead of direct linking

---
 speexbuild/speex.def                | 3 ---
 src/mumble/AudioInput.cpp           | 2 +-
 src/mumble/AudioOutput.cpp          | 2 +-
 src/mumble11x/AudioConfigDialog.cpp | 2 +-
 src/mumble11x/AudioInput.cpp        | 6 +++---
 src/mumble11x/AudioOutput.cpp       | 6 +++---
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/speexbuild/speex.def b/speexbuild/speex.def
index 72695577f..ec2ee9b27 100644
--- a/speexbuild/speex.def
+++ b/speexbuild/speex.def
@@ -127,7 +127,4 @@ speex_resampler_skip_zeros
 speex_resampler_reset_mem
 speex_resampler_strerror
 
-speex_wb_mode
-speex_uwb_mode
-
 mumble_speex_init
diff --git a/src/mumble/AudioInput.cpp b/src/mumble/AudioInput.cpp
index 4832cbbd9..8deb6d6b3 100644
--- a/src/mumble/AudioInput.cpp
+++ b/src/mumble/AudioInput.cpp
@@ -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);
 
diff --git a/src/mumble/AudioOutput.cpp b/src/mumble/AudioOutput.cpp
index 9b5bd4550..b0a363246 100644
--- a/src/mumble/AudioOutput.cpp
+++ b/src/mumble/AudioOutput.cpp
@@ -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);
diff --git a/src/mumble11x/AudioConfigDialog.cpp b/src/mumble11x/AudioConfigDialog.cpp
index 307a77bc6..a422b67dd 100644
--- a/src/mumble11x/AudioConfigDialog.cpp
+++ b/src/mumble11x/AudioConfigDialog.cpp
@@ -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);
diff --git a/src/mumble11x/AudioInput.cpp b/src/mumble11x/AudioInput.cpp
index 777fbfd40..229e32573 100644
--- a/src/mumble11x/AudioInput.cpp
+++ b/src/mumble11x/AudioInput.cpp
@@ -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);
 
diff --git a/src/mumble11x/AudioOutput.cpp b/src/mumble11x/AudioOutput.cpp
index d0ede6e1e..385e1d311 100644
--- a/src/mumble11x/AudioOutput.cpp
+++ b/src/mumble11x/AudioOutput.cpp
@@ -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;