jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-07 22:02:12 +08:00
Code Issues Projects Releases Wiki Activity

Fix compilation without -alsa

Browse Source
This commit is contained in:
llea
2005-02-07 14:44:38 +00:00
parent 379990aef3
commit 598b836c6b
3 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/audiortp.cpp
View File

@ -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

2
src/manager.cpp
View File

@ -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

1
src/manager.h
View File

@ -46,7 +46,6 @@ public:
#ifdef ALSA
AudioDrivers *audiodriverReadAlsa;
#endif
bool useAlsa;
ToneGenerator *tone;
QString *DirectCall; // from -p argv
bool mute;