synced with b168

Author: tpanj

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.7)
 
-project(ft2-clone VERSION 0.1.60)
+project(ft2-clone VERSION 0.1.68)
 
 set(SDL_SHARED_ENABLED_BY_DEFAULT OFF)
 add_subdirectory(include/SDL2 EXCLUDE_FROM_ALL)

README.md

@@ -4,23 +4,24 @@
 
 # [Releases download](https://github.com/tpanj/ft2/releases)
 Requirements for running app:
-* Windows can be run on Windows XP sp2+
-* Linux Ubuntu 18.04 LTS + 
+* Windows - can be run on Windows XP sp2+
+* Linux - Ubuntu 18.04 LTS + or others
 * Mac OS X to be done by someone with MAC
 
 # Compiling
 Whole app executable is linked staticly into single standalone file.
-Sources contains vanilla stripped SDL2 stable 2.09 library with removed some items (`rm -fr android-project/ acinclude/ autogen.sh build-scripts configure* docs test VisualC* Xcode*`).
-Various IDEs or console toolchains can be used generatet from cmake and that is why project has no other project files commmited. 
+Sources contains vanilla stripped SDL2 stable 2.0.10 library with removed some items (`rm -fr android-project/ acinclude/ autogen.sh build-scripts configure* docs test VisualC* Xcode*`).
+Various IDEs or console toolchains can be used generated from cmake and that is why project has no other project files committed. 
 
-If you want to build from sources by yourself, download sources or clone repository. 
+If you want to build from sources by yourself, download sources or clone repository. CMake build tool is mandatory besides c compiler and linker.
 
-## Windows
+## Windows (with VS201X)
 ```dos
 REM repo is in shared folder ft2_cloned_dir outside Vbox  
 mkdir build-ft2
 cd build-ft2
 cmake -A Win32 \\VBOXSVR\ft2_cloned_dir
+start ft2-clone.sln
 ```
 
 Set in IDE to release and on project ft2-clone set to MFC to Static and toolset to v141_xp.
@@ -33,4 +34,4 @@ cmake -DCMAKE_BUILD_TYPE=Release ..
 ```
 
 # Source
-All credits goes to Olav → https://16-bits.org/ft2.php
+All credits goes to Olav → https://16-bits.org/ft2.php

misc/ft2_clone_changelog.txt

@@ -117,11 +117,11 @@ static void aboutInit(void)
 				}
 				else
 				{
-					r  = random32(30000);
-					n  = random32(5);
-					w  = ((2 * random32(2)) - 1) * sqr(random32(1000));
+					r = random32(30000);
+					n = random32(5);
+					w = ((2 * random32(2)) - 1) * sqr(random32(1000));
 					ww = (((M_PI * 2.0) / 5.0) * n) + (r / 12000.0) + (w / 3000000.0);
-					h  = ((sqr(r) / 30000) * (random32(10000) - 5000)) / 12000;
+					h = ((sqr(r) / 30000) * (random32(10000) - 5000)) / 12000;
 
 					starcrd[i].x = (int16_t)trunc(r * cos(ww));
 					starcrd[i].y = (int16_t)trunc(r * sin(ww));
@@ -137,9 +137,9 @@ static void aboutInit(void)
 			hastighet = 0;
 			for (i = 0; i < NUM_STARS; i++)
 			{
-				r  = (int32_t)round(sqrt(random32(500) * 500));
-				w  = random32(3000);
-				h  = cos32767[(((w * 8) + r) / 16) & 1023] / 4;
+				r = (int32_t)round(sqrt(random32(500) * 500));
+				w = random32(3000);
+				h = cos32767[(((w * 8) + r) / 16) & 1023] / 4;
 
 				starcrd[i].z = (int16_t)((cos32767[w & 1023] * (w + r)) / 3500);
 				starcrd[i].y = (int16_t)((sin32767[w & 1023] * (w + r)) / 3500);

src/ft2_about.c

@@ -1,5 +1,4 @@
-#ifndef __FT2_ABOUT_H
-#define __FT2_ABOUT_H
+#pragma once
 
 #include <stdint.h>
 
@@ -8,5 +7,3 @@ void seedAboutScreenRandom(uint32_t newseed);
 void showAboutScreen(void);
 void hideAboutScreen(void);
 void exitAboutScreen(void);
-
-#endif

src/ft2_about.h

@@ -171,7 +171,7 @@ void setSpeed(uint16_t bpm)
 		dFrac *= UINT32_MAX + 1.0;
 		if (dFrac > (double)UINT32_MAX)
 			dFrac = (double)UINT32_MAX;
-		double2int32_round(tickTimeLenFrac, dFrac);
+		tickTimeLenFrac = (uint32_t)dFrac;
 	}
 }
 
@@ -199,7 +199,7 @@ static inline void voiceUpdateVolumes(uint8_t i, uint8_t status)
 	volL = v->SVol * amp; // 0..2047 * 1..32 = 0..65504
 
 	// (0..65504 * 0..65536) >> 4 = 0..268304384
-	volR = ((uint32_t)volL * panningTab[      v->SPan]) >> 4;
+	volR = ((uint32_t)volL * panningTab[v->SPan]) >> 4;
 	volL = ((uint32_t)volL * panningTab[256 - v->SPan]) >> 4;
 
 	if (!audio.volumeRampingFlag)
@@ -693,7 +693,7 @@ uint32_t mixReplayerTickToBuffer(uint8_t *stream, uint8_t bitDepth)
 	// normalize mix buffer and send to audio stream
 	if (bitDepth == 16)
 	{
-		if (config.audioDither)
+		if (config.specialFlags2 & DITHERED_AUDIO)
 			sendSamples16BitDitherStereo(stream, speedVal, 2);
 		else
 			sendSamples16BitStereo(stream, speedVal, 2);
@@ -914,15 +914,16 @@ void lockMixerCallback(void) // lock audio + clear voices/scopes (for short oper
 
 	audio.resetSyncTickTimeFlag = true;
 
-	stopVoices(); // VERY important! prevents potential crashes
+	stopVoices(); // VERY important! prevents potential crashes by purging pointers
+
 	// scopes, mixer and replayer are guaranteed to not be active at this point
 
 	resetSyncQueues();
 }
 
 void unlockMixerCallback(void)
 {
-	stopVoices(); // VERY important! prevents potential crashes
+	stopVoices(); // VERY important! prevents potential crashes by purging pointers
 
 	if (audio.locked)
 		unlockAudio();
@@ -931,18 +932,21 @@ void unlockMixerCallback(void)
 void pauseAudio(void) // lock audio + clear voices/scopes + render silence (for long operations)
 {
 	if (audioPaused)
+	{
+		stopVoices(); // VERY important! prevents potential crashes by purging pointers
 		return;
+	}
 
 	if (audio.dev > 0)
 		SDL_PauseAudioDevice(audio.dev, true);
 
 	audio.resetSyncTickTimeFlag = true;
 
-	stopVoices(); // VERY important! prevents potential crashes
+	stopVoices(); // VERY important! prevents potential crashes by purging pointers
+
 	// scopes, mixer and replayer are guaranteed to not be active at this point
 
 	resetSyncQueues();
-
 	audioPaused = true;
 }
 
@@ -1092,10 +1096,10 @@ void updateSendAudSamplesRoutine(bool lockMixer)
 		lockMixerCallback();
 
 	// force dither off if somehow set with 24-bit float (illegal)
-	if (config.audioDither && (config.specialFlags & BITDEPTH_24))
-		config.audioDither = false;
+	if ((config.specialFlags2 & DITHERED_AUDIO) && (config.specialFlags & BITDEPTH_24))
+		config.specialFlags2 &= ~DITHERED_AUDIO;
 
-	if (config.audioDither)
+	if (config.specialFlags2 & DITHERED_AUDIO)
 	{
 		if (config.specialFlags & BITDEPTH_16)
 		{
@@ -1146,7 +1150,7 @@ static void calcAudioLatencyVars(uint16_t haveSamples, int32_t haveFreq)
 	dFrac *= UINT32_MAX + 1.0;
 	if (dFrac > (double)UINT32_MAX)
 		dFrac = (double)UINT32_MAX;
-	double2int32_round(audio.audLatencyPerfValFrac, dFrac);
+	audio.audLatencyPerfValFrac = (uint32_t)round(dFrac);
 
 	audio.dAudioLatencyMs = dAudioLatencySecs * 1000.0;
 }
@@ -1279,8 +1283,8 @@ bool setupAudio(bool showErrorMsg)
 
 	calcAudioLatencyVars(have.samples, have.freq);
 
-	if (config.audioDither && newBitDepth == 24)
-		config.audioDither = false;
+	if ((config.specialFlags2 & DITHERED_AUDIO) && newBitDepth == 24)
+		config.specialFlags2 &= ~DITHERED_AUDIO;
 
 	pmpChannels = have.channels;
 	pmpCountDiv = pmpChannels * ((newBitDepth == 16) ? sizeof (int16_t) : sizeof (float));

src/ft2_audio.c

@@ -1,5 +1,4 @@
-#ifndef __FT2_AUDIO_H
-#define __FT2_AUDIO_H
+#pragma once
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -113,5 +112,3 @@ extern pattSyncData_t *pattSyncEntry;
 extern chSyncData_t *chSyncEntry;
 
 extern volatile bool pattQueueReading, pattQueueClearing, chQueueReading, chQueueClearing;
-
-#endif

src/ft2_audio.h

@@ -1,5 +1,4 @@
-#ifndef __FT2_AUDIOSELECTOR_H
-#define __FT2_AUDIOSELECTOR_H
+#pragma once
 
 #include <stdint.h>
 
@@ -20,5 +19,3 @@ void sbAudOutputSetPos(uint32_t pos);
 void sbAudInputSetPos(uint32_t pos);
 void freeAudioDeviceLists(void);
 void freeAudioDeviceSelectorBuffers(void);
-
-#endif

src/ft2_audioselector.h

@@ -90,6 +90,8 @@ checkBox_t checkBoxes[NUM_CHECKBOXES] =
 	{ 113,  79, 128, 12, cbConfigLineColors },
 	{ 113,  92, 126, 12, cbConfigChanNums },
 	{ 255,  14, 136, 12, cbConfigShowVolCol },
+	{ 255, 158, 113, 12, cbHardwareMouse },
+	// ---------------------------------
 	{ 212,   2, 142, 12, cbSampCutToBuff },
 	{ 212,  15, 145, 12, cbPattCutToBuff },
 	{ 212,  28, 153, 12, cbKillNotesAtStop },

src/ft2_checkboxes.c

@@ -1,5 +1,4 @@
-#ifndef __FT2_CHECKBOXES_H
-#define __FT2_CHECKBOXES_H
+#pragma once
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -68,6 +67,7 @@ enum // CHECKBOXES
 	CB_CONF_LINECOLORS,
 	CB_CONF_CHANNUMS,
 	CB_CONF_SHOW_VOLCOL,
+	CB_CONF_HARDWARE_MOUSE,
 
 	// CONFIG MISCELLANEOUS
 	CB_CONF_SAMP_CUT_TO_BUF,
@@ -96,9 +96,9 @@ enum // CHECKBOXES
 enum
 {
 	CHECKBOX_UNPRESSED = 0,
-	CHECKBOX_PRESSED   = 1,
+	CHECKBOX_PRESSED = 1,
 	CHECKBOX_UNCHECKED = 0,
-	CHECKBOX_CHECKED   = 1
+	CHECKBOX_CHECKED = 1
 };
 
 #define CHECKBOX_W 13
@@ -121,5 +121,3 @@ void hideCheckBox(uint16_t checkBoxID);
 void handleCheckBoxesWhileMouseDown(void);
 bool testCheckBoxMouseDown(void);
 void testCheckBoxMouseRelease(void);
-
-#endif