new setting

Author: RayDeeUx

changelog.md

@@ -3,6 +3,7 @@
 *<c-aaaaaa>Friendly reminder that</c> <cl>some</c> <cj>features</c> <c-aaaaaa>of this mod (including features from this update and features related to bugfixes in this update) require [Better Touch Prio](mod:alk.better-touch-prio) to be installed. These decisions are still here to stay.</c>*
 - <cg>Added</c> playback increment/decrement controls.
   - You can toggle this option off in the mod settings.
+  - You can also adjust how many milliseconds to increment/decrement by in the mod settings.
   - [Better Touch Prio](mod:alk.better-touch-prio) is <cl>requ</c><cj>ired</c> for this feature.
 - <co>Fixed</c> an issue where menu loop positions wouldn't be restored when leaving a level whose most recently played song was also the most recently selected menu loop.
 ## v1.11.3, v1.11.4, and v1.11.5

mod.json

@@ -301,6 +301,24 @@
 			"default": true,
 			"enable-if": "loaded:alk.better-touch-prio"
 		},
+		"incrementDecrementByMilliseconds": {
+			"name": "Control Panel: Playback Progress Controls Forward/Backward Amount (MS)",
+			"description": "<c-ff0000>***__IF THE \"BETTER TOUCH PRIO\" MOD BY UNDEFINED0 + ALK1M123 IS NOT INSTALLED, THIS SETTING IS IGNORED.__***</c>\n\nChoose how many milliseconds to go forward/backward in when using the playback progress controls in the Control Panel.\n\n<cy>If</c> <cl>Constant Shuffle Mode</c> <c-aaaaaa>(formerly known as Playlist Mode)</c> <cy>is enabled, going past the end of the current song will shuffle a new song, and going backwards will be capped to the very start of the song.</c>\n\nOtherwise, going too far past the end or the beginning of the current song will wrap around from the opposite end of the song.",
+			"type": "int",
+			"default": 5000,
+			"min": 100,
+			"max": 30000,
+			"control": {
+				"input": true,
+				"slider": true,
+				"arrows": true,
+				"big-arrows": true,
+				"arrow-step": 500,
+				"big-arrow-step": 1000,
+				"slider-step": 100
+			},
+			"enable-if": "loaded:alk.better-touch-prio"
+		},
 		"specificSongOverride": {
 			"name": "Specific Menu Loop File Override",
 			"description": "In case you *hate* the randomizer elements from this mod.\n\n<cy>Leave this as blank to disable this option.</c>",

src/SongManager.cpp

@@ -323,4 +323,12 @@ void SongManager::setFinishedCalculatingSongLengths(const bool value) {
 
 bool SongManager::getFinishedCalculatingSongLengths() const {
 	return m_finishedCalculatingSongLengths;
+}
+
+void SongManager::setIncrementDecrementByMilliseconds(const int value) {
+	m_incrementDecrementByMilliseconds = std::clamp<int>(value, 100, 30000);
+}
+
+int SongManager::getIncrementDecrementByMilliseconds() const {
+	return m_incrementDecrementByMilliseconds;
 }

src/SongManager.hpp

@@ -98,6 +98,8 @@ class SongManager {
 	bool getShowPlaybackProgressAndControls() const;
 	void setFinishedCalculatingSongLengths(const bool);
 	bool getFinishedCalculatingSongLengths() const;
+	void setIncrementDecrementByMilliseconds(const int);
+	int getIncrementDecrementByMilliseconds() const;
 
   private:
 	SongManager();
@@ -124,9 +126,10 @@ class SongManager {
 	bool m_comingFromGJBGL = false;
 	bool m_showPlaybackProgressAndControls = false;
 	int m_lastPosition = 0;
+	int m_towerRepeatCount = 0;
+	int m_incrementDecrementByMilliseconds = 0;
 	std::vector<std::string> m_blacklist {};
 	std::vector<std::string> m_favorites {};
-	int m_towerRepeatCount = 0;
 	geode::Mod* m_colonMenuLoopStartTime {};
 	SongToSongData m_songToSongDataMap {};
 	bool m_finishedCalculatingSongLengths = false;

src/main.cpp

@@ -22,6 +22,7 @@ bool originalOverrideWasEmpty = false;
 	songManager.setFinishedCalculatingSongLengths(false);
 	songManager.setAdvancedLogs(Mod::get()->getSettingValue<bool>("advancedLogs"));
 	songManager.setShowPlaybackProgressAndControls(Mod::get()->getSettingValue<bool>("showPlaybackProgressAndControls"));
+	songManager.setIncrementDecrementByMilliseconds(Mod::get()->getSettingValue<int64_t>("incrementDecrementByMilliseconds"));
 	songManager.setVibecodedVentilla(VIBECODED_RADIO && (VIBECODED_RADIO->isEnabled() || VIBECODED_RADIO->shouldLoad()));
 	songManager.setUndefined0Alk1m123TouchPrio(BTP && (BTP->isEnabled() || BTP->shouldLoad()) && !BTP->hasUnresolvedDependencies() && !BTP->hasUnresolvedIncompatibilities());
 	if (!std::filesystem::exists(configDir / "playlistOne.txt")) Utils::writeToFile("# This file was generated automatically as it hadn't existed previously.", configDir / "playlistOne.txt");
@@ -200,6 +201,11 @@ bool originalOverrideWasEmpty = false;
 		if (SongManager::get().getUndefined0Alk1m123TouchPrio() || !showPlaybackProgressAndControls) return;
 		Utils::showMDPopup("Control Panel Playback Progress Controls", USE_BETTER_TOUCH_PRIO_DAMMIT, 20260105, "show-playback-progress-controls");
 	});
+	listenForSettingChanges<int64_t>("incrementDecrementByMilliseconds", [](const int64_t incrementDecrementByMilliseconds) {
+		SongManager::get().setIncrementDecrementByMilliseconds(incrementDecrementByMilliseconds);
+		if (SongManager::get().getUndefined0Alk1m123TouchPrio()) return;
+		Utils::showMDPopup("Control Panel Playback Progress Controls", USE_BETTER_TOUCH_PRIO_DAMMIT, 20260105, "playback-progress-incrdecr-amt");
+	});
 	listenForSettingChanges<bool>("advancedLogs", [](const bool newAdvancedLogs) {
 		SongManager::get().setAdvancedLogs(newAdvancedLogs);
 	});

src/ui/SongControlMenu.cpp

@@ -7,6 +7,7 @@
 #define REST_OF_THE_OWL this->m_songControlsMenu, this
 #define DEFAULT_FOOTER_TEXT fmt::format("Hi! Menu Loop Randomizer will never resemble Spotify or its distant cousin EditorMusic. Please respect that. :) [Platform: {}]", Utils::getPlatform())
 #define CAN_USE_PLAYBACK_CONTROLS (songManager.getFinishedCalculatingSongLengths() && songManager.getUndefined0Alk1m123TouchPrio() && songManager.getShowPlaybackProgressAndControls())
+#define INCREMENT_DECREMENT_AMOUNT songManager.getIncrementDecrementByMilliseconds()
 
 bool SongControlMenu::setup() {
 	this->setTitle("Menu Loop Randomizer - Control Panel");
@@ -357,18 +358,18 @@ void SongControlMenu::onSkipBkwdButton(CCObject*) {
 	const int fullLength = songManager.getSongToSongDataEntries().find(songManager.getCurrentSong())->second.songLength;
 	const int lastPosition = songManager.getLastMenuLoopPosition();
 
-	if ((lastPosition - 5000) < 0) {
+	if ((lastPosition - INCREMENT_DECREMENT_AMOUNT) < 0) {
 		if (songManager.getConstantShuffleMode()) {
 			fmod->getActiveMusicChannel(0)->setPosition(0, FMOD_TIMEUNIT_MS);
 		} else if (fullLength > 0 && fullLength < std::numeric_limits<unsigned int>::max()) {
-			const int newPosition = ((((lastPosition % fullLength) + fullLength) % fullLength) - (5000 % fullLength) + fullLength) % fullLength;
+			const int newPosition = ((((lastPosition % fullLength) + fullLength) % fullLength) - (INCREMENT_DECREMENT_AMOUNT % fullLength) + fullLength) % fullLength;
 			songManager.setPauseSongPositionTracking(true);
 			fmod->getActiveMusicChannel(0)->setPosition(newPosition, FMOD_TIMEUNIT_MS);
 			songManager.setLastMenuLoopPosition(newPosition);
 			songManager.setPauseSongPositionTracking(false);
 		}
 	} else {
-		fmod->getActiveMusicChannel(0)->setPosition(lastPosition - 5000, FMOD_TIMEUNIT_MS);
+		fmod->getActiveMusicChannel(0)->setPosition(lastPosition - INCREMENT_DECREMENT_AMOUNT, FMOD_TIMEUNIT_MS);
 	}
 }
 
@@ -383,19 +384,19 @@ void SongControlMenu::onSkipFwrdButton(CCObject*) {
 	const int fullLength = songManager.getSongToSongDataEntries().find(songManager.getCurrentSong())->second.songLength;
 	const int lastPosition = songManager.getLastMenuLoopPosition();
 
-	if ((lastPosition + 5000) > fullLength) {
+	if ((lastPosition + INCREMENT_DECREMENT_AMOUNT) > fullLength) {
 		if (songManager.getConstantShuffleMode()) {
 			SongControl::shuffleSong();
 			SongControlMenu::updateCurrentLabel();
 		} else if (fullLength > 0 && fullLength < std::numeric_limits<unsigned int>::max()) {
-			const int newPosition = ((((lastPosition % fullLength) + fullLength) % fullLength) + (5000 % fullLength)) % fullLength;
+			const int newPosition = ((((lastPosition % fullLength) + fullLength) % fullLength) + (INCREMENT_DECREMENT_AMOUNT % fullLength)) % fullLength;
 			songManager.setPauseSongPositionTracking(true);
 			fmod->getActiveMusicChannel(0)->setPosition(newPosition, FMOD_TIMEUNIT_MS);
 			songManager.setLastMenuLoopPosition(newPosition);
 			songManager.setPauseSongPositionTracking(false);
 		}
 	} else {
-		fmod->getActiveMusicChannel(0)->setPosition(lastPosition + 5000, FMOD_TIMEUNIT_MS);
+		fmod->getActiveMusicChannel(0)->setPosition(lastPosition + INCREMENT_DECREMENT_AMOUNT, FMOD_TIMEUNIT_MS);
 	}
 }