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

do not reset the timer (and remove intro monitor)

Browse source
This commit is contained in:
tildearrow 2023-08-03 03:54:06 -05:00
parent 3837fe59fb
commit c58eec5753
3 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/engine/playback.cpp
View file

@ -1967,8 +1967,8 @@ void DivEngine::nextBuf(float** in, float** out, int inChans, int outChans, unsi
if (cycles<=0) { if (cycles<=0) {
// we have to tick // we have to tick
if (nextTick()) { if (nextTick()) {
totalTicks=0; /*totalTicks=0;
totalSeconds=0; totalSeconds=0;*/
lastLoopPos=size-(runLeftG>>MASTER_CLOCK_PREC); lastLoopPos=size-(runLeftG>>MASTER_CLOCK_PREC);
logD("last loop pos: %d for a size of %d and runLeftG of %d",lastLoopPos,size,runLeftG); logD("last loop pos: %d for a size of %d and runLeftG of %d",lastLoopPos,size,runLeftG);
totalLoops++; totalLoops++;

14
src/gui/gui.cpp
View file

@ -4476,17 +4476,6 @@ bool FurnaceGUI::loop() {
} }
MEASURE(songInfo,drawSongInfo()); MEASURE(songInfo,drawSongInfo());
MEASURE(orders,drawOrders()); 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(sampleList,drawSampleList());
MEASURE(sampleEdit,drawSampleEdit()); MEASURE(sampleEdit,drawSampleEdit());
MEASURE(waveList,drawWaveList()); MEASURE(waveList,drawWaveList());
@ -6079,7 +6068,6 @@ bool FurnaceGUI::init() {
clockOpen=e->getConfBool("clockOpen",false); clockOpen=e->getConfBool("clockOpen",false);
speedOpen=e->getConfBool("speedOpen",true); speedOpen=e->getConfBool("speedOpen",true);
groovesOpen=e->getConfBool("groovesOpen",false); groovesOpen=e->getConfBool("groovesOpen",false);
introMonOpen=e->getConfBool("introMonOpen",false);
regViewOpen=e->getConfBool("regViewOpen",false); regViewOpen=e->getConfBool("regViewOpen",false);
logOpen=e->getConfBool("logOpen",false); logOpen=e->getConfBool("logOpen",false);
effectListOpen=e->getConfBool("effectListOpen",true); effectListOpen=e->getConfBool("effectListOpen",true);
@ -6597,7 +6585,6 @@ void FurnaceGUI::commitState() {
e->setConf("clockOpen",clockOpen); e->setConf("clockOpen",clockOpen);
e->setConf("speedOpen",speedOpen); e->setConf("speedOpen",speedOpen);
e->setConf("groovesOpen",groovesOpen); e->setConf("groovesOpen",groovesOpen);
e->setConf("introMonOpen",introMonOpen);
e->setConf("regViewOpen",regViewOpen); e->setConf("regViewOpen",regViewOpen);
e->setConf("logOpen",logOpen); e->setConf("logOpen",logOpen);
e->setConf("effectListOpen",effectListOpen); e->setConf("effectListOpen",effectListOpen);
@ -6881,7 +6868,6 @@ FurnaceGUI::FurnaceGUI():
clockOpen(false), clockOpen(false),
speedOpen(true), speedOpen(true),
groovesOpen(false), groovesOpen(false),
introMonOpen(false),
basicMode(true), basicMode(true),
shortIntro(false), shortIntro(false),
insListDir(false), insListDir(false),

2
src/gui/gui.h
View file

@ -1727,7 +1727,7 @@ class FurnaceGUI {
bool mixerOpen, debugOpen, inspectorOpen, oscOpen, volMeterOpen, statsOpen, compatFlagsOpen; bool mixerOpen, debugOpen, inspectorOpen, oscOpen, volMeterOpen, statsOpen, compatFlagsOpen;
bool pianoOpen, notesOpen, channelsOpen, regViewOpen, logOpen, effectListOpen, chanOscOpen; bool pianoOpen, notesOpen, channelsOpen, regViewOpen, logOpen, effectListOpen, chanOscOpen;
bool subSongsOpen, findOpen, spoilerOpen, patManagerOpen, sysManagerOpen, clockOpen, speedOpen; bool subSongsOpen, findOpen, spoilerOpen, patManagerOpen, sysManagerOpen, clockOpen, speedOpen;
bool groovesOpen, introMonOpen; bool groovesOpen;
bool basicMode, shortIntro; bool basicMode, shortIntro;
bool insListDir, waveListDir, sampleListDir; bool insListDir, waveListDir, sampleListDir;