etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-12-31 20:11:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

don't alter instruments in patterns when moving

Browse source 
fixes #150
This commit is contained in:
tildearrow 2022-02-07 23:42:54 -05:00
parent 8d45236cce
commit 3cc4add1e3
2 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/engine/engine.cpp
View file

@ -5546,6 +5546,16 @@ void DivEngine::delInstrument(int index) {
delete song.ins[index]; delete song.ins[index];
song.ins.erase(song.ins.begin()+index); song.ins.erase(song.ins.begin()+index);
song.insLen=song.ins.size(); song.insLen=song.ins.size();
for (int i=0; i<chans; i++) {
for (int j=0; j<128; j++) {
if (song.pat[i].data[j]==NULL) continue;
for (int k=0; k<song.patLen; k++) {
if (song.pat[i].data[j]->data[k][2]>index) {
song.pat[i].data[j]->data[k][2]--;
}
}
}
}
} }
isBusy.unlock(); isBusy.unlock();
} }
@ -5858,12 +5868,28 @@ void DivEngine::moveOrderDown() {
isBusy.unlock(); isBusy.unlock();
} }
void DivEngine::exchangeIns(int one, int two) {
for (int i=0; i<chans; i++) {
for (int j=0; j<128; j++) {
if (song.pat[i].data[j]==NULL) continue;
for (int k=0; k<song.patLen; k++) {
if (song.pat[i].data[j]->data[k][2]==one) {
song.pat[i].data[j]->data[k][2]=two;
} else if (song.pat[i].data[j]->data[k][2]==two) {
song.pat[i].data[j]->data[k][2]=one;
}
}
}
}
}
bool DivEngine::moveInsUp(int which) { bool DivEngine::moveInsUp(int which) {
if (which<1 || which>=(int)song.ins.size()) return false; if (which<1 || which>=(int)song.ins.size()) return false;
isBusy.lock(); isBusy.lock();
DivInstrument* prev=song.ins[which]; DivInstrument* prev=song.ins[which];
song.ins[which]=song.ins[which-1]; song.ins[which]=song.ins[which-1];
song.ins[which-1]=prev; song.ins[which-1]=prev;
exchangeIns(which,which-1);
isBusy.unlock(); isBusy.unlock();
return true; return true;
} }
@ -5894,6 +5920,7 @@ bool DivEngine::moveInsDown(int which) {
DivInstrument* prev=song.ins[which]; DivInstrument* prev=song.ins[which];
song.ins[which]=song.ins[which+1]; song.ins[which]=song.ins[which+1];
song.ins[which+1]=prev; song.ins[which+1]=prev;
exchangeIns(which,which+1);
isBusy.unlock(); isBusy.unlock();
return true; return true;
} }

2
src/engine/engine.h
View file

@ -215,6 +215,8 @@ class DivEngine {
bool initAudioBackend(); bool initAudioBackend();
bool deinitAudioBackend(); bool deinitAudioBackend();
void exchangeIns(int one, int two);
public: public:
DivSong song; DivSong song;
DivSystem sysOfChan[DIV_MAX_CHANS]; DivSystem sysOfChan[DIV_MAX_CHANS];