Rename rarch_main_iterate and rarch_main_data_iterate

frontend/drivers/platform_emscripten.c

@@ -29,10 +29,10 @@
 static void emscripten_mainloop(void)
 {
    unsigned sleep_ms = 0;
-   int ret = rarch_main_iterate(&sleep_ms);
+   int ret = runloop_iterate(&sleep_ms);
    if (ret == 1 && sleep_ms > 0)
       retro_sleep(sleep_ms);
-   rarch_main_data_iterate();
+   runloop_data_iterate();
    if (ret != -1)
       return;
 

frontend/drivers/platform_linux.c

@@ -773,11 +773,11 @@ static void android_app_entry(void *data)
    do
    {
       unsigned sleep_ms = 0;
-      ret = rarch_main_iterate(&sleep_ms);
+      ret = runloop_iterate(&sleep_ms);
 
       if (ret == 1 && sleep_ms > 0)
          retro_sleep(sleep_ms);
-      rarch_main_data_iterate();
+      runloop_data_iterate();
    }while (ret != -1);
 
    main_exit(data);

frontend/frontend.c

@@ -303,11 +303,11 @@ int rarch_main(int argc, char *argv[], void *data)
    do
    {
       unsigned sleep_ms = 0;
-      ret = rarch_main_iterate(&sleep_ms);
+      ret = runloop_iterate(&sleep_ms);
 
       if (ret == 1 && sleep_ms > 0)
          retro_sleep(sleep_ms);
-      rarch_main_data_iterate();
+      runloop_data_iterate();
    }while(ret != -1);
 
    main_exit(args);

menu/cbs/menu_cbs_select.c

@@ -78,7 +78,7 @@ static int action_select_default(const char *path, const char *label, unsigned t
    if (action != MENU_ACTION_NOOP)
        ret = menu_entry_action(&entry, idx, action);
 
-   rarch_main_data_iterate();
+   runloop_data_iterate();
     
    return ret;
 }

runloop.c

@@ -1050,7 +1050,7 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
 
 
 #ifdef HAVE_OVERLAY
-static void rarch_main_iterate_linefeed_overlay(settings_t *settings)
+static void runloop_iterate_linefeed_overlay(settings_t *settings)
 {
    static char prev_overlay_restore = false;
    bool osk_enable = input_driver_ctl(RARCH_INPUT_CTL_IS_OSK_ENABLED, NULL);
@@ -1086,7 +1086,7 @@ static void rarch_main_iterate_linefeed_overlay(settings_t *settings)
  * d) Video driver no longer alive.
  * e) End of BSV movie and BSV EOF exit is true. (TODO/FIXME - explain better)
  */
-static INLINE int rarch_main_iterate_time_to_exit(bool quit_key_pressed)
+static INLINE int runloop_iterate_time_to_exit(bool quit_key_pressed)
 {
    bool time_to_exit             = runloop_ctl(RUNLOOP_CTL_IS_SHUTDOWN, NULL) || quit_key_pressed;
    time_to_exit                  = time_to_exit || (video_driver_ctl(RARCH_DISPLAY_CTL_IS_ALIVE, NULL) == false);
@@ -1124,14 +1124,14 @@ static INLINE int rarch_main_iterate_time_to_exit(bool quit_key_pressed)
 }
 
 /**
- * rarch_main_iterate:
+ * runloop_iterate:
  *
  * Run Libretro core in RetroArch for one frame.
  *
  * Returns: 0 on success, 1 if we have to wait until button input in order
  * to wake up the loop, -1 if we forcibly quit out of the RetroArch iteration loop.
  **/
-int rarch_main_iterate(unsigned *sleep_ms)
+int runloop_iterate(unsigned *sleep_ms)
 {
    unsigned i;
    event_cmd_state_t    cmd;
@@ -1246,10 +1246,10 @@ int rarch_main_iterate(unsigned *sleep_ms)
 #endif
 
 #ifdef HAVE_OVERLAY
-   rarch_main_iterate_linefeed_overlay(settings);
+   runloop_iterate_linefeed_overlay(settings);
 #endif
 
-   if (rarch_main_iterate_time_to_exit(rarch_main_cmd_press(cmd_ptr, RARCH_QUIT_KEY)) != 1)
+   if (runloop_iterate_time_to_exit(rarch_main_cmd_press(cmd_ptr, RARCH_QUIT_KEY)) != 1)
    {
       frame_limit_last_time = 0.0;
       return -1;
@@ -1367,7 +1367,7 @@ end:
    return 0;
 }
 
-void rarch_main_data_iterate(void)
+void runloop_data_iterate(void)
 {
    rarch_task_check();
 }

runloop.h

@@ -288,14 +288,14 @@ typedef struct global
 global_t *global_get_ptr(void);
 
 /**
- * rarch_main_iterate:
+ * runloop_iterate:
  *
  * Run Libretro core in RetroArch for one frame.
  *
  * Returns: 0 on successful run, 1 if we have to wait until button input in order
  * to wake up the loop, -1 if we forcibly quit out of the RetroArch iteration loop. 
  **/
-int rarch_main_iterate(unsigned *sleep_ms);
+int runloop_iterate(unsigned *sleep_ms);
 
 void rarch_main_msg_queue_push(const char *msg, unsigned prio,
       unsigned duration, bool flush);
@@ -311,7 +311,7 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data);
 
 typedef int (*transfer_cb_t)(void *data, size_t len);
 
-void rarch_main_data_iterate(void);
+void runloop_data_iterate(void);
 
 #ifdef __cplusplus
 }

ui/drivers/cocoa/cocoatouch_menu.m

@@ -750,7 +750,7 @@ didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 - (void)menuSelect: (uint32_t) i
 {
   menu_entry_select(i);
-  rarch_main_data_iterate();
+  runloop_data_iterate();
 }
 
 - (void)menuBack

ui/drivers/ui_cocoa.m

@@ -229,10 +229,10 @@ static void poll_iteration(void)
     {
        unsigned sleep_ms = 0;
        poll_iteration();
-       ret = rarch_main_iterate(&sleep_ms);
+       ret = runloop_iterate(&sleep_ms);
        if (ret == 1 && sleep_ms > 0)
           retro_sleep(sleep_ms);
-       rarch_main_data_iterate();
+       runloop_data_iterate();
        while(CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.002, FALSE) == kCFRunLoopRunHandledSource);
     }
     

ui/drivers/ui_cocoatouch.m

@@ -75,11 +75,11 @@ static void rarch_draw_observer(CFRunLoopObserverRef observer,
     CFRunLoopActivity activity, void *info)
 {
    unsigned sleep_ms  = 0;
-   int ret            = rarch_main_iterate(&sleep_ms);
+   int ret            = runloop_iterate(&sleep_ms);
 
    if (ret == 1 && !ui_companion_is_on_foreground() && sleep_ms > 0)
       retro_sleep(sleep_ms);
-   rarch_main_data_iterate();
+   runloop_data_iterate();
 
    if (ret == -1)
    {