ref: abd2256c8281de66d6eb30b71ad86880be2704fc
parent: 00d680a305c0b3602eafaeac8c5d19df736546b0
author: Olav Sørensen <[email protected]>
date: Tue Aug 31 17:49:40 EDT 2021
Very minor variable/comment changing
--- a/src/ft2_replayer.c
+++ b/src/ft2_replayer.c
@@ -3127,7 +3127,7 @@
resetCachedMixerVars();
// wait for scope thread to finish, so that we know pointers aren't deprecated
- while (editor.scopeThreadMutex);
+ while (editor.scopeThreadBusy);
if (audioWasntLocked)
unlockAudio();
--- a/src/ft2_structs.h
+++ b/src/ft2_structs.h
@@ -15,7 +15,7 @@
UNICHAR *configFileLocationU, *audioDevConfigFileLocationU, *midiConfigFileLocationU;
volatile bool mainLoopOngoing;
- volatile bool busy, scopeThreadMutex, programRunning, wavIsRendering, wavReachedEndFlag;
+ volatile bool busy, scopeThreadBusy, programRunning, wavIsRendering, wavReachedEndFlag;
volatile bool updateCurSmp, updateCurInstr, diskOpReadDir, diskOpReadDone, updateWindowTitle;
volatile uint8_t loadMusicEvent;
volatile FILE *wavRendererFileHandle;
--- a/src/modloaders/ft2_load_mod.c
+++ b/src/modloaders/ft2_load_mod.c
@@ -317,7 +317,7 @@
if (s->loopLength < 2)
s->loopLength = 2;
- // fix for poorly converted STK (< v2.5) -> PT/NT modules (FIXME: Worth keeping or not?)
+ // fix for poorly converted STK (< v2.5) -> PT/NT modules
if (s->loopLength > 2 && s->loopStart+s->loopLength > s->length)
{
if ((s->loopStart >> 1) + s->loopLength <= s->length)
--- a/src/scopes/ft2_scopes.c
+++ b/src/scopes/ft2_scopes.c
@@ -526,9 +526,9 @@
while (editor.programRunning)
{
- editor.scopeThreadMutex = true;
+ editor.scopeThreadBusy = true;
updateScopes();
- editor.scopeThreadMutex = false;
+ editor.scopeThreadBusy = false;
uint64_t time64 = SDL_GetPerformanceCounter();
if (time64 < timeNext64)