From 617940fb8da48ded4b80555cf7ccb5fae1ade7ba Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 9 Jan 2020 17:00:46 +0100
Subject: [PATCH] Move midi_null driver to retroarch.c

---
 Makefile.common          |  1 -
 griffin/griffin.c        |  2 -
 midi/drivers/null_midi.c | 99 ----------------------------------------
 retroarch.c              | 24 +++++++++-
 4 files changed, 23 insertions(+), 103 deletions(-)
 delete mode 100644 midi/drivers/null_midi.c

diff --git a/Makefile.common b/Makefile.common
index 90edc8a84d..ba02e642bf 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -246,7 +246,6 @@ OBJ += \
        $(LIBRETRO_COMM_DIR)/features/features_cpu.o \
        performance_counters.o \
        verbosity.o \
-       midi/drivers/null_midi.o \
        $(LIBRETRO_COMM_DIR)/playlists/label_sanitization.o \
        manual_content_scan.o
 
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 30c958d36f..5f8bd10d51 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -889,8 +889,6 @@ AUDIO
 /*============================================================
 MIDI
 ============================================================ */
-#include "../midi/drivers/null_midi.c"
-
 #ifdef HAVE_WINMM
 #include "../midi/drivers/winmm_midi.c"
 #endif
diff --git a/midi/drivers/null_midi.c b/midi/drivers/null_midi.c
deleted file mode 100644
index ca1dc3b129..0000000000
--- a/midi/drivers/null_midi.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2018 The RetroArch team
- *
- *  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/>.
- */
-
-#include <string.h>
-
-#include <libretro.h>
-#include <string/stdstring.h>
-#include <lists/string_list.h>
-
-#include "../midi_driver.h"
-
-static bool null_midi_get_avail_inputs(struct string_list *inputs)
-{
-   union string_list_elem_attr attr = {0};
-
-   return string_list_append(inputs, "Null", attr);
-}
-
-static bool null_midi_get_avail_outputs(struct string_list *outputs)
-{
-   union string_list_elem_attr attr = {0};
-
-   return string_list_append(outputs, "Null", attr);
-}
-
-static void *null_midi_init(const char *input, const char *output)
-{
-   (void)input;
-   (void)output;
-
-   return (void*)-1;
-}
-
-static void null_midi_free(void *p)
-{
-   (void)p;
-}
-
-static bool null_midi_set_input(void *p, const char *input)
-{
-   (void)p;
-
-   return input == NULL || string_is_equal(input, "Null");
-}
-
-static bool null_midi_set_output(void *p, const char *output)
-{
-   (void)p;
-
-   return output == NULL || string_is_equal(output, "Null");
-}
-
-static bool null_midi_read(void *p, midi_event_t *event)
-{
-   (void)p;
-   (void)event;
-
-   return false;
-}
-
-static bool null_midi_write(void *p, const midi_event_t *event)
-{
-   (void)p;
-   (void)event;
-
-   return true;
-}
-
-static bool null_midi_flush(void *p)
-{
-   (void)p;
-
-   return true;
-}
-
-midi_driver_t midi_null = {
-   "null",
-   null_midi_get_avail_inputs,
-   null_midi_get_avail_outputs,
-   null_midi_init,
-   null_midi_free,
-   null_midi_set_input,
-   null_midi_set_output,
-   null_midi_read,
-   null_midi_write,
-   null_midi_flush
-};
diff --git a/retroarch.c b/retroarch.c
index 95b76147be..2cf64b3549 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -881,7 +881,29 @@ static const record_driver_t *record_drivers[] = {
 
 extern midi_driver_t midi_winmm;
 extern midi_driver_t midi_alsa;
-extern midi_driver_t midi_null;
+
+static void null_midi_free(void *p) { }
+static bool null_midi_get_avail_inputs(struct string_list *inputs) { union string_list_elem_attr attr = {0}; return string_list_append(inputs, "Null", attr); }
+static bool null_midi_get_avail_outputs(struct string_list *outputs) { union string_list_elem_attr attr = {0}; return string_list_append(outputs, "Null", attr); }
+static void *null_midi_init(const char *input, const char *output) { return (void*)-1; }
+static bool null_midi_set_input(void *p, const char *input) { return input == NULL || string_is_equal(input, "Null"); }
+static bool null_midi_set_output(void *p, const char *output) { return output == NULL || string_is_equal(output, "Null"); }
+static bool null_midi_read(void *p, midi_event_t *event) { return false; }
+static bool null_midi_write(void *p, const midi_event_t *event) { return true; }
+static bool null_midi_flush(void *p) { return true; }
+
+static midi_driver_t midi_null = {
+   "null",
+   null_midi_get_avail_inputs,
+   null_midi_get_avail_outputs,
+   null_midi_init,
+   null_midi_free,
+   null_midi_set_input,
+   null_midi_set_output,
+   null_midi_read,
+   null_midi_write,
+   null_midi_flush
+};
 
 static midi_driver_t *midi_drivers[] = {
 #if defined(HAVE_ALSA) && !defined(HAVE_HAKCHI) && !defined(HAVE_SEGAM)