ft2-clone

commit abd2256c8281de66d6eb30b71ad86880be2704fc
parent 00d680a305c0b3602eafaeac8c5d19df736546b0
Author: Olav Sørensen <olav.sorensen@live.no>
Date:   Tue, 31 Aug 2021 21:49:13 +0200

Very minor variable/comment changing

Diffstat:
M
src/ft2_replayer.c
 | 
2
+-
M
src/ft2_structs.h
 | 
2
+-
M
src/modloaders/ft2_load_mod.c
 | 
2
+-
M
src/scopes/ft2_scopes.c
 | 
4
++--

4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/ft2_replayer.c b/src/ft2_replayer.c
@@ -3127,7 +3127,7 @@ void stopVoices(void)
 	resetCachedMixerVars();
 
 	// wait for scope thread to finish, so that we know pointers aren't deprecated
-	while (editor.scopeThreadMutex);
+	while (editor.scopeThreadBusy);
 
 	if (audioWasntLocked)
 		unlockAudio();
diff --git a/src/ft2_structs.h b/src/ft2_structs.h
@@ -15,7 +15,7 @@ typedef struct editor_t
 	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;
diff --git a/src/modloaders/ft2_load_mod.c b/src/modloaders/ft2_load_mod.c
@@ -317,7 +317,7 @@ bool loadMOD(FILE *f, uint32_t filesize)
 		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)
diff --git a/src/scopes/ft2_scopes.c b/src/scopes/ft2_scopes.c
@@ -526,9 +526,9 @@ static int32_t SDLCALL scopeThreadFunc(void *ptr)
 
 	while (editor.programRunning)
 	{
-		editor.scopeThreadMutex = true;
+		editor.scopeThreadBusy = true;
 		updateScopes();
-		editor.scopeThreadMutex = false;
+		editor.scopeThreadBusy = false;
 
 		uint64_t time64 = SDL_GetPerformanceCounter();
 		if (time64 < timeNext64)