Remove the need to double up the MENU macros in manu.h.

Icons are now used by their id which must be part of the icons_6x8 enum, 
or Icon_NOICON for none


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12571 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 23 insertions, 23 deletions

diff --git a/apps/menus/eq_menu.c b/apps/menus/eq_menu.c
index 25ab170169..65b17a73c9 100644
--- a/apps/menus/eq_menu.c
+++ b/apps/menus/eq_menu.c
@@ -144,21 +144,21 @@ MENUITEM_SETTING(gain_4, &global_settings.eq_band4_gain, dsp_set_coefs_callback)
 
 MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_0, do_option, (void*)&gain_0, NULL,
                                     gainitem_get_name, 
-                                    &global_settings.eq_band0_cutoff, NOICON);
+                                    &global_settings.eq_band0_cutoff, Icon_NOICON);
 MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_1, do_option, (void*)&gain_1, NULL,
                                     gainitem_get_name, 
-                                    &global_settings.eq_band1_cutoff, NOICON);
+                                    &global_settings.eq_band1_cutoff, Icon_NOICON);
 MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_2, do_option, (void*)&gain_2, NULL,
                                     gainitem_get_name, 
-                                    &global_settings.eq_band2_cutoff, NOICON);
+                                    &global_settings.eq_band2_cutoff, Icon_NOICON);
 MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_3, do_option, (void*)&gain_3, NULL,
                                     gainitem_get_name, 
-                                    &global_settings.eq_band3_cutoff, NOICON);
+                                    &global_settings.eq_band3_cutoff, Icon_NOICON);
 MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_4, do_option, (void*)&gain_4, NULL,
                                     gainitem_get_name, 
-                                    &global_settings.eq_band4_cutoff, NOICON);
+                                    &global_settings.eq_band4_cutoff, Icon_NOICON);
                                     
-MAKE_MENU(gain_menu, ID2P(LANG_EQUALIZER_GAIN), NULL, NOICON, &gain_item_0, 
+MAKE_MENU(gain_menu, ID2P(LANG_EQUALIZER_GAIN), NULL, Icon_NOICON, &gain_item_0, 
             &gain_item_1, &gain_item_2, &gain_item_3, &gain_item_4);
 
 static const struct menu_item_ex *band_items[3][3] = {
@@ -183,7 +183,7 @@ int do_center_band_menu(void* param)
     cb_and_desc.menu_callback = NULL;
     snprintf(desc, MAX_PATH, str(LANG_EQUALIZER_BAND_PEAK), band);
     cb_and_desc.desc = desc;
-    cb_and_desc.icon = bitmap_icons_6x8[Icon_EQ];
+    cb_and_desc.icon_id = Icon_EQ;
     menu.flags = MT_MENU|(3<<MENU_COUNT_SHIFT)|MENU_HAS_DESC;
     menu.submenus = band_items[band-1];
     menu.callback_and_desc = &cb_and_desc;
@@ -191,17 +191,17 @@ int do_center_band_menu(void* param)
     return 0;
 }
 MAKE_MENU(band_0_menu, ID2P(LANG_EQUALIZER_BAND_LOW_SHELF), NULL, 
-            bitmap_icons_6x8[Icon_EQ], &cutoff_0, &q_0, &gain_0);
+            Icon_EQ, &cutoff_0, &q_0, &gain_0);
 MENUITEM_FUNCTION_WPARAM_DYNTEXT(band_1_menu, do_center_band_menu, (void*)1, NULL,
-                                    centerband_get_name, (void*)1, bitmap_icons_6x8[Icon_EQ]);
+                                    centerband_get_name, (void*)1, Icon_EQ);
 MENUITEM_FUNCTION_WPARAM_DYNTEXT(band_2_menu, do_center_band_menu, (void*)2, NULL,
-                                    centerband_get_name, (void*)2, bitmap_icons_6x8[Icon_EQ]);
+                                    centerband_get_name, (void*)2, Icon_EQ);
 MENUITEM_FUNCTION_WPARAM_DYNTEXT(band_3_menu, do_center_band_menu, (void*)3, NULL,
-                                    centerband_get_name, (void*)3, bitmap_icons_6x8[Icon_EQ]);
+                                    centerband_get_name, (void*)3, Icon_EQ);
 MAKE_MENU(band_4_menu, ID2P(LANG_EQUALIZER_BAND_HIGH_SHELF), NULL, 
-            bitmap_icons_6x8[Icon_EQ], &cutoff_4, &q_4, &gain_4);
+            Icon_EQ, &cutoff_4, &q_4, &gain_4);
 
