diff --git a/crone/osc-methods.txt b/crone/osc-methods.txt index 9a7170b7c..22f51b3c7 100644 --- a/crone/osc-methods.txt +++ b/crone/osc-methods.txt @@ -44,7 +44,6 @@ osc methods: /set/param/cut/rec_level [if] /set/param/cut/pre_level [if] /set/param/cut/rec_flag [if] - /set/param/cut/rec_once [if] /set/param/cut/play_flag [if] /set/param/cut/rec_offset [if] /set/param/cut/position [if] diff --git a/crone/softcut b/crone/softcut index 53f52c26b..6ecbfa305 160000 --- a/crone/softcut +++ b/crone/softcut @@ -1 +1 @@ -Subproject commit 53f52c26bb0a3f546ff1e1d440958c255896a528 +Subproject commit 6ecbfa305ab058656cbd0638435a9ba6f8f0ef6b diff --git a/crone/src/Commands.h b/crone/src/Commands.h index 278cef2b9..3146f1701 100644 --- a/crone/src/Commands.h +++ b/crone/src/Commands.h @@ -57,7 +57,6 @@ namespace crone { // params SET_CUT_REC_FLAG, - SET_CUT_REC_ONCE, SET_CUT_PLAY_FLAG, SET_CUT_RATE, diff --git a/crone/src/OscInterface.cpp b/crone/src/OscInterface.cpp index 9e95bfc06..f74b90bcf 100644 --- a/crone/src/OscInterface.cpp +++ b/crone/src/OscInterface.cpp @@ -376,11 +376,6 @@ void OscInterface::addServerMethods() { Commands::softcutCommands.post(Commands::Id::SET_CUT_REC_FLAG, argv[0]->i, argv[1]->f); }); - addServerMethod("/set/param/cut/rec_once", "if", [](lo_arg **argv, int argc) { - if (argc < 2) { return; } - Commands::softcutCommands.post(Commands::Id::SET_CUT_REC_ONCE, argv[0]->i, argv[1]->f); - }); - addServerMethod("/set/param/cut/play_flag", "if", [](lo_arg **argv, int argc) { if (argc < 2) { return; } Commands::softcutCommands.post(Commands::Id::SET_CUT_PLAY_FLAG, argv[0]->i, argv[1]->f); @@ -480,6 +475,7 @@ void OscInterface::addServerMethods() { Commands::softcutCommands.post(Commands::Id::SET_CUT_VOICE_SYNC, argv[0]->i, argv[1]->i, argv[2]->f); }); + /////////////////////////////////////////// /// FIXME: fade curve calculations are now per-voice, /// so these methods won't work at all without modification. diff --git a/crone/src/SoftcutClient.cpp b/crone/src/SoftcutClient.cpp index ebff15b13..4c7f41492 100644 --- a/crone/src/SoftcutClient.cpp +++ b/crone/src/SoftcutClient.cpp @@ -137,13 +137,6 @@ void crone::SoftcutClient::handleCommand(Commands::CommandPacket *p) { case Commands::Id::SET_CUT_REC_FLAG: cut.setRecFlag(idx_0, value > 0.f); break; - case Commands::Id::SET_CUT_REC_ONCE: - cut.setRecOnceFlag(idx_0,true); - if (value >= 0.f) { - clamp(value, 0.f, bufDur); - cut.cutToPos(idx_0,value); - } - break; case Commands::Id::SET_CUT_PLAY_FLAG: cut.setPlayFlag(idx_0, value > 0.f); break; diff --git a/lua/core/softcut.lua b/lua/core/softcut.lua index 27fd16161..21b048c82 100644 --- a/lua/core/softcut.lua +++ b/lua/core/softcut.lua @@ -108,10 +108,6 @@ SC.pre_level = function(voice,amp) _norns.cut_param("pre_level",voice,amp) end -- @tparam int voice : voice number (1-?) -- @tparam int state : off/on (0,1) SC.rec = function(voice,state) _norns.cut_param("rec_flag",voice,state) end --- set to record one loop. --- @tparam int voice : voice number (1-?) --- @tparam float pos : position in seconds to initiate loop (optional). if omitted, then next cut will start -SC.rec_once = function(src, pos) _norns.cut_param("rec_once",src,pos or -1) end --- set record head offset SC.rec_offset = function(voice,value) _norns.cut_param("rec_offset",voice,value) end --- set play position