Move menu_entries_cbs_* files to menu/cbs

2024-12-15 14:59:37 +00:00 · 2015-06-08 14:35:58 +02:00 · 2015-06-08 14:35:58 +02:00 · 41e2caf5f6
commit 41e2caf5f6
parent 01d07721b4
18 changed files with 114 additions and 116 deletions
--- a/Makefile.common
+++ b/Makefile.common
@ -340,23 +340,23 @@ ifeq ($(HAVE_MENU_COMMON), 1)
 			 menu/menu_navigation.o  \
 			 menu/menu_setting.o \
 			 menu/menu_shader.o \
-			 menu/menu_entries_cbs_ok.o \
-			 menu/menu_entries_cbs_cancel.o \
-			 menu/menu_entries_cbs_select.o \
-			 menu/menu_entries_cbs_start.o \
-			 menu/menu_entries_cbs_info.o \
-			 menu/menu_entries_cbs_refresh.o \
-			 menu/menu_entries_cbs_left.o \
-			 menu/menu_entries_cbs_right.o \
-			 menu/menu_entries_cbs_deferred_push.o \
-			 menu/menu_entries_cbs_scan.o \
-			 menu/menu_entries_cbs_get_value.o \
-			 menu/menu_entries_cbs_iterate.o \
-			 menu/menu_entries_cbs_title.o \
-			 menu/menu_entries_cbs_up.o \
-			 menu/menu_entries_cbs_down.o \
-			 menu/menu_entries_cbs_contentlist_switch.o \
 			 menu/menu_entries_cbs.o \
+			 menu/cbs/menu_entries_cbs_ok.o \
+			 menu/cbs/menu_entries_cbs_cancel.o \
+			 menu/cbs/menu_entries_cbs_select.o \
+			 menu/cbs/menu_entries_cbs_start.o \
+			 menu/cbs/menu_entries_cbs_info.o \
+			 menu/cbs/menu_entries_cbs_refresh.o \
+			 menu/cbs/menu_entries_cbs_left.o \
+			 menu/cbs/menu_entries_cbs_right.o \
+			 menu/cbs/menu_entries_cbs_deferred_push.o \
+			 menu/cbs/menu_entries_cbs_scan.o \
+			 menu/cbs/menu_entries_cbs_get_value.o \
+			 menu/cbs/menu_entries_cbs_iterate.o \
+			 menu/cbs/menu_entries_cbs_title.o \
+			 menu/cbs/menu_entries_cbs_up.o \
+			 menu/cbs/menu_entries_cbs_down.o \
+			 menu/cbs/menu_entries_cbs_contentlist_switch.o \
 			 menu/menu_list.o \
 			 menu/menu_display.o \
 			 menu/menu_displaylist.o \
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@ -715,23 +715,23 @@ MENU
 #include "../menu/menu_entry.c"
 #include "../menu/menu_setting.c"
 #include "../menu/menu_list.c"
-#include "../menu/menu_entries_cbs_ok.c"
-#include "../menu/menu_entries_cbs_cancel.c"
-#include "../menu/menu_entries_cbs_select.c"
-#include "../menu/menu_entries_cbs_start.c"
-#include "../menu/menu_entries_cbs_info.c"
-#include "../menu/menu_entries_cbs_refresh.c"
-#include "../menu/menu_entries_cbs_left.c"
-#include "../menu/menu_entries_cbs_right.c"
-#include "../menu/menu_entries_cbs_title.c"
-#include "../menu/menu_entries_cbs_deferred_push.c"
-#include "../menu/menu_entries_cbs_scan.c"
-#include "../menu/menu_entries_cbs_get_value.c"
-#include "../menu/menu_entries_cbs_iterate.c"
-#include "../menu/menu_entries_cbs_up.c"
-#include "../menu/menu_entries_cbs_down.c"
-#include "../menu/menu_entries_cbs_contentlist_switch.c"
-#include "../menu/menu_entries_cbs.c"
+#include "../menu/cbs/menu_entries_cbs_ok.c"
+#include "../menu/cbs/menu_entries_cbs_cancel.c"
+#include "../menu/cbs/menu_entries_cbs_select.c"
+#include "../menu/cbs/menu_entries_cbs_start.c"
+#include "../menu/cbs/menu_entries_cbs_info.c"
+#include "../menu/cbs/menu_entries_cbs_refresh.c"
+#include "../menu/cbs/menu_entries_cbs_left.c"
+#include "../menu/cbs/menu_entries_cbs_right.c"
+#include "../menu/cbs/menu_entries_cbs_title.c"
+#include "../menu/cbs/menu_entries_cbs_deferred_push.c"
+#include "../menu/cbs/menu_entries_cbs_scan.c"
+#include "../menu/cbs/menu_entries_cbs_get_value.c"
+#include "../menu/cbs/menu_entries_cbs_iterate.c"
+#include "../menu/cbs/menu_entries_cbs_up.c"
+#include "../menu/cbs/menu_entries_cbs_down.c"
+#include "../menu/cbs/menu_entries_cbs_contentlist_switch.c"
+#include "../menu/cbs/menu_entries_cbs.c"
 #include "../menu/menu_shader.c"
 #include "../menu/menu_navigation.c"
 #include "../menu/menu_display.c"
