etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-23 04:55:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

asset directories, part 5

Browse source
This commit is contained in:
tildearrow 2023-05-15 23:27:45 -05:00
parent 1f5b08e09e
commit 442ccd0e09
3 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/engine/engine.cpp
View file

@ -1572,6 +1572,21 @@ void DivEngine::changeSong(size_t songIndex) {
prevRow=0;
}
void DivEngine::removeAsset(std::vector<DivAssetDir>& dir, int entry) {
if (entry<0) return;
for (DivAssetDir& i: dir) {
for (size_t j=0; j<i.entries.size(); j++) {
// erase matching entry
if (i.entries[j]==entry) {
i.entries.erase(i.entries.begin()+j);
j--;
} else if (i.entries[j]>entry) {
i.entries[j]--;
}
}
}
}
void DivEngine::checkAssetDir(std::vector<DivAssetDir>& dir, size_t entries) {
bool* inAssetDir=new bool[entries];
memset(inAssetDir,0,entries*sizeof(bool));
@ -3032,6 +3047,7 @@ int DivEngine::addInstrument(int refChan, DivInstrumentType fallbackType) {
saveLock.lock();
song.ins.push_back(ins);
song.insLen=insCount+1;
checkAssetDir(song.insDir,song.ins.size());
saveLock.unlock();
BUSY_END;
return insCount;
@ -3046,6 +3062,7 @@ int DivEngine::addInstrumentPtr(DivInstrument* which) {
saveLock.lock();
song.ins.push_back(which);
song.insLen=song.ins.size();
checkAssetDir(song.insDir,song.ins.size());
saveLock.unlock();
BUSY_END;
return song.insLen;
@ -3082,6 +3099,8 @@ void DivEngine::delInstrument(int index) {
}
}
}
removeAsset(song.insDir,index);
checkAssetDir(song.insDir,song.ins.size());
}
saveLock.unlock();
BUSY_END;
@ -3098,6 +3117,7 @@ int DivEngine::addWave() {
int waveCount=(int)song.wave.size();
song.wave.push_back(wave);
song.waveLen=waveCount+1;
checkAssetDir(song.waveDir,song.wave.size());
saveLock.unlock();
BUSY_END;
return waveCount;
@ -3114,6 +3134,7 @@ int DivEngine::addWavePtr(DivWavetable* which) {
int waveCount=(int)song.wave.size();
song.wave.push_back(which);
song.waveLen=waveCount+1;
checkAssetDir(song.waveDir,song.wave.size());
saveLock.unlock();
BUSY_END;
return song.waveLen;
@ -3268,6 +3289,8 @@ void DivEngine::delWave(int index) {
delete song.wave[index];
song.wave.erase(song.wave.begin()+index);
song.waveLen=song.wave.size();
removeAsset(song.waveDir,index);
checkAssetDir(song.waveDir,song.wave.size());
}
saveLock.unlock();
BUSY_END;
@ -3288,6 +3311,7 @@ int DivEngine::addSample() {
sPreview.sample=-1;
sPreview.pos=0;
sPreview.dir=false;
checkAssetDir(song.sampleDir,song.sample.size());
saveLock.unlock();
renderSamples();
BUSY_END;
@ -3305,6 +3329,7 @@ int DivEngine::addSamplePtr(DivSample* which) {
saveLock.lock();
song.sample.push_back(which);
song.sampleLen=sampleCount+1;
checkAssetDir(song.sampleDir,song.sample.size());
saveLock.unlock();
renderSamples();
BUSY_END;
@ -3774,6 +3799,8 @@ void DivEngine::delSample(int index) {
delete song.sample[index];
song.sample.erase(song.sample.begin()+index);
song.sampleLen=song.sample.size();
removeAsset(song.sampleDir,index);
checkAssetDir(song.sampleDir,song.sample.size());
renderSamples();
}
saveLock.unlock();

3
src/engine/engine.h
View file

@ -517,6 +517,9 @@ class DivEngine {
// change song (UNSAFE)
void changeSong(size_t songIndex);
// remove an asset
void removeAsset(std::vector<DivAssetDir>& dir, int entry);
// check whether an asset directory is complete
void checkAssetDir(std::vector<DivAssetDir>& dir, size_t entries);

5
src/gui/dataList.cpp
View file

@ -74,7 +74,7 @@ void FurnaceGUI::insListItem(int i, int dir, int asset) {
ImGui::PushID(i);
String name=ICON_FA_CIRCLE_O;
const char* insType="Bug!";
if (i>=0) {
if (i>=0 && i<e->song.insLen) {
DivInstrument* ins=e->song.ins[i];
insType=(ins->type>DIV_INS_MAX)?"Unknown":insTypes[ins->type];
if (ins->type==DIV_INS_N163) insType=settings.c163Name.c_str();
@ -342,6 +342,9 @@ void FurnaceGUI::insListItem(int i, int dir, int asset) {
DivInstrument* ins=e->song.ins[i];
ImGui::SameLine();
ImGui::Text("%.2X: %s",i,ins->name.c_str());
} else {
ImGui::SameLine();
ImGui::Text("%.2X: <INVALID>",i);
}
} else {
ImGui::SameLine();