Remove menu/disp/menu_display.h and menu/backend/menu_backend.h

and merge into menu/menu_driver.h

driver.h

@@ -31,8 +31,6 @@
 #include "audio/audio_driver.h"
 
 #include "menu/menu_driver.h"
-#include "menu/backend/menu_backend.h"
-#include "menu/disp/menu_display.h"
 #include "audio/resamplers/resampler.h"
 #include "record/ffemu.h"
 

menu/backend/menu_backend.h

@@ -1,48 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2015 - 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 DRIVER_MENU_BACKEND_H__
-#define DRIVER_MENU_BACKEND_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct menu_file_list_cbs
-{
-   int (*action_deferred_push)(void *data, void *userdata, const char
-         *path, const char *label, unsigned type);
-   int (*action_ok)(const char *path, const char *label, unsigned type,
-         size_t idx);
-   int (*action_cancel)(const char *path, const char *label, unsigned type,
-         size_t idx);
-   int (*action_start)(unsigned type,  const char *label, unsigned action);
-   int (*action_content_list_switch)(void *data, void *userdata, const char
-         *path, const char *label, unsigned type);
-   int (*action_toggle)(unsigned type, const char *label, unsigned action);
-} menu_file_list_cbs_t;
-
-typedef struct menu_ctx_driver_backend
-{
-   int      (*iterate)(unsigned);
-   const char *ident;
-} menu_ctx_driver_backend_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

menu/backend/menu_common_backend.c

@@ -20,7 +20,6 @@
 #include <string.h>
 #include <ctype.h>
 #include <file/file_path.h>
-#include "menu_backend.h"
 #include "../menu_entries.h"
 #include "../menu_input.h"
 

menu/backend/menu_lakka_backend.c

@@ -23,7 +23,6 @@
 #include <ctype.h>
 #include "../menu_action.h"
 #include "../menu_navigation.h"
-#include "menu_backend.h"
 
 #include "../../gfx/gfx_common.h"
 #include "../../driver.h"

menu/disp/ios.c

@@ -15,7 +15,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "menu_display.h"
+#include "../menu_driver.h"
 #include "../menu.h"
 #include "../../general.h"
 #include "ios.h"

menu/disp/menu_display.h

@@ -1,61 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2011-2015 - 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 DRIVER_MENU_DISPLAY_H__
-#define DRIVER_MENU_DISPLAY_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct menu_ctx_driver
-{
-   void  (*set_texture)(void*);
-   void  (*render_messagebox)(const char*);
-   void  (*render)(void);
-   void  (*frame)(void);
-   void* (*init)(void);
-   bool  (*init_lists)(void*);
-   void  (*free)(void*);
-   void  (*context_reset)(void*);
-   void  (*context_destroy)(void*);
-   void  (*populate_entries)(void*, const char *, const char *,
-         unsigned);
-   void  (*iterate)(void*, unsigned);
-   int   (*input_postprocess)(uint64_t, uint64_t);
-   void  (*navigation_clear)(void *, bool);
-   void  (*navigation_decrement)(void *);
-   void  (*navigation_increment)(void *);
-   void  (*navigation_set)(void *, bool);
-   void  (*navigation_set_last)(void *);
-   void  (*navigation_descend_alphabet)(void *, size_t *);
-   void  (*navigation_ascend_alphabet)(void *, size_t *);
-   void  (*list_insert)(void *, const char *, const char *, size_t);
-   void  (*list_delete)(void *, size_t, size_t);
-   void  (*list_clear)(void *);
-   void  (*list_cache)(bool, unsigned);
-   void  (*list_set_selection)(void *);
-   void  (*init_core_info)(void *);
-   void  (*update_core_info)(void *);
-
-   const menu_ctx_driver_backend_t *backend;
-   const char *ident;
-} menu_ctx_driver_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

menu/disp/rmenu.c

@@ -21,7 +21,7 @@
 #include <string.h>
 #include <limits.h>
 
-#include "menu_display.h"
+#include "../menu_driver.h"
 #include "../menu.h"
 #include "../../general.h"
 #include "../../gfx/gfx_common.h"

menu/disp/rmenu_xui.cpp

@@ -20,7 +20,7 @@
 #include <xui.h>
 #include <xuiapp.h>
 
-#include "menu_display.h"
+#include "../menu_driver.h"
 #include "../menu.h"
 #include "../menu_list.h"
 

menu/menu_driver.h

@@ -141,6 +141,60 @@ typedef struct
    rarch_setting_t *list_settings;
 } menu_handle_t;
 
+typedef struct menu_file_list_cbs
+{
+   int (*action_deferred_push)(void *data, void *userdata, const char
+         *path, const char *label, unsigned type);
+   int (*action_ok)(const char *path, const char *label, unsigned type,
+         size_t idx);
+   int (*action_cancel)(const char *path, const char *label, unsigned type,
+         size_t idx);
+   int (*action_start)(unsigned type,  const char *label, unsigned action);
+   int (*action_content_list_switch)(void *data, void *userdata, const char
+         *path, const char *label, unsigned type);
+   int (*action_toggle)(unsigned type, const char *label, unsigned action);
+} menu_file_list_cbs_t;
+
+typedef struct menu_ctx_driver_backend
+{
+   int      (*iterate)(unsigned);
+   const char *ident;
+} menu_ctx_driver_backend_t;
+
+typedef struct menu_ctx_driver
+{
+   void  (*set_texture)(void*);
+   void  (*render_messagebox)(const char*);
+   void  (*render)(void);
+   void  (*frame)(void);
+   void* (*init)(void);
+   bool  (*init_lists)(void*);
+   void  (*free)(void*);
+   void  (*context_reset)(void*);
+   void  (*context_destroy)(void*);
+   void  (*populate_entries)(void*, const char *, const char *,
+         unsigned);
+   void  (*iterate)(void*, unsigned);
+   int   (*input_postprocess)(uint64_t, uint64_t);
+   void  (*navigation_clear)(void *, bool);
+   void  (*navigation_decrement)(void *);
+   void  (*navigation_increment)(void *);
+   void  (*navigation_set)(void *, bool);
+   void  (*navigation_set_last)(void *);
+   void  (*navigation_descend_alphabet)(void *, size_t *);
+   void  (*navigation_ascend_alphabet)(void *, size_t *);
+   void  (*list_insert)(void *, const char *, const char *, size_t);
+   void  (*list_delete)(void *, size_t, size_t);
+   void  (*list_clear)(void *);
+   void  (*list_cache)(bool, unsigned);
+   void  (*list_set_selection)(void *);
+   void  (*init_core_info)(void *);
+   void  (*update_core_info)(void *);
+
+   const menu_ctx_driver_backend_t *backend;
+   const char *ident;
+} menu_ctx_driver_t;
+
 #ifdef __cplusplus
 }
 #endif