From 598b836c6bf5eadae0889a932fd8121838c2cd4a Mon Sep 17 00:00:00 2001
From: llea <llea>
Date: Mon, 7 Feb 2005 14:44:38 +0000
Subject: [PATCH] Fix compilation without -alsa

---
 src/audiortp.cpp | 34 ++++++++++++++++++----------------
 src/manager.cpp  |  2 --
 src/manager.h    |  1 -
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/audiortp.cpp b/src/audiortp.cpp
index 34340c2c5..5d24ee9e7 100644
--- a/src/audiortp.cpp
+++ b/src/audiortp.cpp
@@ -68,13 +68,13 @@ AudioRtp::createNewSession (SipCall *ca) {
 		symetric = true;
 	}
 	
-	if (manager->useAlsa) {
-		RTXThread = new AudioRtpRTX (ca, manager->audiodriver, 
+#ifdef ALSA
+	RTXThread = new AudioRtpRTX (ca, manager->audiodriver, 
 				manager->audiodriverReadAlsa, manager, symetric);
-	} else {
-		RTXThread = new AudioRtpRTX (ca, manager->audiodriver, NULL, manager, 
+#else
+	RTXThread = new AudioRtpRTX (ca, manager->audiodriver, NULL, manager, 
 			symetric);
-	}
+#endif
 	
 	if (RTXThread->start() != 0) {
 		return -1;
@@ -110,8 +110,9 @@ AudioRtpRTX::AudioRtpRTX (SipCall *sipcall, AudioDrivers *driver,
 	this->ca = sipcall;
 	this->sym =sym;
 	this->audioDevice = driver;
-	if (manager->useAlsa)
-		this->audioDeviceRead = read_driver;
+#ifdef ALSA
+	this->audioDeviceRead = read_driver;
+#endif
 
 	// TODO: Change bind address according to user settings.
 	InetHostAddress local_ip("0.0.0.0");
@@ -254,18 +255,19 @@ AudioRtpRTX::run (void) {
 		// Send session
 		////////////////////////////
 		if (!manager->mute) {
-			if (manager->useAlsa) {
-				i = audioDeviceRead->readBuffer (data_from_mic, 320);
-			} else {
-				i = audioDevice->readBuffer (data_from_mic, 320);
-			}
+#ifdef ALSA
+			i = audioDeviceRead->readBuffer (data_from_mic, 320);
+#else
+			i = audioDevice->readBuffer (data_from_mic, 320);
+#endif
 		} else {
 			// When IP-phone user click on mute button, we read buffer of a
 			// temp buffer to avoid delay in sound.
-			if (manager->useAlsa)
-				i = audioDeviceRead->readBuffer (data_mute, 320);
-			else
-				i = audioDevice->readBuffer (data_mute, 320);
+#ifdef
+			i = audioDeviceRead->readBuffer (data_mute, 320);
+#else
+			i = audioDevice->readBuffer (data_mute, 320);
+#endif
 		}
 
 		// TODO : return an error because no sound
diff --git a/src/manager.cpp b/src/manager.cpp
index ee41e5d2f..cbf5987a4 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -141,12 +141,10 @@ Manager::createSettingsPath (void) {
 void
 Manager::selectAudioDriver (void) {
 	if (Config::getb("Audio", "Drivers.driverOSS")) {
-		useAlsa = false;
 		this->audiodriver = new AudioDriversOSS (AudioDrivers::ReadWrite);
 	}
 	if (Config::getb("Audio", "Drivers.driverALSA")) {
 #ifdef ALSA
-		useAlsa = true;
 		this->audiodriver = new AudioDriversALSA (AudioDrivers::WriteOnly);
 		this->audiodriverReadAlsa = new AudioDriversALSA (AudioDrivers::ReadOnly);
 #endif
diff --git a/src/manager.h b/src/manager.h
index 6f145c69a..7ade05636 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -46,7 +46,6 @@ public:
 #ifdef ALSA
 	AudioDrivers	*audiodriverReadAlsa;
 #endif
-	bool 			 useAlsa;
 	ToneGenerator	*tone;
 	QString 		*DirectCall; // from -p argv
 	bool 			 mute;
-- 
GitLab