From 1f47047e0b6c7d6f291d65c2703618890edb5cce 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 16:53:46 -0400
Subject: [PATCH] RingBuffer::Put() : remove constant volume argument
---
sflphone-common/src/audio/mainbuffer.cpp | 4 ++--
sflphone-common/src/audio/ringbuffer.cpp | 15 +--------------
sflphone-common/src/audio/ringbuffer.h | 3 +--
3 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/sflphone-common/src/audio/mainbuffer.cpp b/sflphone-common/src/audio/mainbuffer.cpp
index 82a52d82ed..5514c28ffa 100644
--- a/sflphone-common/src/audio/mainbuffer.cpp
+++ b/sflphone-common/src/audio/mainbuffer.cpp
@@ -314,11 +314,11 @@ int MainBuffer::putData (void *buffer, int toCopy, std::string call_id)
if (a >= toCopy) {
- return ring_buffer->Put (buffer, toCopy, 100);
+ return ring_buffer->Put (buffer, toCopy);
} else {
- return ring_buffer->Put (buffer, a, 100);
+ return ring_buffer->Put (buffer, a);
}
}
diff --git a/sflphone-common/src/audio/ringbuffer.cpp b/sflphone-common/src/audio/ringbuffer.cpp
index 2a1d5fdea8..2b15ef80b3 100644
--- a/sflphone-common/src/audio/ringbuffer.cpp
+++ b/sflphone-common/src/audio/ringbuffer.cpp
@@ -227,9 +227,8 @@ RingBuffer::AvailForPut()
}
// This one puts some data inside the ring buffer.
-// Change the volume if it's not 100
int
-RingBuffer::Put (void* buffer, int toCopy, unsigned short volume)
+RingBuffer::Put (void* buffer, int toCopy)
{
samplePtr src;
int block;
@@ -258,18 +257,6 @@ RingBuffer::Put (void* buffer, int toCopy, unsigned short volume)
block = mBufferSize - pos;
}
- // Gain adjustment (when Mic vol. is changed)
- if (volume != 100) {
- SFLDataFormat* start = (SFLDataFormat*) src;
- int nbSample = block / sizeof (SFLDataFormat);
-
- for (int i=0; i<nbSample; i++) {
- start[i] = start[i] * volume / 100;
- }
- }
-
- // bcopy(src, dest, len)
- //fprintf(stderr, "has %d put %d\t", len, block);
bcopy (src, mBuffer + pos, block);
src += block;
diff --git a/sflphone-common/src/audio/ringbuffer.h b/sflphone-common/src/audio/ringbuffer.h
index d931470eaa..8b84e94418 100644
--- a/sflphone-common/src/audio/ringbuffer.h
+++ b/sflphone-common/src/audio/ringbuffer.h
@@ -107,10 +107,9 @@ class RingBuffer
* Write data in the ring buffer
* @param buffer Data to copied
* @param toCopy Number of bytes to copy
- * @param volume The volume
* @return int Number of bytes copied
*/
- int Put (void* buffer, int toCopy, unsigned short volume = 100);
+ int Put (void* buffer, int toCopy);
/**
* To get how much space is available in the buffer to read in
--
GitLab