Complete namespace changes

camera/camera_driver.c

@@ -130,7 +130,7 @@ bool driver_camera_start(void)
       if (settings->camera.allow)
          return camera_driver->start(camera_data);
 
-      rarch_main_msg_queue_push(
+      runloop_msg_queue_push(
             "Camera is explicitly disabled.\n", 1, 180, false);
    }
    return false;

cheats.c

@@ -309,7 +309,7 @@ void cheat_manager_free(void)
 
 void cheat_manager_update(cheat_manager_t *handle, unsigned handle_idx)
 {
-   char msg[256] = {0};
+   char msg[256];
 
    if (!handle)
       return;
@@ -319,7 +319,7 @@ void cheat_manager_update(cheat_manager_t *handle, unsigned handle_idx)
          (handle->cheats[handle_idx].desc) ? 
          (handle->cheats[handle_idx].desc) : (handle->cheats[handle_idx].code)
          );
-   rarch_main_msg_queue_push(msg, 1, 180, true);
+   runloop_msg_queue_push(msg, 1, 180, true);
    RARCH_LOG("%s\n", msg);
 }
 

cheevos.c

@@ -1207,8 +1207,8 @@ static int cheevos_login(retro_time_t *timeout)
 
    if (!username || !*username || !password || !*password)
    {
-      rarch_main_msg_queue_push("Missing Retro Achievements account information", 0, 5 * 60, false);
-      rarch_main_msg_queue_push("Please fill in your account information in Settings", 0, 5 * 60, false);
+      runloop_msg_queue_push("Missing Retro Achievements account information", 0, 5 * 60, false);
+      runloop_msg_queue_push("Please fill in your account information in Settings", 0, 5 * 60, false);
       RARCH_LOG("CHEEVOS username and/or password not informed\n");
       return -1;
    }
@@ -1236,8 +1236,8 @@ static int cheevos_login(retro_time_t *timeout)
       }
    }
 
-   rarch_main_msg_queue_push("Retro Achievements login error", 0, 5 * 60, false);
-   rarch_main_msg_queue_push("Please make sure your account information is correct", 0, 5 * 60, false);
+   runloop_msg_queue_push("Retro Achievements login error", 0, 5 * 60, false);
+   runloop_msg_queue_push("Please make sure your account information is correct", 0, 5 * 60, false);
    RARCH_LOG("CHEEVOS error getting user token\n");
    return -1;
 }
@@ -1285,8 +1285,8 @@ static void cheevos_test_cheevo_set(const cheevoset_t *set)
          RARCH_LOG("CHEEVOS %s\n", cheevo->title);
          RARCH_LOG("CHEEVOS %s\n", cheevo->description);
 
-         rarch_main_msg_queue_push(cheevo->title, 0, 3 * 60, false);
-         rarch_main_msg_queue_push(cheevo->description, 0, 5 * 60, false);
+         runloop_msg_queue_push(cheevo->title, 0, 3 * 60, false);
+         runloop_msg_queue_push(cheevo->description, 0, 5 * 60, false);
 
          rarch_main_async_job_add(cheevos_unlocker, (void*)(uintptr_t)cheevo->id);
 
@@ -1851,7 +1851,7 @@ int cheevos_load(const void *data)
 
    if (!memory)
    {
-      rarch_main_msg_queue_push("This core doesn't support achievements", 0, 5 * 60, false);
+      runloop_msg_queue_push("This core doesn't support achievements", 0, 5 * 60, false);
       RARCH_LOG("This core doesn't support achievements\n");
       return -1;
    }
@@ -1915,7 +1915,7 @@ int cheevos_load(const void *data)
       }
    }
 
-   rarch_main_msg_queue_push("This game doesn't feature achievements", 0, 5 * 60, false);
+   runloop_msg_queue_push("This game doesn't feature achievements", 0, 5 * 60, false);
    return -1;
 
    found:
@@ -1935,7 +1935,7 @@ int cheevos_load(const void *data)
       free((void*)json);
    }
 
-   rarch_main_msg_queue_push("Error loading achievements", 0, 5 * 60, false);
+   runloop_msg_queue_push("Error loading achievements", 0, 5 * 60, false);
    return -1;
 }
 

command.c

@@ -242,7 +242,7 @@ static bool cmd_set_shader(const char *arg)
    }
 
    snprintf(msg, sizeof(msg), "Shader: \"%s\"", arg);
-   rarch_main_msg_queue_push(msg, 1, 120, true);
+   runloop_msg_queue_push(msg, 1, 120, true);
    RARCH_LOG("%s \"%s\".\n",
          msg_hash_to_str(MSG_APPLYING_SHADER),
          arg);

command_event.c

@@ -128,7 +128,7 @@ static void event_disk_control_set_eject(bool new_state, bool print_log)
 
       /* Only noise in menu. */
       if (print_log)
-         rarch_main_msg_queue_push(msg, 1, 180, true);
+         runloop_msg_queue_push(msg, 1, 180, true);
    }
 }
 
@@ -195,7 +195,7 @@ static void event_disk_control_set_index(unsigned idx)
          RARCH_ERR("%s\n", msg);
       else
          RARCH_LOG("%s\n", msg);
-      rarch_main_msg_queue_push(msg, 1, 180, true);
+      runloop_msg_queue_push(msg, 1, 180, true);
    }
 }
 
@@ -233,7 +233,7 @@ void event_disk_control_append_image(const char *path)
    snprintf(msg, sizeof(msg), "%s: ", msg_hash_to_str(MSG_APPENDED_DISK));
    strlcat(msg, path, sizeof(msg));
    RARCH_LOG("%s\n", msg);
-   rarch_main_msg_queue_push(msg, 0, 180, true);
+   runloop_msg_queue_push(msg, 0, 180, true);
 
    event_command(EVENT_CMD_AUTOSAVE_DEINIT);
 
@@ -340,7 +340,7 @@ static void event_set_volume(float gain)
    settings->audio.volume  = min(settings->audio.volume, 12.0f);
 
    snprintf(msg, sizeof(msg), "Volume: %.1f dB", settings->audio.volume);
-   rarch_main_msg_queue_push(msg, 1, 180, true);
+   runloop_msg_queue_push(msg, 1, 180, true);
    RARCH_LOG("%s\n", msg);
 
    audio_driver_set_volume_gain(db_to_gain(settings->audio.volume));
@@ -490,7 +490,7 @@ static void event_load_auto_state(void)
 
    snprintf(msg, sizeof(msg), "Auto-loading savestate from \"%s\" %s.",
          savestate_name_auto, ret ? "succeeded" : "failed");
-   rarch_main_msg_queue_push(msg, 1, 180, false);
+   runloop_msg_queue_push(msg, 1, 180, false);
    RARCH_LOG("%s\n", msg);
 }
 
@@ -686,7 +686,7 @@ static bool event_save_core_config(void)
             sizeof(config_dir));
    else
    {
-      rarch_main_msg_queue_push_new(MSG_CONFIG_DIRECTORY_NOT_SET, 1, 180, true);
+      runloop_msg_queue_push_new(MSG_CONFIG_DIRECTORY_NOT_SET, 1, 180, true);
       RARCH_ERR("%s\n", msg_hash_to_str(MSG_CONFIG_DIRECTORY_NOT_SET));
       return false;
    }
@@ -755,7 +755,7 @@ static bool event_save_core_config(void)
       RARCH_ERR("%s\n", msg);
    }
 
-   rarch_main_msg_queue_push(msg, 1, 180, true);
+   runloop_msg_queue_push(msg, 1, 180, true);
    global->overrides_active = overrides_active;
    return ret;
 }
@@ -874,7 +874,7 @@ static void event_main_state(unsigned cmd)
    else
       strlcpy(msg, msg_hash_to_str(MSG_CORE_DOES_NOT_SUPPORT_SAVESTATES), sizeof(msg));
 
-   rarch_main_msg_queue_push(msg, 2, 180, true);
+   runloop_msg_queue_push(msg, 2, 180, true);
    RARCH_LOG("%s\n", msg);
 }
 
@@ -937,7 +937,7 @@ bool event_command(enum event_command cmd)
                video_driver_set_video_mode(width, height, true);
 
                snprintf(msg, sizeof(msg),"Resolution: %dx%d",width, height);
-               rarch_main_msg_queue_push(msg, 1, 100, true);
+               runloop_msg_queue_push(msg, 1, 100, true);
             }
          }
 #endif
@@ -1037,7 +1037,7 @@ bool event_command(enum event_command cmd)
          break;
       case EVENT_CMD_RESET:
          RARCH_LOG("%s.\n", msg_hash_to_str(MSG_RESET));
-         rarch_main_msg_queue_push_new(MSG_RESET, 1, 120, true);
+         runloop_msg_queue_push_new(MSG_RESET, 1, 120, true);
 
 #ifdef HAVE_CHEEVOS
          cheevos_set_cheats();
@@ -1177,7 +1177,7 @@ bool event_command(enum event_command cmd)
                return false;
             }
 
-            rarch_main_msg_queue_push(msg, 1, 180, true);
+            runloop_msg_queue_push(msg, 1, 180, true);
             RARCH_LOG("%s\n", msg);
          }
          break;
@@ -1310,7 +1310,7 @@ bool event_command(enum event_command cmd)
          break;
       case EVENT_CMD_SHUTDOWN:
 #if defined(__linux__) && !defined(ANDROID)
-         rarch_main_msg_queue_push("Shutting down...", 1, 180, true);
+         runloop_msg_queue_push("Shutting down...", 1, 180, true);
          rarch_ctl(RARCH_CTL_FORCE_QUIT, NULL);
          system("shutdown -P now");
 #endif
@@ -1505,7 +1505,7 @@ bool event_command(enum event_command cmd)
                event_check_disk_eject(control);
          }
          else
-            rarch_main_msg_queue_push_new(
+            runloop_msg_queue_push_new(
                   MSG_CORE_DOES_NOT_SUPPORT_DISK_OPTIONS,
                   1, 120, true);
          break;
@@ -1525,7 +1525,7 @@ bool event_command(enum event_command cmd)
             event_check_disk_next(control);
          }
          else
-            rarch_main_msg_queue_push_new(
+            runloop_msg_queue_push_new(
                   MSG_CORE_DOES_NOT_SUPPORT_DISK_OPTIONS,
                   1, 120, true);
          break;
@@ -1545,7 +1545,7 @@ bool event_command(enum event_command cmd)
             event_check_disk_prev(control);
          }
          else
-            rarch_main_msg_queue_push_new(
+            runloop_msg_queue_push_new(
                   MSG_CORE_DOES_NOT_SUPPORT_DISK_OPTIONS,
                   1, 120, true);
          break;

configuration.c

@@ -2045,7 +2045,7 @@ bool config_load_override(void)
    /* Restore the libretro_path we're using
     * since it will be overwritten by the override when reloading. */
    strlcpy(settings->libretro,buf,sizeof(settings->libretro));
-   rarch_main_msg_queue_push("Configuration override loaded", 1, 100, true);
+   runloop_msg_queue_push("Configuration override loaded", 1, 100, true);
 
    /* Reset save paths */
    global->has_set.save_path  = true;
@@ -2157,7 +2157,7 @@ bool config_load_remap(void)
       RARCH_LOG("Remaps: game-specific remap found at %s\n", game_path);
       if (input_remapping_load_file(new_conf, game_path))
       {
-         rarch_main_msg_queue_push("Game remap file loaded", 1, 100, true);
+         runloop_msg_queue_push("Game remap file loaded", 1, 100, true);
          return true;
       }
    }
@@ -2177,7 +2177,7 @@ bool config_load_remap(void)
       RARCH_LOG("Remaps: core-specific remap found at %s\n", core_path);
       if (input_remapping_load_file(new_conf, core_path))
       {
-         rarch_main_msg_queue_push("Core remap file loaded", 1, 100, true);
+         runloop_msg_queue_push("Core remap file loaded", 1, 100, true);
          return true;
       }
    }

driver.c

@@ -311,7 +311,7 @@ bool driver_update_system_av_info(const void *data)
     * Take the easiest route out and just restart the recording. */
    if (recording_driver_get_data_ptr())
    {
-      rarch_main_msg_queue_push_new(
+      runloop_msg_queue_push_new(
             MSG_RESTARTING_RECORDING_DUE_TO_DRIVER_REINIT, 2, 180, false);
       event_command(EVENT_CMD_RECORD_DEINIT);
       event_command(EVENT_CMD_RECORD_INIT);

dynamic.c

@@ -658,7 +658,7 @@ bool rarch_environment_cb(unsigned cmd, void *data)
       {
          const struct retro_message *msg = (const struct retro_message*)data;
          RARCH_LOG("Environ SET_MESSAGE: %s\n", msg->msg);
-         rarch_main_msg_queue_push(msg->msg, 1, msg->frames, true);
+         runloop_msg_queue_push(msg->msg, 1, msg->frames, true);
          break;
       }
 

gfx/common/x11_common.c

@@ -543,7 +543,7 @@ void x11_update_window_title(void *data)
             buf_fps, sizeof(buf_fps)))
       XStoreName(g_x11_dpy, g_x11_win, buf);
    if (settings->fps_show)
-      rarch_main_msg_queue_push(buf_fps, 1, 1, false);
+      runloop_msg_queue_push(buf_fps, 1, 1, false);
 }
 
 bool x11_input_ctx_new(bool true_full)

gfx/drivers/exynos_gfx.c

@@ -1305,7 +1305,7 @@ static bool exynos_gfx_frame(void *data, const void *frame, unsigned width,
       char buffer_fps[128] = {0};
       video_monitor_get_fps(buffer, sizeof(buffer),
             settings->fps_show ? buffer_fps : NULL, sizeof(buffer_fps));
-      rarch_main_msg_queue_push(buffer_fps, 1, 1, false);
+      runloop_msg_queue_push(buffer_fps, 1, 1, false);
    }
 
    /* If at this point the dimension parameters are still zero, setup some  *

gfx/drivers_context/androidegl_ctx.c

@@ -132,7 +132,7 @@ static void android_gfx_ctx_update_window_title(void *data)
    video_monitor_get_fps(buf, sizeof(buf),
          buf_fps, sizeof(buf_fps));
    if (settings->fps_show)
-      rarch_main_msg_queue_push(buf_fps, 1, 1, false);
+      runloop_msg_queue_push(buf_fps, 1, 1, false);
 }
 
 static bool android_gfx_ctx_set_video_mode(void *data,

gfx/drivers_context/bbqnx_ctx.c

@@ -265,7 +265,7 @@ static void gfx_ctx_qnx_update_window_title(void *data)
    video_monitor_get_fps(buf, sizeof(buf),
          buf_fps, sizeof(buf_fps));
    if (settings->fps_show)
-      rarch_main_msg_queue_push(buf_fps, 1, 1, false);
+      runloop_msg_queue_push(buf_fps, 1, 1, false);
 }
 
 static bool gfx_ctx_qnx_set_video_mode(void *data,

gfx/drivers_context/cgl_ctx.c

@@ -122,7 +122,7 @@ static void gfx_ctx_cgl_update_window_title(void *data)
    video_monitor_get_fps(buf, sizeof(buf),
       buf_fps, sizeof(buf_fps));
    if (settings->fps_show)
-      rarch_main_msg_queue_push(buf_fps, 1, 1, false);
+      runloop_msg_queue_push(buf_fps, 1, 1, false);
 }
 
 

gfx/drivers_context/cocoa_gl_ctx.m

@@ -375,7 +375,7 @@ static void cocoagl_gfx_ctx_update_window_title(void *data)
        [[g_view window] setTitle:[NSString stringWithCString:text encoding:NSUTF8StringEncoding]];
 #endif
     if (settings->fps_show)
-        rarch_main_msg_queue_push(buf_fps, 1, 1, false);
+        runloop_msg_queue_push(buf_fps, 1, 1, false);
 }
 
 static bool cocoagl_gfx_ctx_get_metrics(void *data, enum display_metric_types type,

gfx/drivers_context/d3d_ctx.cpp

@@ -104,7 +104,7 @@ static void gfx_ctx_d3d_update_title(void *data)
             stat.dwAvailPhys/(1024.0f*1024.0f), stat.dwTotalPhys/(1024.0f*1024.0f));
       strlcat(buffer_fps, mem, sizeof(buffer_fps));
 #endif
-      rarch_main_msg_queue_push(buffer_fps, 1, 1, false);
+      runloop_msg_queue_push(buffer_fps, 1, 1, false);
    }
 }
 

gfx/drivers_context/drm_egl_ctx.c

@@ -244,7 +244,7 @@ static void gfx_ctx_drm_egl_update_window_title(void *data)
    video_monitor_get_fps(buf, sizeof(buf),
          buf_fps, sizeof(buf_fps));
    if (settings->fps_show)
-      rarch_main_msg_queue_push( buf_fps, 1, 1, false);
+      runloop_msg_queue_push( buf_fps, 1, 1, false);
 }
 
 static void gfx_ctx_drm_egl_get_video_size(void *data,

gfx/drivers_context/emscriptenegl_ctx.c

@@ -88,7 +88,7 @@ static void gfx_ctx_emscripten_update_window_title(void *data)
    video_monitor_get_fps(buf, sizeof(buf),
          buf_fps, sizeof(buf_fps));
    if (settings->fps_show)
-      rarch_main_msg_queue_push(buf_fps, 1, 1, false);
+      runloop_msg_queue_push(buf_fps, 1, 1, false);
 }
 
 static void gfx_ctx_emscripten_get_video_size(void *data,

gfx/drivers_context/mali_fbdev_ctx.c

@@ -134,7 +134,7 @@ static void gfx_ctx_mali_fbdev_update_window_title(void *data)
    video_monitor_get_fps(buf, sizeof(buf),
          buf_fps, sizeof(buf_fps));
    if (settings->fps_show)
-      rarch_main_msg_queue_push(buf_fps, 1, 1, false);
+      runloop_msg_queue_push(buf_fps, 1, 1, false);
 }
 
 static bool gfx_ctx_mali_fbdev_set_video_mode(void *data,

gfx/drivers_context/ps3_ctx.c

@@ -201,7 +201,7 @@ static void gfx_ctx_ps3_update_window_title(void *data)
    video_monitor_get_fps(buf, sizeof(buf),
          buf_fps, sizeof(buf_fps));
    if (settings->fps_show)
-      rarch_main_msg_queue_push(buf_fps, 1, 1, false);
+      runloop_msg_queue_push(buf_fps, 1, 1, false);
 }
 
 static void gfx_ctx_ps3_get_video_size(void *data,

gfx/drivers_context/sdl_gl_ctx.c

@@ -284,7 +284,7 @@ static void sdl_ctx_update_window_title(void *data)
 #endif
    }
    if (settings->fps_show)
-      rarch_main_msg_queue_push(buf_fps, 1, 1, false);
+      runloop_msg_queue_push(buf_fps, 1, 1, false);
 }
 
 static void sdl_ctx_check_window(void *data, bool *quit, bool *resize,unsigned *width,

gfx/drivers_context/vc_egl_ctx.c

@@ -91,7 +91,7 @@ static void gfx_ctx_vc_update_window_title(void *data)
    video_monitor_get_fps(buf, sizeof(buf),
          buf_fps, sizeof(buf_fps));
    if (settings->fps_show)
-      rarch_main_msg_queue_push(buf_fps, 1, 1, false);
+      runloop_msg_queue_push(buf_fps, 1, 1, false);
 }
 
 static void gfx_ctx_vc_get_video_size(void *data,