Create separate menu_entries_cbs_up.c/menu_entries_cbs_down.c

Makefile.common

@@ -352,7 +352,8 @@ ifeq ($(HAVE_MENU_COMMON), 1)
 			 menu/menu_entries_cbs_deferred_push.o \
 			 menu/menu_entries_cbs_representation.o \
 			 menu/menu_entries_cbs_iterate.o \
-			 menu/menu_entries_cbs_up_or_down.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/menu_list.o \

griffin/griffin.c

@@ -726,7 +726,8 @@ MENU
 #include "../menu/menu_entries_cbs_deferred_push.c"
 #include "../menu/menu_entries_cbs_representation.c"
 #include "../menu/menu_entries_cbs_iterate.c"
-#include "../menu/menu_entries_cbs_up_or_down.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/menu_shader.c"

menu/menu_entries_cbs.c

@@ -194,7 +194,8 @@ void menu_entries_cbs_init(void *data,
    menu_entries_cbs_init_bind_start(cbs, path, label, type, idx, elem0, elem1);
    menu_entries_cbs_init_bind_select(cbs, path, label, type, idx, elem0, elem1);
    menu_entries_cbs_init_bind_content_list_switch(cbs, path, label, type, idx, elem0, elem1);
-   menu_entries_cbs_init_bind_up_or_down(cbs, path, label, type, idx, elem0, elem1);
+   menu_entries_cbs_init_bind_up(cbs, path, label, type, idx, elem0, elem1);
+   menu_entries_cbs_init_bind_down(cbs, path, label, type, idx, elem0, elem1);
    menu_entries_cbs_init_bind_toggle(cbs, path, label, type, idx, elem0, elem1, menu_label);
    menu_entries_cbs_init_bind_deferred_push(cbs, path, label, type, idx, elem0, elem1);
    menu_entries_cbs_init_bind_refresh(cbs, path, label, type, idx, elem0, elem1);

menu/menu_entries_cbs.h

@@ -45,7 +45,11 @@ void menu_entries_cbs_init_bind_get_string_representation(menu_file_list_cbs_t *
       const char *path, const char *label, unsigned type, size_t idx,
       const char *elem0, const char *elem1);
 
-void menu_entries_cbs_init_bind_up_or_down(menu_file_list_cbs_t *cbs,
+void menu_entries_cbs_init_bind_up(menu_file_list_cbs_t *cbs,
+      const char *path, const char *label, unsigned type, size_t idx,
+      const char *elem0, const char *elem1);
+
+void menu_entries_cbs_init_bind_down(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
       const char *elem0, const char *elem1);
 

menu/menu_entries_cbs_down.c

@@ -17,8 +17,7 @@
 #include "menu_navigation.h"
 #include "menu_entries_cbs.h"
 
-static int action_bind_up_or_down_generic(unsigned type, const char *label,
+static int action_bind_down_generic(unsigned type, const char *label)
-      unsigned action)
 {
    unsigned scroll_speed  = 0;
    menu_handle_t *menu    = menu_driver_get_ptr();
@@ -30,25 +29,17 @@ static int action_bind_up_or_down_generic(unsigned type, const char *label,
    if (menu_list_get_size(menu->menu_list) <= 0)
       return 0;
 
-   switch (action)
+   menu_navigation_increment(&menu->navigation, scroll_speed);
-   {
-      case MENU_ACTION_UP:
-         menu_navigation_decrement(&menu->navigation, scroll_speed);
-         break;
-      case MENU_ACTION_DOWN:
-         menu_navigation_increment(&menu->navigation, scroll_speed);
-         break;
-   }
 
    return 0;
 }
 
-void menu_entries_cbs_init_bind_up_or_down(menu_file_list_cbs_t *cbs,
+void menu_entries_cbs_init_bind_down(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
       const char *elem0, const char *elem1)
 {
    if (!cbs)
       return;
 
-   cbs->action_up_or_down = action_bind_up_or_down_generic;
+   cbs->action_down = action_bind_down_generic;
 }

menu/menu_entries_cbs_up.c

@@ -0,0 +1,45 @@
+/*  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/>.
+ */
+
+#include "menu.h"
+#include "menu_navigation.h"
+#include "menu_entries_cbs.h"
+
+static int action_bind_up_generic(unsigned type, const char *label)
+{
+   unsigned scroll_speed  = 0;
+   menu_handle_t *menu    = menu_driver_get_ptr();
+   if (!menu)
+      return -1;
+
+   scroll_speed = (max(menu->navigation.scroll.acceleration, 2) - 2) / 4 + 1;
+
+   if (menu_list_get_size(menu->menu_list) <= 0)
+      return 0;
+
+   menu_navigation_decrement(&menu->navigation, scroll_speed);
+
+   return 0;
+}
+
+void menu_entries_cbs_init_bind_up(menu_file_list_cbs_t *cbs,
+      const char *path, const char *label, unsigned type, size_t idx,
+      const char *elem0, const char *elem1)
+{
+   if (!cbs)
+      return;
+
+   cbs->action_up = action_bind_up_generic;
+}

menu/menu_entry.c

@@ -459,9 +459,12 @@ int menu_entry_action(menu_entry_t *entry, unsigned i, enum menu_action action)
    switch (action)
    {
       case MENU_ACTION_UP:
+         if (cbs && cbs->action_up)
+            return cbs->action_up(entry->type, entry->label);
+         break;
       case MENU_ACTION_DOWN:
-         if (cbs && cbs->action_up_or_down)
+         if (cbs && cbs->action_down)
-            return cbs->action_up_or_down(entry->type, entry->label, action);
+            return cbs->action_down(entry->type, entry->label);
          break;
       case MENU_ACTION_SCROLL_UP:
          menu_navigation_descend_alphabet(nav, &nav->selection_ptr);

menu/menu_list.h

@@ -47,7 +47,8 @@ typedef struct menu_file_list_cbs
    int (*action_toggle)(unsigned type, const char *label, unsigned action,
          bool wraparound);
    int (*action_refresh)(file_list_t *list, file_list_t *menu_list);
-   int (*action_up_or_down)(unsigned type, const char *label, unsigned action);
+   int (*action_up)(unsigned type, const char *label);
+   int (*action_down)(unsigned type, const char *label);
    void (*action_get_representation)(file_list_t* list,
          unsigned *w, unsigned type, unsigned i,
          const char *label,