Musicplayer2

RetroFE/Source/CMakeLists.txt

@@ -216,6 +216,7 @@ set(RETROFE_HEADERS
 	"${RETROFE_DIR}/Source/Graphics/Component/Component.h"
 	"${RETROFE_DIR}/Source/Graphics/Component/Image.h"
 	"${RETROFE_DIR}/Source/Graphics/Component/ImageBuilder.h"
+	"${RETROFE_DIR}/Source/Graphics/Component/MusicPlayerComponent.h"
     "${RETROFE_DIR}/Source/Graphics/Component/ReloadableHiscores.h"
 	"${RETROFE_DIR}/Source/Graphics/Component/ReloadableMedia.h"
 	"${RETROFE_DIR}/Source/Graphics/Component/ReloadableText.h"
@@ -231,6 +232,7 @@ set(RETROFE_HEADERS
 	"${RETROFE_DIR}/Source/Graphics/ThreadPool.h"
 	"${RETROFE_DIR}/Source/Menu/Menu.h"
 	"${RETROFE_DIR}/Source/Sound/Sound.h"
+    "${RETROFE_DIR}/Source/Sound/MusicPlayer.h"
 	"${RETROFE_DIR}/Source/Utility/Log.h"
 	"${RETROFE_DIR}/Source/Utility/Utils.h"
 	"${RETROFE_DIR}/Source/Video/IVideo.h"
@@ -278,6 +280,7 @@ set(RETROFE_SOURCES
 	"${RETROFE_DIR}/Source/Graphics/Component/Component.cpp"
 	"${RETROFE_DIR}/Source/Graphics/Component/Image.cpp"
 	"${RETROFE_DIR}/Source/Graphics/Component/ImageBuilder.cpp"
+	"${RETROFE_DIR}/Source/Graphics/Component/MusicPlayerComponent.cpp"
     "${RETROFE_DIR}/Source/Graphics/Component/ReloadableHiscores.cpp"
   	"${RETROFE_DIR}/Source/Graphics/Component/Text.cpp"
 	"${RETROFE_DIR}/Source/Graphics/Component/ReloadableMedia.cpp"
@@ -288,6 +291,7 @@ set(RETROFE_SOURCES
 	"${RETROFE_DIR}/Source/Graphics/Component/VideoComponent.cpp"
 	"${RETROFE_DIR}/Source/Menu/Menu.cpp"
 	"${RETROFE_DIR}/Source/Sound/Sound.cpp"
+    "${RETROFE_DIR}/Source/Sound/MusicPlayer.cpp"
 	"${RETROFE_DIR}/Source/Utility/Log.cpp"
 	"${RETROFE_DIR}/Source/Utility/Utils.cpp"
 	"${RETROFE_DIR}/Source/Video/GStreamerVideo.cpp"

RetroFE/Source/Control/UserInput.cpp

@@ -83,6 +83,11 @@ bool UserInput::initialize()
     MapKey("toggleBuildInfo", KeyCodeToggleBuildInfo, false);
     MapKey("settings", KeyCodeSettings, false);
 	MapKey("quickPlaylist", KeyCodeQuickList, false);
+    MapKey("musicPlayer.playPause", KeyCodeMusicPlayPause, false);
+    MapKey("musicPlayer.next", KeyCodeMusicNext, false);
+    MapKey("musicPlayer.prev", KeyCodeMusicPrev, false);
+    MapKey("musicPlayer.volUp", KeyCodeMusicVolumeUp, false);
+    MapKey("musicPlayer.volDown", KeyCodeMusicVolumeDown, false);
 
     std::string jbKey;
     if(config_.getProperty(OPTION_JUKEBOX, jbKey)) {

RetroFE/Source/Control/UserInput.h

@@ -89,6 +89,13 @@ class UserInput
         KeyCodeToggleBuildInfo,
         KeyCodeSettings,
         KeyCodeQuickList,
+        KeyCodeMusicPlayPause,
+        KeyCodeMusicNext,
+        KeyCodeMusicPrev,
+        KeyCodeMusicVolumeUp,
+        KeyCodeMusicVolumeDown,
+        KeyCodeMusicToggleShuffle,
+        KeyCodeMusicToggleLoop,
         // leave KeyCodeMax at the end
         KeyCodeMax,
     };

RetroFE/Source/Database/Configuration.cpp

@@ -300,6 +300,25 @@ bool Configuration::getProperty(const std::string& key, int& value)
     return retVal;
 }
 
+bool Configuration::getProperty(const std::string& key, float& value)
+{
+    std::string strValue;
+    bool retVal = getProperty(key, strValue);
+
+    if (retVal) {
+        try {
+            value = std::stof(strValue);
+        }
+        catch (const std::invalid_argument&) {
+            LOG_WARNING("RetroFE", "Invalid float format for key: " + key);
+        }
+        catch (const std::out_of_range&) {
+            LOG_WARNING("RetroFE", "Float out of range for key: " + key);
+        }
+    }
+    return retVal;
+}
+
 
 bool Configuration::getProperty(const std::string& key, bool& value)
 {

RetroFE/Source/Database/Configuration.h

@@ -34,6 +34,7 @@ class Configuration
     bool import(const std::string& collection, const std::string& keyPrefix, const std::string& file, bool mustExist = true);
     bool getProperty(const std::string& key, std::string &value);
     bool getProperty(const std::string& key, int &value);
+    bool getProperty(const std::string& key, float& value);
     bool getProperty(const std::string& key, bool &value);
     void childKeyCrumbs(const std::string& parent, std::vector<std::string> &children);
     void setProperty(const std::string& key, const std::string& value);

RetroFE/Source/Execute/AttractMode.cpp

@@ -55,6 +55,9 @@ AttractMode::AttractMode()
 }
 
 void AttractMode::reset(bool set) {
+	if (idleTime <= 0)
+		return;
+
     elapsedTime_ = 0;
     isActive_ = false;
     isSet_ = set;
@@ -78,6 +81,10 @@ void AttractMode::reset(bool set) {
 }
 
 int AttractMode::update(float dt, Page& page) {
+
+    if (idleTime <= 0)
+        return 0;
+
     // Track total time for state management
     float currentTime = elapsedTime_ + dt;
 

RetroFE/Source/Execute/Launcher.cpp

@@ -33,6 +33,7 @@
 #include <thread>
 #include <atomic>
 #include <filesystem>
+#include <set>
 #ifdef WIN32
 #include <Windows.h>
 #pragma comment(lib, "Xinput.lib")
@@ -41,6 +42,7 @@
 #include "PacDrive.h"
 #include "StdAfx.h"
 #include <tlhelp32.h>
+#include <Psapi.h>
 #endif
 #if defined(__linux__) || defined(__APPLE__)
 #include <libusb-1.0/libusb.h>
@@ -419,7 +421,47 @@ std::string replaceVariables(std::string str,
 
 #ifdef WIN32
 // Utility function to terminate a process and all its child processes
-void TerminateProcessAndChildren(DWORD processId) {
+void TerminateProcessAndChildren(DWORD processId, const std::string& originalExeName = "", std::set<DWORD>& processedIds = std::set<DWORD>()) {
+	// Check if we've already processed this process ID to avoid infinite recursion
+	if (processedIds.find(processId) != processedIds.end()) {
+		LOG_DEBUG("Launcher", "Process ID: " + std::to_string(processId) + " already processed, skipping.");
+		return;
+	}
+
+	// Add this process to the set of processed IDs
+	processedIds.insert(processId);
+
+	// Verify this is the expected process if we have an original name
+	bool shouldTerminate = true;
+	if (!originalExeName.empty()) {
+		HANDLE hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, processId);
+		if (hProcess != nullptr) {
+			char processName[MAX_PATH] = { 0 };
+			if (GetModuleFileNameExA(hProcess, nullptr, processName, MAX_PATH) > 0) {
+				std::string currentName = processName;
+				std::string baseName = currentName.substr(currentName.find_last_of("\\/") + 1);
+
+				// Case-insensitive comparison for Windows filenames
+				std::string lowerBaseName = baseName;
+				std::string lowerOriginalName = originalExeName;
+				std::transform(lowerBaseName.begin(), lowerBaseName.end(), lowerBaseName.begin(), ::tolower);
+				std::transform(lowerOriginalName.begin(), lowerOriginalName.end(), lowerOriginalName.begin(), ::tolower);
+
+				if (lowerBaseName != lowerOriginalName) {
+					LOG_WARNING("Launcher", "Process ID " + std::to_string(processId) +
+						" is " + baseName + ", not " + originalExeName +
+						". Skipping termination.");
+					shouldTerminate = false;
+				}
+			}
+			CloseHandle(hProcess);
+		}
+	}
+
+	if (!shouldTerminate) {
+		return;
+	}
+
 	LOG_INFO("Launcher", "Terminating process ID: " + std::to_string(processId));
 
 	HANDLE hSnap = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
@@ -436,6 +478,7 @@ void TerminateProcessAndChildren(DWORD processId) {
 	if (Process32First(hSnap, &pe32)) {
 		do {
 			if (pe32.th32ParentProcessID == processId) {
+				// For child processes, we don't verify the name
 				childPids.push_back(pe32.th32ProcessID);
 			}
 		} while (Process32Next(hSnap, &pe32));
@@ -445,10 +488,10 @@ void TerminateProcessAndChildren(DWORD processId) {
 
 	// Terminate children first
 	for (DWORD childPid : childPids) {
-		TerminateProcessAndChildren(childPid);
+		TerminateProcessAndChildren(childPid, "", processedIds);
 	}
 
-	// Now terminate the main process
+	// Now terminate the main process if it passed our verification
 	HANDLE hProcess = OpenProcess(PROCESS_TERMINATE | SYNCHRONIZE, FALSE, processId);
 	if (hProcess != nullptr) {
 		if (TerminateProcess(hProcess, 1)) {
@@ -1157,7 +1200,9 @@ bool Launcher::execute(std::string executable, std::string args, std::string cur
 				// Timer elapsed case (process still running)
 				DWORD processId = GetProcessId(hLaunchedProcess);
 				if (processId != 0) {
-					TerminateProcessAndChildren(processId);
+					// Extract the executable base name to ensure we terminate the right process
+					std::string exeName = exePathStr.substr(exePathStr.find_last_of("\\/") + 1);
+					TerminateProcessAndChildren(processId, exeName);
 				}
 				else {
 					LOG_WARNING("Launcher", "Could not get process ID for termination");