Commit 7c9839ee authored by yanmorin's avatar yanmorin
Browse files

*** empty log message ***

parent 50d6c312
This diff is collapsed.
......@@ -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 bip) an incoming call when there is already a call
// Notify (with a beep) an incoming call when there is already a call
countTime += time->getSecond();
if (Manager::instance().getNumberOfCalls() > 0
and Manager::instance().getbRingtone()) {
......
......@@ -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");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment