From db83b2a3a0251c3a7367fb43e617e4184c573967 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:52:51 -0400
Subject: [PATCH] RingBuffer::availForPut() : remove
check is already done in RingBuffer::Put
---
sflphone-common/src/audio/audiolayer.cpp | 11 +----------
sflphone-common/src/audio/mainbuffer.cpp | 18 ++----------------
sflphone-common/src/audio/ringbuffer.cpp | 7 -------
sflphone-common/src/audio/ringbuffer.h | 6 ------
4 files changed, 3 insertions(+), 39 deletions(-)
diff --git a/sflphone-common/src/audio/audiolayer.cpp b/sflphone-common/src/audio/audiolayer.cpp
index 15f4425b64..bb71e48983 100644
--- a/sflphone-common/src/audio/audiolayer.cpp
+++ b/sflphone-common/src/audio/audiolayer.cpp
@@ -50,18 +50,9 @@ void AudioLayer::flushUrgent (void)
int AudioLayer::putUrgent (void* buffer, int toCopy)
{
- int a;
-
ost::MutexLock guard (_mutex);
- a = _urgentRingBuffer.AvailForPut();
-
- if (a >= toCopy) {
- return _urgentRingBuffer.Put (buffer, toCopy);
- } else {
- return _urgentRingBuffer.Put (buffer, a);
- }
- return 0;
+ return _urgentRingBuffer.Put (buffer, toCopy);
}
int AudioLayer::putMain (void *buffer, int toCopy, std::string call_id)
diff --git a/sflphone-common/src/audio/mainbuffer.cpp b/sflphone-common/src/audio/mainbuffer.cpp
index f7226052a0..54b1552e3d 100644
--- a/sflphone-common/src/audio/mainbuffer.cpp
+++ b/sflphone-common/src/audio/mainbuffer.cpp
@@ -303,24 +303,10 @@ int MainBuffer::putData (void *buffer, int toCopy, std::string call_id)
ost::MutexLock guard (_mutex);
RingBuffer* ring_buffer = getRingBuffer (call_id);
-
- if (ring_buffer == NULL) {
+ if (!ring_buffer)
return 0;
- }
-
- int a;
-
- a = ring_buffer->AvailForPut();
-
- if (a >= toCopy) {
-
- return ring_buffer->Put (buffer, toCopy);
-
- } else {
-
- return ring_buffer->Put (buffer, a);
- }
+ return ring_buffer->Put (buffer, toCopy);
}
int MainBuffer::getData (void *buffer, int toCopy, std::string call_id)
diff --git a/sflphone-common/src/audio/ringbuffer.cpp b/sflphone-common/src/audio/ringbuffer.cpp
index cf918a7338..96448ccc34 100644
--- a/sflphone-common/src/audio/ringbuffer.cpp
+++ b/sflphone-common/src/audio/ringbuffer.cpp
@@ -178,13 +178,6 @@ RingBuffer::getNbReadPointer()
//
// For the writer only:
//
-int
-RingBuffer::AvailForPut()
-{
- // Always keep 4 bytes safe (?)
-
- return mBufferSize - putLen();
-}
// This one puts some data inside the ring buffer.
int
diff --git a/sflphone-common/src/audio/ringbuffer.h b/sflphone-common/src/audio/ringbuffer.h
index f3ad4b66bb..7289c45370 100644
--- a/sflphone-common/src/audio/ringbuffer.h
+++ b/sflphone-common/src/audio/ringbuffer.h
@@ -94,12 +94,6 @@ class RingBuffer
int getNbReadPointer();
- /**
- * To get how much space is available in the buffer to write in
- * @return int The available size
- */
- int AvailForPut (void);
-
/**
* Write data in the ring buffer
* @param buffer Data to copied
--
GitLab