From 9b87febb8c425a1fd5d47a0f9da8809e5ca0b4b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?=
<rafael.carre@savoirfairelinux.com>
Date: Tue, 9 Aug 2011 17:03:24 -0400
Subject: [PATCH] MainBuffer::getData() : remove constant volume argument
The only user was alsalayer, volume change is added here
---
sflphone-common/src/audio/alsa/alsalayer.cpp | 6 ++++--
sflphone-common/src/audio/audiorecorder.cpp | 2 +-
.../src/audio/audiortp/AudioRtpRecordHandler.cpp | 2 +-
sflphone-common/src/audio/mainbuffer.cpp | 6 +++---
sflphone-common/src/audio/mainbuffer.h | 2 +-
sflphone-common/src/audio/pulseaudio/pulselayer.cpp | 4 ++--
sflphone-common/src/iax/iaxvoiplink.cpp | 2 +-
7 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/sflphone-common/src/audio/alsa/alsalayer.cpp b/sflphone-common/src/audio/alsa/alsalayer.cpp
index 4261eb4896..ec30bad9ec 100644
--- a/sflphone-common/src/audio/alsa/alsalayer.cpp
+++ b/sflphone-common/src/audio/alsa/alsalayer.cpp
@@ -924,8 +924,10 @@ void AlsaLayer::audioCallback (void)
memset (out, 0, maxNbBytesToGet);
if (normalAvailBytes) {
-
- getMainBuffer()->getData (out, toGet, spkrVolume);
+ getMainBuffer()->getData (out, toGet);
+ if (spkrVolume!=100)
+ for (int i=0; i<toGet / sizeof (SFLDataFormat); i++)
+ out[i] = out[i] * spkrVolume / 100;
if (_mainBufferSampleRate && ( (int) _audioSampleRate != _mainBufferSampleRate)) {
diff --git a/sflphone-common/src/audio/audiorecorder.cpp b/sflphone-common/src/audio/audiorecorder.cpp
index e2f5b37aa7..4b1ddfc7d9 100644
--- a/sflphone-common/src/audio/audiorecorder.cpp
+++ b/sflphone-common/src/audio/audiorecorder.cpp
@@ -71,7 +71,7 @@ void AudioRecorder::run (void)
int toGet = (availBytes < bufferLength) ? availBytes : bufferLength;
- mbuffer->getData (buffer, toGet, 100, recorderId);
+ mbuffer->getData (buffer, toGet, recorderId);
if (availBytes > 0) {
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.cpp b/sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.cpp
index cfc0aa51c9..7b9b0c83dd 100644
--- a/sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.cpp
+++ b/sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.cpp
@@ -280,7 +280,7 @@ int AudioRtpRecordHandler::processDataEncode (void)
return 0;
// Get bytes from micRingBuffer to data_from_mic
- int nbSample = Manager::instance().getMainBuffer()->getData (micData, bytesToGet, 100, _id) / sizeof (SFLDataFormat);
+ int nbSample = Manager::instance().getMainBuffer()->getData (micData, bytesToGet, _id) / sizeof (SFLDataFormat);
// process mic fade in
if (!_audioRtpRecord._micFadeInComplete)
diff --git a/sflphone-common/src/audio/mainbuffer.cpp b/sflphone-common/src/audio/mainbuffer.cpp
index 5514c28ffa..d35f75fb8a 100644
--- a/sflphone-common/src/audio/mainbuffer.cpp
+++ b/sflphone-common/src/audio/mainbuffer.cpp
@@ -338,7 +338,7 @@ int MainBuffer::availForPut (std::string call_id)
}
-int MainBuffer::getData (void *buffer, int toCopy, unsigned short volume, std::string call_id)
+int MainBuffer::getData (void *buffer, int toCopy, std::string call_id)
{
ost::MutexLock guard (_mutex);
@@ -353,7 +353,7 @@ int MainBuffer::getData (void *buffer, int toCopy, unsigned short volume, std::s
CallIDSet::iterator iter_id = callid_set->begin();
if (iter_id != callid_set->end()) {
- return getDataByID (buffer, toCopy, volume, *iter_id, call_id);
+ return getDataByID (buffer, toCopy, 100, *iter_id, call_id);
} else
return 0;
} else {
@@ -367,7 +367,7 @@ int MainBuffer::getData (void *buffer, int toCopy, unsigned short volume, std::s
int nbSmplToCopy = toCopy / sizeof (SFLDataFormat);
SFLDataFormat mixBuffer[nbSmplToCopy];
memset (mixBuffer, 0, toCopy);
- size = getDataByID (mixBuffer, toCopy, volume, *iter_id, call_id);
+ size = getDataByID (mixBuffer, toCopy, 100, *iter_id, call_id);
if (size > 0) {
for (int k = 0; k < nbSmplToCopy; k++) {
diff --git a/sflphone-common/src/audio/mainbuffer.h b/sflphone-common/src/audio/mainbuffer.h
index 8d74dc3deb..7eb3cb9635 100644
--- a/sflphone-common/src/audio/mainbuffer.h
+++ b/sflphone-common/src/audio/mainbuffer.h
@@ -91,7 +91,7 @@ class MainBuffer
int putData (void *buffer, int toCopy, std::string call_id = default_id);
- int getData (void *buffer, int toCopy, unsigned short volume = 100, std::string call_id = default_id);
+ int getData (void *buffer, int toCopy, std::string call_id = default_id);
int availForPut (std::string call_id = default_id);
diff --git a/sflphone-common/src/audio/pulseaudio/pulselayer.cpp b/sflphone-common/src/audio/pulseaudio/pulselayer.cpp
index 03e3049d40..b4d38ba09e 100644
--- a/sflphone-common/src/audio/pulseaudio/pulselayer.cpp
+++ b/sflphone-common/src/audio/pulseaudio/pulselayer.cpp
@@ -744,7 +744,7 @@ void PulseLayer::writeToSpeaker (void)
out = (SFLDataFormat*) pa_xmalloc (writeableSize);
memset (out, 0, writeableSize);
- _urgentRingBuffer.Get (out, writeableSize, 100);
+ _urgentRingBuffer.Get (out, writeableSize);
pa_stream_write (playback->pulseStream(), out, writeableSize, NULL, 0, PA_SEEK_RELATIVE);
@@ -803,7 +803,7 @@ void PulseLayer::writeToSpeaker (void)
out = (SFLDataFormat*) pa_xmalloc (maxNbBytesToGet);
memset (out, 0, maxNbBytesToGet);
- getMainBuffer()->getData (out, byteToGet, 100);
+ getMainBuffer()->getData (out, byteToGet);
// test if resampling is required
if (_mainBufferSampleRate && ( (int) _audioSampleRate != _mainBufferSampleRate)) {
diff --git a/sflphone-common/src/iax/iaxvoiplink.cpp b/sflphone-common/src/iax/iaxvoiplink.cpp
index 5a23dfdd35..84838945ed 100644
--- a/sflphone-common/src/iax/iaxvoiplink.cpp
+++ b/sflphone-common/src/iax/iaxvoiplink.cpp
@@ -310,7 +310,7 @@ IAXVoIPLink::sendAudioFromMic (void)
continue;
// Get bytes from micRingBuffer to data_from_mic
- int bytes = audiolayer->getMainBuffer()->getData (micData, needed, 100, currentCall->getCallId()) / sizeof (SFLDataFormat);
+ int bytes = audiolayer->getMainBuffer()->getData (micData, needed, currentCall->getCallId()) / sizeof (SFLDataFormat);
int compSize;
if (audioCodec->getClockRate() && ((int) audioCodec->getClockRate() != _mainBufferSampleRate)) {
--
GitLab