otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

GUI: use DeltaTime for soloTimeout

Browse source 
issue #846
This commit is contained in:
tildearrow 2023-01-14 13:51:02 -05:00
parent ed11b6cf78
commit 26e424fe9f
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gui/gui.cpp
View file

@ -5148,7 +5148,12 @@ bool FurnaceGUI::loop() {
renderTimeDelta=renderTimeEnd-renderTimeBegin; renderTimeDelta=renderTimeEnd-renderTimeBegin;
eventTimeDelta=eventTimeEnd-eventTimeBegin; eventTimeDelta=eventTimeEnd-eventTimeBegin;
if (--soloTimeout<0) soloTimeout=0; soloTimeout-=ImGui::GetIO().DeltaTime*60.0f;
if (soloTimeout<0) {
soloTimeout=0;
} else {
WAKE_UP;
}
wheelX=0; wheelX=0;
wheelY=0; wheelY=0;
@ -5784,7 +5789,6 @@ FurnaceGUI::FurnaceGUI():
editStep(1), editStep(1),
exportLoops(0), exportLoops(0),
soloChan(-1), soloChan(-1),
soloTimeout(0),
orderEditMode(0), orderEditMode(0),
orderCursor(-1), orderCursor(-1),
loopOrder(-1), loopOrder(-1),
@ -5803,6 +5807,7 @@ FurnaceGUI::FurnaceGUI():
dragDestinationY(0), dragDestinationY(0),
oldBeat(-1), oldBeat(-1),
oldBar(-1), oldBar(-1),
soloTimeout(0.0f),
exportFadeOut(5.0), exportFadeOut(5.0),
editControlsOpen(true), editControlsOpen(true),
ordersOpen(true), ordersOpen(true),

3
src/gui/gui.h
View file

@ -1447,9 +1447,10 @@ class FurnaceGUI {
DivInstrument* prevInsData; DivInstrument* prevInsData;
int curIns, curWave, curSample, curOctave, curOrder, prevIns, oldRow, oldOrder, oldOrder1, editStep, exportLoops, soloChan, soloTimeout, orderEditMode, orderCursor; int curIns, curWave, curSample, curOctave, curOrder, prevIns, oldRow, oldOrder, oldOrder1, editStep, exportLoops, soloChan,orderEditMode, orderCursor;
int loopOrder, loopRow, loopEnd, isClipping, extraChannelButtons, patNameTarget, newSongCategory, latchTarget; int loopOrder, loopRow, loopEnd, isClipping, extraChannelButtons, patNameTarget, newSongCategory, latchTarget;
int wheelX, wheelY, dragSourceX, dragSourceY, dragDestinationX, dragDestinationY, oldBeat, oldBar; int wheelX, wheelY, dragSourceX, dragSourceY, dragDestinationX, dragDestinationY, oldBeat, oldBar;
float soloTimeout;
double exportFadeOut; double exportFadeOut;