From a5227d57de09550ae76b98f52146092f6ffa99bf 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:41:45 -0400
Subject: [PATCH] audiolayer: remove constant _defaultvolume

---
 sflphone-common/src/audio/audiolayer.cpp | 8 ++++----
 sflphone-common/src/audio/audiolayer.h   | 9 +--------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/sflphone-common/src/audio/audiolayer.cpp b/sflphone-common/src/audio/audiolayer.cpp
index f7eb216a8f..86b7c32d49 100644
--- a/sflphone-common/src/audio/audiolayer.cpp
+++ b/sflphone-common/src/audio/audiolayer.cpp
@@ -56,9 +56,9 @@ int AudioLayer::putUrgent (void* buffer, int toCopy)
     a = _urgentRingBuffer.AvailForPut();
 
     if (a >= toCopy) {
-        return _urgentRingBuffer.Put (buffer, toCopy, _defaultVolume);
+        return _urgentRingBuffer.Put (buffer, toCopy);
     } else {
-        return _urgentRingBuffer.Put (buffer, a, _defaultVolume);
+        return _urgentRingBuffer.Put (buffer, a);
     }
 
     return 0;
@@ -72,10 +72,10 @@ int AudioLayer::putMain (void *buffer, int toCopy, std::string call_id)
     a = getMainBuffer()->availForPut (call_id);
 
     if (a >= toCopy) {
-        return getMainBuffer()->putData (buffer, toCopy, _defaultVolume, call_id);
+        return getMainBuffer()->putData (buffer, toCopy, 100, call_id);
     } else {
         _debug ("Chopping sound, Ouch! RingBuffer full ?");
-        return getMainBuffer()->putData (buffer, a, _defaultVolume, call_id);
+        return getMainBuffer()->putData (buffer, a, 100, call_id);
     }
 
     return 0;
diff --git a/sflphone-common/src/audio/audiolayer.h b/sflphone-common/src/audio/audiolayer.h
index 77e7261056..89ea65bb9b 100644
--- a/sflphone-common/src/audio/audiolayer.h
+++ b/sflphone-common/src/audio/audiolayer.h
@@ -70,8 +70,7 @@ class AudioLayer
          * @param manager An instance of managerimpl
          */
         AudioLayer (ManagerImpl* manager , int type)
-            : _defaultVolume (100)
-            , _layerType (type)
+            : _layerType (type)
         	, _isStarted(false)
             , _manager (manager)
             , _urgentRingBuffer (SIZEBUF, default_id)
@@ -245,12 +244,6 @@ class AudioLayer
             _mainBuffer = mainbuffer;
         }
 
-        /**
-         * Default volume for incoming RTP and Urgent sounds.
-         */
-        unsigned short _defaultVolume; // 100
-
-
         /**
          * Set the audio recorder
          */
-- 
GitLab