Merge branch 'main' of github.com:monome/softcut-lib

Author: catfact

clients/softcut-jack-osc/tests/pulsefile.scd

@@ -0,0 +1,49 @@
+n = NetAddr("localhost", 9999);
+
+~setup = {
+
+	// load file
+	f = "/home/emb/code/softcut-lib/pulse.wav";
+
+	n.sendMsg("/softcut/buffer/clear");
+	n.sendMsg("/softcut/buffer/read_mono", f, 0, 0, 0.5, 0, 0);
+
+//	n.sendMsg("/softcut/buffer/write_mono", "/home/emb/code/softcut-lib/pulse_cutloop.wav", 0, 1.0, 0);
+
+	n.sendMsg("/set/enabled/cut", 0, 1);
+	n.sendMsg("/set/level/cut", 0, 0.5);
+	n.sendMsg("/set/pan/cut", 0, 0);
+
+	n.sendMsg("/set/param/cut/buffer", 0, 0);
+
+	n.sendMsg("/set/param/cut/loop_start", 0, 0);
+	n.sendMsg("/set/param/cut/loop_end", 0, 1);
+	n.sendMsg("/set/param/cut/loop_flag", 0, 0);
+
+	n.sendMsg("/set/param/cut/fade_time", 0, 0);
+
+	n.sendMsg("/set/param/cut/post_filter_lp", 0, 0);
+	n.sendMsg("/set/param/cut/post_filter_hp", 0, 0);
+	n.sendMsg("/set/param/cut/post_filter_bp", 0, 0);
+	n.sendMsg("/set/param/cut/post_filter_br", 0, 0);
+	n.sendMsg("/set/param/cut/post_filter_dry", 0, 1);
+	n.sendMsg("/set/param/cut/play_flag", 0, 1);
+
+};
+
+~bang = {
+	n.sendMsg("/set/param/cut/position", 0, 0);
+};
+
+r = Routine {
+
+	var delta = 0.5;
+	~setup.value;
+	0.2.wait;
+
+	20.do({
+		~bang.value;
+		delta = delta * 0.9;
+		delta.wait;
+	});
+}.play;

clients/softcut_jack_osc/src/BufDiskWorker.cpp

@@ -177,13 +177,13 @@ void BufDiskWorker::readBufferMono(const std::string &path, BufDesc &buf,
 
     auto numSrcChan = file.channels();
     chanSrc = std::min(numSrcChan - 1, std::max(0, chanSrc));
-    // std::cout << "reading soundfile channel " << chanSrc << std::endl;
+    std::cout << "reading soundfile channel " << chanSrc << std::endl;
 
     auto *ioBuf = new float[numSrcChan * ioBufFrames];
     size_t numBlocks = frDur / ioBufFrames;
     size_t rem = frDur - (numBlocks * ioBufFrames);
-    // std::cout << "file contains " << file.frames() << " frames" << std::endl;
-    // std::cout << "reading " << numBlocks << " blocks and " << rem << " remainder frames..." << std::endl;
+    std::cout << "file contains " << file.frames() << " frames" << std::endl;
+    std::cout << "reading " << numBlocks << " blocks and " << rem << " remainder frames..." << std::endl;
     for (size_t block = 0; block < numBlocks; ++block) {
 	int res = file.seek(frSrc, SF_SEEK_SET);
 	if (res == -1) {	    

softcut-lib/src/FadeCurves.cpp

@@ -14,16 +14,6 @@
 using namespace softcut;
 
 static constexpr float fpi = 3.1415926535898f;
-/*
-float FadeCurves::recDelayRatio;
-float FadeCurves::preWindowRatio;
-unsigned int FadeCurves::recDelayMinFrames;
-unsigned int FadeCurves::preWindowMinFrames;
-float FadeCurves::recFadeBuf[fadeBufSize];
-float FadeCurves::preFadeBuf[fadeBufSize];
-FadeCurves::Shape FadeCurves::recShape = Linear;
-FadeCurves::Shape FadeCurves::preShape = Linear;
-*/
 
 void FadeCurves::init() {
     setPreShape(FadeCurves::Shape::Linear);
@@ -70,7 +60,7 @@ void FadeCurves::calcRecFade() {
         buf[n] = 1.f;
     } else if (recShape == Raised) {
         const float phi = fpi/(nr*2);
-        float x = fpi;
+        float x = 0.f;
         float y = 0.f;
         while (i < ndr) {
             buf[i++] = y;