From b4bc7ab8f0ba3c00c045a32c923abf0860115c9d Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Tue, 10 Sep 2013 11:27:57 -0400
Subject: [PATCH] * #29632: audiobuffer: make buffer size an explicit parameter
---
daemon/src/audio/audiobuffer.h | 2 +-
daemon/src/audio/audioloop.cpp | 2 +-
daemon/src/audio/audiortp/audio_rtp_record_handler.cpp | 2 +-
daemon/src/audio/pulseaudio/pulselayer.cpp | 2 +-
daemon/src/audio/sound/tone.cpp | 2 +-
daemon/test/audiobuffertest.cpp | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/daemon/src/audio/audiobuffer.h b/daemon/src/audio/audiobuffer.h
index 5b5c95bb48..95d84007f2 100644
--- a/daemon/src/audio/audiobuffer.h
+++ b/daemon/src/audio/audiobuffer.h
@@ -42,7 +42,7 @@ class AudioBuffer {
/**
* Default constructor.
*/
- AudioBuffer(size_t sample_num = 0, unsigned channel_num = 1, int sample_rate = 8000);
+ AudioBuffer(size_t sample_num, unsigned channel_num = 1, int sample_rate = 8000);
/**
* Construtor from existing interleaved data (copied into the buffer).
diff --git a/daemon/src/audio/audioloop.cpp b/daemon/src/audio/audioloop.cpp
index d8a3d4892b..f1f645ab58 100644
--- a/daemon/src/audio/audioloop.cpp
+++ b/daemon/src/audio/audioloop.cpp
@@ -46,7 +46,7 @@
AudioLoop::AudioLoop(unsigned int sampleRate) : buffer_(0), pos_(0)
{
- buffer_ = new AudioBuffer;
+ buffer_ = new AudioBuffer(0);
buffer_->setSampleRate(sampleRate);
}
diff --git a/daemon/src/audio/audiortp/audio_rtp_record_handler.cpp b/daemon/src/audio/audiortp/audio_rtp_record_handler.cpp
index ad6eb3f1af..563b3a063c 100644
--- a/daemon/src/audio/audiortp/audio_rtp_record_handler.cpp
+++ b/daemon/src/audio/audiortp/audio_rtp_record_handler.cpp
@@ -100,7 +100,7 @@ AudioRtpRecord::AudioRtpRecord() :
, decoderPayloadType_(0)
, hasDynamicPayloadType_(false)
, decData_(DEC_BUFFER_SIZE) // std::tr1::arrays will be 0-initialized
- , resampledData_()
+ , resampledData_(0)
, encodedData_()
, converterEncode_(0)
, converterDecode_(0)
diff --git a/daemon/src/audio/pulseaudio/pulselayer.cpp b/daemon/src/audio/pulseaudio/pulselayer.cpp
index eeaa34f84e..fe6db98987 100644
--- a/daemon/src/audio/pulseaudio/pulselayer.cpp
+++ b/daemon/src/audio/pulseaudio/pulselayer.cpp
@@ -80,7 +80,7 @@ PulseLayer::PulseLayer(AudioPreference &pref)
, ringtone_(0)
, sinkList_()
, sourceList_()
- , mic_buffer_()
+ , mic_buffer_(0)
, context_(0)
, mainloop_(pa_threaded_mainloop_new())
, enumeratingSinks_(false)
diff --git a/daemon/src/audio/sound/tone.cpp b/daemon/src/audio/sound/tone.cpp
index 0062267aa0..4cf0b2e070 100644
--- a/daemon/src/audio/sound/tone.cpp
+++ b/daemon/src/audio/sound/tone.cpp
@@ -48,7 +48,7 @@ Tone::Tone(const std::string& definition, unsigned int sampleRate) :
{
fillWavetable();
delete buffer_;
- buffer_ = new AudioBuffer();
+ buffer_ = new AudioBuffer(0);
buffer_->setSampleRate(sampleRate);
genBuffer(definition); // allocate memory with definition parameter
}
diff --git a/daemon/test/audiobuffertest.cpp b/daemon/test/audiobuffertest.cpp
index 99109d8b07..7a1aa9052d 100644
--- a/daemon/test/audiobuffertest.cpp
+++ b/daemon/test/audiobuffertest.cpp
@@ -42,7 +42,7 @@ void AudioBufferTest::testAudioBufferConstructors()
SFLAudioSample test_samples1[] = {};
SFLAudioSample test_samples2[] = {10, 11, 12, 13, 14, 15, 16, 17};
- AudioBuffer empty_buf;
+ AudioBuffer empty_buf(0);
CPPUNIT_ASSERT(empty_buf.samples() == 0);
CPPUNIT_ASSERT(empty_buf.channels() == 1);
CPPUNIT_ASSERT(empty_buf.getChannel(0)->size() == 0);
@@ -84,7 +84,7 @@ void AudioBufferTest::testAudioBufferMix()
test_buf1.setChannelNum(2, true);
CPPUNIT_ASSERT((*test_buf1.getChannel(1))[0] == test_samples1[0]);
- AudioBuffer test_buf2;
+ AudioBuffer test_buf2(0);
test_buf2.deinterleave(test_samples2, 3, 3);
CPPUNIT_ASSERT((*test_buf2.getChannel(0))[2] == test_samples2[6]);
CPPUNIT_ASSERT((*test_buf2.getChannel(1))[1] == test_samples2[4]);
--
GitLab