forked from len0rd/rockbox
h1x0/h3x0: Fix missing TIME context in remote button map
It was actually defined but not actually mapped in. Also shut up a warning in the peakmeter code when not using a color display. Both caught by -Wunused-const-variable Change-Id: Ie2403c0cd77e6fdf3468fd45115a1e0f228238e8
This commit is contained in:
parent
3b974e791a
commit
6d24ff3257
2 changed files with 150 additions and 149 deletions
|
@ -703,7 +703,6 @@ static const struct button_mapping button_context_radio_h300lcdremote[] = {
|
|||
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
|
||||
};
|
||||
|
||||
|
||||
static const struct button_mapping button_context_time_remote[] = {
|
||||
{ ACTION_STD_CANCEL, BUTTON_OFF, BUTTON_NONE },
|
||||
{ ACTION_STD_OK, BUTTON_ON, BUTTON_NONE },
|
||||
|
@ -881,6 +880,7 @@ static const struct button_mapping* get_context_mapping_remote(int context)
|
|||
case CONTEXT_CUSTOM|CONTEXT_TREE:
|
||||
return remote_btn_ctxt_tree;
|
||||
case CONTEXT_SETTINGS_TIME:
|
||||
return button_context_time_remote;
|
||||
case CONTEXT_SETTINGS_RECTRIGGER:
|
||||
return remote_btn_ctxt_settingsgrph;
|
||||
|
||||
|
|
|
@ -134,7 +134,9 @@ static int hist_l = 0;
|
|||
static int hist_r = 0;
|
||||
static unsigned char history_l[HIST_BUF_SIZE];
|
||||
static unsigned char history_r[HIST_BUF_SIZE];
|
||||
#ifdef HAVE_LCD_COLOR
|
||||
static const char hist_level_marks[6] = { 29, 26, 23, 17, 9, 2};
|
||||
#endif
|
||||
static int history_pos = 0;
|
||||
#define HIST_W (LCD_WIDTH / 2)
|
||||
#if LCD_DEPTH > 1
|
||||
|
@ -1453,4 +1455,3 @@ void histogram_draw(int x1, int x2, int y1, int y2, int width, int height)
|
|||
#endif
|
||||
}
|
||||
#endif /* HAVE_HISTOGRAM */
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue