Skip to content
Snippets Groups Projects
Commit ccc291eb authored by Alexandre Bourget's avatar Alexandre Bourget
Browse files

Set a default volume for incoming (RTP) and urgent sounds.

parent 7156cbb3
No related branches found
No related tags found
No related merge requests found
...@@ -36,6 +36,7 @@ AudioLayer::AudioLayer(ManagerImpl* manager) ...@@ -36,6 +36,7 @@ AudioLayer::AudioLayer(ManagerImpl* manager)
: _urgentRingBuffer(SIZEBUF) : _urgentRingBuffer(SIZEBUF)
, _mainSndRingBuffer(SIZEBUF) , _mainSndRingBuffer(SIZEBUF)
, _micRingBuffer(SIZEBUF) , _micRingBuffer(SIZEBUF)
, _defaultVolume(100)
, _stream(NULL) , _stream(NULL)
, _errorMessage("") , _errorMessage("")
, _manager(manager) , _manager(manager)
...@@ -293,9 +294,10 @@ AudioLayer::putMain(void* buffer, int toCopy) ...@@ -293,9 +294,10 @@ AudioLayer::putMain(void* buffer, int toCopy)
if (_stream) { if (_stream) {
int a = _mainSndRingBuffer.AvailForPut(); int a = _mainSndRingBuffer.AvailForPut();
if ( a >= toCopy ) { if ( a >= toCopy ) {
return _mainSndRingBuffer.Put(buffer, toCopy); return _mainSndRingBuffer.Put(buffer, toCopy, _defaultVolume);
} else { } else {
return _mainSndRingBuffer.Put(buffer, a); _debug("Chopping sound, Ouch! RingBuffer full ?\n");
return _mainSndRingBuffer.Put(buffer, a, _defaultVolume);
} }
} }
return 0; return 0;
...@@ -315,9 +317,9 @@ AudioLayer::putUrgent(void* buffer, int toCopy) ...@@ -315,9 +317,9 @@ AudioLayer::putUrgent(void* buffer, int toCopy)
if (_stream) { if (_stream) {
int a = _urgentRingBuffer.AvailForPut(); int a = _urgentRingBuffer.AvailForPut();
if ( a >= toCopy ) { if ( a >= toCopy ) {
return _urgentRingBuffer.Put(buffer, toCopy); return _urgentRingBuffer.Put(buffer, toCopy, _defaultVolume);
} else { } else {
return _urgentRingBuffer.Put(buffer, a); return _urgentRingBuffer.Put(buffer, a, _defaultVolume);
} }
} }
return 0; return 0;
......
...@@ -109,6 +109,10 @@ private: ...@@ -109,6 +109,10 @@ private:
*/ */
unsigned int _outChannel; // speaker unsigned int _outChannel; // speaker
/**
* Default volume for incoming RTP and Urgent sounds.
*/
unsigned short _defaultVolume; // 100
/** /**
* Echo testing or not * Echo testing or not
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment