Header cleanups

command.c

@@ -89,6 +89,7 @@
 #include "managers/cheat_manager.h"
 #include "managers/state_manager.h"
 #include "ui/ui_companion_driver.h"
+#include "tasks/task_content.h"
 #include "tasks/tasks_internal.h"
 #include "list_special.h"
 

configuration.c

@@ -50,6 +50,7 @@
 #include "verbosity.h"
 #include "lakka.h"
 
+#include "tasks/task_content.h"
 #include "tasks/tasks_internal.h"
 
 #include "../list_special.h"

frontend/frontend.c

@@ -29,9 +29,10 @@
 #endif
 
 #include "frontend.h"
+#include "frontend_driver.h"
 #include "../configuration.h"
 #include "../ui/ui_companion_driver.h"
-#include "../tasks/tasks_internal.h"
+#include "../tasks/task_content.h"
 
 #include "../driver.h"
 #include "../paths.h"

gfx/common/win32_common.c

@@ -44,6 +44,7 @@
 #include "../../driver.h"
 #include "../../paths.h"
 #include "../../retroarch.h"
+#include "../../tasks/task_content.h"
 #include "../../tasks/tasks_internal.h"
 #include "../../core_info.h"
 
@@ -51,7 +52,6 @@
 
 #include <commdlg.h>
 #include <dbt.h>
-#include "../../retroarch.h"
 #include "../../input/input_driver.h"
 #include "../../input/input_keymaps.h"
 #include "../video_thread_wrapper.h"

menu/cbs/menu_cbs_ok.c

@@ -57,6 +57,7 @@
 #include "../../defaults.h"
 #include "../../managers/core_option_manager.h"
 #include "../../managers/cheat_manager.h"
+#include "../../tasks/task_content.h"
 #include "../../tasks/task_file_transfer.h"
 #include "../../tasks/tasks_internal.h"
 #include "../../input/input_remapping.h"

menu/drivers/ozone/ozone.c

@@ -48,6 +48,7 @@
 #include "../../../core_info.h"
 #include "../../../core.h"
 #include "../../../verbosity.h"
+#include "../../../tasks/task_powerstate.h"
 #include "../../../tasks/tasks_internal.h"
 #include "../../../dynamic.h"
 

menu/drivers/xmb.c

@@ -60,6 +60,7 @@
 #include "../../playlist.h"
 #include "../../retroarch.h"
 
+#include "../../tasks/task_powerstate.h"
 #include "../../tasks/tasks_internal.h"
 
 #include "../../cheevos/badges.h"

network/netplay/netplay_frontend.c

@@ -36,7 +36,9 @@
 #include "netplay_private.h"
 
 #include "../../configuration.h"
+#include "../../frontend/frontend_driver.h"
 #include "../../input/input_driver.h"
+#include "../../tasks/task_content.h"
 #include "../../tasks/tasks_internal.h"
 #include "../../file_path_special.h"
 #include "../../paths.h"

retroarch.c

@@ -112,6 +112,7 @@
 #include "managers/core_option_manager.h"
 #include "managers/cheat_manager.h"
 #include "managers/state_manager.h"
+#include "tasks/task_content.h"
 #include "tasks/tasks_internal.h"
 #include "performance_counters.h"
 

tasks/task_content.c

@@ -69,6 +69,7 @@
 #include "../cheevos/cheevos.h"
 #endif
 
+#include "task_content.h"
 #include "tasks_internal.h"
 
 #include "../command.h"

tasks/task_content.h

@@ -0,0 +1,117 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2017 - Higor Euripedes
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef TASKS_HANDLER_CONTENT_H
+#define TASKS_HANDLER_CONTENT_H
+
+#include <stdint.h>
+
+#include <boolean.h>
+#include <retro_common_api.h>
+#include <retro_miscellaneous.h>
+
+#include <queues/task_queue.h>
+
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
+#include "../content.h"
+#include "../core_type.h"
+
+RETRO_BEGIN_DECLS
+
+enum content_mode_load
+{
+   CONTENT_MODE_LOAD_NONE = 0,
+   CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_MENU,
+   CONTENT_MODE_LOAD_CONTENT_WITH_FFMPEG_CORE_FROM_MENU,
+   CONTENT_MODE_LOAD_CONTENT_WITH_IMAGEVIEWER_CORE_FROM_MENU
+};
+
+bool task_push_load_content_with_current_core_from_companion_ui(
+      const char *fullpath,
+      content_ctx_info_t *content_info,
+      enum rarch_core_type type,
+      retro_task_callback_t cb,
+      void *user_data);
+
+bool task_push_load_content_from_cli(
+      const char *core_path,
+      const char *fullpath,
+      content_ctx_info_t *content_info,
+      enum rarch_core_type type,
+      retro_task_callback_t cb,
+      void *user_data);
+
+bool task_push_load_new_core(
+      const char *core_path,
+      const char *fullpath,
+      content_ctx_info_t *content_info,
+      enum rarch_core_type type,
+      retro_task_callback_t cb,
+      void *user_data);
+
+bool task_push_start_builtin_core(content_ctx_info_t *content_info,
+      enum rarch_core_type type,
+      retro_task_callback_t cb,
+      void *user_data);
+
+bool task_push_start_current_core(content_ctx_info_t *content_info);
+
+bool task_push_start_dummy_core(content_ctx_info_t *content_info);
+
+bool task_push_load_content_with_new_core_from_companion_ui(
+      const char *core_path,
+      const char *fullpath,
+      const char *label,
+      content_ctx_info_t *content_info,
+      retro_task_callback_t cb,
+      void *user_data);
+
+#ifdef HAVE_MENU
+bool task_push_load_content_with_new_core_from_menu(
+      const char *core_path,
+      const char *fullpath,
+      content_ctx_info_t *content_info,
+      enum rarch_core_type type,
+      retro_task_callback_t cb,
+      void *user_data);
+
+bool task_push_load_content_from_playlist_from_menu(
+      const char *core_path,
+      const char *fullpath,
+      const char *label,
+      content_ctx_info_t *content_info,
+      retro_task_callback_t cb,
+      void *user_data);
+
+bool task_push_load_content_with_core_from_menu(
+      const char *fullpath,
+      content_ctx_info_t *content_info,
+      enum rarch_core_type type,
+      retro_task_callback_t cb,
+      void *user_data);
+bool task_push_load_subsystem_with_core_from_menu(
+      const char *fullpath,
+      content_ctx_info_t *content_info,
+      enum rarch_core_type type,
+      retro_task_callback_t cb,
+      void *user_data);
+#endif
+
+RETRO_END_DECLS
+
+#endif

tasks/task_netplay_find_content.c

@@ -27,6 +27,7 @@
 #include <file/file_path.h>
 #include <lists/dir_list.h>
 
+#include "task_content.h"
 #include "tasks_internal.h"
 #include "../file_path_special.h"
 #include "../verbosity.h"

tasks/task_powerstate.h

@@ -0,0 +1,37 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2017 - Higor Euripedes
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef TASK_POWER_STATE_H
+#define TASK_POWER_STATE_H
+
+#include <stdint.h>
+
+#include <boolean.h>
+#include <retro_common_api.h>
+#include <retro_miscellaneous.h>
+
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
+RETRO_BEGIN_DECLS
+
+void task_push_get_powerstate(void);
+
+enum frontend_powerstate get_last_powerstate(int *percent);
+
+RETRO_END_DECLS
+
+#endif

tasks/task_save.c

@@ -44,6 +44,7 @@
 #include "../network/netplay/netplay.h"
 #endif
 
+#include "../content.h"
 #include "../core.h"
 #include "../file_path_special.h"
 #include "../configuration.h"

tasks/tasks_internal.h

@@ -30,19 +30,8 @@
 
 #include "../audio/audio_driver.h"
 
