From ec45dbaf0cd067b2d862dd117fa52de3a6746b9a Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 17 Sep 2016 12:56:19 +0200
Subject: [PATCH] Move retroarch_path_is_media_type to paths.c

---
 menu/menu_displaylist.c |  3 ++-
 paths.c                 | 57 +++++++++++++++++++++++++++++++++++++++
 paths.h                 |  2 ++
 retroarch.c             | 59 +----------------------------------------
 tasks/task_content.c    |  2 +-
 5 files changed, 63 insertions(+), 60 deletions(-)

diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index df96b36e17..0e435de683 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -53,6 +53,7 @@
 #include "../defaults.h"
 #include "../managers/cheat_manager.h"
 #include "../managers/core_option_manager.h"
+#include "../paths.h"
 #include "../retroarch.h"
 #include "../runloop.h"
 #include "../core.h"
@@ -3485,7 +3486,7 @@ static int menu_displaylist_parse_generic(
       if (settings->multimedia.builtin_mediaplayer_enable ||
             settings->multimedia.builtin_imageviewer_enable)
       {
-         switch (retroarch_path_is_media_type(path))
+         switch (path_is_media_type(path))
          {
             case RARCH_CONTENT_MOVIE:
 #ifdef HAVE_FFMPEG
diff --git a/paths.c b/paths.c
index 1f5f1853ed..799fc26538 100644
--- a/paths.c
+++ b/paths.c
@@ -454,3 +454,60 @@ const char *path_get_config(void)
 
    return NULL;
 }
+
+enum rarch_content_type path_is_media_type(const char *path)
+{
+   char ext_lower[PATH_MAX_LENGTH] = {0};
+
+   strlcpy(ext_lower, path_get_extension(path), sizeof(ext_lower));
+
+   string_to_lower(ext_lower);
+
+   switch (msg_hash_to_file_type(msg_hash_calculate(ext_lower)))
+   {
+#ifdef HAVE_FFMPEG
+      case FILE_TYPE_OGM:
+      case FILE_TYPE_MKV:
+      case FILE_TYPE_AVI:
+      case FILE_TYPE_MP4:
+      case FILE_TYPE_FLV:
+      case FILE_TYPE_WEBM:
+      case FILE_TYPE_3GP:
+      case FILE_TYPE_3G2:
+      case FILE_TYPE_F4F:
+      case FILE_TYPE_F4V:
+      case FILE_TYPE_MOV:
+      case FILE_TYPE_WMV:
+      case FILE_TYPE_MPG:
+      case FILE_TYPE_MPEG:
+      case FILE_TYPE_VOB:
+      case FILE_TYPE_ASF:
+      case FILE_TYPE_DIVX:
+      case FILE_TYPE_M2P:
+      case FILE_TYPE_M2TS:
+      case FILE_TYPE_PS:
+      case FILE_TYPE_TS:
+      case FILE_TYPE_MXF:
+         return RARCH_CONTENT_MOVIE;
+      case FILE_TYPE_WMA:
+      case FILE_TYPE_OGG:
+      case FILE_TYPE_MP3:
+      case FILE_TYPE_M4A:
+      case FILE_TYPE_FLAC:
+      case FILE_TYPE_WAV:
+         return RARCH_CONTENT_MUSIC;
+#endif
+#ifdef HAVE_IMAGEVIEWER
+      case FILE_TYPE_JPEG:
+      case FILE_TYPE_PNG:
+      case FILE_TYPE_TGA:
+      case FILE_TYPE_BMP:
+         return RARCH_CONTENT_IMAGE;
+#endif
+      case FILE_TYPE_NONE:
+      default:
+         break;
+   }
+
+   return RARCH_CONTENT_NONE;
+}
diff --git a/paths.h b/paths.h
index 69cdf993dd..f50829b2dd 100644
--- a/paths.h
+++ b/paths.h
@@ -49,6 +49,8 @@ void path_clear_core(void);
 
 const char *path_get_config(void);
 
+enum rarch_content_type path_is_media_type(const char *path);
+
 RETRO_END_DECLS
 
 #endif
diff --git a/retroarch.c b/retroarch.c
index aa3eb5eab9..bfcd9b2166 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -338,63 +338,6 @@ static void retroarch_print_help(const char *arg0)
         "then exits.\n");
 }
 
-enum rarch_content_type retroarch_path_is_media_type(const char *path)
-{
-   char ext_lower[PATH_MAX_LENGTH] = {0};
-
-   strlcpy(ext_lower, path_get_extension(path), sizeof(ext_lower));
-
-   string_to_lower(ext_lower);
-
-   switch (msg_hash_to_file_type(msg_hash_calculate(ext_lower)))
-   {
-#ifdef HAVE_FFMPEG
-      case FILE_TYPE_OGM:
-      case FILE_TYPE_MKV:
-      case FILE_TYPE_AVI:
-      case FILE_TYPE_MP4:
-      case FILE_TYPE_FLV:
-      case FILE_TYPE_WEBM:
-      case FILE_TYPE_3GP:
-      case FILE_TYPE_3G2:
-      case FILE_TYPE_F4F:
-      case FILE_TYPE_F4V:
-      case FILE_TYPE_MOV:
-      case FILE_TYPE_WMV:
-      case FILE_TYPE_MPG:
-      case FILE_TYPE_MPEG:
-      case FILE_TYPE_VOB:
-      case FILE_TYPE_ASF:
-      case FILE_TYPE_DIVX:
-      case FILE_TYPE_M2P:
-      case FILE_TYPE_M2TS:
-      case FILE_TYPE_PS:
-      case FILE_TYPE_TS:
-      case FILE_TYPE_MXF:
-         return RARCH_CONTENT_MOVIE;
-      case FILE_TYPE_WMA:
-      case FILE_TYPE_OGG:
-      case FILE_TYPE_MP3:
-      case FILE_TYPE_M4A:
-      case FILE_TYPE_FLAC:
-      case FILE_TYPE_WAV:
-         return RARCH_CONTENT_MUSIC;
-#endif
-#ifdef HAVE_IMAGEVIEWER
-      case FILE_TYPE_JPEG:
-      case FILE_TYPE_PNG:
-      case FILE_TYPE_TGA:
-      case FILE_TYPE_BMP:
-         return RARCH_CONTENT_IMAGE;
-#endif
-      case FILE_TYPE_NONE:
-      default:
-         break;
-   }
-
-   return RARCH_CONTENT_NONE;
-}
-
 #define FFMPEG_RECORD_ARG "r:"
 
 #ifdef HAVE_DYNAMIC
@@ -984,7 +927,7 @@ static void retroarch_main_init_media(void)
    if (string_is_empty(fullpath))
       return;
 
-   switch (retroarch_path_is_media_type(fullpath))
+   switch (path_is_media_type(fullpath))
    {
       case RARCH_CONTENT_MOVIE:
       case RARCH_CONTENT_MUSIC:
diff --git a/tasks/task_content.c b/tasks/task_content.c
index 8240347451..152e2f8c1a 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -1693,7 +1693,7 @@ static bool task_load_content(content_ctx_info_t *content_info,
          const char *core_name            = NULL;
          playlist_t *playlist_tmp         = g_defaults.content_history;
 
-         switch (retroarch_path_is_media_type(tmp))
+         switch (path_is_media_type(tmp))
          {
             case RARCH_CONTENT_MOVIE:
 #ifdef HAVE_FFMPEG