Merge branch 'master' into ZSMv1
This commit is contained in:
commit
40d67d7bb5
757 changed files with 4340 additions and 359 deletions
|
|
@ -45,8 +45,8 @@
|
|||
#define BUSY_BEGIN_SOFT softLocked=true; isBusy.lock();
|
||||
#define BUSY_END isBusy.unlock(); softLocked=false;
|
||||
|
||||
#define DIV_VERSION "dev99"
|
||||
#define DIV_ENGINE_VERSION 99
|
||||
#define DIV_VERSION "0.6pre1"
|
||||
#define DIV_ENGINE_VERSION 100
|
||||
|
||||
// for imports
|
||||
#define DIV_VERSION_MOD 0xff01
|
||||
|
|
@ -60,8 +60,9 @@ enum DivStatusView {
|
|||
enum DivAudioEngines {
|
||||
DIV_AUDIO_JACK=0,
|
||||
DIV_AUDIO_SDL=1,
|
||||
DIV_AUDIO_NULL=2,
|
||||
DIV_AUDIO_DUMMY=3
|
||||
|
||||
DIV_AUDIO_NULL=126,
|
||||
DIV_AUDIO_DUMMY=127
|
||||
};
|
||||
|
||||
enum DivAudioExportModes {
|
||||
|
|
@ -87,7 +88,7 @@ struct DivChannelState {
|
|||
int tremoloDepth, tremoloRate, tremoloPos;
|
||||
unsigned char arp, arpStage, arpTicks, panL, panR;
|
||||
bool doNote, legato, portaStop, keyOn, keyOff, nowYouCanStop, stopOnOff;
|
||||
bool arpYield, delayLocked, inPorta, scheduledSlideReset, shorthandPorta, noteOnInhibit, resetArp;
|
||||
bool arpYield, delayLocked, inPorta, scheduledSlideReset, shorthandPorta, wasShorthandPorta, noteOnInhibit, resetArp;
|
||||
|
||||
int midiNote, curMidiNote, midiPitch;
|
||||
size_t midiAge;
|
||||
|
|
@ -135,6 +136,7 @@ struct DivChannelState {
|
|||
inPorta(false),
|
||||
scheduledSlideReset(false),
|
||||
shorthandPorta(false),
|
||||
wasShorthandPorta(false),
|
||||
noteOnInhibit(false),
|
||||
resetArp(false),
|
||||
midiNote(-1),
|
||||
|
|
@ -655,6 +657,9 @@ class DivEngine {
|
|||
|
||||
// is playing
|
||||
bool isPlaying();
|
||||
|
||||
// is running
|
||||
bool isRunning();
|
||||
|
||||
// is stepping
|
||||
bool isStepping();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue