Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
ccc291eb
Commit
ccc291eb
authored
Aug 23, 2007
by
Alexandre Bourget
Browse files
Set a default volume for incoming (RTP) and urgent sounds.
parent
7156cbb3
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/audio/audiolayer.cpp
View file @
ccc291eb
...
...
@@ -36,6 +36,7 @@ AudioLayer::AudioLayer(ManagerImpl* manager)
:
_urgentRingBuffer
(
SIZEBUF
)
,
_mainSndRingBuffer
(
SIZEBUF
)
,
_micRingBuffer
(
SIZEBUF
)
,
_defaultVolume
(
100
)
,
_stream
(
NULL
)
,
_errorMessage
(
""
)
,
_manager
(
manager
)
...
...
@@ -293,9 +294,10 @@ AudioLayer::putMain(void* buffer, int toCopy)
if
(
_stream
)
{
int
a
=
_mainSndRingBuffer
.
AvailForPut
();
if
(
a
>=
toCopy
)
{
return
_mainSndRingBuffer
.
Put
(
buffer
,
toCopy
);
return
_mainSndRingBuffer
.
Put
(
buffer
,
toCopy
,
_defaultVolume
);
}
else
{
return
_mainSndRingBuffer
.
Put
(
buffer
,
a
);
_debug
(
"Chopping sound, Ouch! RingBuffer full ?
\n
"
);
return
_mainSndRingBuffer
.
Put
(
buffer
,
a
,
_defaultVolume
);
}
}
return
0
;
...
...
@@ -315,9 +317,9 @@ AudioLayer::putUrgent(void* buffer, int toCopy)
if
(
_stream
)
{
int
a
=
_urgentRingBuffer
.
AvailForPut
();
if
(
a
>=
toCopy
)
{
return
_urgentRingBuffer
.
Put
(
buffer
,
toCopy
);
return
_urgentRingBuffer
.
Put
(
buffer
,
toCopy
,
_defaultVolume
);
}
else
{
return
_urgentRingBuffer
.
Put
(
buffer
,
a
);
return
_urgentRingBuffer
.
Put
(
buffer
,
a
,
_defaultVolume
);
}
}
return
0
;
...
...
src/audio/audiolayer.h
View file @
ccc291eb
...
...
@@ -109,6 +109,10 @@ private:
*/
unsigned
int
_outChannel
;
// speaker
/**
* Default volume for incoming RTP and Urgent sounds.
*/
unsigned
short
_defaultVolume
;
// 100
/**
* Echo testing or not
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment