gpddammit

Author: RayDeeUx

src/FMODAudioEngine.cpp

@@ -10,26 +10,19 @@ float stupidAccmulatorTooLazyToPutElsewhere = 0;
 
 class $modify(MenuLoopFMODHook, FMODAudioEngine) {
 	void update(float dt) {
-		constexpr int channelNumber = 0;
-
-		FMOD::Channel* menuLoopChannelProbably = FMODAudioEngine::get()->getActiveMusicChannel(channelNumber);
-		SongManager& songManager = SongManager::get();
-
-		bool isPlaying = false;
-		menuLoopChannelProbably->isPlaying(&isPlaying);
-		songManager.setWasPlaying(isPlaying);
-
 		FMODAudioEngine::update(dt);
-
-		menuLoopChannelProbably->isPlaying(&isPlaying);
-		if ((!isPlaying && isPlaying != songManager.getWasPlaying()) || GJBaseGameLayer::get() || VANILLA_GD_MENU_LOOP_DISABLED) {
+		SongManager& songManager = SongManager::get();
+		if (GJBaseGameLayer::get() || VANILLA_GD_MENU_LOOP_DISABLED) {
 			if (stupidAccmulatorTooLazyToPutElsewhere != 0) stupidAccmulatorTooLazyToPutElsewhere = 0;
 			return;
 		}
 
 		if (SongManager::get().getAdvancedLogs()) stupidAccmulatorTooLazyToPutElsewhere += dt;
 		else if (stupidAccmulatorTooLazyToPutElsewhere != 0) stupidAccmulatorTooLazyToPutElsewhere = 0;
 
+		constexpr int channelNumber = 0;
+
+		FMOD::Channel* menuLoopChannelProbably = FMODAudioEngine::get()->getActiveMusicChannel(channelNumber);
 		const auto activeSong = FMODAudioEngine::get()->getActiveMusic(channelNumber);
 		const auto songManagerSong = songManager.getCurrentSong();
 		const bool isSongManagerSong = activeSong == songManagerSong;
@@ -66,9 +59,11 @@ class $modify(MenuLoopFMODHook, FMODAudioEngine) {
 		if (!songManager.getConstantShuffleMode() || songManager.isOverride()) return;
 		if (GJBaseGameLayer::get() || songManager.isOriginalMenuLoop() || songManager.getSongsSize() < 2) return;
 
+		bool isPlaying = true;
 		FMOD::Sound* sound;
 		unsigned int length = 0;
 		menuLoopChannelProbably->getCurrentSound(&sound);
+		menuLoopChannelProbably->isPlaying(&isPlaying);
 		sound->getLength(&length, 1);
 
 		if (SongManager::get().getAdvancedLogs() && stupidAccmulatorTooLazyToPutElsewhere > SECS_BETWEEN_LOGS) {

src/ui/SongControlMenu.cpp

@@ -361,8 +361,8 @@ void SongControlMenu::onSkipBkwdButton(CCObject*) {
 			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;
-			fmod->getActiveMusicChannel(0)->setPosition(newPosition, FMOD_TIMEUNIT_MS);
 			songManager.setPauseSongPositionTracking(true);
+			fmod->getActiveMusicChannel(0)->setPosition(newPosition, FMOD_TIMEUNIT_MS);
 			songManager.setLastMenuLoopPosition(newPosition);
 			songManager.setPauseSongPositionTracking(false);
 		}
@@ -388,8 +388,8 @@ void SongControlMenu::onSkipFwrdButton(CCObject*) {
 			SongControlMenu::updateCurrentLabel();
 		} else if (fullLength > 0 && fullLength < std::numeric_limits<unsigned int>::max()) {
 			const int newPosition = ((((lastPosition % fullLength) + fullLength) % fullLength) + (5000 % fullLength)) % fullLength;
-			fmod->getActiveMusicChannel(0)->setPosition(newPosition, FMOD_TIMEUNIT_MS);
 			songManager.setPauseSongPositionTracking(true);
+			fmod->getActiveMusicChannel(0)->setPosition(newPosition, FMOD_TIMEUNIT_MS);
 			songManager.setLastMenuLoopPosition(newPosition);
 			songManager.setPauseSongPositionTracking(false);
 		}