rename methods

RayDeeUx · RayDeeUx · commit c98a47e39749 · 2025-07-22T09:24:51.000-04:00
diff --git a/src/EditorPauseLayer.cpp b/src/EditorPauseLayer.cpp
@@ -45,8 +45,8 @@ class $modify(MenuLoopEPLHook, EditorPauseLayer) {
 		Utils::removeCardRemotely();
 
 		if (Utils::getBool("playlistMode")) {
-			Utils::playlistModePLAndEPL();
-			Utils::playlistModeNewSong();
+			Utils::constantShuffleModePLAndEPL();
+			Utils::constantShuffleModeNewSong();
 		}
 	}
 	void FLAlert_Clicked(FLAlertLayer* p0, bool btnTwo) {
@@ -94,8 +94,8 @@ class $modify(MenuLoopEPLHook, EditorPauseLayer) {
 		Utils::removeCardRemotely();
 
 		if (Utils::getBool("playlistMode")) {
-			Utils::playlistModePLAndEPL();
-			Utils::playlistModeNewSong();
+			Utils::constantShuffleModePLAndEPL();
+			Utils::constantShuffleModeNewSong();
 		}
 	}
 	#endif
diff --git a/src/PlayLayer.cpp b/src/PlayLayer.cpp
@@ -16,8 +16,8 @@ class $modify(MenuLoopPLHook, PlayLayer) {
 		Utils::removeCardRemotely();
 
 		if (Utils::getBool("playlistMode")) {
-			Utils::playlistModePLAndEPL();
-			Utils::playlistModeNewSong();
+			Utils::constantShuffleModePLAndEPL();
+			Utils::constantShuffleModeNewSong();
 		}
 	}
 };
diff --git a/src/SongControl.cpp b/src/SongControl.cpp
@@ -51,7 +51,7 @@ namespace SongControl {
 			Utils::newCardAndDisplayNameFromCurrentSong();
 		}
 		if (!Utils::getBool("playlistMode")) Utils::setNewSong();
-		else Utils::playlistModeNewSong();
+		else Utils::constantShuffleModeNewSong();
 		Utils::newCardAndDisplayNameFromCurrentSong();
 	}
 	void favoriteSong(SongManager& songManager) {
@@ -118,7 +118,7 @@ namespace SongControl {
 		}
 
 		if (!Utils::getBool("playlistMode")) Utils::setNewSong();
-		else Utils::playlistModeNewSong();
+		else Utils::constantShuffleModeNewSong();
 
 		if (!Utils::getBool("enableNotification")) return;
 
diff --git a/src/SongManager.cpp b/src/SongManager.cpp
@@ -83,6 +83,15 @@ bool SongManager::getConstantShuffleMode() const {
 	return m_constantShuffleMode;
 }
 
+void SongManager::setPlaylistFileName() {
+	m_playlistName = geode::utils::string::replace(Utils::toNormalizedString(geode::Mod::get()->getSettingValue<std::filesystem::path>("playlistFile").filename()), ".txt", "");
+}
+
+std::string SongManager::getPlaylistFileName() {
+	return m_playlistName;
+}
+
+
 void SongManager::update(float dt) const {
 	// split for readability
 	if (VANILLA_GD_MENU_LOOP_DISABLED || !m_constantShuffleMode) return;
@@ -97,7 +106,7 @@ void SongManager::update(float dt) const {
 	#endif
 	geode::log::info("song is probably finished. Switching songs.");
 	Utils::removeCard();
-	Utils::playlistModeNewSong();
+	Utils::constantShuffleModeNewSong();
 	Utils::newCardAndDisplayNameFromCurrentSong();
 }
 
diff --git a/src/SongManager.hpp b/src/SongManager.hpp
@@ -32,6 +32,8 @@ class SongManager {
 	bool isOriginalMenuLoop() const;
 	void setConstantShuffleMode();
 	bool getConstantShuffleMode() const;
+	void setPlaylistFileName();
+	std::string getPlaylistFileName();
 	std::string getCurrentSong();
 	void setCurrentSong(const std::string&);
 	void setCurrentSongToSavedSong();
@@ -74,6 +76,7 @@ class SongManager {
 	std::string m_previousSong = "";
 	std::string m_overrideSong = "";
 	std::string m_displayName = "";
+	std::string m_playlistName = "";
 	bool m_isMenuLoop;
 	bool m_constantShuffleMode;
 	bool m_calledOnce = false;
diff --git a/src/Utils.cpp b/src/Utils.cpp
@@ -58,7 +58,7 @@ void Utils::removeCard() {
 }
 
 void Utils::setNewSong() {
-	if (Utils::getBool("playlistMode")) return Utils::playlistModeNewSong();
+	if (Utils::getBool("playlistMode")) return Utils::constantShuffleModeNewSong();
 	FMODAudioEngine::sharedEngine()->m_backgroundMusicChannel->stop();
 	SongManager& songManager = SongManager::get();
 	const std::string& songToBeStored = songManager.getCurrentSong();
@@ -69,7 +69,7 @@ void Utils::setNewSong() {
 	GameManager::sharedState()->playMenuMusic();
 }
 
-void Utils::playlistModeNewSong(const bool fromGJBGL) {
+void Utils::constantShuffleModeNewSong(const bool fromGJBGL) {
 	if (VANILLA_GD_MENU_LOOP_DISABLED) return;
 	if (!Utils::getBool("playlistMode")) return Utils::setNewSong();
 	geode::log::info("attempting to hijack menuloop channel to use Constant Shuffle Mode");
@@ -202,8 +202,8 @@ std::string Utils::getFormattedNGMLSongName(SongInfoObject* songInfo) {
 	return fmt::format("{}", songInfo->m_songName);
 }
 
-void Utils::playlistModePLAndEPL() {
-	if (Utils::getBool("playlistMode") && GJBaseGameLayer::get()) return Utils::playlistModeNewSong(true);
+void Utils::constantShuffleModePLAndEPL() {
+	if (Utils::getBool("playlistMode") && GJBaseGameLayer::get()) return Utils::constantShuffleModeNewSong(true);
 }
 
 void Utils::copyCurrentSongName() {
@@ -290,6 +290,7 @@ void Utils::populateVector(const bool customSongs, const std::filesystem::path&
 
 	// impl playlist files
 	const std::filesystem::path playlistFile = geode::Mod::get()->getSettingValue<std::filesystem::path>("playlistFile");
+	songManager.setPlaylistFileName();
 	if (geode::Mod::get()->getSettingValue<bool>("loadPlaylistFile") && std::filesystem::exists(playlistFile) && playlistFile.extension() == ".txt") {
 		bool isPlaylistEmpty = true;
 		std::ifstream playlistFileStream(playlistFile);
diff --git a/src/Utils.hpp b/src/Utils.hpp
@@ -11,12 +11,12 @@ class Utils {
 	static cocos2d::CCNode* findCard();
 	static cocos2d::CCNode* findCardRemotely();
 	static void setNewSong();
-	static void playlistModeNewSong(const bool fromGJBGL = false);
+	static void constantShuffleModeNewSong(const bool fromGJBGL = false);
 	static void newNotification(const std::string& notifString, const bool checkSetting = false);
 	static std::string composedNotifString(std::string notifString, const std::string& middle, const std::string& suffix);
 	static void newCardAndDisplayNameFromCurrentSong();
 	static std::string getFormattedNGMLSongName(SongInfoObject* songInfo);
-	static void playlistModePLAndEPL();
+	static void constantShuffleModePLAndEPL();
 	static void copyCurrentSongName();
 	static void loadFromPlaylistFile(const std::filesystem::path& playlistFile);
 	static void populateVector(const bool customSongs, const std::filesystem::path& path = "", std::vector<std::string> textFileBlacklist = {}, std::vector<std::string> textFileFavorites = {});
diff --git a/src/ui/SongControlMenu.cpp b/src/ui/SongControlMenu.cpp
@@ -168,5 +168,9 @@ void SongControlMenu::updateCurrentLabel() {
 	if (songManager.isOverride()) this->m_headerLabl->setString("Current Song (Custom Override):");
 	else if (songManager.getConstantShuffleMode()) this->m_headerLabl->setString("Current Song (Constant Shuffle Mode):");
 	else this->m_headerLabl->setString("Current Song:");
+	if (!songManager.getPlaylistIsEmpty()) {
+		const std::string& newHeaderString = geode::utils::string::replace(this->m_headerLabl->getString(), "Song", fmt::format("Song from {}", songManager.getPlaylistFileName()));
+		this->m_headerLabl->setString(newHeaderString.c_str());
+	}
 	this->m_headerLabl->limitLabelWidth(this->m_mainLayer->getContentSize().width * .95f * .95f, 1.0f, .0001f);
 }
diff --git a/src/ui/SongListLayer.cpp b/src/ui/SongListLayer.cpp
@@ -106,9 +106,9 @@ void SongListLayer::showLayer(const bool instant) {
 	CCNode* titleLabel = m_listLayer->getChildByID("title");
 	if (!titleLabel) return;
 
-	const SongManager& songManager = SongManager::get();
+	SongManager& songManager = SongManager::get();
 
-	const std::string& playlistFileName = songManager.getPlaylistIsEmpty() ? "None" : geode::utils::string::replace(Utils::toNormalizedString(geode::Mod::get()->getSettingValue<std::filesystem::path>("playlistFile").filename()), ".txt", "");
+	const std::string& playlistFileName = songManager.getPlaylistIsEmpty() ? "None" : songManager.getPlaylistFileName();
 	cocos2d::CCLabelBMFont* currentPlaylistLabel = cocos2d::CCLabelBMFont::create(fmt::format("Playlist: {}", playlistFileName).c_str(), "bigFont.fnt");
 	currentPlaylistLabel->setPosition({83.5f, 0.f});
 	currentPlaylistLabel->limitLabelWidth(279.f * .45f, 1.f, .0001f);

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ class $modify(MenuLoopEPLHook, EditorPauseLayer) {`
`45`	`45`	`Utils::removeCardRemotely();`
`46`	`46`
`47`	`47`	`if (Utils::getBool("playlistMode")) {`
`48`		`- Utils::playlistModePLAndEPL();`
`49`		`- Utils::playlistModeNewSong();`
	`48`	`+ Utils::constantShuffleModePLAndEPL();`
	`49`	`+ Utils::constantShuffleModeNewSong();`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`	`void FLAlert_Clicked(FLAlertLayer* p0, bool btnTwo) {`
`@@ -94,8 +94,8 @@ class $modify(MenuLoopEPLHook, EditorPauseLayer) {`
`94`	`94`	`Utils::removeCardRemotely();`
`95`	`95`
`96`	`96`	`if (Utils::getBool("playlistMode")) {`
`97`		`- Utils::playlistModePLAndEPL();`
`98`		`- Utils::playlistModeNewSong();`
	`97`	`+ Utils::constantShuffleModePLAndEPL();`
	`98`	`+ Utils::constantShuffleModeNewSong();`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ class $modify(MenuLoopPLHook, PlayLayer) {`
`16`	`16`	`Utils::removeCardRemotely();`
`17`	`17`
`18`	`18`	`if (Utils::getBool("playlistMode")) {`
`19`		`- Utils::playlistModePLAndEPL();`
`20`		`- Utils::playlistModeNewSong();`
	`19`	`+ Utils::constantShuffleModePLAndEPL();`
	`20`	`+ Utils::constantShuffleModeNewSong();`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`	`};`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ namespace SongControl {`
`51`	`51`	`Utils::newCardAndDisplayNameFromCurrentSong();`
`52`	`52`	`}`
`53`	`53`	`if (!Utils::getBool("playlistMode")) Utils::setNewSong();`
`54`		`- else Utils::playlistModeNewSong();`
	`54`	`+ else Utils::constantShuffleModeNewSong();`
`55`	`55`	`Utils::newCardAndDisplayNameFromCurrentSong();`
`56`	`56`	`}`
`57`	`57`	`void favoriteSong(SongManager& songManager) {`
`@@ -118,7 +118,7 @@ namespace SongControl {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`if (!Utils::getBool("playlistMode")) Utils::setNewSong();`
`121`		`- else Utils::playlistModeNewSong();`
	`121`	`+ else Utils::constantShuffleModeNewSong();`
`122`	`122`
`123`	`123`	`if (!Utils::getBool("enableNotification")) return;`
`124`	`124`