-#include "../content.h"
-#include "../core_type.h"
-
 RETRO_BEGIN_DECLS
 
-enum content_mode_load
-{
-   CONTENT_MODE_LOAD_NONE = 0,
-   CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_MENU,
-   CONTENT_MODE_LOAD_CONTENT_WITH_FFMPEG_CORE_FROM_MENU,
-   CONTENT_MODE_LOAD_CONTENT_WITH_IMAGEVIEWER_CORE_FROM_MENU
-};
-
 #ifdef HAVE_NETWORKING
 typedef struct
 {
@@ -99,77 +88,6 @@ bool task_push_decompress(
       retro_task_callback_t cb,
       void *user_data);
 
-bool task_push_load_content_with_current_core_from_companion_ui(
-      const char *fullpath,
-      content_ctx_info_t *content_info,
-      enum rarch_core_type type,
-      retro_task_callback_t cb,
-      void *user_data);
-
-bool task_push_load_content_from_cli(
-      const char *core_path,
-      const char *fullpath,
-      content_ctx_info_t *content_info,
-      enum rarch_core_type type,
-      retro_task_callback_t cb,
-      void *user_data);
-
-bool task_push_load_new_core(
-      const char *core_path,
-      const char *fullpath,
-      content_ctx_info_t *content_info,
-      enum rarch_core_type type,
-      retro_task_callback_t cb,
-      void *user_data);
-
-bool task_push_start_builtin_core(content_ctx_info_t *content_info,
-      enum rarch_core_type type,
-      retro_task_callback_t cb,
-      void *user_data);
-
-bool task_push_start_current_core(content_ctx_info_t *content_info);
-
-bool task_push_start_dummy_core(content_ctx_info_t *content_info);
-
-bool task_push_load_content_with_new_core_from_companion_ui(
-      const char *core_path,
-      const char *fullpath,
-      const char *label,
-      content_ctx_info_t *content_info,
-      retro_task_callback_t cb,
-      void *user_data);
-
-#ifdef HAVE_MENU
-bool task_push_load_content_with_new_core_from_menu(
-      const char *core_path,
-      const char *fullpath,
-      content_ctx_info_t *content_info,
-      enum rarch_core_type type,
-      retro_task_callback_t cb,
-      void *user_data);
-
-bool task_push_load_content_from_playlist_from_menu(
-      const char *core_path,
-      const char *fullpath,
-      const char *label,
-      content_ctx_info_t *content_info,
-      retro_task_callback_t cb,
-      void *user_data);
-
-bool task_push_load_content_with_core_from_menu(
-      const char *fullpath,
-      content_ctx_info_t *content_info,
-      enum rarch_core_type type,
-      retro_task_callback_t cb,
-      void *user_data);
-bool task_push_load_subsystem_with_core_from_menu(
-      const char *fullpath,
-      content_ctx_info_t *content_info,
-      enum rarch_core_type type,
-      retro_task_callback_t cb,
-      void *user_data);
-#endif
-
 void task_file_load_handler(retro_task_t *task);
 
 bool task_audio_mixer_load_handler(retro_task_t *task);
@@ -207,10 +125,6 @@ bool input_autoconfigure_get_swap_override(void);
 
 void input_autoconfigure_joypad_reindex_devices(void);
 
-void task_push_get_powerstate(void);
-
-enum frontend_powerstate get_last_powerstate(int *percent);
-
 bool task_push_audio_mixer_load_and_play(
       const char *fullpath, retro_task_callback_t cb, void *user_data,
       bool system,

ui/drivers/qt/ui_qt_window.cpp

@@ -67,6 +67,7 @@ extern "C" {
 #include "../../../menu/menu_driver.h"
 #endif
 #include "../../../config.def.h"
+#include "../../../tasks/task_content.h"
 #include "../../../tasks/tasks_internal.h"
 #include <string/stdstring.h>
 #include <encodings/utf.h>