Remove old SampleBuffer

sakertooth · Aug 28, 2023 · 53728ce · 53728ce
1 parent 0017f66
commit 53728ce
Show file tree

Hide file tree

Showing 29 changed files with 201 additions and 2,150 deletions.
diff --git a/include/AudioSampleRecorder.h b/include/AudioSampleRecorder.h
@@ -34,7 +34,7 @@
 namespace lmms
 {
 
-class SampleBuffer2;
+class SampleBuffer;
 
 
 class AudioSampleRecorder : public AudioDevice
@@ -44,7 +44,7 @@ class AudioSampleRecorder : public AudioDevice
 	~AudioSampleRecorder() override;
 
 	f_cnt_t framesRecorded() const;
-	void createSampleBuffer(SampleBuffer2** sampleBuffer);
+	void createSampleBuffer(SampleBuffer** sampleBuffer);
 
 
 private:

diff --git a/include/EnvelopeAndLfoParameters.h b/include/EnvelopeAndLfoParameters.h
@@ -167,7 +167,7 @@ public slots:
 	sample_t * m_lfoShapeData;
 	sample_t m_random;
 	bool m_bad_lfoShapeData;
-	SampleBuffer m_userWave;
+	std::shared_ptr<const SampleBuffer> m_userWave;
 
 	enum class LfoShape
 	{

diff --git a/include/LfoController.h b/include/LfoController.h
@@ -86,7 +86,7 @@ public slots:
 	sample_t (*m_sampleFunction)( const float );
 
 private:
-	std::shared_ptr<const SampleBuffer2> m_userDefSampleBuffer;
+	std::shared_ptr<const SampleBuffer> m_userDefSampleBuffer;
 
 protected slots:
 	void updatePhase();

diff --git a/include/Oscillator.h b/include/Oscillator.h
@@ -36,7 +36,7 @@
 #include "lmmsconfig.h"
 #include "AudioEngine.h"
 #include "OscillatorConstants.h"
-#include "SampleBuffer2.h"
+#include "SampleBuffer.h"
 
 namespace lmms
 {
@@ -91,14 +91,14 @@ class LMMS_EXPORT Oscillator
 
 	static void waveTableInit();
 	static void destroyFFTPlans();
-	static std::unique_ptr<OscillatorConstants::waveform_t> generateAntiAliasUserWaveTable(const SampleBuffer2 *sampleBuffer);
+	static std::unique_ptr<OscillatorConstants::waveform_t> generateAntiAliasUserWaveTable(const SampleBuffer *sampleBuffer);
 
 	inline void setUseWaveTable(bool n)
 	{
 		m_useWaveTable = n;
 	}
 
-	inline void setUserWave(std::shared_ptr<const SampleBuffer2> _wave)
+	inline void setUserWave(std::shared_ptr<const SampleBuffer> _wave)
 	{
 		m_userWave = _wave;
 	}
@@ -164,7 +164,7 @@ class LMMS_EXPORT Oscillator
 		return 1.0f - fast_rand() * 2.0f / FAST_RAND_MAX;
 	}
 
-	static inline sample_t userWaveSample(const SampleBuffer2* buffer, const float sample)
+	static inline sample_t userWaveSample(const SampleBuffer* buffer, const float sample)
 	{
 		if (buffer == nullptr || buffer->size() == 0) { return 0; }
 		const auto frames = buffer->size();
@@ -256,7 +256,7 @@ class LMMS_EXPORT Oscillator
 	Oscillator * m_subOsc;
 	float m_phaseOffset;
 	float m_phase;
-	std::shared_ptr<const SampleBuffer2> m_userWave;
+	std::shared_ptr<const SampleBuffer> m_userWave;
 	std::shared_ptr<const OscillatorConstants::waveform_t> m_userAntiAliasWaveTable;
 	bool m_useWaveTable;
 	// There are many update*() variants; the modulator flag is stored as a member variable to avoid

diff --git a/include/Sample.h b/include/Sample.h
@@ -1,5 +1,5 @@
 /*
- * Sample.h - State for container-class SampleBuffer2
+ * Sample.h - State for container-class SampleBuffer
  *
  * Copyright (c) 2023 saker <sakertooth@gmail.com>
  *
@@ -29,7 +29,7 @@
 #include <memory>
 
 #include "Note.h"
-#include "SampleBuffer2.h"
+#include "SampleBuffer.h"
 #include "lmms_export.h"
 
 #ifdef __MINGW32__
@@ -88,7 +88,7 @@ class LMMS_EXPORT Sample
 	Sample(const QString& audioFile);
 	Sample(const QByteArray& base64, int sampleRate = Engine::audioEngine()->processingSampleRate());
 	Sample(const sampleFrame* data, int numFrames, int sampleRate = Engine::audioEngine()->processingSampleRate());
-	Sample(std::shared_ptr<const SampleBuffer2> buffer);
+	Sample(std::shared_ptr<const SampleBuffer> buffer);
 	Sample(const Sample& other);
 	Sample(Sample&& other) noexcept;
 
@@ -107,7 +107,7 @@ class LMMS_EXPORT Sample
 
 	auto toBase64() const -> QString;
 
-	auto buffer() const -> std::shared_ptr<const SampleBuffer2>;
+	auto buffer() const -> std::shared_ptr<const SampleBuffer>;
 	auto startFrame() const -> int;
 	auto endFrame() const -> int;
 	auto loopStartFrame() const -> int;
@@ -144,7 +144,7 @@ class LMMS_EXPORT Sample
 	auto amplifySampleRange(sampleFrame* src, int numFrames) const -> void;
 
 private:
-	std::shared_ptr<const SampleBuffer2> m_buffer = std::make_shared<SampleBuffer2>();
+	std::shared_ptr<const SampleBuffer> m_buffer = std::make_shared<SampleBuffer>();
 	int m_startFrame = 0;
 	int m_endFrame = 0;
 	int m_loopStartFrame = 0;