-MAKE_MENU(advanced_eq_menu_, ID2P(LANG_EQUALIZER_ADVANCED), NULL, bitmap_icons_6x8[Icon_EQ],
+MAKE_MENU(advanced_eq_menu_, ID2P(LANG_EQUALIZER_ADVANCED), NULL, Icon_EQ,
             &band_0_menu, &band_1_menu, &band_2_menu, &band_3_menu, &band_4_menu);
 
 
@@ -627,13 +627,13 @@ bool eq_browse_presets(void)
 
 MENUITEM_FUNCTION(eq_graphical, ID2P(LANG_EQUALIZER_GRAPHICAL),
                     (int(*)(void))eq_menu_graphical, NULL, 
-                    bitmap_icons_6x8[Icon_EQ]);
+                    Icon_EQ);
 MENUITEM_FUNCTION(eq_save, ID2P(LANG_EQUALIZER_SAVE),
-                    (int(*)(void))eq_save_preset, NULL, NOICON);
+                    (int(*)(void))eq_save_preset, NULL, Icon_NOICON);
 MENUITEM_FUNCTION(eq_browse, ID2P(LANG_EQUALIZER_BROWSE),
-                    (int(*)(void))eq_browse_presets, NULL, NOICON);
+                    (int(*)(void))eq_browse_presets, NULL, Icon_NOICON);
 
-MAKE_MENU(equalizer_menu, ID2P(LANG_EQUALIZER), NULL, bitmap_icons_6x8[Icon_EQ],
+MAKE_MENU(equalizer_menu, ID2P(LANG_EQUALIZER), NULL, Icon_EQ,
         &eq_enable, &eq_graphical, &eq_precut, &gain_menu, 
         &advanced_eq_menu_, &eq_save, &eq_browse);
 
@@ -753,33 +753,33 @@ MENUITEM_SETTING(hw_eq_enable, &global_settings.eq_hw_enabled, hweq_enable_callb
 
 MENUITEM_SETTING(hw_eq_cutoff_0, &global_settings.eq_hw_band0_cutoff, band0_callback);
 MENUITEM_SETTING(hw_eq_gain_0, &global_settings.eq_hw_band0_gain, band0_callback);
-MAKE_MENU(hw_eq_band0, ID2P(LANG_EQUALIZER_BAND_LOW_SHELF), NULL, NOICON, 
+MAKE_MENU(hw_eq_band0, ID2P(LANG_EQUALIZER_BAND_LOW_SHELF), NULL, Icon_NOICON, 
     &hw_eq_cutoff_0, &hw_eq_gain_0);
 
 MENUITEM_SETTING(hw_eq_cutoff_1, &global_settings.eq_hw_band1_center, band1_callback);
 MENUITEM_SETTING(hw_eq_bandwidth_1, &global_settings.eq_hw_band1_bandwidth, band1_callback);
 MENUITEM_SETTING(hw_eq_gain_1, &global_settings.eq_hw_band1_gain, band1_callback);
-MAKE_MENU(hw_eq_band1, "Peak Filter 1", NULL, NOICON, 
+MAKE_MENU(hw_eq_band1, "Peak Filter 1", NULL, Icon_NOICON, 
     &hw_eq_cutoff_1, &hw_eq_bandwidth_1, &hw_eq_gain_1);
 
 MENUITEM_SETTING(hw_eq_cutoff_2, &global_settings.eq_hw_band2_center, band2_callback);
 MENUITEM_SETTING(hw_eq_bandwidth_2, &global_settings.eq_hw_band2_bandwidth, band2_callback);
 MENUITEM_SETTING(hw_eq_gain_2, &global_settings.eq_hw_band2_gain, band2_callback);
-MAKE_MENU(hw_eq_band2, "Peak Filter 2", NULL, NOICON, 
+MAKE_MENU(hw_eq_band2, "Peak Filter 2", NULL, Icon_NOICON, 
     &hw_eq_cutoff_2, &hw_eq_bandwidth_2, &hw_eq_gain_2);
 
 MENUITEM_SETTING(hw_eq_cutoff_3, &global_settings.eq_hw_band3_center, band3_callback);
 MENUITEM_SETTING(hw_eq_bandwidth_3, &global_settings.eq_hw_band3_bandwidth, band3_callback);
 MENUITEM_SETTING(hw_eq_gain_3, &global_settings.eq_hw_band3_gain, band3_callback);
-MAKE_MENU(hw_eq_band3, "Peak Filter 3", NULL, NOICON, 
+MAKE_MENU(hw_eq_band3, "Peak Filter 3", NULL, Icon_NOICON, 
     &hw_eq_cutoff_3, &hw_eq_bandwidth_3, &hw_eq_gain_3);
 
 MENUITEM_SETTING(hw_eq_cutoff_4, &global_settings.eq_hw_band4_cutoff, band4_callback);
 MENUITEM_SETTING(hw_eq_gain_4, &global_settings.eq_hw_band4_gain, band4_callback);
-MAKE_MENU(hw_eq_band4, ID2P(LANG_EQUALIZER_BAND_HIGH_SHELF), NULL, NOICON, 
+MAKE_MENU(hw_eq_band4, ID2P(LANG_EQUALIZER_BAND_HIGH_SHELF), NULL, Icon_NOICON, 
     &hw_eq_cutoff_4, &hw_eq_gain_4);
 
-MAKE_MENU(hw_eq_menu, ID2P(LANG_EQUALIZER_HARDWARE), NULL, bitmap_icons_6x8[Icon_EQ],
+MAKE_MENU(hw_eq_menu, ID2P(LANG_EQUALIZER_HARDWARE), NULL, Icon_EQ,
     &hw_eq_enable, &hw_eq_band0, &hw_eq_band1, 
     &hw_eq_band2, &hw_eq_band3, &hw_eq_band4);