From e4384c5a10817738727eb12875fc13a532e526a4 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 2 Jul 2015 18:46:27 +0200
Subject: [PATCH] Updates pt .3

---
 intl/english.h     |  8 --------
 intl/msg_hash_us.c |  4 ++++
 msg_hash.h         |  3 +++
 runloop.c          | 13 ++++++-------
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/intl/english.h b/intl/english.h
index 244b1ed27a..1278c19b2b 100644
--- a/intl/english.h
+++ b/intl/english.h
@@ -81,12 +81,4 @@
 #define RETRO_LBL_GRAB_MOUSE_TOGGLE "Grab mouse toggle"
 #define RETRO_LBL_MENU_TOGGLE "Menu toggle"
 
-#define TERM_STR "\n"
-
-#define RETRO_MSG_MOVIE_RECORD_STOPPING "Stopping movie record."
-#define RETRO_MSG_MOVIE_PLAYBACK_ENDED "Movie playback ended."
-
-#define RETRO_LOG_MOVIE_RECORD_STOPPING RETRO_MSG_MOVIE_RECORD_STOPPING TERM_STR
-#define RETRO_LOG_MOVIE_PLAYBACK_ENDED RETRO_MSG_MOVIE_PLAYBACK_ENDED TERM_STR
-
 #endif
diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c
index 8b8e55471f..20b0feb3f2 100644
--- a/intl/msg_hash_us.c
+++ b/intl/msg_hash_us.c
@@ -20,6 +20,10 @@ const char *msg_hash_to_str_us(uint32_t hash)
 {
    switch (hash)
    {
+      case MSG_MOVIE_RECORD_STOPPED:
+         return "Stopping movie record.";
+      case MSG_MOVIE_PLAYBACK_ENDED:
+         return "Movie playback ended.";
       case MSG_AUTOSAVE_FAILED:
          return "Could not initialize autosave.";
       case MSG_NETPLAY_FAILED_MOVIE_PLAYBACK_HAS_STARTED:
diff --git a/msg_hash.h b/msg_hash.h
index b676b341f1..cea1706008 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -48,6 +48,9 @@
 
 #define MSG_AUTOSAVE_FAILED                           0x9a02d8d1U
 
+#define MSG_MOVIE_RECORD_STOPPED                      0xbc7832c1U
+#define MSG_MOVIE_PLAYBACK_ENDED                      0xbeadce2aU
+
 #define MSG_TAKING_SCREENSHOT                         0xdcfda0e0U
 #define MSG_FAILED_TO_TAKE_SCREENSHOT                 0x7a480a2dU
 
diff --git a/runloop.c b/runloop.c
index fce3d8a171..446a311e3e 100644
--- a/runloop.c
+++ b/runloop.c
@@ -25,7 +25,6 @@
 #include "configuration.h"
 #include "dynamic.h"
 #include "performance.h"
-#include "intl/intl.h"
 #include "retroarch.h"
 #include "runloop.h"
 #include "runloop_data.h"
@@ -309,9 +308,9 @@ static bool check_movie_record(void)
    if (!global->bsv.movie)
       return false;
 
-   rarch_main_msg_queue_push(
-         RETRO_MSG_MOVIE_RECORD_STOPPING, 2, 180, true);
-   RARCH_LOG(RETRO_LOG_MOVIE_RECORD_STOPPING);
+   rarch_main_msg_queue_push_new(
+         MSG_MOVIE_RECORD_STOPPED, 2, 180, true);
+   RARCH_LOG("%s\n", msg_hash_to_str(MSG_MOVIE_RECORD_STOPPED));
 
    event_command(EVENT_CMD_BSV_MOVIE_DEINIT);
 
@@ -331,9 +330,9 @@ static bool check_movie_playback(void)
    if (!global->bsv.movie_end)
       return false;
 
-   rarch_main_msg_queue_push(
-         RETRO_MSG_MOVIE_PLAYBACK_ENDED, 1, 180, false);
-   RARCH_LOG(RETRO_LOG_MOVIE_PLAYBACK_ENDED);
+   rarch_main_msg_queue_push_new(
+         MSG_MOVIE_PLAYBACK_ENDED, 1, 180, false);
+   RARCH_LOG("%s\n", msg_hash_to_str(MSG_MOVIE_PLAYBACK_ENDED));
 
    event_command(EVENT_CMD_BSV_MOVIE_DEINIT);