commit 213b3c10a6dd3f0920c53be5b0c605640b0815b8
parent 7aab8e015ed301a8830eec7c05748b7e3b992621
Author: falkTX <[email protected]>
Date: Fri, 29 Jan 2016 17:19:55 +0100
Merge branch 'master' of ssh://git.code.sf.net/p/zynaddsubfx/code into dpf-plugin
Conflicts:
src/Misc/Master.cpp
Diffstat:
23 files changed, 619 insertions(+), 88 deletions(-)
diff --git a/src/Containers/NotePool.cpp b/src/Containers/NotePool.cpp
@@ -1,18 +1,69 @@
#include "NotePool.h"
-//XXX eliminate dependence on Part.h
-#include "../Misc/Part.h"
#include "../Misc/Allocator.h"
#include "../Synth/SynthNote.h"
#include <cstring>
#include <cassert>
#include <iostream>
+#define SUSTAIN_BIT 0x04
+#define NOTE_MASK 0x03
+
+enum NoteStatus {
+ KEY_OFF = 0x00,
+ KEY_PLAYING = 0x01,
+ KEY_RELEASED_AND_SUSTAINED = 0x02,
+ KEY_RELEASED = 0x03
+};
+
+
NotePool::NotePool(void)
:needs_cleaning(0)
{
memset(ndesc, 0, sizeof(ndesc));
memset(sdesc, 0, sizeof(sdesc));
}
+
+bool NotePool::NoteDescriptor::playing(void) const
+{
+ return (status&NOTE_MASK) == KEY_PLAYING;
+}
+
+bool NotePool::NoteDescriptor::sustained(void) const
+{
+ return (status&NOTE_MASK) == KEY_RELEASED_AND_SUSTAINED;
+}
+
+bool NotePool::NoteDescriptor::released(void) const
+{
+ return (status&NOTE_MASK) == KEY_RELEASED;
+}
+
+bool NotePool::NoteDescriptor::off(void) const
+{
+ return (status&NOTE_MASK) == KEY_OFF;
+}
+
+void NotePool::NoteDescriptor::setStatus(uint8_t s)
+{
+ status &= ~NOTE_MASK;
+ status |= (NOTE_MASK&s);
+}
+
+void NotePool::NoteDescriptor::doSustain(void)
+{
+ setStatus(KEY_RELEASED_AND_SUSTAINED);
+}
+
+bool NotePool::NoteDescriptor::canSustain(void) const
+{
+ return !(status & SUSTAIN_BIT);
+}
+
+void NotePool::NoteDescriptor::makeUnsustainable(void)
+{
+ status |= SUSTAIN_BIT;
+}
+
NotePool::activeNotesIter NotePool::activeNotes(NoteDescriptor &n)
{
const int off_d1 = &n-ndesc;
@@ -35,18 +86,18 @@ static int getMergeableDescriptor(uint8_t note, uint8_t sendto, bool legato,
{
int desc_id = 0;
for(int i=0; i<POLYPHONY; ++i, ++desc_id)
- if(ndesc[desc_id].status == Part::KEY_OFF)
+ if(ndesc[desc_id].off())
break;
if(desc_id != 0) {
auto &nd = ndesc[desc_id-1];
if(nd.age == 0 && nd.note == note && nd.sendto == sendto
- && nd.status == Part::KEY_PLAYING && nd.legatoMirror == legato)
+ && nd.playing() && nd.legatoMirror == legato && nd.canSustain())
return desc_id-1;
}
//Out of free descriptors
- if(desc_id >= POLYPHONY || ndesc[desc_id].status != Part::KEY_OFF) {
+ if(desc_id >= POLYPHONY || !ndesc[desc_id].off()) {
return -1;
}
@@ -65,6 +116,28 @@ NotePool::constActiveDescIter NotePool::activeDesc(void) const
return constActiveDescIter{*this};
}
+int NotePool::usedNoteDesc(void) const
+{
+ if(needs_cleaning)
+ const_cast<NotePool*>(this)->cleanup();
+
+ int cnt = 0;
+ for(int i=0; i<POLYPHONY; ++i)
+ cnt += (ndesc[i].size != 0);
+ return cnt;
+}
+
+int NotePool::usedSynthDesc(void) const
+{
+ if(needs_cleaning)
+ const_cast<NotePool*>(this)->cleanup();
+
+ int cnt = 0;
+ for(int i=0; i<POLYPHONY*EXPECTED_USAGE; ++i)
+ cnt += (bool)sdesc[i].note;
+ return cnt;
+}
+
void NotePool::insertNote(uint8_t note, uint8_t sendto, SynthDescriptor desc, bool legato)
{
//Get first free note descriptor
@@ -74,7 +147,7 @@ void NotePool::insertNote(uint8_t note, uint8_t sendto, SynthDescriptor desc, bo
ndesc[desc_id].note = note;
ndesc[desc_id].sendto = sendto;
ndesc[desc_id].size += 1;
- ndesc[desc_id].status = Part::KEY_PLAYING;
+ ndesc[desc_id].status = KEY_PLAYING;
ndesc[desc_id].legatoMirror = legato;
//Get first free synth descriptor
@@ -90,7 +163,7 @@ void NotePool::insertNote(uint8_t note, uint8_t sendto, SynthDescriptor desc, bo
void NotePool::upgradeToLegato(void)
{
for(auto &d:activeDesc())
- if(d.status == Part::KEY_PLAYING)
+ if(d.playing())
for(auto &s:activeNotes(d))
insertLegatoNote(d.note, d.sendto, s);
}
@@ -118,12 +191,23 @@ void NotePool::applyLegato(LegatoParams &par)
std::cerr << "failed to create legato note: " << ba.what() << std::endl;
}
}
-};
+}
+
+void NotePool::makeUnsustainable(uint8_t note)
+{
+ for(auto &desc:activeDesc()) {
+ if(desc.note == note) {
+ desc.makeUnsustainable();
+ if(desc.sustained())
+ release(desc);
+ }
+ }
+}
bool NotePool::full(void) const
{
for(int i=0; i<POLYPHONY; ++i)
- if(ndesc[i].status == Part::KEY_OFF)
+ if(ndesc[i].off())
return false;
return true;
}
@@ -149,8 +233,7 @@ int NotePool::getRunningNotes(void) const
bool running[256] = {0};
for(auto &desc:activeDesc()) {
//printf("note!(%d)\n", desc.note);
- if(desc.status == Part::KEY_PLAYING ||
- desc.status == Part::KEY_RELEASED_AND_SUSTAINED)
+ if(desc.playing() || desc.sustained())
running[desc.note] = true;
}
@@ -160,30 +243,44 @@ int NotePool::getRunningNotes(void) const
return running_count;
}
-int NotePool::enforceKeyLimit(int limit) const
-{
- //{
- //int oldestnotepos = -1;
- //if(notecount > keylimit) //find out the oldest note
- // for(int i = 0; i < POLYPHONY; ++i) {
- // int maxtime = 0;
- // if(((partnote[i].status == KEY_PLAYING) || (partnote[i].status == KEY_RELEASED_AND_SUSTAINED)) && (partnote[i].time > maxtime)) {
- // maxtime = partnote[i].time;
- // oldestnotepos = i;
- // }
- // }
- //if(oldestnotepos != -1)
- // ReleaseNotePos(oldestnotepos);
- //}
- //printf("Unimplemented enforceKeyLimit()\n");
- return -1;
+void NotePool::enforceKeyLimit(int limit)
+{
+ int notes_to_kill = getRunningNotes() - limit;
+ if(notes_to_kill <= 0)
+ return;
+
+ NoteDescriptor *to_kill = NULL;
+ unsigned oldest = 0;
+ for(auto &nd : activeDesc()) {
+ if(to_kill == NULL) {
+ //There must be something to kill
+ oldest = nd.age;
+ to_kill = &nd;
+ } else if(to_kill->released() && nd.playing()) {
+ //Prefer to kill off a running note
+ oldest = nd.age;
+ to_kill = &nd;
+ } else if(nd.age > oldest && !(to_kill->playing() && nd.released())) {
+ //Get an older note when it doesn't move from running to released
+ oldest = nd.age;
+ to_kill = &nd;
+ }
+ }
+
+ if(to_kill) {
+ auto &tk = *to_kill;
+ if(tk.released() || tk.sustained())
+ kill(*to_kill);
+ else
+ entomb(*to_kill);
+ }
}
void NotePool::releasePlayingNotes(void)
{
for(auto &d:activeDesc()) {
- if(d.status == Part::KEY_PLAYING) {
- d.status = Part::KEY_RELEASED;
+ if(d.playing()) {
+ d.setStatus(KEY_RELEASED);
for(auto s:activeNotes(d))
s.note->releasekey();
}
@@ -192,7 +289,7 @@ void NotePool::releasePlayingNotes(void)
void NotePool::release(NoteDescriptor &d)
{
- d.status = Part::KEY_RELEASED;
+ d.setStatus(KEY_RELEASED);
for(auto s:activeNotes(d))
s.note->releasekey();
}
@@ -213,7 +310,7 @@ void NotePool::killNote(uint8_t note)
void NotePool::kill(NoteDescriptor &d)
{
- d.status = Part::KEY_OFF;
+ d.setStatus(KEY_OFF);
for(auto &s:activeNotes(d))
kill(s);
}
@@ -225,6 +322,13 @@ void NotePool::kill(SynthDescriptor &s)
needs_cleaning = true;
}
+void NotePool::entomb(NoteDescriptor &d)
+{
+ d.setStatus(KEY_RELEASED);
+ for(auto &s:activeNotes(d))
+ s.note->entomb();
+}
+
const char *getStatus(int status_bits)
{
switch(status_bits)
@@ -252,7 +356,7 @@ void NotePool::cleanup(void)
int last_valid_desc = 0;
for(int i=0; i<POLYPHONY; ++i)
- if(ndesc[i].status != Part::KEY_OFF)
+ if(!ndesc[i].off())
last_valid_desc = i;
//Find the real numbers of allocated notes
@@ -275,7 +379,7 @@ void NotePool::cleanup(void)
if(new_length[i] != 0)
ndesc[cum_new++] = ndesc[i];
else
- ndesc[i].status = Part::KEY_OFF;
+ ndesc[i].setStatus(KEY_OFF);
}
memset(ndesc+cum_new, 0, sizeof(*ndesc)*(POLYPHONY-cum_new));
}
diff --git a/src/Containers/NotePool.h b/src/Containers/NotePool.h
@@ -24,6 +24,19 @@ class NotePool
uint8_t status;
bool legatoMirror;
bool operator==(NoteDescriptor);
+
+ //status checks
+ bool playing(void) const;
+ bool off(void) const;
+ bool sustained(void) const;
+ bool released(void) const;
+
+ //status transitions
+ void setStatus(uint8_t s);
+ void doSustain(void);
+
+ bool canSustain(void) const;
+ void makeUnsustainable(void);
};
//To be pedantic this wastes 2 or 6 bytes per descriptor
@@ -84,6 +97,10 @@ class NotePool
activeDescIter activeDesc(void);
constActiveDescIter activeDesc(void) const;
+ //Counts of descriptors used for tests
+ int usedNoteDesc(void) const;
+ int usedSynthDesc(void) const;
+
NotePool(void);
//Operations
@@ -93,13 +110,15 @@ class NotePool
void upgradeToLegato(void);
void applyLegato(LegatoParams &par);
+ void makeUnsustainable(uint8_t note);
+
bool full(void) const;
bool synthFull(int sdesc_count) const;
//Note that isn't KEY_PLAYING or KEY_RELASED_AND_SUSTAINING
bool existsRunningNote(void) const;
int getRunningNotes(void) const;
- int enforceKeyLimit(int limit) const;
+ void enforceKeyLimit(int limit);
void releasePlayingNotes(void);
void releaseNote(note_t note);
@@ -109,6 +128,7 @@ class NotePool
void killNote(note_t note);
void kill(NoteDescriptor &d);
void kill(SynthDescriptor &s);
+ void entomb(NoteDescriptor &d);
void cleanup(void);
diff --git a/src/Misc/CMakeLists.txt b/src/Misc/CMakeLists.txt
@@ -14,6 +14,7 @@ set(zynaddsubfx_misc_SRCS
Misc/MiddleWare.cpp
Misc/PresetExtractor.cpp
Misc/Allocator.cpp
+ Misc/CallbackRepeater.cpp
)
diff --git a/src/Misc/CallbackRepeater.cpp b/src/Misc/CallbackRepeater.cpp
@@ -0,0 +1,13 @@
+#include "CallbackRepeater.h"
+CallbackRepeater::CallbackRepeater(int interval, cb_t cb_)
+ :last(time(0)), dt(interval), cb(cb_)
+{}
+
+void CallbackRepeater::tick(void)
+{
+ auto now = time(0);
+ if(now-last > dt && dt >= 0) {
+ cb();
+ last = now;
+ }
+}
diff --git a/src/Misc/CallbackRepeater.h b/src/Misc/CallbackRepeater.h
@@ -0,0 +1,17 @@
+#include <functional>
+#include <ctime>
+
+struct CallbackRepeater
+{
+ typedef std::function<void(void)> cb_t ;
+
+ //Call interval in seconds and callback
+ CallbackRepeater(int interval, cb_t cb_);
+
+ //Time Check
+ void tick(void);
+
+ std::time_t last;
+ std::time_t dt;
+ cb_t cb;
+};
diff --git a/src/Misc/Master.cpp b/src/Misc/Master.cpp
@@ -237,6 +237,19 @@ static const Ports master_ports = {
SNIP
preset_ports.dispatch(msg, data);
rBOIL_END},
+ {"HDDRecorder/preparefile:s", rDoc("Init WAV file"), 0, [](const char *msg, RtData &d) {
+ Master *m = (Master*)d.obj;
+ m->HDDRecorder.preparefile(rtosc_argument(msg, 0).s, 1);}},
+ {"HDDRecorder/start:", rDoc("Start recording"), 0, [](const char *, RtData &d) {
+ Master *m = (Master*)d.obj;
+ m->HDDRecorder.start();}},
+ {"HDDRecorder/stop:", rDoc("Stop recording"), 0, [](const char *, RtData &d) {
+ Master *m = (Master*)d.obj;
+ m->HDDRecorder.stop();}},
+ {"HDDRecorder/pause:", rDoc("Pause recording"), 0, [](const char *, RtData &d) {
+ Master *m = (Master*)d.obj;
+ m->HDDRecorder.pause();}},
+
};
const Ports &Master::ports = master_ports;
@@ -618,7 +631,7 @@ int msg_id=0;
/*
* Master audio out (the final sound)
*/
-bool Master::AudioOut(float *outl, float *outr)
+bool Master::AudioOut(float *outr, float *outl)
{
//Danger Limits
if(memory->lowMemory(2,1024*1024))
diff --git a/src/Misc/MiddleWare.cpp b/src/Misc/MiddleWare.cpp
@@ -5,6 +5,7 @@
#include <cstdlib>
#include <fstream>
#include <iostream>
+#include <dirent.h>
#include <rtosc/undo-history.h>
#include <rtosc/thread-link.h>
@@ -19,6 +20,7 @@
#include <map>
#include "Util.h"
+#include "CallbackRepeater.h"
#include "Master.h"
#include "Part.h"
#include "PresetExtractor.h"
@@ -576,14 +578,18 @@ public:
{
if(server)
while(lo_server_recv_noblock(server, 0));
+
while(bToU->hasNext()) {
const char *rtmsg = bToU->read();
bToUhandle(rtmsg);
}
+
while(auto *m = multi_thread_source.read()) {
handleMsg(m->memory);
multi_thread_source.free(m);
}
+
+ autoSave.tick();
}
@@ -659,6 +665,8 @@ public:
const SYNTH_T synth;
PresetsStore presetsstore;
+
+ CallbackRepeater autoSave;
};
/*****************************************************************************
@@ -965,6 +973,25 @@ static rtosc::Ports middwareSnoopPorts = {
const char *file = rtosc_argument(msg,1).s;
impl.savePart(part_id, file);
rEnd},
+ {"reload_auto_save:i", 0, 0,
+ rBegin
+ const int save_id = rtosc_argument(msg,0).i;
+ const string save_dir = string(getenv("HOME")) + "/.local";
+ const string save_file = "zynaddsubfx-"+to_s(save_id)+"-autosave.xmz";
+ const string save_loc = save_dir + "/" + save_file;
+ impl.loadMaster(save_loc.c_str());
+ //XXX it would be better to remove the autosave after there is a new
+ //autosave, but this method should work for non-immediate crashes :-|
+ remove(save_loc.c_str());
+ rEnd},
+ {"delete_auto_save:i", 0, 0,
+ rBegin
+ const int save_id = rtosc_argument(msg,0).i;
+ const string save_dir = string(getenv("HOME")) + "/.local";
+ const string save_file = "zynaddsubfx-"+to_s(save_id)+"-autosave.xmz";
+ const string save_loc = save_dir + "/" + save_file;
+ remove(save_loc.c_str());
+ rEnd},
{"load_xmz:s", 0, 0,
rBegin;
const char *file = rtosc_argument(msg, 0).s;
@@ -1100,7 +1127,14 @@ static rtosc::Ports middlewareReplyPorts = {
MiddleWareImpl::MiddleWareImpl(MiddleWare *mw, SYNTH_T synth_,
Config* config, int preferrred_port)
:parent(mw), config(config), ui(nullptr), synth(std::move(synth_)),
- presetsstore(*config)
+ presetsstore(*config), autoSave(-1, [this]() {
+ auto master = this->master;
+ this->doReadOnlyOp([master](){
+ std::string home = getenv("HOME");
+ std::string save_file = home+"/.local/zynaddsubfx-"+to_s(getpid())+"-autosave.xmz";
+ printf("doing an autosave <%s>...\n", save_file.c_str());
+ int res = master->saveXML(save_file.c_str());
+ (void)res;});})
{
bToU = new rtosc::ThreadLink(4096*2,1024);
uToB = new rtosc::ThreadLink(4096*2,1024);
@@ -1425,24 +1459,86 @@ MiddleWare::MiddleWare(SYNTH_T synth, Config* config,
int preferred_port)
:impl(new MiddleWareImpl(this, std::move(synth), config, preferred_port))
{}
+
MiddleWare::~MiddleWare(void)
{
delete impl;
}
+
void MiddleWare::updateResources(Master *m)
{
impl->updateResources(m);
}
+
Master *MiddleWare::spawnMaster(void)
{
assert(impl->master);
assert(impl->master->uToB);
return impl->master;
}
+
+void MiddleWare::enableAutoSave(int interval_sec)
+{
+ impl->autoSave.dt = interval_sec;
+}
+
+int MiddleWare::checkAutoSave(void)
+{
+ //save spec zynaddsubfx-PID-autosave.xmz
+ const std::string home = getenv("HOME");
+ const std::string save_dir = home+"/.local/";
+
+ DIR *dir = opendir(save_dir.c_str());
+
+ if(dir == NULL)
+ return -1;
+
+ struct dirent *fn;
+ int reload_save = -1;
+
+ while((fn = readdir(dir))) {
+ const char *filename = fn->d_name;
+ const char *prefix = "zynaddsubfx-";
+
+ //check for manditory prefix
+ if(strstr(filename, prefix) != filename)
+ continue;
+
+ int id = atoi(filename+strlen(prefix));
+
+ bool in_use = false;
+
+ std::string proc_file = "/proc/" + to_s(id) + "/comm";
+ std::ifstream ifs(proc_file);
+ if(ifs.good()) {
+ std::string comm_name;
+ ifs >> comm_name;
+ in_use = (comm_name == "zynaddsubfx");
+ }
+
+ if(!in_use) {
+ reload_save = id;
+ break;
+ }
+ }
+
+ closedir(dir);
+
+ return reload_save;
+}
+
+void MiddleWare::removeAutoSave(void)
+{
+ std::string home = getenv("HOME");
+ std::string save_file = home+"/.local/zynaddsubfx-"+to_s(getpid())+"-autosave.xmz";
+ remove(save_file.c_str());
+}
+
Fl_Osc_Interface *MiddleWare::spawnUiApi(void)
{
return impl->osc;
}
+
void MiddleWare::tick(void)
{
impl->tick();
diff --git a/src/Misc/MiddleWare.h b/src/Misc/MiddleWare.h
@@ -17,6 +17,18 @@ class MiddleWare
void updateResources(Master *m);
//returns internal master pointer
class Master *spawnMaster(void);
+
+ //Enable AutoSave Functionality
+ void enableAutoSave(int interval_sec=60);
+
+ //Check for old automatic saves which should only exist if multiple
+ //instances are in use OR when there was a crash
+ //
+ //When an old save is found return the id of the save file
+ int checkAutoSave(void);
+
+ void removeAutoSave(void);
+
//return UI interface
class Fl_Osc_Interface *spawnUiApi(void);
//Set callback to push UI events to
@@ -40,6 +52,7 @@ class MiddleWare
//Indicate that a bank will be loaded
//NOTE: Can only be called by realtime thread
void pendingSetBank(int bank);
+
//Indicate that a program will be loaded on a known part
//NOTE: Can only be called by realtime thread
void pendingSetProgram(int part, int program);
diff --git a/src/Misc/Part.cpp b/src/Misc/Part.cpp
@@ -475,6 +475,9 @@ bool Part::NoteOn(unsigned char note,
return true;
}
+ if(Ppolymode)
+ notePool.makeUnsustainable(note);
+
//Create New Notes
for(uint8_t i = 0; i < NUM_KIT_ITEMS; ++i) {
auto &item = kit[i];
@@ -522,7 +525,7 @@ void Part::NoteOff(unsigned char note) //release the key
monomemPop(note);
for(auto &desc:notePool.activeDesc()) {
- if(desc.note != note || desc.status != KEY_PLAYING)
+ if(desc.note != note || !desc.playing())
continue;
if(!ctl.sustain.sustain) { //the sustain pedal is not pushed
if((isMonoMode() || isLegatoMode()) && !monomemEmpty())
@@ -530,8 +533,12 @@ void Part::NoteOff(unsigned char note) //release the key
else
notePool.release(desc);
}
- else //the sustain pedal is pushed
- desc.status = KEY_RELEASED_AND_SUSTAINED;
+ else { //the sustain pedal is pushed
+ if(desc.canSustain())
+ desc.doSustain();
+ else
+ notePool.release(desc);
+ }
}
}
@@ -550,7 +557,7 @@ void Part::PolyphonicAftertouch(unsigned char note,
const float vel = getVelocity(velocity, Pvelsns, Pveloffs);
for(auto &d:notePool.activeDesc()) {
- if(d.note == note && d.status == KEY_PLAYING)
+ if(d.note == note && d.playing())
for(auto &s:notePool.activeNotes(d))
s.note->setVelocity(vel);
}
@@ -659,7 +666,7 @@ void Part::ReleaseSustainedKeys()
MonoMemRenote(); // To play most recent still held note.
for(auto &d:notePool.activeDesc())
- if(d.status == KEY_RELEASED_AND_SUSTAINED)
+ if(d.sustained())
for(auto &s:notePool.activeNotes(d))
s.note->releasekey();
}
@@ -671,7 +678,7 @@ void Part::ReleaseSustainedKeys()
void Part::ReleaseAllKeys()
{
for(auto &d:notePool.activeDesc())
- if(d.status != KEY_RELEASED)
+ if(!d.released())
for(auto &s:notePool.activeNotes(d))
s.note->releasekey();
}
@@ -726,7 +733,7 @@ void Part::setkeylimit(unsigned char Pkeylimit_)
if(keylimit == 0)
keylimit = POLYPHONY - 5;
- if(notePool.getRunningNotes() > keylimit)
+ if(notePool.getRunningNotes() >= keylimit)
notePool.enforceKeyLimit(keylimit);
}
diff --git a/src/Misc/Part.h b/src/Misc/Part.h
@@ -147,9 +147,6 @@ class Part
float *partfxinputl[NUM_PART_EFX + 1], //Left and right signal that pass thru part effects;
*partfxinputr[NUM_PART_EFX + 1]; //partfxinput l/r [NUM_PART_EFX] is for "no effect" buffer
- enum NoteStatus {
- KEY_OFF, KEY_PLAYING, KEY_RELEASED_AND_SUSTAINED, KEY_RELEASED
- };
float volume, oldvolumel, oldvolumer; //this is applied by Master
float panning; //this is applied by Master, too
diff --git a/src/Synth/ADnote.cpp b/src/Synth/ADnote.cpp
@@ -1845,7 +1845,7 @@ void ADnote::releasekey()
/*
* Check if the note is finished
*/
-int ADnote::finished() const
+bool ADnote::finished() const
{
if(NoteEnabled == ON)
return 0;
@@ -1853,6 +1853,11 @@ int ADnote::finished() const
return 1;
}
+void ADnote::entomb(void)
+{
+ NoteGlobalPar.AmpEnvelope->forceFinish();
+}
+
void ADnote::Voice::releasekey()
{
if(!Enabled)
diff --git a/src/Synth/ADnote.h b/src/Synth/ADnote.h
@@ -52,7 +52,9 @@ class ADnote:public SynthNote
int noteout(float *outl, float *outr);
void releasekey();
- int finished() const;
+ bool finished() const;
+ void entomb(void);
+
virtual SynthNote *cloneLegato(void) override;
private:
diff --git a/src/Synth/Envelope.cpp b/src/Synth/Envelope.cpp
@@ -101,6 +101,11 @@ void Envelope::releasekey()
t = 0.0f;
}
+void Envelope::forceFinish(void)
+{
+ envfinish = true;
+}
+
/*
* Envelope Output
*/
diff --git a/src/Synth/Envelope.h b/src/Synth/Envelope.h
@@ -35,6 +35,8 @@ class Envelope
/**Destructor*/
~Envelope();
void releasekey();
+ /**Push Envelope to finishing state*/
+ void forceFinish(void);
float envout();
float envout_dB();
/**Determines the status of the Envelope
diff --git a/src/Synth/PADnote.cpp b/src/Synth/PADnote.cpp
@@ -428,11 +428,16 @@ int PADnote::noteout(float *outl, float *outr)
return 1;
}
-int PADnote::finished() const
+bool PADnote::finished() const
{
return finished_;
}
+void PADnote::entomb(void)
+{
+ NoteGlobalPar.AmpEnvelope->forceFinish();
+}
+
void PADnote::releasekey()
{
NoteGlobalPar.FreqEnvelope->releasekey();
diff --git a/src/Synth/PADnote.h b/src/Synth/PADnote.h
@@ -38,7 +38,9 @@ class PADnote:public SynthNote
void legatonote(LegatoParams pars);
int noteout(float *outl, float *outr);
- int finished() const;
+ bool finished() const;
+ void entomb(void);
+
void releasekey();
private:
void setup(float freq, float velocity, int portamento_,
diff --git a/src/Synth/SUBnote.cpp b/src/Synth/SUBnote.cpp
@@ -619,10 +619,15 @@ void SUBnote::releasekey()
/*
* Check if the note is finished
*/
-int SUBnote::finished() const
+bool SUBnote::finished() const
{
if(NoteEnabled == OFF)
return 1;
else
return 0;
}
+
+void SUBnote::entomb(void)
+{
+ AmpEnvelope->forceFinish();
+}
diff --git a/src/Synth/SUBnote.h b/src/Synth/SUBnote.h
@@ -38,7 +38,8 @@ class SUBnote:public SynthNote
int noteout(float *outl, float *outr); //note output,return 0 if the note is finished
void releasekey();
- int finished() const;
+ bool finished() const;
+ void entomb(void);
private:
void setup(float freq,
diff --git a/src/Synth/SynthNote.h b/src/Synth/SynthNote.h
@@ -63,7 +63,10 @@ class SynthNote
/**Return if note is finished.
* @return finished=1 unfinished=0*/
- virtual int finished() const = 0;
+ virtual bool finished() const = 0;
+
+ /**Make a note die off next buffer compute*/
+ virtual void entomb(void) = 0;
virtual void legatonote(LegatoParams pars) = 0;
diff --git a/src/Tests/KitTest.h b/src/Tests/KitTest.h
@@ -17,6 +17,15 @@ int dummy=0;
using namespace std;
+#define SUSTAIN_BIT 0x04
+enum PrivateNoteStatus {
+ KEY_OFF = 0x00,
+ KEY_PLAYING = 0x01,
+ KEY_RELEASED_AND_SUSTAINED = 0x02,
+ KEY_RELEASED = 0x03
+};
+
+
class KitTest:public CxxTest::TestSuite
{
private:
@@ -42,6 +51,85 @@ class KitTest:public CxxTest::TestSuite
part = new Part(alloc, *synth, *time, dummy, dummy, µtonal, &fft);
}
+ //Standard poly mode with sustain
+ void testSustainCase1() {
+ //enable sustain
+ part->ctl.setsustain(127);
+
+ part->NoteOn(64, 127, 0);
+ part->NoteOn(64, 127, 0);
+ part->NoteOff(64);
+
+ //first note has moved to release state
+ //second note has moved to sustain state
+
+ TS_ASSERT_EQUALS(part->notePool.ndesc[0],
+ (NotePool::NoteDescriptor{
+ .age=0,
+ .note=64,
+ .sendto=0,
+ .size=1,
+ .status=KEY_RELEASED|SUSTAIN_BIT,
+ .legatoMirror=false}));
+
+ TS_ASSERT_EQUALS(part->notePool.ndesc[1],
+ (NotePool::NoteDescriptor{
+ .age=0,
+ .note=64,
+ .sendto=0,
+ .size=1,
+ .status=KEY_RELEASED_AND_SUSTAINED,
+ .legatoMirror=false}));
+
+ TS_ASSERT_EQUALS(part->notePool.ndesc[2],
+ (NotePool::NoteDescriptor{
+ .age=0,
+ .note=0,
+ .sendto=0,
+ .size=0,
+ .status=0,
+ .legatoMirror=false}));
+ }
+
+ void testSustainCase2() {
+ //enable sustain
+ part->ctl.setsustain(127);
+
+ part->NoteOn(64, 127, 0);
+ part->NoteOff(64);
+ part->NoteOn(64, 127, 0);
+
+ //first note has moved to release state
+ //second note has stayed in playing state
+
+ TS_ASSERT_EQUALS(part->notePool.ndesc[0],
+ (NotePool::NoteDescriptor{
+ .age=0,
+ .note=64,
+ .sendto=0,
+ .size=1,
+ .status=KEY_RELEASED|SUSTAIN_BIT,
+ .legatoMirror=false}));
+
+ TS_ASSERT_EQUALS(part->notePool.ndesc[1],
+ (NotePool::NoteDescriptor{
+ .age=0,
+ .note=64,
+ .sendto=0,
+ .size=1,
+ .status=KEY_PLAYING,
+ .legatoMirror=false}));
+
+ TS_ASSERT_EQUALS(part->notePool.ndesc[2],
+ (NotePool::NoteDescriptor{
+ .age=0,
+ .note=0,
+ .sendto=0,
+ .size=0,
+ .status=0,
+ .legatoMirror=false}));
+ }
+
//Enumerate cases of:
//Legato = {disabled,enabled}
//Mono = {diabled, enabled}
@@ -59,7 +147,7 @@ class KitTest:public CxxTest::TestSuite
.note=64,
.sendto=0,
.size=1,
- .status=Part::KEY_PLAYING,
+ .status=KEY_PLAYING,
.legatoMirror=false}));
TS_ASSERT_EQUALS(part->notePool.ndesc[1],
@@ -68,7 +156,7 @@ class KitTest:public CxxTest::TestSuite
.note=65,
.sendto=0,
.size=1,
- .status=Part::KEY_PLAYING,
+ .status=KEY_PLAYING,
.legatoMirror=false}));
TS_ASSERT_EQUALS(part->notePool.ndesc[2],
@@ -93,7 +181,7 @@ class KitTest:public CxxTest::TestSuite
.note=65,
.sendto=0,
.size=1,
- .status=Part::KEY_PLAYING,
+ .status=KEY_PLAYING,
.legatoMirror=false}));
TS_ASSERT_EQUALS(part->notePool.ndesc[1],
@@ -102,7 +190,7 @@ class KitTest:public CxxTest::TestSuite
.note=65,
.sendto=0,
.size=1,
- .status=Part::KEY_PLAYING,
+ .status=KEY_PLAYING,
.legatoMirror=false}));
TS_ASSERT_EQUALS(part->notePool.ndesc[2],
@@ -139,7 +227,7 @@ class KitTest:public CxxTest::TestSuite
.note=64,
.sendto=0,
.size=1,
- .status=Part::KEY_RELEASED,
+ .status=KEY_RELEASED,
.legatoMirror=false}));
TS_ASSERT_EQUALS(part->notePool.ndesc[1],
@@ -148,7 +236,7 @@ class KitTest:public CxxTest::TestSuite
.note=65,
.sendto=0,
.size=1,
- .status=Part::KEY_PLAYING,
+ .status=KEY_PLAYING,
.legatoMirror=false}));
TS_ASSERT_EQUALS(part->notePool.ndesc[2],
@@ -191,7 +279,7 @@ class KitTest:public CxxTest::TestSuite
.note=64,
.sendto=0,
.size=2,
- .status=Part::KEY_PLAYING,
+ .status=KEY_PLAYING,
.legatoMirror=false}));
TS_ASSERT_EQUALS(part->notePool.ndesc[1],
@@ -200,7 +288,7 @@ class KitTest:public CxxTest::TestSuite
.note=65,
.sendto=0,
.size=2,
- .status=Part::KEY_PLAYING,
+ .status=KEY_PLAYING,
.legatoMirror=false}));
TS_ASSERT_EQUALS(part->notePool.ndesc[2],
@@ -257,7 +345,7 @@ class KitTest:public CxxTest::TestSuite
.note=65,
.sendto=0,
.size=2,
- .status=Part::KEY_PLAYING,
+ .status=KEY_PLAYING,
.legatoMirror=false}));
TS_ASSERT_EQUALS(part->notePool.ndesc[1],
@@ -266,7 +354,7 @@ class KitTest:public CxxTest::TestSuite
.note=65,
.sendto=0,
.size=2,
- .status=Part::KEY_PLAYING,
+ .status=KEY_PLAYING,
.legatoMirror=false}));
TS_ASSERT_EQUALS(part->notePool.ndesc[2],
@@ -323,7 +411,7 @@ class KitTest:public CxxTest::TestSuite
.note=64,
.sendto=0,
.size=2,
- .status=Part::KEY_RELEASED,
+ .status=KEY_RELEASED,
.legatoMirror=false}));
TS_ASSERT_EQUALS(part->notePool.ndesc[1],
@@ -332,7 +420,7 @@ class KitTest:public CxxTest::TestSuite
.note=65,
.sendto=0,
.size=2,
- .status=Part::KEY_PLAYING,
+ .status=KEY_PLAYING,
.legatoMirror=false}));
TS_ASSERT_EQUALS(part->notePool.ndesc[2],
@@ -388,7 +476,7 @@ class KitTest:public CxxTest::TestSuite
.note=64,
.sendto=0,
.size=1,
- .status=Part::KEY_PLAYING,
+ .status=KEY_PLAYING,
.legatoMirror=false}));
TS_ASSERT_EQUALS(part->notePool.ndesc[1],
@@ -397,7 +485,7 @@ class KitTest:public CxxTest::TestSuite
.note=65,
.sendto=0,
.size=1,
- .status=Part::KEY_PLAYING,
+ .status=KEY_PLAYING,
.legatoMirror=false}));
TS_ASSERT_EQUALS(part->notePool.ndesc[2],
@@ -442,7 +530,7 @@ class KitTest:public CxxTest::TestSuite
.note=65,
.sendto=0,
.size=1,
- .status=Part::KEY_PLAYING,
+ .status=KEY_PLAYING,
.legatoMirror=false}));
TS_ASSERT_EQUALS(part->notePool.ndesc[1],
@@ -451,7 +539,7 @@ class KitTest:public CxxTest::TestSuite
.note=65,
.sendto=0,
.size=1,
- .status=Part::KEY_PLAYING,
+ .status=KEY_PLAYING,
.legatoMirror=false}));
TS_ASSERT_EQUALS(part->notePool.ndesc[2],
@@ -495,7 +583,7 @@ class KitTest:public CxxTest::TestSuite
.note=64,
.sendto=0,
.size=1,
- .status=Part::KEY_RELEASED,
+ .status=KEY_RELEASED,
.legatoMirror=false}));
TS_ASSERT_EQUALS(part->notePool.ndesc[1],
@@ -504,7 +592,7 @@ class KitTest:public CxxTest::TestSuite
.note=65,
.sendto=0,
.size=1,
- .status=Part::KEY_PLAYING,
+ .status=KEY_PLAYING,
.legatoMirror=false}));
TS_ASSERT_EQUALS(part->notePool.ndesc[2],
@@ -527,6 +615,94 @@ class KitTest:public CxxTest::TestSuite
TS_ASSERT_EQUALS(part->notePool.sdesc[1].kit, 0)
}
+ void testKeyLimit(void)
+ {
+ auto &pool = part->notePool;
+ //Verify that without a key limit, several notes can be run
+ part->NoteOn(64, 127, 0);
+ part->NoteOn(65, 127, 0);
+ part->NoteOn(66, 127, 0);
+ part->NoteOn(67, 127, 0);
+ part->NoteOn(68, 127, 0);
+
+ //Verify that notes are spawned as expected
+ TS_ASSERT_EQUALS(pool.usedNoteDesc(), 5);
+ TS_ASSERT_EQUALS(pool.usedSynthDesc(), 5);
+
+ //Reset the part
+ part->monomemClear();
+ pool.killAllNotes();
+
+ //Verify that notes are despawned
+ TS_ASSERT_EQUALS(pool.usedNoteDesc(), 0);
+ TS_ASSERT_EQUALS(pool.usedSynthDesc(), 0);
+
+ //Enable keylimit
+ part->setkeylimit(3);
+
+ //Replay notes
+ part->NoteOn(64, 127, 0);
+ part->NoteOn(65, 127, 0);
+ part->NoteOn(66, 127, 0);
+ part->NoteOn(67, 127, 0);
+ part->NoteOn(68, 127, 0);
+
+ //Verify that notes are spawned as expected with limit
+ TS_ASSERT_EQUALS(pool.getRunningNotes(), 3);//2 entombed
+ TS_ASSERT_EQUALS(pool.usedNoteDesc(), 5);
+ TS_ASSERT_EQUALS(pool.usedSynthDesc(), 5);
+
+ //Reset the part
+ part->monomemClear();
+ pool.killAllNotes();
+
+ //Verify that notes are despawned
+ TS_ASSERT_EQUALS(pool.usedNoteDesc(), 0);
+ TS_ASSERT_EQUALS(pool.usedSynthDesc(), 0);
+
+ //Now to test note stealing
+
+ //Replay notes
+ part->NoteOn(64, 127, 0);
+ part->NoteOn(65, 127, 0);
+ part->NoteOn(66, 127, 0);
+
+ //Verify that note pool is full
+ TS_ASSERT_EQUALS(pool.usedNoteDesc(), 3);
+ TS_ASSERT_EQUALS(pool.usedSynthDesc(), 3);
+
+ //Age the notes
+ pool.ndesc[1].age = 50;
+ pool.ndesc[2].age = 500;
+
+ printf("-------------------------------------\n");
+
+ //Inject two more notes which should steal the note
+ //descriptors for #66 and #65
+ part->NoteOn(67, 127, 0);
+ pool.cleanup();
+ TS_ASSERT_EQUALS(pool.ndesc[0].note, 64);
+ TS_ASSERT_EQUALS(pool.ndesc[1].note, 65);
+ TS_ASSERT_EQUALS(pool.ndesc[2].note, 66);
+ TS_ASSERT_EQUALS(pool.ndesc[2].status, KEY_RELEASED);
+ TS_ASSERT_EQUALS(pool.ndesc[3].note, 67);
+
+ part->NoteOn(68, 127, 0);
+
+ //Verify that note pool is still full and entombed
+ TS_ASSERT_EQUALS(pool.usedNoteDesc(), 5);
+ TS_ASSERT_EQUALS(pool.usedSynthDesc(), 5);
+
+ //Check that the result is {64, 68, 67}
+ TS_ASSERT_EQUALS(pool.ndesc[0].note, 64);
+ TS_ASSERT_EQUALS(pool.ndesc[1].note, 65);
+ TS_ASSERT_EQUALS(pool.ndesc[1].status, KEY_RELEASED);
+ TS_ASSERT_EQUALS(pool.ndesc[2].note, 66);
+ TS_ASSERT_EQUALS(pool.ndesc[2].status, KEY_RELEASED);
+ TS_ASSERT_EQUALS(pool.ndesc[3].note, 67);
+ TS_ASSERT_EQUALS(pool.ndesc[4].note, 68);
+ }
+
void tearDown() {
delete part;
delete[] outL;
diff --git a/src/UI/Connection.cpp b/src/UI/Connection.cpp
@@ -134,7 +134,7 @@ void GUI::destroyUi(ui_handle_t ui)
delete static_cast<MasterUI*>(ui);
}
-#define BEGIN(x) {x,":non-realtime\0",NULL,[](const char *m, rtosc::RtData d){ \
+#define BEGIN(x) {x,":non-realtime\0",NULL,[](const char *m, rtosc::RtData &d){ \
MasterUI *ui = static_cast<MasterUI*>(d.obj); \
rtosc_arg_t a0 = {0}, a1 = {0}; \
if(rtosc_narguments(m) > 0) \
@@ -157,6 +157,18 @@ rtosc::Ports uiPorts::ports = {
BEGIN("alert:s") {
fl_alert("%s",a0.s);
} END
+ BEGIN("alert-reload:i") {
+ int res = fl_choice("Old autosave found, do you want to reload?",
+ "Delete", "Reload", "Ignore");
+ // 0 1 2
+ if(1==res) {
+ d.reply("/reload_auto_save", "i", a0.i);
+ ui->refresh_master_ui();
+ ui->updatepanel();
+ } else if(0==res) {
+ d.reply("/delete_auto_save", "i", a0.i);
+ }
+ } END
BEGIN("session-type:s") {
if(strcmp(a0.s,"LASH"))
return;
@@ -188,6 +200,26 @@ rtosc::Ports uiPorts::ports = {
} END
};
+//very tiny rtdata ext
+class RtDataUI: public rtosc::RtData {
+public:
+
+ RtDataUI(Fl_Osc_Interface *osc_)
+ :osc(osc_)
+ {}
+
+ void reply(const char *path, const char *args, ...) override
+ {
+ va_list va;
+ va_start(va,args);
+ char buf[2048];
+ rtosc_vmessage(buf,sizeof(buf),path,args,va);
+ osc->writeRaw(buf);
+ va_end(va);
+ }
+
+ Fl_Osc_Interface *osc;
+};
void GUI::raiseUi(ui_handle_t gui, const char *message)
{
@@ -209,7 +241,7 @@ void GUI::raiseUi(ui_handle_t gui, const char *message)
//printf("got message for UI '%s'\n", message);
char buffer[1024];
memset(buffer, 0, sizeof(buffer));
- rtosc::RtData d;
+ RtDataUI d(mui->osc);
d.loc = buffer;
d.loc_size = 1024;
d.obj = gui;
diff --git a/src/UI/MasterUI.fl b/src/UI/MasterUI.fl
@@ -178,18 +178,13 @@ bankui->show();}
}
Fl_Check_Button partenabled {
label 01
- callback {o->oscWrite("Penabled", o->value() ? "T" : "F");
-if ((int) o->value()==0) panellistitemgroup->deactivate();
- else {
- panellistitemgroup->activate();
- /*
- if ((int)bankui->cbwig->value()!=(npart+1)){
- bankui->cbwig->value(npart+1);
- bankui->cbwig->do_callback();
- };*/
-};
+ callback {
+ if ((int) o->value()==0) panellistitemgroup->deactivate();
+ else {
+ panellistitemgroup->activate();
+ };
-o->redraw();}
+ o->redraw();}
private xywh {5 0 45 20} down_box DOWN_BOX labeltype EMBOSSED_LABEL labelfont 1 labelsize 13 align 24
code0 {char tmp[10];snprintf(tmp,10,"%d",npart+1);o->copy_label(tmp);}
code1 {o->init("Penabled");}
@@ -472,7 +467,7 @@ fl_filename_setext(filename,".wav");
//TODO TODO Test if a file exists
if (fl_choice("The file *might* exist. \\nOverwrite it?","No","Yes",NULL)) {
- osc->write("/HDDRecorder/preparefile", "T");
+ osc->write("/HDDRecorder/preparefile", "s", filename);
recordbutton->activate();//TODO make this button osc controlled
}
@@ -765,7 +760,7 @@ stopbutton->activate();
pausebutton->activate();
pauselabel->activate();
o->oscWrite("HDDRecorder/start");
-o->oscWrite("resetvu");
+o->oscWrite("reset-vu");
mastermenu->redraw();}
tooltip {Start Recording} xywh {159 46 21 21} box ROUND_UP_BOX color 88 labelfont 1 labelsize 10 align 2 deactivate
class Fl_Osc_Button
diff --git a/src/main.cpp b/src/main.cpp
@@ -109,6 +109,7 @@ void exitprogram(const Config& config)
{
Nio::stop();
config.save();
+ middleware->removeAutoSave();
GUI::destroyUi(gui);
delete middleware;
@@ -194,6 +195,9 @@ int main(int argc, char *argv[])
"auto-connect", 0, NULL, 'a'
},
{
+ "auto-save", 0, NULL, 'A'
+ },
+ {
"pid-in-client-name", 0, NULL, 'p'
},
{
@@ -221,6 +225,7 @@ int main(int argc, char *argv[])
opterr = 0;
int option_index = 0, opt, exitwithhelp = 0, exitwithversion = 0;
int prefered_port = -1;
+ int auto_save_interval = 60;
string loadfile, loadinstrument, execAfterInit, ui_title;
@@ -230,7 +235,7 @@ int main(int argc, char *argv[])
/**\todo check this process for a small memory leak*/
opt = getopt_long(argc,
argv,
- "l:L:r:b:o:I:O:N:e:P:u:hvapSDUY",
+ "l:L:r:b:o:I:O:N:e:P:A:u:hvapSDUY",
opts,
&option_index);
char *optarguments = optarg;
@@ -321,6 +326,10 @@ int main(int argc, char *argv[])
if(optarguments)
prefered_port = atoi(optarguments);
break;
+ case 'A':
+ if(optarguments)
+ auto_save_interval = atoi(optarguments);
+ break;
case 'e':
GETOP(execAfterInit);
break;
@@ -370,6 +379,7 @@ int main(int argc, char *argv[])
" -U , --no-gui\t\t\t\t Run ZynAddSubFX without user interface\n"
<< " -N , --named\t\t\t\t Postfix IO Name when possible\n"
<< " -a , --auto-connect\t\t\t AutoConnect when using JACK\n"
+ << " -A , --auto-save=INTERVAL\t\t Automatically save at interval (disabled for negative intervals)\n"
<< " -p , --pid-in-client-name\t\t Append PID to (JACK) "
"client name\n"
<< " -P , --preferred-port\t\t\t Preferred OSC Port\n"
@@ -476,6 +486,13 @@ int main(int argc, char *argv[])
"Default IO did not initialize.\nDefaulting to NULL backend.");
}
+ if(auto_save_interval >= 0) {
+ int old_save = middleware->checkAutoSave();
+ if(old_save > 0)
+ GUI::raiseUi(gui, "/alert-reload", "i", old_save);
+ middleware->enableAutoSave(auto_save_interval);
+ }
+
#if USE_NSM
char *nsm_url = getenv("NSM_URL");
