added AudioBuffer class

woguls · Mar 22, 2020 · 50d8663 · 50d8663
1 parent d4a3d89
commit 50d8663
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 16 deletions.
diff --git a/Makefile.base.mk b/Makefile.base.mk
@@ -129,7 +129,7 @@ endif
 # Set build and link flags
 
 BASE_FLAGS = -Wall -Wextra -pipe -MD -MP
-BASE_OPTS  = -O3 -ffast-math -fdata-sections -ffunction-sections # -fopt-info-vec-missed
+BASE_OPTS  = -O3 -ffast-math -fdata-sections -ffunction-sections -fopt-info-vec-missed
 
 ifeq ($(CPU_I386_OR_X86_64),true)
 BASE_OPTS += -mtune=generic -msse -msse2

diff --git a/src/csound-session/CsoundSession.cpp b/src/csound-session/CsoundSession.cpp
@@ -32,26 +32,37 @@ CsoundSession::CsoundSession(const char* orc, double framerate, uint32_t buffers
     SetOption("-d");
     if (CompileOrc(m_orc) == 0) {
         Start();
-        m_ksmps = GetKsmps();
-        m_processedFrames = m_ksmps;
     }
     else {
       m_result = 1;
       return;
     }
 
-    m_spout = GetSpout();
-    m_spin  = GetSpin();
     m_result =  0;
-    m_0dBFS = Get0dBFS();
+
+    buffers = new AudioBuffers(Get0dBFS(), GetKsmps(), GetSpin(), GetSpout(), GetCsound());
 };
 // -----------------------------------------------------------------------
 // CopyBuffers
 // low, high: sample numbers relative to the Distrho buffers.
 void CsoundSession::CopyBuffers(const uint32_t low, const uint32_t high, const float** in, float** out) {
+
+	buffers->Copy(low, high, in, out);
+}
+
+AudioBuffers::AudioBuffers(const MYFLT zdbfs, const uint32_t ksmps, MYFLT* spin, MYFLT* spout, CSOUND * const csound) :
+        m_0dBFS{zdbfs},
+        m_ksmps{ksmps},
+        m_spin{spin},
+        m_spout{spout},
+        m_processedFrames{ksmps},
+        m_csound{csound}
+        {}
+
+void AudioBuffers::Copy(const uint32_t low, const uint32_t high, const float** const in, float** const out) {
 	for (uint32_t frame = low; frame < high; frame++, m_processedFrames++) {
 		if (m_processedFrames == m_ksmps ) {
-			PerformKsmps();
+			csoundPerformKsmps(m_csound);
 			m_processedFrames = 0;
 		}
 
@@ -65,10 +76,7 @@ void CsoundSession::CopyBuffers(const uint32_t low, const uint32_t high, const f
 	        m_spin[j + offset] = in[j][frame] * m_0dBFS;
 		}
 	}
-}
-
-
-
 
+}
 
 END_NAMESPACE_DISTRHO
diff --git a/src/csound-session/CsoundSession.hpp b/src/csound-session/CsoundSession.hpp
@@ -7,22 +7,35 @@
 
 START_NAMESPACE_DISTRHO
 
+class AudioBuffers
+{
+public:
+    AudioBuffers(const MYFLT zdbfs, const uint32_t ksmps, MYFLT* spin, MYFLT* spout, CSOUND * const csound);
+    void Copy(const uint32_t low, const uint32_t high, const float** const in, float** const out);
+
+private:
+    const MYFLT m_0dBFS;
+    MYFLT * const m_spin;
+    MYFLT * const m_spout;
+    const uint32_t m_ksmps;
+    uint32_t m_processedFrames;
+    CSOUND * const m_csound;
+};
+
 
 class CsoundSession : public Csound
 {
 public:	
-	CsoundSession(const char* orc, double framerate, uint32_t buffersize);
+	CsoundSession(const char* orc, const double framerate, const uint32_t buffersize);
 
     void CopyBuffers(uint32_t low, uint32_t high, const float** in, float** out);
 private:
 	CSOUND_PARAMS m_csParams;
 	String m_orc;
-	uint32_t m_processedFrames;
     int m_result;
-    uint32_t m_ksmps;
-    MYFLT *m_spin, *m_spout;
-    MYFLT m_0dBFS;
+    AudioBuffers* buffers;
 };
 
+
 END_NAMESPACE_DISTRHO
 #endif