Commit 3889f125 authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #7131: renamed logging macros

parent 765508ff
...@@ -113,7 +113,7 @@ bool AlsaLayer::openDevice(snd_pcm_t **pcm, const std::string &dev, snd_pcm_stre ...@@ -113,7 +113,7 @@ bool AlsaLayer::openDevice(snd_pcm_t **pcm, const std::string &dev, snd_pcm_stre
} }
if (err < 0) { if (err < 0) {
_error("Alsa: couldn't open device %s : %s", dev.c_str(), ERROR("Alsa: couldn't open device %s : %s", dev.c_str(),
snd_strerror(err)); snd_strerror(err));
return false; return false;
} }
...@@ -218,7 +218,7 @@ AlsaLayer::stopStream() ...@@ -218,7 +218,7 @@ AlsaLayer::stopStream()
#define ALSA_CALL(call, error) ({ \ #define ALSA_CALL(call, error) ({ \
int err_code = call; \ int err_code = call; \
if (err_code < 0) \ if (err_code < 0) \
_error("ALSA: "error": %s", snd_strerror(err_code)); \ ERROR("ALSA: "error": %s", snd_strerror(err_code)); \
err_code; \ err_code; \
}) })
...@@ -320,7 +320,7 @@ bool AlsaLayer::alsa_set_params(snd_pcm_t *pcm_handle) ...@@ -320,7 +320,7 @@ bool AlsaLayer::alsa_set_params(snd_pcm_t *pcm_handle)
TRY(snd_pcm_hw_params(HW), "hwparams"); TRY(snd_pcm_hw_params(HW), "hwparams");
#undef HW #undef HW
_debug("ALSA: %s using sampling rate %dHz", DEBUG("ALSA: %s using sampling rate %dHz",
(snd_pcm_stream(pcm_handle) == SND_PCM_STREAM_PLAYBACK) ? "playback" : "capture", (snd_pcm_stream(pcm_handle) == SND_PCM_STREAM_PLAYBACK) ? "playback" : "capture",
audioSampleRate_); audioSampleRate_);
...@@ -369,7 +369,7 @@ AlsaLayer::write(void* buffer, int length, snd_pcm_t * handle) ...@@ -369,7 +369,7 @@ AlsaLayer::write(void* buffer, int length, snd_pcm_t * handle)
} }
default: default:
_error("ALSA: unknown write error, dropping frames: %s", snd_strerror(err)); ERROR("ALSA: unknown write error, dropping frames: %s", snd_strerror(err));
stopPlaybackStream(); stopPlaybackStream();
break; break;
} }
...@@ -404,12 +404,12 @@ AlsaLayer::read(void* buffer, int toCopy) ...@@ -404,12 +404,12 @@ AlsaLayer::read(void* buffer, int toCopy)
startCaptureStream(); startCaptureStream();
} }
_error("ALSA: XRUN capture ignored (%s)", snd_strerror(err)); ERROR("ALSA: XRUN capture ignored (%s)", snd_strerror(err));
break; break;
} }
case EPERM: case EPERM:
_error("ALSA: Can't capture, EPERM (%s)", snd_strerror(err)); ERROR("ALSA: Can't capture, EPERM (%s)", snd_strerror(err));
prepareCaptureStream(); prepareCaptureStream();
startCaptureStream(); startCaptureStream();
break; break;
...@@ -459,9 +459,9 @@ AlsaLayer::getSoundCardsInfo(int stream) ...@@ -459,9 +459,9 @@ AlsaLayer::getSoundCardsInfo(int stream)
snd_pcm_info_set_stream(pcminfo, (stream == SFL_PCM_CAPTURE) ? SND_PCM_STREAM_CAPTURE : SND_PCM_STREAM_PLAYBACK); snd_pcm_info_set_stream(pcminfo, (stream == SFL_PCM_CAPTURE) ? SND_PCM_STREAM_CAPTURE : SND_PCM_STREAM_PLAYBACK);
if (snd_ctl_pcm_info(handle ,pcminfo) < 0) if (snd_ctl_pcm_info(handle ,pcminfo) < 0)
_debug(" Cannot get info"); DEBUG(" Cannot get info");
else { else {
_debug("card %i : %s [%s]", DEBUG("card %i : %s [%s]",
numCard, numCard,
snd_ctl_card_info_get_id(info), snd_ctl_card_info_get_id(info),
snd_ctl_card_info_get_name(info)); snd_ctl_card_info_get_name(info));
...@@ -531,7 +531,7 @@ void AlsaLayer::capture() ...@@ -531,7 +531,7 @@ void AlsaLayer::capture()
int toGetSamples = snd_pcm_avail_update(captureHandle_); int toGetSamples = snd_pcm_avail_update(captureHandle_);
if (toGetSamples < 0) if (toGetSamples < 0)
_error("Audio: Mic error: %s", snd_strerror(toGetSamples)); ERROR("Audio: Mic error: %s", snd_strerror(toGetSamples));
if (toGetSamples <= 0) if (toGetSamples <= 0)
return; return;
...@@ -545,7 +545,7 @@ void AlsaLayer::capture() ...@@ -545,7 +545,7 @@ void AlsaLayer::capture()
SFLDataFormat* in = (SFLDataFormat*) malloc(toGetBytes); SFLDataFormat* in = (SFLDataFormat*) malloc(toGetBytes);
if (read(in, toGetBytes) != toGetBytes) { if (read(in, toGetBytes) != toGetBytes) {
_error("ALSA MIC : Couldn't read!"); ERROR("ALSA MIC : Couldn't read!");
goto end; goto end;
} }
......
...@@ -52,7 +52,7 @@ AudioLoop::getNext(SFLDataFormat* output, size_t total_samples, short volume) ...@@ -52,7 +52,7 @@ AudioLoop::getNext(SFLDataFormat* output, size_t total_samples, short volume)
size_t pos = pos_; size_t pos = pos_;
if (size_ == 0) { if (size_ == 0) {
_error("AudioLoop: Error: Audio loop size is 0"); ERROR("AudioLoop: Error: Audio loop size is 0");
return; return;
} }
......
...@@ -100,12 +100,12 @@ void AudioRecord::initFileName(std::string peerNumber) ...@@ -100,12 +100,12 @@ void AudioRecord::initFileName(std::string peerNumber)
if (fileType_ == FILE_RAW) { if (fileType_ == FILE_RAW) {
if (strstr(fileName_, ".raw") == NULL) { if (strstr(fileName_, ".raw") == NULL) {
_debug("AudioRecord: concatenate .raw file extension: name : %s", fileName_); DEBUG("AudioRecord: concatenate .raw file extension: name : %s", fileName_);
fName.append(".raw"); fName.append(".raw");
} }
} else if (fileType_ == FILE_WAV) { } else if (fileType_ == FILE_WAV) {
if (strstr(fileName_, ".wav") == NULL) { if (strstr(fileName_, ".wav") == NULL) {
_debug("AudioRecord: concatenate .wav file extension: name : %s", fileName_); DEBUG("AudioRecord: concatenate .wav file extension: name : %s", fileName_);
fName.append(".wav"); fName.append(".wav");
} }
} }
...@@ -122,10 +122,10 @@ bool AudioRecord::openFile() ...@@ -122,10 +122,10 @@ bool AudioRecord::openFile()
{ {
bool result = false; bool result = false;
_debug("AudioRecord: Open file()"); DEBUG("AudioRecord: Open file()");
if (not fileExists()) { if (not fileExists()) {
_debug("AudioRecord: Filename does not exist, creating one"); DEBUG("AudioRecord: Filename does not exist, creating one");
byteCounter_ = 0; byteCounter_ = 0;
if (fileType_ == FILE_RAW) if (fileType_ == FILE_RAW)
...@@ -133,7 +133,7 @@ bool AudioRecord::openFile() ...@@ -133,7 +133,7 @@ bool AudioRecord::openFile()
else if (fileType_ == FILE_WAV) else if (fileType_ == FILE_WAV)
result = setWavFile(); result = setWavFile();
} else { } else {
_debug("AudioRecord: Filename already exists, opening it"); DEBUG("AudioRecord: Filename already exists, opening it");
if (fileType_ == FILE_RAW) if (fileType_ == FILE_RAW)
result = openExistingRawFile(); result = openExistingRawFile();
else if (fileType_ == FILE_WAV) else if (fileType_ == FILE_WAV)
...@@ -163,7 +163,7 @@ bool AudioRecord::isOpenFile() ...@@ -163,7 +163,7 @@ bool AudioRecord::isOpenFile()
bool AudioRecord::fileExists() bool AudioRecord::fileExists()
{ {
_info("AudioRecord: Trying to open %s ", fileName_); INFO("AudioRecord: Trying to open %s ", fileName_);
return fopen(fileName_,"rb") != 0; return fopen(fileName_,"rb") != 0;
} }
...@@ -177,10 +177,10 @@ bool AudioRecord::setRecording() ...@@ -177,10 +177,10 @@ bool AudioRecord::setRecording()
{ {
if (isOpenFile()) { if (isOpenFile()) {
if (!recordingEnabled_) { if (!recordingEnabled_) {
_info("AudioRecording: Start recording"); INFO("AudioRecording: Start recording");
recordingEnabled_ = true; recordingEnabled_ = true;
} else { } else {
_info("AudioRecording: Stop recording"); INFO("AudioRecording: Stop recording");
recordingEnabled_ = false; recordingEnabled_ = false;
} }
} else { } else {
...@@ -195,7 +195,7 @@ bool AudioRecord::setRecording() ...@@ -195,7 +195,7 @@ bool AudioRecord::setRecording()
void AudioRecord::stopRecording() void AudioRecord::stopRecording()
{ {
_info("AudioRecording: Stop recording"); INFO("AudioRecording: Stop recording");
recordingEnabled_ = false; recordingEnabled_ = false;
} }
...@@ -249,7 +249,7 @@ void AudioRecord::createFilename() ...@@ -249,7 +249,7 @@ void AudioRecord::createFilename()
// fileName_ = out.str(); // fileName_ = out.str();
strncpy(fileName_, out.str().c_str(), 8192); strncpy(fileName_, out.str().c_str(), 8192);
_info("AudioRecord: create filename for this call %s ", fileName_); INFO("AudioRecord: create filename for this call %s ", fileName_);
} }
bool AudioRecord::setRawFile() bool AudioRecord::setRawFile()
...@@ -257,11 +257,11 @@ bool AudioRecord::setRawFile() ...@@ -257,11 +257,11 @@ bool AudioRecord::setRawFile()
fileHandle_ = fopen(savePath_.c_str(), "wb"); fileHandle_ = fopen(savePath_.c_str(), "wb");
if (!fileHandle_) { if (!fileHandle_) {
_warn("AudioRecord: Could not create RAW file!"); WARN("AudioRecord: Could not create RAW file!");
return false; return false;
} }
_debug("AudioRecord:setRawFile() : created RAW file."); DEBUG("AudioRecord:setRawFile() : created RAW file.");
return true; return true;
} }
...@@ -269,12 +269,12 @@ bool AudioRecord::setRawFile() ...@@ -269,12 +269,12 @@ bool AudioRecord::setRawFile()
bool AudioRecord::setWavFile() bool AudioRecord::setWavFile()
{ {
_debug("AudioRecord: Create new wave file %s, sampling rate: %d", savePath_.c_str(), sndSmplRate_); DEBUG("AudioRecord: Create new wave file %s, sampling rate: %d", savePath_.c_str(), sndSmplRate_);
fileHandle_ = fopen(savePath_.c_str(), "wb"); fileHandle_ = fopen(savePath_.c_str(), "wb");
if (!fileHandle_) { if (!fileHandle_) {
_warn("AudioRecord: Error: could not create WAV file."); WARN("AudioRecord: Error: could not create WAV file.");
return false; return false;
} }
...@@ -300,11 +300,11 @@ bool AudioRecord::setWavFile() ...@@ -300,11 +300,11 @@ bool AudioRecord::setWavFile()
if (fwrite(&hdr, 4, 11, fileHandle_) != 11) { if (fwrite(&hdr, 4, 11, fileHandle_) != 11) {
_warn("AudioRecord: Error: could not write WAV header for file. "); WARN("AudioRecord: Error: could not write WAV header for file. ");
return false; return false;
} }
_debug("AudioRecord: created WAV file successfully."); DEBUG("AudioRecord: created WAV file successfully.");
return true; return true;
} }
...@@ -315,7 +315,7 @@ bool AudioRecord::openExistingRawFile() ...@@ -315,7 +315,7 @@ bool AudioRecord::openExistingRawFile()
fileHandle_ = fopen(fileName_, "ab+"); fileHandle_ = fopen(fileName_, "ab+");
if (!fileHandle_) { if (!fileHandle_) {
_warn("AudioRecord: could not create RAW file!"); WARN("AudioRecord: could not create RAW file!");
return false; return false;
} }
...@@ -325,37 +325,37 @@ bool AudioRecord::openExistingRawFile() ...@@ -325,37 +325,37 @@ bool AudioRecord::openExistingRawFile()
bool AudioRecord::openExistingWavFile() bool AudioRecord::openExistingWavFile()
{ {
_info("%s(%s)\n", __PRETTY_FUNCTION__, fileName_); INFO("%s(%s)\n", __PRETTY_FUNCTION__, fileName_);
fileHandle_ = fopen(fileName_, "rb+"); fileHandle_ = fopen(fileName_, "rb+");
if (!fileHandle_) { if (!fileHandle_) {
_warn("AudioRecord: Error: could not open WAV file!"); WARN("AudioRecord: Error: could not open WAV file!");
return false; return false;
} }
if (fseek(fileHandle_, 40, SEEK_SET) != 0) // jump to data length if (fseek(fileHandle_, 40, SEEK_SET) != 0) // jump to data length
_warn("AudioRecord: Error: Couldn't seek offset 40 in the file "); WARN("AudioRecord: Error: Couldn't seek offset 40 in the file ");
if (fread(&byteCounter_, 4, 1, fileHandle_)) if (fread(&byteCounter_, 4, 1, fileHandle_))
_warn("AudioRecord: Error: bytecounter Read successfully "); WARN("AudioRecord: Error: bytecounter Read successfully ");
if (fseek(fileHandle_, 0 , SEEK_END) != 0) if (fseek(fileHandle_, 0 , SEEK_END) != 0)
_warn("AudioRecord: Error: Couldn't seek at the en of the file "); WARN("AudioRecord: Error: Couldn't seek at the en of the file ");
if (fclose(fileHandle_) != 0) if (fclose(fileHandle_) != 0)
_warn("AudioRecord: Error: Can't close file r+ "); WARN("AudioRecord: Error: Can't close file r+ ");
fileHandle_ = fopen(fileName_, "ab+"); fileHandle_ = fopen(fileName_, "ab+");
if (!fileHandle_) { if (!fileHandle_) {
_warn("AudioRecord: Error: Could not createopen WAV file ab+!"); WARN("AudioRecord: Error: Could not createopen WAV file ab+!");
return false; return false;
} }
if (fseek(fileHandle_, 4 , SEEK_END) != 0) if (fseek(fileHandle_, 4 , SEEK_END) != 0)
_warn("AudioRecord: Error: Couldn't seek at the en of the file "); WARN("AudioRecord: Error: Couldn't seek at the en of the file ");
return true; return true;
...@@ -364,38 +364,38 @@ bool AudioRecord::openExistingWavFile() ...@@ -364,38 +364,38 @@ bool AudioRecord::openExistingWavFile()
void AudioRecord::closeWavFile() void AudioRecord::closeWavFile()
{ {
if (fileHandle_ == 0) { if (fileHandle_ == 0) {
_debug("AudioRecord: Can't closeWavFile, a file has not yet been opened!"); DEBUG("AudioRecord: Can't closeWavFile, a file has not yet been opened!");
return; return;
} }
_debug("AudioRecord: Close wave file"); DEBUG("AudioRecord: Close wave file");
SINT32 bytes = byteCounter_ * channels_; SINT32 bytes = byteCounter_ * channels_;
fseek(fileHandle_, 40, SEEK_SET); // jump to data length fseek(fileHandle_, 40, SEEK_SET); // jump to data length
if (ferror(fileHandle_)) if (ferror(fileHandle_))
_warn("AudioRecord: Error: can't reach offset 40 while closing"); WARN("AudioRecord: Error: can't reach offset 40 while closing");
fwrite(&bytes, sizeof(SINT32), 1, fileHandle_); fwrite(&bytes, sizeof(SINT32), 1, fileHandle_);
if (ferror(fileHandle_)) if (ferror(fileHandle_))
_warn("AudioRecord: Error: can't write bytes for data length "); WARN("AudioRecord: Error: can't write bytes for data length ");
bytes = byteCounter_ * channels_ + 44; // + 44 for the wave header bytes = byteCounter_ * channels_ + 44; // + 44 for the wave header
fseek(fileHandle_, 4, SEEK_SET); // jump to file size fseek(fileHandle_, 4, SEEK_SET); // jump to file size
if (ferror(fileHandle_)) if (ferror(fileHandle_))
_warn("AudioRecord: Error: can't reach offset 4"); WARN("AudioRecord: Error: can't reach offset 4");
fwrite(&bytes, 4, 1, fileHandle_); fwrite(&bytes, 4, 1, fileHandle_);
if (ferror(fileHandle_)) if (ferror(fileHandle_))
_warn("AudioRecord: Error: can't reach offset 4"); WARN("AudioRecord: Error: can't reach offset 4");
if (fclose(fileHandle_) != 0) if (fclose(fileHandle_) != 0)
_warn("AudioRecord: Error: can't close file"); WARN("AudioRecord: Error: can't close file");
} }
void AudioRecord::recSpkrData(SFLDataFormat* buffer, int nSamples) void AudioRecord::recSpkrData(SFLDataFormat* buffer, int nSamples)
...@@ -425,12 +425,12 @@ void AudioRecord::recData(SFLDataFormat* buffer, int nSamples) ...@@ -425,12 +425,12 @@ void AudioRecord::recData(SFLDataFormat* buffer, int nSamples)
{ {
if (recordingEnabled_) { if (recordingEnabled_) {
if (fileHandle_ == 0) { if (fileHandle_ == 0) {
_debug("AudioRecord: Can't record data, a file has not yet been opened!"); DEBUG("AudioRecord: Can't record data, a file has not yet been opened!");
return; return;
} }
if (fwrite(buffer, sizeof(SFLDataFormat), nSamples, fileHandle_) != (unsigned int) nSamples) if (fwrite(buffer, sizeof(SFLDataFormat), nSamples, fileHandle_) != (unsigned int) nSamples)
_warn("AudioRecord: Could not record data! "); WARN("AudioRecord: Could not record data! ");
else { else {
fflush(fileHandle_); fflush(fileHandle_);
byteCounter_ += (unsigned long)(nSamples*sizeof(SFLDataFormat)); byteCounter_ += (unsigned long)(nSamples*sizeof(SFLDataFormat));
...@@ -444,7 +444,7 @@ void AudioRecord::recData(SFLDataFormat* buffer_1, SFLDataFormat* buffer_2, ...@@ -444,7 +444,7 @@ void AudioRecord::recData(SFLDataFormat* buffer_1, SFLDataFormat* buffer_2,
{ {
if (recordingEnabled_) { if (recordingEnabled_) {
if (fileHandle_ == 0) { if (fileHandle_ == 0) {
_debug("AudioRecord: Can't record data, a file has not yet been opened!"); DEBUG("AudioRecord: Can't record data, a file has not yet been opened!");
return; return;
} }
...@@ -452,7 +452,7 @@ void AudioRecord::recData(SFLDataFormat* buffer_1, SFLDataFormat* buffer_2, ...@@ -452,7 +452,7 @@ void AudioRecord::recData(SFLDataFormat* buffer_1, SFLDataFormat* buffer_2,
mixBuffer_[k] = (buffer_1[k]+buffer_2[k]); mixBuffer_[k] = (buffer_1[k]+buffer_2[k]);
if (fwrite(&mixBuffer_[k], 2, 1, fileHandle_) != 1) if (fwrite(&mixBuffer_[k], 2, 1, fileHandle_) != 1)
_warn("AudioRecord: Could not record data!"); WARN("AudioRecord: Could not record data!");
else else
fflush(fileHandle_); fflush(fileHandle_);
} }
......
...@@ -125,7 +125,7 @@ int AudioRtpRecordHandler::processDataEncode() ...@@ -125,7 +125,7 @@ int AudioRtpRecordHandler::processDataEncode()
int bytes = Manager::instance().getMainBuffer()->getData(micData, bytesToGet, id_); int bytes = Manager::instance().getMainBuffer()->getData(micData, bytesToGet, id_);
if (bytes != bytesToGet) { if (bytes != bytesToGet) {
_error("%s : asked %d bytes from mainbuffer, got %d", __PRETTY_FUNCTION__, bytesToGet, bytes); ERROR("%s : asked %d bytes from mainbuffer, got %d", __PRETTY_FUNCTION__, bytesToGet, bytes);
return 0; return 0;
} }
......
...@@ -72,7 +72,7 @@ void AudioRtpSession::updateSessionMedia(AudioCodec *audioCodec) ...@@ -72,7 +72,7 @@ void AudioRtpSession::updateSessionMedia(AudioCodec *audioCodec)
Manager::instance().audioSamplingRateChanged(audioRtpRecord_.codecSampleRate_); Manager::instance().audioSamplingRateChanged(audioRtpRecord_.codecSampleRate_);
if (lastSamplingRate != audioRtpRecord_.codecSampleRate_) { if (lastSamplingRate != audioRtpRecord_.codecSampleRate_) {
_debug("AudioRtpSession: Update noise suppressor with sampling rate %d and frame size %d", getCodecSampleRate(), getCodecFrameSize()); DEBUG("AudioRtpSession: Update noise suppressor with sampling rate %d and frame size %d", getCodecSampleRate(), getCodecFrameSize());
initNoiseSuppress(); initNoiseSuppress();
} }
...@@ -94,20 +94,20 @@ void AudioRtpSession::setSessionMedia(AudioCodec *audioCodec) ...@@ -94,20 +94,20 @@ void AudioRtpSession::setSessionMedia(AudioCodec *audioCodec)
else else
timestampIncrement_ = frameSize; timestampIncrement_ = frameSize;
_debug("AudioRptSession: Codec payload: %d", payloadType); DEBUG("AudioRptSession: Codec payload: %d", payloadType);
_debug("AudioSymmetricRtpSession: Codec sampling rate: %d", smplRate); DEBUG("AudioSymmetricRtpSession: Codec sampling rate: %d", smplRate);
_debug("AudioSymmetricRtpSession: Codec frame size: %d", frameSize); DEBUG("AudioSymmetricRtpSession: Codec frame size: %d", frameSize);
_debug("AudioSymmetricRtpSession: RTP timestamp increment: %d", timestampIncrement_); DEBUG("AudioSymmetricRtpSession: RTP timestamp increment: %d", timestampIncrement_);
if (payloadType == g722PayloadType) { if (payloadType == g722PayloadType) {
_debug("AudioSymmetricRtpSession: Setting G722 payload format"); DEBUG("AudioSymmetricRtpSession: Setting G722 payload format");
queue_->setPayloadFormat(ost::DynamicPayloadFormat((ost::PayloadType) payloadType, g722RtpClockRate)); queue_->setPayloadFormat(ost::DynamicPayloadFormat((ost::PayloadType) payloadType, g722RtpClockRate));
} else { } else {
if (dynamic) { if (dynamic) {
_debug("AudioSymmetricRtpSession: Setting dynamic payload format"); DEBUG("AudioSymmetricRtpSession: Setting dynamic payload format");
queue_->setPayloadFormat(ost::DynamicPayloadFormat((ost::PayloadType) payloadType, smplRate)); queue_->setPayloadFormat(ost::DynamicPayloadFormat((ost::PayloadType) payloadType, smplRate));
} else { } else {
_debug("AudioSymmetricRtpSession: Setting static payload format"); DEBUG("AudioSymmetricRtpSession: Setting static payload format");
queue_->setPayloadFormat(ost::StaticPayloadFormat((ost::StaticPayloadType) payloadType)); queue_->setPayloadFormat(ost::StaticPayloadFormat((ost::StaticPayloadType) payloadType));
} }
} }
...@@ -127,7 +127,7 @@ void AudioRtpSession::sendDtmfEvent() ...@@ -127,7 +127,7 @@ void AudioRtpSession::sendDtmfEvent()
audioRtpRecord_.dtmfQueue_.pop_front(); audioRtpRecord_.dtmfQueue_.pop_front();
_debug("AudioRtpSession: Send RTP Dtmf (%d)", payload.event); DEBUG("AudioRtpSession: Send RTP Dtmf (%d)", payload.event);
timestamp_ += (type_ == Zrtp) ? 160 : timestampIncrement_; timestamp_ += (type_ == Zrtp) ? 160 : timestampIncrement_;
...@@ -186,7 +186,7 @@ void AudioRtpSession::sendMicData() ...@@ -186,7 +186,7 @@ void AudioRtpSession::sendMicData()
void AudioRtpSession::setSessionTimeouts() void AudioRtpSession::setSessionTimeouts()
{ {
_debug("AudioRtpSession: Set session scheduling timeout (%d) and expireTimeout (%d)", sfl::schedulingTimeout, sfl::expireTimeout); DEBUG("AudioRtpSession: Set session scheduling timeout (%d) and expireTimeout (%d)", sfl::schedulingTimeout, sfl::expireTimeout);
queue_->setSchedulingTimeout(sfl::schedulingTimeout); queue_->setSchedulingTimeout(sfl::schedulingTimeout);
queue_->setExpireTimeout(sfl::expireTimeout); queue_->setExpireTimeout(sfl::expireTimeout);
...@@ -194,13 +194,13 @@ void AudioRtpSession::setSessionTimeouts() ...@@ -194,13 +194,13 @@ void AudioRtpSession::setSessionTimeouts()
void AudioRtpSession::setDestinationIpAddress() void AudioRtpSession::setDestinationIpAddress()
{ {
_info("AudioRtpSession: Setting IP address for the RTP session"); INFO("AudioRtpSession: Setting IP address for the RTP session");