cleo.log improvements (#182)

* cleo.log improvements * Added peer script separator to log. * fixup! Added peer script separator to log.
cleolibrary · Sep 10, 2024 · 8e5025b · 8e5025b
1 parent 53d5198
commit 8e5025b
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 17 deletions.
diff --git a/cleo_plugins/Audio/CSoundSystem.cpp b/cleo_plugins/Audio/CSoundSystem.cpp
@@ -20,14 +20,22 @@ namespace CLEO
 
     void EnumerateBassDevices(int& total, int& enabled, int& default_device)
     {
+        TRACE(""); // separator
+        TRACE("Listing audio devices:");
+
         BASS_DEVICEINFO info;
-        for (default_device = -1, enabled = 0, total = 0; BASS_GetDeviceInfo(total, &info); ++total)
+        enabled = 0;
+        default_device = -1;
+        for (total = 0; BASS_GetDeviceInfo(total, &info); ++total)
         {
-            if (info.flags & BASS_DEVICE_ENABLED) ++enabled;
             if (info.flags & BASS_DEVICE_DEFAULT) default_device = total;
-            TRACE("Found sound device %d%s: %s", total, default_device == total ?
-                " (default)" : "", info.name);
+
+            bool isEnabled = info.flags & BASS_DEVICE_ENABLED;
+            if (isEnabled) ++enabled;
+
+            TRACE(" %d: %s%s", total, info.name, isEnabled ? "" : " (disabled)");
         }
+        TRACE(" Default device index: %d", default_device);
     }
 
     bool isNetworkSource(const char* path)
@@ -58,19 +66,32 @@ namespace CLEO
         LegacyModeDefaultStreamType = (eStreamType)GetPrivateProfileInt("General", "LegacyModeDefaultStreamType", 0, config.c_str());
         allowNetworkSources = GetPrivateProfileInt("General", "AllowNetworkSources", 1, config.c_str()) != 0;
 
-        int default_device, total_devices, enabled_devices;
-        EnumerateBassDevices(total_devices, enabled_devices, default_device);
+        int deviceIndex, total_devices, enabled_devices;
+        EnumerateBassDevices(total_devices, enabled_devices, deviceIndex);
 
-        int forceDevice = GetPrivateProfileInt("General", "AudioDevice", -1, config.c_str());
-        BASS_DEVICEINFO info = { nullptr, nullptr, 0 };
-        if (forceDevice != -1 && BASS_GetDeviceInfo(forceDevice, &info) && (info.flags & BASS_DEVICE_ENABLED))
-            default_device = forceDevice;
+        BASS_DEVICEINFO info = { "Unknown device", nullptr, 0 };
+        BASS_GetDeviceInfo(deviceIndex, &info);
 
-        TRACE("On system found %d devices, %d enabled devices, assuming device to use: %d (%s)",
-            total_devices, enabled_devices, default_device, BASS_GetDeviceInfo(default_device, &info) ?
-            info.name : "Unknown device");
+        int forceIndex = GetPrivateProfileInt("General", "AudioDevice", -1, config.c_str());
+        if (forceIndex != -1)
+        {
+            BASS_DEVICEINFO forceInfo = { "Unknown device", nullptr, 0 };
+            if (BASS_GetDeviceInfo(forceIndex, &forceInfo) && forceInfo.flags & BASS_DEVICE_ENABLED)
+            {
+                TRACE("Force selecting audio device #%d: %s", forceIndex, forceInfo.name);
+                deviceIndex = forceIndex;
+            }
+            else
+            {
+                LOG_WARNING(0, "Failed to force select device #%d! Selecting default audio device #%d: %s", forceIndex, deviceIndex, info.name);
+            }
+        }
+        else
+        {
+            TRACE("Selecting default audio device #%d: %s", deviceIndex, info.name);
+        }
 
-        if (BASS_Init(default_device, 44100, BASS_DEVICE_3D, RsGlobal.ps->window, nullptr) &&
+        if (BASS_Init(deviceIndex, 44100, BASS_DEVICE_3D, RsGlobal.ps->window, nullptr) &&
             BASS_Set3DFactors(1.0f, 3.0f, 80.0f) &&
             BASS_Set3DPosition(&pos, &vel, &front, &top))
         {

diff --git a/cleo_plugins/Text/CTextManager.cpp b/cleo_plugins/Text/CTextManager.cpp
@@ -92,6 +92,9 @@ namespace CLEO
 
     void CTextManager::LoadFxts()
     {
+        TRACE(""); // separator
+        TRACE("Loading CLEO text files...");
+
         // create FXT directory if not present yet
         FS::create_directory(FS::path(Gta_Root_Dir_Path).append("cleo\\cleo_text"));
 
@@ -103,7 +106,7 @@ namespace CLEO
             {
                 std::ifstream stream(list.strings[i]);
                 auto result = ParseFxtFile(stream);
-                TRACE("Added %d new FXT entries from file %s", result, list.strings[i]);
+                TRACE("Added %d new FXT entries from file '%s'", result, list.strings[i]);
             }
             catch (std::exception& ex)
             {

diff --git a/source/CCustomOpcodeSystem.cpp b/source/CCustomOpcodeSystem.cpp
@@ -239,6 +239,7 @@ namespace CLEO
 	{
 		if (initialized) return;
 
+		TRACE(""); // separator
 		TRACE("Initializing CLEO core opcodes...");
 
 		CLEO_RegisterOpcode(0x0051, opcode_0051);

diff --git a/source/CPluginSystem.cpp b/source/CPluginSystem.cpp
@@ -57,6 +57,7 @@ void CPluginSystem::LoadPlugins()
         CLEO_StringListFree(files);
     };
 
+    TRACE(""); // separator
     TRACE("Listing CLEO plugins:");
     ScanPluginsDir(FS::path(Filepath_Cleo).append("cleo_plugins").string(), "SA.", ".cleo");
     ScanPluginsDir(FS::path(Filepath_Cleo).append("cleo_plugins").string(), "", ".cleo"); // legacy plugins in new location
@@ -68,6 +69,7 @@ void CPluginSystem::LoadPlugins()
         for (auto it = paths.crbegin(); it != paths.crend(); it++)
         {
             const auto filename = it->c_str();
+            TRACE(""); // separator
             TRACE("Loading plugin '%s'", filename);
 
             HMODULE hlib = LoadLibrary(filename);
@@ -79,6 +81,7 @@ void CPluginSystem::LoadPlugins()
 
             plugins.push_back(hlib);
         }
+        TRACE(""); // separator
     }
     else
     {

diff --git a/source/CScriptEngine.cpp b/source/CScriptEngine.cpp
@@ -1023,7 +1023,7 @@ namespace CLEO
 
         if (!found.empty())
         {
-            TRACE("Starting CLEO scripts");
+            TRACE("Starting CLEO scripts...");
 
             for (const auto& path : found)
             {
@@ -1476,7 +1476,8 @@ namespace CLEO
         LastSearchPed(0), LastSearchCar(0), LastSearchObj(0),
         CompatVer(CLEO_VER_CUR)
     {
-        TRACE("Loading custom script %s...", szFileName);
+        TRACE(""); // separator
+        TRACE("Loading custom script '%s'...", szFileName);
 
         bIsCustom = true;
         bIsMission = bUseMissionCleanup = bIsMiss;

diff --git a/source/CleoBase.cpp b/source/CleoBase.cpp
@@ -164,6 +164,7 @@ namespace CLEO
 
         saveSlot = MenuManager->m_bWantToLoad ? MenuManager->m_nSelectedSaveGame : -1;
 
+        TRACE(""); // separator
         TRACE("Starting new game, save slot: %d", saveSlot);
 
         // execute registered callbacks
@@ -175,6 +176,7 @@ namespace CLEO
         if (!m_bGameInProgress) return;
         m_bGameInProgress = false;
 
+        TRACE(""); // separator
         TRACE("Ending current game");
         GetInstance().CallCallbacks(eCallbackId::GameEnd); // execute registered callbacks
         ScriptEngine.GameEnd();