From c58eec5753ef6a09761573f1053f1d1b579819cf Mon Sep 17 00:00:00 2001 From: tildearrow Date: Thu, 3 Aug 2023 03:54:06 -0500 Subject: [PATCH] do not reset the timer (and remove intro monitor) --- src/engine/playback.cpp | 4 ++-- src/gui/gui.cpp | 14 -------------- src/gui/gui.h | 2 +- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/engine/playback.cpp b/src/engine/playback.cpp index aabce5c6a..544d59250 100644 --- a/src/engine/playback.cpp +++ b/src/engine/playback.cpp @@ -1967,8 +1967,8 @@ void DivEngine::nextBuf(float** in, float** out, int inChans, int outChans, unsi if (cycles<=0) { // we have to tick if (nextTick()) { - totalTicks=0; - totalSeconds=0; + /*totalTicks=0; + totalSeconds=0;*/ lastLoopPos=size-(runLeftG>>MASTER_CLOCK_PREC); logD("last loop pos: %d for a size of %d and runLeftG of %d",lastLoopPos,size,runLeftG); totalLoops++; diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index aa85a877b..e7221f941 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -4476,17 +4476,6 @@ bool FurnaceGUI::loop() { } MEASURE(songInfo,drawSongInfo()); MEASURE(orders,drawOrders()); - if (introMonOpen) { - int totalTicks=e->getTotalTicks(); - int totalSeconds=e->getTotalSeconds(); - double newMonitorPos=totalSeconds+((double)totalTicks/1000000.0); - - if (fabs(newMonitorPos-monitorPos)>0.08) monitorPos=newMonitorPos; - - drawIntro(monitorPos,true); - - if (e->isPlaying()) monitorPos+=ImGui::GetIO().DeltaTime; - } MEASURE(sampleList,drawSampleList()); MEASURE(sampleEdit,drawSampleEdit()); MEASURE(waveList,drawWaveList()); @@ -6079,7 +6068,6 @@ bool FurnaceGUI::init() { clockOpen=e->getConfBool("clockOpen",false); speedOpen=e->getConfBool("speedOpen",true); groovesOpen=e->getConfBool("groovesOpen",false); - introMonOpen=e->getConfBool("introMonOpen",false); regViewOpen=e->getConfBool("regViewOpen",false); logOpen=e->getConfBool("logOpen",false); effectListOpen=e->getConfBool("effectListOpen",true); @@ -6597,7 +6585,6 @@ void FurnaceGUI::commitState() { e->setConf("clockOpen",clockOpen); e->setConf("speedOpen",speedOpen); e->setConf("groovesOpen",groovesOpen); - e->setConf("introMonOpen",introMonOpen); e->setConf("regViewOpen",regViewOpen); e->setConf("logOpen",logOpen); e->setConf("effectListOpen",effectListOpen); @@ -6881,7 +6868,6 @@ FurnaceGUI::FurnaceGUI(): clockOpen(false), speedOpen(true), groovesOpen(false), - introMonOpen(false), basicMode(true), shortIntro(false), insListDir(false), diff --git a/src/gui/gui.h b/src/gui/gui.h index ee158f6af..f35b0b692 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -1727,7 +1727,7 @@ class FurnaceGUI { bool mixerOpen, debugOpen, inspectorOpen, oscOpen, volMeterOpen, statsOpen, compatFlagsOpen; bool pianoOpen, notesOpen, channelsOpen, regViewOpen, logOpen, effectListOpen, chanOscOpen; bool subSongsOpen, findOpen, spoilerOpen, patManagerOpen, sysManagerOpen, clockOpen, speedOpen; - bool groovesOpen, introMonOpen; + bool groovesOpen; bool basicMode, shortIntro; bool insListDir, waveListDir, sampleListDir;