diff --git a/sflphone-common/src/audio/audiolayer.cpp b/sflphone-common/src/audio/audiolayer.cpp index 1615d97c71317f10ba23ef9eac06cedcbbe9baf0..15f4425b64119c3f6961a50d0cea0cbf8be7a38f 100644 --- a/sflphone-common/src/audio/audiolayer.cpp +++ b/sflphone-common/src/audio/audiolayer.cpp @@ -66,19 +66,9 @@ int AudioLayer::putUrgent (void* buffer, int toCopy) int AudioLayer::putMain (void *buffer, int toCopy, std::string call_id) { - int a; - ost::MutexLock guard (_mutex); - a = getMainBuffer()->availForPut (call_id); - if (a >= toCopy) { - return getMainBuffer()->putData (buffer, toCopy, call_id); - } else { - _debug ("Chopping sound, Ouch! RingBuffer full ?"); - return getMainBuffer()->putData (buffer, a, call_id); - } - - return 0; + return getMainBuffer()->putData (buffer, toCopy, call_id); } void AudioLayer::notifyincomingCall() diff --git a/sflphone-common/src/audio/mainbuffer.cpp b/sflphone-common/src/audio/mainbuffer.cpp index e3520aecdb0bd2795f946c92c016326580c8d3c5..f7226052a0d795af791c0964036cf9a9fed7970e 100644 --- a/sflphone-common/src/audio/mainbuffer.cpp +++ b/sflphone-common/src/audio/mainbuffer.cpp @@ -323,21 +323,6 @@ int MainBuffer::putData (void *buffer, int toCopy, std::string call_id) } -int MainBuffer::availForPut (std::string call_id) -{ - - ost::MutexLock guard (_mutex); - - RingBuffer* ringbuffer = getRingBuffer (call_id); - - if (ringbuffer == NULL) - return 0; - else - return ringbuffer->AvailForPut(); - -} - - int MainBuffer::getData (void *buffer, int toCopy, std::string call_id) { ost::MutexLock guard (_mutex); diff --git a/sflphone-common/src/audio/mainbuffer.h b/sflphone-common/src/audio/mainbuffer.h index 31867f207cc2f5463d45083ae6b4b4f875bcf048..bffc5eea7e3614872e2aeab462c3d8e3f33ac9c7 100644 --- a/sflphone-common/src/audio/mainbuffer.h +++ b/sflphone-common/src/audio/mainbuffer.h @@ -93,8 +93,6 @@ class MainBuffer int getData (void *buffer, int toCopy, std::string call_id = default_id); - int availForPut (std::string call_id = default_id); - int availForGet (std::string call_id = default_id); int discard (int toDiscard, std::string call_id = default_id);