--- a/menu/cbs/menu_entries_cbs_cancel.c
+++ b/menu/cbs/menu_entries_cbs_cancel.c
@ -14,10 +14,10 @@
 */

 #include <file/file_path.h>
-#include "menu.h"
-#include "menu_entries_cbs.h"
-#include "menu_entry.h"
-#include "menu_setting.h"
+#include "../menu.h"
+#include "../menu_entries_cbs.h"
+#include "../menu_entry.h"
+#include "../menu_setting.h"

 static int action_cancel_pop_default(const char *path,
      const char *label, unsigned type, size_t idx)
--- a/menu/cbs/menu_entries_cbs_contentlist_switch.c
+++ b/menu/cbs/menu_entries_cbs_contentlist_switch.c
@ -13,8 +13,8 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "menu.h"
-#include "menu_entries_cbs.h"
+#include "../menu.h"
+#include "../menu_entries_cbs.h"

 int menu_entries_cbs_init_bind_content_list_switch(menu_file_list_cbs_t *cbs,
      const char *path, const char *label, unsigned type, size_t idx,
--- a/menu/cbs/menu_entries_cbs_deferred_push.c
+++ b/menu/cbs/menu_entries_cbs_deferred_push.c
@ -15,14 +15,14 @@

 #include <file/file_path.h>

-#include "menu.h"
-#include "menu_displaylist.h"
-#include "menu_entries_cbs.h"
-#include "menu_setting.h"
+#include "../menu.h"
+#include "../menu_displaylist.h"
+#include "../menu_entries_cbs.h"
+#include "../menu_setting.h"

-#include "../file_ext.h"
+#include "../../file_ext.h"

-#include "../gfx/video_shader_driver.h"
+#include "../../gfx/video_shader_driver.h"

 static int deferred_push_core_information(menu_displaylist_info_t *info)
 {
--- a/menu/cbs/menu_entries_cbs_down.c
+++ b/menu/cbs/menu_entries_cbs_down.c
@ -13,9 +13,9 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "menu.h"
-#include "menu_navigation.h"
-#include "menu_entries_cbs.h"
+#include "../menu.h"
+#include "../menu_navigation.h"
+#include "../menu_entries_cbs.h"

 static int action_bind_down_generic(unsigned type, const char *label)
 {
--- a/menu/cbs/menu_entries_cbs_get_value.c
+++ b/menu/cbs/menu_entries_cbs_get_value.c
@ -16,13 +16,13 @@
 #include <file/file_path.h>
 #include <rhash.h>

-#include "menu.h"
-#include "menu_entries_cbs.h"
-#include "menu_shader.h"
-#include "menu_setting.h"
+#include "../menu.h"
+#include "../menu_entries_cbs.h"
+#include "../menu_shader.h"
+#include "../menu_setting.h"

-#include "../performance.h"
-#include "../intl/intl.h"
+#include "../../performance.h"
+#include "../../intl/intl.h"

 const char axis_labels[4][128] = {
   RETRO_LBL_ANALOG_LEFT_X,
--- a/menu/cbs/menu_entries_cbs_info.c
+++ b/menu/cbs/menu_entries_cbs_info.c
@ -13,8 +13,8 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "menu.h"
-#include "menu_entries_cbs.h"
+#include "../menu.h"
+#include "../menu_entries_cbs.h"

 static int action_info_default(unsigned type, const char *label)
 {
--- a/menu/cbs/menu_entries_cbs_iterate.c
+++ b/menu/cbs/menu_entries_cbs_iterate.c
@ -17,18 +17,17 @@
 #include <rhash.h>
 #include <retro_inline.h>

-#include "menu.h"
-#include "menu_display.h"
-#include "menu_entry.h"
-#include "menu_entries_cbs.h"
-#include "menu_setting.h"
-#include "menu_input.h"
-#include "menu_shader.h"
-#include "menu_navigation.h"
+#include "../menu.h"
+#include "../menu_display.h"
+#include "../menu_entry.h"
+#include "../menu_entries_cbs.h"
+#include "../menu_setting.h"
+#include "../menu_input.h"
+#include "../menu_shader.h"
+#include "../menu_navigation.h"

-#include "../retroarch.h"
-
-#include "../input/input_autodetect.h"
+#include "../../retroarch.h"
+#include "../../input/input_autodetect.h"

 static int archive_open(void)
 {
--- a/menu/cbs/menu_entries_cbs_left.c
+++ b/menu/cbs/menu_entries_cbs_left.c
@ -15,13 +15,13 @@

 #include <file/file_path.h>

-#include "menu.h"
-#include "menu_entries_cbs.h"
-#include "menu_setting.h"
-#include "menu_shader.h"
-#include "menu_navigation.h"
+#include "../menu.h"
+#include "../menu_entries_cbs.h"
+#include "../menu_setting.h"
+#include "../menu_shader.h"
+#include "../menu_navigation.h"

-#include "../retroarch.h"
+#include "../../retroarch.h"


 #ifdef HAVE_SHADER_MANAGER
--- a/menu/cbs/menu_entries_cbs_ok.c
+++ b/menu/cbs/menu_entries_cbs_ok.c
@ -16,19 +16,18 @@
 #include <file/file_path.h>
 #include <rhash.h>

-#include "menu.h"
-#include "menu_display.h"
-#include "menu_entries_cbs.h"
-#include "menu_setting.h"
-#include "menu_entry.h"
-#include "menu_shader.h"
-#include "menu_navigation.h"
-#include "menu_entries_cbs.h"
+#include "../menu.h"
+#include "../menu_display.h"
+#include "../menu_entries_cbs.h"
+#include "../menu_setting.h"
+#include "../menu_entry.h"
+#include "../menu_shader.h"
+#include "../menu_navigation.h"
+#include "../menu_entries_cbs.h"

-#include "../retroarch.h"
-#include "../runloop_data.h"
-
-#include "../input/input_remapping.h"
+#include "../../retroarch.h"
+#include "../../runloop_data.h"
+#include "../../input/input_remapping.h"

 /* FIXME - Global variables, refactor */
 static char detect_content_path[PATH_MAX_LENGTH];
--- a/menu/cbs/menu_entries_cbs_refresh.c
+++ b/menu/cbs/menu_entries_cbs_refresh.c
@ -13,9 +13,9 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "menu.h"
-#include "menu_displaylist.h"
-#include "menu_entries_cbs.h"
+#include "../menu.h"
+#include "../menu_displaylist.h"
+#include "../menu_entries_cbs.h"

 static int action_refresh_default(file_list_t *list, file_list_t *menu_list)
 {
--- a/menu/cbs/menu_entries_cbs_right.c
+++ b/menu/cbs/menu_entries_cbs_right.c
@ -15,13 +15,13 @@

 #include <file/file_path.h>

-#include "menu.h"
-#include "menu_entries_cbs.h"
-#include "menu_setting.h"
-#include "menu_shader.h"
-#include "menu_navigation.h"
+#include "../menu.h"
+#include "../menu_entries_cbs.h"
+#include "../menu_setting.h"
+#include "../menu_shader.h"
+#include "../menu_navigation.h"

-#include "../retroarch.h"
+#include "../../retroarch.h"


 #ifdef HAVE_SHADER_MANAGER
--- a/menu/cbs/menu_entries_cbs_scan.c
+++ b/menu/cbs/menu_entries_cbs_scan.c
@ -14,12 +14,12 @@
 */

 #include <file/file_path.h>
-#include "menu.h"
-#include "menu_entries_cbs.h"
-#include "menu_entry.h"
-#include "menu_setting.h"
+#include "../menu.h"
+#include "../menu_entries_cbs.h"
+#include "../menu_entry.h"
+#include "../menu_setting.h"

-#include "../runloop_data.h"
+#include "../../runloop_data.h"

 static int action_scan_directory(const char *path,
      const char *label, unsigned type, size_t idx)
--- a/menu/cbs/menu_entries_cbs_select.c
+++ b/menu/cbs/menu_entries_cbs_select.c
@ -13,12 +13,12 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "menu.h"
-#include "menu_entry.h"
-#include "menu_entries_cbs.h"
-#include "menu_setting.h"
+#include "../menu.h"
+#include "../menu_entry.h"
+#include "../menu_entries_cbs.h"
+#include "../menu_setting.h"

-#include "../runloop_data.h"
+#include "../../runloop_data.h"

 static int action_select_default(const char *path, const char *label, unsigned type,
      size_t idx)
--- a/menu/cbs/menu_entries_cbs_start.c
+++ b/menu/cbs/menu_entries_cbs_start.c
@ -13,15 +13,15 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "menu.h"
-#include "menu_entries_cbs.h"
-#include "menu_setting.h"
-#include "menu_shader.h"
+#include "../menu.h"
+#include "../menu_entries_cbs.h"
+#include "../menu_setting.h"
+#include "../menu_shader.h"

-#include "../retroarch.h"
-#include "../performance.h"
+#include "../../retroarch.h"
+#include "../../performance.h"

-#include "../input/input_remapping.h"
+#include "../../input/input_remapping.h"

 static int action_start_remap_file_load(unsigned type, const char *label)
 {
--- a/menu/cbs/menu_entries_cbs_title.c
+++ b/menu/cbs/menu_entries_cbs_title.c
@ -17,8 +17,8 @@
 #include <string/stdstring.h>
 #include <file/file_path.h>

-#include "menu.h"
-#include "menu_entries_cbs.h"
+#include "../menu.h"
+#include "../menu_entries_cbs.h"

 static INLINE void replace_chars(char *str, char c1, char c2)
 {
--- a/menu/cbs/menu_entries_cbs_up.c
+++ b/menu/cbs/menu_entries_cbs_up.c
@ -13,9 +13,9 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "menu.h"
-#include "menu_navigation.h"
-#include "menu_entries_cbs.h"
+#include "../menu.h"
+#include "../menu_navigation.h"
+#include "../menu_entries_cbs.h"

 static int action_bind_up_generic(unsigned type, const char *label)
 {