[mcp] Fix async load rom

Author: drhelius

platforms/shared/desktop/emu.cpp

@@ -117,36 +117,6 @@ void emu_destroy(void)
         SafeDeleteArray(emu_savestates_screenshots[i].data);
 }
 
-bool emu_load_media(const char* file_path)
-{
-    if (loading_state.load() != Loading_State_None)
-        return false;
-
-    emu_debug_command = Debug_Command_None;
-    reset_buffers();
-
-    save_ram();
-    save_mb128();
-
-    loading_state.store(Loading_State_Loading);
-    bool success = geargrafx->LoadMedia(file_path);
-    loading_state.store(Loading_State_None);
-
-    if (!success)
-        return false;
-
-    emu_audio_reset();
-    load_ram();
-    load_mb128();
-
-    if (config_debug.debug && (config_debug.dis_look_ahead_count > 0))
-        geargrafx->GetHuC6280()->DisassembleAhead(config_debug.dis_look_ahead_count);
-
-    update_savestates_data();
-
-    return true;
-}
-
 static void load_media_thread_func(void)
 {
     loading_result = geargrafx->LoadMedia(loading_file_path);

platforms/shared/desktop/emu.h

@@ -65,7 +65,6 @@ EXTERN bool emu_debug_irq_breakpoints;
 EXTERN bool emu_init(GG_Input_Pump_Fn input_pump_fn);
 EXTERN void emu_destroy(void);
 EXTERN void emu_update(void);
-EXTERN bool emu_load_media(const char* file_path);
 EXTERN void emu_load_media_async(const char* file_path);
 EXTERN bool emu_is_media_loading(void);
 EXTERN bool emu_finish_media_loading(void);

platforms/shared/desktop/mcp/mcp_debug_adapter.cpp

@@ -32,6 +32,8 @@
 #include <iomanip>
 #include <vector>
 #include <algorithm>
+#include <thread>
+#include <chrono>
 
 struct DisassemblerBookmark
 {
@@ -1326,7 +1328,24 @@ json DebugAdapter::LoadMedia(const std::string& file_path)
         return result;
     }
 
-    if (!emu_load_media(file_path.c_str()) || !m_core || !m_core->GetMedia()->IsReady())
+    emu_load_media_async(file_path.c_str());
+
+    int timeout_ms = 180000;
+    int elapsed_ms = 0;
+    while (emu_is_media_loading() && elapsed_ms < timeout_ms)
+    {
+        std::this_thread::sleep_for(std::chrono::milliseconds(500));
+        elapsed_ms += 500;
+    }
+
+    if (emu_is_media_loading())
+    {
+        result["error"] = "Loading timed out";
+        Log("[MCP] LoadMedia timed out: %s", file_path.c_str());
+        return result;
+    }
+
+    if (!emu_finish_media_loading() || !m_core || !m_core->GetMedia()->IsReady())
     {
         result["error"] = "Failed to load media file";
         Log("[MCP] LoadMedia failed: %s", file_path.c_str());