Header include updates

audio/audio_driver.c

@@ -37,6 +37,7 @@
 #include "../gfx/video_driver.h"
 #include "../record/record_driver.h"
 #include "../frontend/frontend_driver.h"
+#include "../tasks/task_audio_mixer.h"
 #include "../tasks/tasks_internal.h"
 
 #include "../command.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_audio_mixer.h"
 #include "../../tasks/task_content.h"
 #include "../../tasks/task_file_transfer.h"
 #include "../../tasks/tasks_internal.h"

tasks/task_audio_mixer.h

@@ -0,0 +1,51 @@
+/*  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_AUDIO_MIXER_H
+#define TASKS_HANDLER_AUDIO_MIXER_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 "../audio/audio_driver.h"
+
+RETRO_BEGIN_DECLS
+
+bool task_audio_mixer_load_handler(retro_task_t *task);
+
+bool task_push_audio_mixer_load_and_play(
+      const char *fullpath, retro_task_callback_t cb, void *user_data,
+      bool system,
+      enum audio_mixer_slot_selection_type slot_selection_type,
+      int slot_selection_idx);
+
+bool task_push_audio_mixer_load(
+      const char *fullpath, retro_task_callback_t cb, void *user_data,
+      bool system,
+      enum audio_mixer_slot_selection_type slot_selection_type,
+      int slot_selection_idx);
+
+RETRO_END_DECLS
+
+#endif

tasks/task_file_transfer.c

@@ -21,6 +21,7 @@
 
 #include <string/stdstring.h>
 
+#include "task_audio_mixer.h"
 #include "task_file_transfer.h"
 #include "tasks_internal.h"
 #include "../verbosity.h"

tasks/tasks_internal.h

@@ -28,8 +28,6 @@
 #include "../config.h"
 #endif
 
-#include "../audio/audio_driver.h"
-
 RETRO_BEGIN_DECLS
 
 #ifdef HAVE_NETWORKING
@@ -90,8 +88,6 @@ bool task_push_decompress(
 
 void task_file_load_handler(retro_task_t *task);
 
-bool task_audio_mixer_load_handler(retro_task_t *task);
-
 bool take_screenshot(const char *path, bool silence,
       bool has_valid_framebuffer, bool fullpath, bool use_thread);
 
@@ -125,18 +121,6 @@ bool input_autoconfigure_get_swap_override(void);
 
 void input_autoconfigure_joypad_reindex_devices(void);
 
-bool task_push_audio_mixer_load_and_play(
-      const char *fullpath, retro_task_callback_t cb, void *user_data,
-      bool system,
-      enum audio_mixer_slot_selection_type slot_selection_type,
-      int slot_selection_idx);
-
-bool task_push_audio_mixer_load(
-      const char *fullpath, retro_task_callback_t cb, void *user_data,
-      bool system,
-      enum audio_mixer_slot_selection_type slot_selection_type,
-      int slot_selection_idx);
-
 void set_save_state_in_background(bool state);
 
 extern const char* const input_builtin_autoconfs[];