From 1274092fdd0be189492c898ab4cc86400aa36c86 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 22 Mar 2017 03:00:21 +0100
Subject: [PATCH] Move audio_mixer code to libretro-common

---
 Makefile.common                               |  2 +-
 audio/audio_driver.c                          |  2 +-
 audio/audio_mixer.h                           | 52 ----------------
 griffin/griffin.c                             |  2 +-
 .../audio}/audio_mixer.c                      | 37 +++++++-----
 libretro-common/include/audio/audio_mixer.h   | 59 +++++++++++++++++++
 6 files changed, 84 insertions(+), 70 deletions(-)
 delete mode 100644 audio/audio_mixer.h
 rename {audio => libretro-common/audio}/audio_mixer.c (90%)
 create mode 100644 libretro-common/include/audio/audio_mixer.h

diff --git a/Makefile.common b/Makefile.common
index 16964a7af7..6d06ca008a 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -186,7 +186,7 @@ OBJ += frontend/frontend.o \
        file_path_str.o \
        $(LIBRETRO_COMM_DIR)/hash/rhash.o \
        audio/audio_driver.o \
-       audio/audio_mixer.o \
+       $(LIBRETRO_COMM_DIR)/audio/audio_mixer.o \
        input/input_driver.o \
        gfx/video_coord_array.o \
        gfx/video_driver.o \
diff --git a/audio/audio_driver.c b/audio/audio_driver.c
index fcdf62e783..be714d9062 100644
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@@ -23,6 +23,7 @@
 #include <audio/conversion/s16_to_float.h>
 #include <audio/audio_resampler.h>
 #include <audio/dsp_filter.h>
+#include <audio/audio_mixer.h>
 #include <file/file_path.h>
 #include <lists/dir_list.h>
 
@@ -31,7 +32,6 @@
 #endif
 
 #include "audio_driver.h"
-#include "audio_mixer.h"
 #include "audio_thread_wrapper.h"
 #include "../record/record_driver.h"
 #include "../frontend/frontend_driver.h"
diff --git a/audio/audio_mixer.h b/audio/audio_mixer.h
deleted file mode 100644
index cde544d1bb..0000000000
--- a/audio/audio_mixer.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2017 - Andre Leiradella
- * 
- *  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 __AUDIO_MIXER__H
-#define __AUDIO_MIXER__H
-
-#include <stdint.h>
-#include <stddef.h>
-
-#include <boolean.h>
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-typedef struct audio_mixer_sound_t audio_mixer_sound_t;
-typedef struct audio_mixer_voice_t audio_mixer_voice_t;
-
-typedef void (*audio_mixer_stop_cb_t)(audio_mixer_voice_t* voice, unsigned reason);
-
-/* Reasons passed to the stop callback. */
-#define AUDIO_MIXER_SOUND_FINISHED 0
-#define AUDIO_MIXER_SOUND_STOPPED  1
-#define AUDIO_MIXER_SOUND_REPEATED 2
-
-void audio_mixer_init(unsigned rate);
-void audio_mixer_done(void);
-
-audio_mixer_sound_t* audio_mixer_load_wav(const char* path);
-audio_mixer_sound_t* audio_mixer_load_ogg(const char* path);
-
-void audio_mixer_destroy(audio_mixer_sound_t* sound);
-
-audio_mixer_voice_t* audio_mixer_play(audio_mixer_sound_t* sound, bool repeat, float volume, audio_mixer_stop_cb_t stop_cb);
-void                 audio_mixer_stop(audio_mixer_voice_t* voice);
-
-void audio_mixer_mix(float* buffer, size_t num_frames);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 1b726f957b..e882bfc4e1 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -672,7 +672,7 @@ DRIVERS
 #include "../gfx/video_coord_array.c"
 #include "../input/input_driver.c"
 #include "../audio/audio_driver.c"
-#include "../audio/audio_mixer.c"
+#include "../libretro-common/audio/audio_mixer.c"
 #include "../camera/camera_driver.c"
 #include "../location/location_driver.c"
 #include "../driver.c"
diff --git a/audio/audio_mixer.c b/libretro-common/audio/audio_mixer.c
similarity index 90%
rename from audio/audio_mixer.c
rename to libretro-common/audio/audio_mixer.c
index 93ef4fe253..1d96fb51ba 100644
--- a/audio/audio_mixer.c
+++ b/libretro-common/audio/audio_mixer.c
@@ -1,21 +1,28 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2017 - Andre Leiradella
- * 
- *  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.
+/* Copyright  (C) 2010-2017 The RetroArch team
  *
- *  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.
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (audio_mixer.c).
+ * ---------------------------------------------------------------------------------------
  *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "audio_mixer.h"
-
+#include <audio/audio_mixer.h>
 #include <audio/audio_resampler.h>
+
 #include <streams/file_stream.h>
 #include <formats/rwav.h>
 #include <memalign.h>
@@ -25,7 +32,7 @@
 #include <math.h>
 
 #ifdef HAVE_CONFIG_H
-#include "../config.h"
+#include "../../config.h"
 #endif
 
 #ifdef HAVE_STB_VORBIS
@@ -33,7 +40,7 @@
 #define STB_VORBIS_NO_STDIO
 #define STB_VORBIS_NO_CRT
 
-#include "../deps/stb/stb_vorbis.h"
+#include "../../deps/stb/stb_vorbis.h"
 #endif
 
 #define AUDIO_MIXER_MAX_VOICES      8
diff --git a/libretro-common/include/audio/audio_mixer.h b/libretro-common/include/audio/audio_mixer.h
new file mode 100644
index 0000000000..b2b013166f
--- /dev/null
+++ b/libretro-common/include/audio/audio_mixer.h
@@ -0,0 +1,59 @@
+/* Copyright  (C) 2010-2017 The RetroArch team
+ *
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (audio_mixer.h).
+ * ---------------------------------------------------------------------------------------
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __LIBRETRO_SDK_AUDIO_MIXER__H
+#define __LIBRETRO_SDK_AUDIO_MIXER__H
+
+#include <stdint.h>
+#include <stddef.h>
+
+#include <boolean.h>
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+typedef struct audio_mixer_sound_t audio_mixer_sound_t;
+typedef struct audio_mixer_voice_t audio_mixer_voice_t;
+
+typedef void (*audio_mixer_stop_cb_t)(audio_mixer_voice_t* voice, unsigned reason);
+
+/* Reasons passed to the stop callback. */
+#define AUDIO_MIXER_SOUND_FINISHED 0
+#define AUDIO_MIXER_SOUND_STOPPED  1
+#define AUDIO_MIXER_SOUND_REPEATED 2
+
+void audio_mixer_init(unsigned rate);
+void audio_mixer_done(void);
+
+audio_mixer_sound_t* audio_mixer_load_wav(const char* path);
+audio_mixer_sound_t* audio_mixer_load_ogg(const char* path);
+
+void audio_mixer_destroy(audio_mixer_sound_t* sound);
+
+audio_mixer_voice_t* audio_mixer_play(audio_mixer_sound_t* sound, bool repeat, float volume, audio_mixer_stop_cb_t stop_cb);
+void                 audio_mixer_stop(audio_mixer_voice_t* voice);
+
+void audio_mixer_mix(float* buffer, size_t num_frames);
+
+RETRO_END_DECLS
+
+#endif