Commit 66a47ba3 authored by Alexandre Savard's avatar Alexandre Savard
parents 48c24139 d1cb9540
......@@ -89,7 +89,7 @@ void AudioRecord::setSndSamplingRate (int smplRate)
sndSmplRate_ = smplRate;
}
int AudioRecord::getSndSamplingRate()
int AudioRecord::getSndSamplingRate() const
{
return sndSmplRate_;
}
......
......@@ -53,7 +53,7 @@ class AudioRecord
void setSndSamplingRate (int smplRate);
int getSndSamplingRate(void);
int getSndSamplingRate(void) const;
void setRecordingOption (FILE_TYPE type, SOUND_FORMAT format, int sndSmplRate, std::string path);
......
......@@ -299,7 +299,7 @@ void AudioRtpFactory::updateDestinationIpAddress (void)
sfl::AudioSymmetricRtpSession * AudioRtpFactory::getAudioSymetricRtpSession()
{
if ( (_rtpSessionType == Symmetric) && (_rtpSessionType != NULL)) {
if ( (_rtpSessionType == Symmetric) && (_rtpSessionType != 0)) {
return static_cast<AudioSymmetricRtpSession *> (_rtpSession);
} else {
throw AudioRtpFactoryException ("RTP: Error: _rtpSession is NULL in getAudioSymetricRtpSession");
......@@ -308,7 +308,7 @@ sfl::AudioSymmetricRtpSession * AudioRtpFactory::getAudioSymetricRtpSession()
sfl::AudioZrtpSession * AudioRtpFactory::getAudioZrtpSession()
{
if ( (_rtpSessionType == Zrtp) && (_rtpSessionType != NULL)) {
if ( (_rtpSessionType == Zrtp) && (_rtpSessionType != 0)) {
return static_cast<AudioZrtpSession *> (_rtpSession);
} else {
throw AudioRtpFactoryException ("RTP: Error: _rtpSession is NULL in getAudioZrtpSession");
......
......@@ -61,9 +61,9 @@ void Recordable::setRecordingSmplRate (int smplRate)
}
int Recordable::getRecordingSmplRate()
int Recordable::getRecordingSmplRate() const
{
recAudio.getSndSamplingRate();
return recAudio.getSndSamplingRate();
}
......@@ -72,7 +72,7 @@ class Recordable
*/
void setRecordingSmplRate (int smplRate);
int getRecordingSmplRate(void);
int getRecordingSmplRate(void) const;
virtual std::string getRecFileId() = 0;
......
......@@ -40,7 +40,7 @@
#define SIP_SCHEME "sip:"
#define SIPS_SCHEME "sips:"
#define CallConfigNULL NULL
#define CallConfigNULL 0
/*
* @file call.h
......
......@@ -62,7 +62,7 @@ IAXVoIPLink::IAXVoIPLink (const AccountID& accountID) : VoIPLink (accountID)
, spkrDataDecoded (NULL)
, spkrDataConverted (NULL)
, converter (NULL)
, converterSamplingRate (NULL)
, converterSamplingRate (0)
, urlhook (NULL)
{
_evThread = new EventThread (this);
......
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