diff --git a/sflphone-common/src/audio/mainbuffer.cpp b/sflphone-common/src/audio/mainbuffer.cpp index 82a52d82ed2e8e3a181abef578df0cc41608794b..5514c28ffa3a49553880f36cfafe89ee83b49861 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 2a1d5fdea84be7577ab91c81af5418c2e22c5e0a..2b15ef80b36f55a5b189e1f215f3ea17cd414348 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 d931470eaa634418f18b0f3f43fb201632b4f1c6..8b84e94418212005a45c590095956f05c9927bac 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