From 20bfeefd7b58c50ac417c3dbd4b0cc2a3d42af51 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Fri, 12 Aug 2011 11:48:21 -0400
Subject: [PATCH] audiolayer: init pointer members
---
sflphone-common/src/audio/audiolayer.h | 9 ++++++---
sflphone-common/src/audio/pulseaudio/pulselayer.cpp | 13 ++++++-------
sflphone-common/src/audio/pulseaudio/pulselayer.h | 8 --------
3 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/sflphone-common/src/audio/audiolayer.h b/sflphone-common/src/audio/audiolayer.h
index 55eb4c9b7f..25421e6844 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 db24a223a1..8258137434 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 7b89c1f12d..b264408f2c 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
*/
--
GitLab