diff --git a/src/audiortp.cpp b/src/audiortp.cpp index 34340c2c50f0a3e71d2d959d1ccfe4b960457806..5d24ee9e712c65a7b91167ddfbbfddda93925966 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 ee41e5d2f79a77ebdeef43b3a17ed47b7ab21803..cbf5987a4d559c8fee717a6c27a9771c2022dd38 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 6f145c69afc9dc5ad52038060a4de6400b344aeb..7ade0563691746614d4d5ec30f6248663ca722fc 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;