From bc47e2da6d3e4c8b079314816b6b23fdba70cec3 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:48:02 -0400
Subject: [PATCH] MainBuffer::availForPut(): remove
check is already done in putData()
---
sflphone-common/src/audio/audiolayer.cpp | 12 +-----------
sflphone-common/src/audio/mainbuffer.cpp | 15 ---------------
sflphone-common/src/audio/mainbuffer.h | 2 --
3 files changed, 1 insertion(+), 28 deletions(-)
diff --git a/sflphone-common/src/audio/audiolayer.cpp b/sflphone-common/src/audio/audiolayer.cpp
index 1615d97c71..15f4425b64 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 e3520aecdb..f7226052a0 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 31867f207c..bffc5eea7e 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);
--
GitLab