diff --git a/sflphone-common/src/audio/audiolayer.h b/sflphone-common/src/audio/audiolayer.h index 55eb4c9b7f64032e2a93f7f1e1c8348f49447ef1..25421e6844beca02d6186886493440a7a0b289b0 100644 --- a/sflphone-common/src/audio/audiolayer.h +++ b/sflphone-common/src/audio/audiolayer.h @@ -74,8 +74,11 @@ class AudioLayer , _isStarted(false) , _manager (manager) , _urgentRingBuffer (SIZEBUF, default_id) + , _mainBuffer(0) + , _recorder(0) , _indexIn (0) , _indexOut (0) + , _indexRing(0) , _audioSampleRate (0) , _frameSize (0) , _inChannel (1) @@ -84,8 +87,9 @@ class AudioLayer , _mutex () , _dcblocker(0) , _audiofilter(0) + , _noisesuppressstate(false) , _countNotificationTime(0) - , _time (new ost::Time()) { + , _time (new ost::Time) { } @@ -94,8 +98,8 @@ class AudioLayer */ virtual ~AudioLayer (void) { delete _time; - delete _dcblocker; delete _audiofilter; + delete _dcblocker; } virtual bool closeLayer (void) = 0; @@ -241,7 +245,6 @@ class AudioLayer * Set the audio recorder */ void setRecorderInstance (Recordable* rec) { - _recorder = NULL; _recorder = rec; } diff --git a/sflphone-common/src/audio/pulseaudio/pulselayer.cpp b/sflphone-common/src/audio/pulseaudio/pulselayer.cpp index db24a223a154ee47cd6953739bd9d60f6cd8ce36..8258137434b36f32c1ab0769f8be56e9b5000821 100644 --- a/sflphone-common/src/audio/pulseaudio/pulselayer.cpp +++ b/sflphone-common/src/audio/pulseaudio/pulselayer.cpp @@ -232,19 +232,18 @@ static void playback_overflow_callback (pa_stream* s UNUSED, void* userdata UNUS PulseLayer::PulseLayer (ManagerImpl* manager) : AudioLayer (manager , PULSEAUDIO) - , context (NULL) - , m (NULL) - , playback (NULL) - , record (NULL) - , ringtone (NULL) + , context(0) + , m(0) + , playback(0) + , record(0) + , ringtone(0) , _converter(0) + , byteCounter(0) { _urgentRingBuffer.createReadPointer(); AudioLayer::_noisesuppressstate = true; - byteCounter = 0; - openLayer(); } diff --git a/sflphone-common/src/audio/pulseaudio/pulselayer.h b/sflphone-common/src/audio/pulseaudio/pulselayer.h index 7b89c1f12d5400fc538023719121adb7f00483d0..b264408f2c40b157eed9af28bb045635b738bcaf 100644 --- a/sflphone-common/src/audio/pulseaudio/pulselayer.h +++ b/sflphone-common/src/audio/pulseaudio/pulselayer.h @@ -115,14 +115,6 @@ class PulseLayer : public AudioLayer return true; } - /** - * UNUSED in pulseaudio layer - */ - //std::vector<std::string> getSoundCardsInfo( int stream UNUSED ) { - //std::vector<std::string> tmp; - //return tmp; - //} - /** * Reduce volume of every audio applications connected to the same sink */