Skip to content
Snippets Groups Projects
Commit 20bfeefd authored by Tristan Matthews's avatar Tristan Matthews
Browse files

audiolayer: init pointer members

parent 935e59a2
No related branches found
No related tags found
No related merge requests found
...@@ -74,8 +74,11 @@ class AudioLayer ...@@ -74,8 +74,11 @@ class AudioLayer
, _isStarted(false) , _isStarted(false)
, _manager (manager) , _manager (manager)
, _urgentRingBuffer (SIZEBUF, default_id) , _urgentRingBuffer (SIZEBUF, default_id)
, _mainBuffer(0)
, _recorder(0)
, _indexIn (0) , _indexIn (0)
, _indexOut (0) , _indexOut (0)
, _indexRing(0)
, _audioSampleRate (0) , _audioSampleRate (0)
, _frameSize (0) , _frameSize (0)
, _inChannel (1) , _inChannel (1)
...@@ -84,8 +87,9 @@ class AudioLayer ...@@ -84,8 +87,9 @@ class AudioLayer
, _mutex () , _mutex ()
, _dcblocker(0) , _dcblocker(0)
, _audiofilter(0) , _audiofilter(0)
, _noisesuppressstate(false)
, _countNotificationTime(0) , _countNotificationTime(0)
, _time (new ost::Time()) { , _time (new ost::Time) {
} }
...@@ -94,8 +98,8 @@ class AudioLayer ...@@ -94,8 +98,8 @@ class AudioLayer
*/ */
virtual ~AudioLayer (void) { virtual ~AudioLayer (void) {
delete _time; delete _time;
delete _dcblocker;
delete _audiofilter; delete _audiofilter;
delete _dcblocker;
} }
virtual bool closeLayer (void) = 0; virtual bool closeLayer (void) = 0;
...@@ -241,7 +245,6 @@ class AudioLayer ...@@ -241,7 +245,6 @@ class AudioLayer
* Set the audio recorder * Set the audio recorder
*/ */
void setRecorderInstance (Recordable* rec) { void setRecorderInstance (Recordable* rec) {
_recorder = NULL;
_recorder = rec; _recorder = rec;
} }
......
...@@ -232,19 +232,18 @@ static void playback_overflow_callback (pa_stream* s UNUSED, void* userdata UNUS ...@@ -232,19 +232,18 @@ static void playback_overflow_callback (pa_stream* s UNUSED, void* userdata UNUS
PulseLayer::PulseLayer (ManagerImpl* manager) PulseLayer::PulseLayer (ManagerImpl* manager)
: AudioLayer (manager , PULSEAUDIO) : AudioLayer (manager , PULSEAUDIO)
, context (NULL) , context(0)
, m (NULL) , m(0)
, playback (NULL) , playback(0)
, record (NULL) , record(0)
, ringtone (NULL) , ringtone(0)
, _converter(0) , _converter(0)
, byteCounter(0)
{ {
_urgentRingBuffer.createReadPointer(); _urgentRingBuffer.createReadPointer();
AudioLayer::_noisesuppressstate = true; AudioLayer::_noisesuppressstate = true;
byteCounter = 0;
openLayer(); openLayer();
} }
......
...@@ -115,14 +115,6 @@ class PulseLayer : public AudioLayer ...@@ -115,14 +115,6 @@ class PulseLayer : public AudioLayer
return true; 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 * Reduce volume of every audio applications connected to the same sink
*/ */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment