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
7c9839ee
Commit
7c9839ee
authored
Sep 27, 2005
by
yanmorin
Browse files
*** empty log message ***
parent
50d6c312
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
doc/sflphone-server2.xmi
View file @
7c9839ee
This diff is collapsed.
Click to expand it.
src/audio/audiortp.cpp
View file @
7c9839ee
...
...
@@ -246,14 +246,24 @@ AudioRtpRTX::receiveSessionForSpkr (int16* data_for_speakers,
// Get audio data stream
#if 0
do {
Thread::sleep(5); // in msec.
#endif
if
(
!
_sym
)
{
adu
=
_sessionRecv
->
getData
(
_sessionRecv
->
getFirstTimestamp
());
}
else
{
adu
=
_session
->
getData
(
_session
->
getFirstTimestamp
());
}
# if 0
}
while
(
adu
==
NULL
);
#else
if
(
adu
==
NULL
)
{
Manager
::
instance
().
getAudioDriver
()
->
mainSndRingBuffer
().
flush
();
//Manager::instance().getAudioDriver()->stopStream();
return
;
}
#endif
// Decode data with relevant codec
CodecDescriptor
*
cd
=
new
CodecDescriptor
(
adu
->
getType
());
...
...
@@ -277,7 +287,7 @@ AudioRtpRTX::receiveSessionForSpkr (int16* data_for_speakers,
Manager
::
instance
().
getAudioDriver
()
->
mainSndRingBuffer
().
Put
(
data_for_speakers_tmp
,
SAMPLES_SIZE
(
RTP_FRAMES2SEND
));
//}
// Notify (with a b
i
p) an incoming call when there is already a call
// Notify (with a b
ee
p) an incoming call when there is already a call
countTime
+=
time
->
getSecond
();
if
(
Manager
::
instance
().
getNumberOfCalls
()
>
0
and
Manager
::
instance
().
getbRingtone
())
{
...
...
src/gui/server/guiserverimpl.cpp
View file @
7c9839ee
...
...
@@ -224,8 +224,8 @@ GUIServerImpl::incomingCall (short id, const std::string& accountId, const std::
TokenList
arg
;
std
::
ostringstream
callId
;
callId
<<
"s"
<<
id
;
arg
.
push_back
(
accountId
);
arg
.
push_back
(
callId
.
str
());
arg
.
push_back
(
accountId
);
arg
.
push_back
(
from
);
arg
.
push_back
(
"call"
);
...
...
Write
Preview
Markdown
is supported
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