Sync to master

This commit is contained in:
cam900 2022-09-25 18:32:34 +09:00
parent 0a49d4bfd0
commit 8e1ce1abb1
21 changed files with 238 additions and 3298 deletions

View file

@ -116,16 +116,11 @@ void FurnaceGUI::drawSampleEdit() {
sample->loopStart=-1;
sample->loopEnd=sample->samples;
}
if (sample->loopEnd>sample->samples) {
sample->loopEnd=sample->samples;
}
sample->loopMode=DivSampleLoopMode(mode);
updateSampleTex=true;
}
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::Text("Length: %d",sample->samples);
bool doLoop=(sample->loopMode!=DIV_SAMPLE_LOOPMODE_ONESHOT);
if (doLoop) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
@ -678,16 +673,11 @@ void FurnaceGUI::drawSampleEdit() {
sample->loopStart=-1;
sample->loopEnd=sample->samples;
}
if (sample->loopEnd>sample->samples) {
sample->loopEnd=sample->samples;
}
sample->loopMode=DivSampleLoopMode(mode);
updateSampleTex=true;
}
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::Text("Length: %d",sample->samples);
bool doLoop=(sample->loopMode!=DIV_SAMPLE_LOOPMODE_ONESHOT);
if (doLoop) {
ImGui::TableNextRow();
ImGui::TableNextColumn();