len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Code Police: Remove tabs throught apps/ . Hopefully no actual code

Browse source 
change


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12504 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2007-02-27 11:09:09 +00:00
parent 96016e4059
commit 8ca99d3288
14 changed files with 140 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

22
apps/debug_menu.c
View file

@ -2081,14 +2081,14 @@ static bool dbg_lcd_power_off(void)
while(1) while(1)
{ {
int button; int button;
lcd_clear_display(); lcd_clear_display();
lcd_puts(0, 0, "LCD Power Off"); lcd_puts(0, 0, "LCD Power Off");
if(lcd_poweroff) if(lcd_poweroff)
lcd_puts(1, 1, "Yes"); lcd_puts(1, 1, "Yes");
else else
lcd_puts(1, 1, "No"); lcd_puts(1, 1, "No");
lcd_update(); lcd_update();
@ -2099,13 +2099,13 @@ static bool dbg_lcd_power_off(void)
case ACTION_STD_NEXT: case ACTION_STD_NEXT:
lcd_poweroff = !lcd_poweroff; lcd_poweroff = !lcd_poweroff;
break; break;
case ACTION_STD_OK: case ACTION_STD_OK:
case ACTION_STD_CANCEL: case ACTION_STD_CANCEL:
action_signalscreenchange(); action_signalscreenchange();
return false; return false;
default: default:
sleep(HZ/10); sleep(HZ/10);
break; break;
} }
} }
return false; return false;

2
apps/keymaps/keymap-gigabeat.c
View file

@ -78,7 +78,7 @@ static const struct button_mapping button_context_wps[] = {
{ ACTION_WPS_STOP, BUTTON_A|BUTTON_REL, BUTTON_A }, { ACTION_WPS_STOP, BUTTON_A|BUTTON_REL, BUTTON_A },
{ ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE },
{ ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE },
{ ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },

24
apps/menu.h
View file

@ -91,9 +91,9 @@ struct menu_item_ex {
const char **strings; /* used with MT_RETURN_ID */ const char **strings; /* used with MT_RETURN_ID */
}; };
union { union {
/* For settings */ /* For settings */
int (*menu_callback)(int action, const struct menu_item_ex *this_item); int (*menu_callback)(int action, const struct menu_item_ex *this_item);
/* For everything else, except if the text is dynamic */ /* For everything else, except if the text is dynamic */
const struct menu_callback_with_desc { const struct menu_callback_with_desc {
int (*menu_callback)(int action, int (*menu_callback)(int action,
const struct menu_item_ex *this_item); const struct menu_item_ex *this_item);
@ -102,16 +102,16 @@ struct menu_item_ex {
ICON icon; /* Icon to display */ ICON icon; /* Icon to display */
#endif #endif
} *callback_and_desc; } *callback_and_desc;
/* For when the item text is dynamic */ /* For when the item text is dynamic */
const struct menu_get_name_and_icon { const struct menu_get_name_and_icon {
int (*menu_callback)(int action, int (*menu_callback)(int action,
const struct menu_item_ex *this_item); const struct menu_item_ex *this_item);
char *(*list_get_name)(int selected_item, void * data, char *buffer); char *(*list_get_name)(int selected_item, void * data, char *buffer);
void *list_get_name_data; void *list_get_name_data;
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
ICON icon; /* Icon to display */ ICON icon; /* Icon to display */
#endif #endif
} *menu_get_name_and_icon; } *menu_get_name_and_icon;
}; };
}; };
@ -168,12 +168,12 @@ bool do_setting_from_menu(const struct menu_item_ex *temp);
{ MT_FUNCTION_WITH_PARAM|MENU_HAS_DESC, \ { MT_FUNCTION_WITH_PARAM|MENU_HAS_DESC, \
{ .func_with_param = &name##__}, \ { .func_with_param = &name##__}, \
{.callback_and_desc = & name##_}}; {.callback_and_desc = & name##_}};
/* As above, except the text is dynamic */ /* As above, except the text is dynamic */
#define MENUITEM_FUNCTION_WPARAM_DYNTEXT(name, func, param, callback, \ #define MENUITEM_FUNCTION_WPARAM_DYNTEXT(name, func, param, callback, \
text_callback, text_cb_data, icon) \ text_callback, text_cb_data, icon) \
static const struct menu_get_name_and_icon name##_ \ static const struct menu_get_name_and_icon name##_ \
= {callback,text_callback,text_cb_data,icon};\ = {callback,text_callback,text_cb_data,icon};\
static const struct menu_func_with_param name##__ = {func, param}; \ static const struct menu_func_with_param name##__ = {func, param}; \
static const struct menu_item_ex name = \ static const struct menu_item_ex name = \
{ MT_FUNCTION_WITH_PARAM|MENU_DYNAMIC_DESC, \ { MT_FUNCTION_WITH_PARAM|MENU_DYNAMIC_DESC, \

14
apps/menus/display_menu.c
View file

@ -508,8 +508,8 @@ MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, NOICON,
struct browse_folder_info { struct browse_folder_info {
const char* dir; const char* dir;
int show_options; int show_options;
}; };
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
static struct browse_folder_info fonts = {FONT_DIR, SHOW_FONT}; static struct browse_folder_info fonts = {FONT_DIR, SHOW_FONT};
@ -521,20 +521,20 @@ static struct browse_folder_info rwps = {WPS_DIR, SHOW_RWPS};
static int browse_folder(void *param) static int browse_folder(void *param)
{ {
const struct browse_folder_info *info = const struct browse_folder_info *info =
(const struct browse_folder_info*)param; (const struct browse_folder_info*)param;
return rockbox_browse(info->dir, info->show_options); return rockbox_browse(info->dir, info->show_options);
} }
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
MENUITEM_FUNCTION_WPARAM(browse_fonts, ID2P(LANG_CUSTOM_FONT), MENUITEM_FUNCTION_WPARAM(browse_fonts, ID2P(LANG_CUSTOM_FONT),
browse_folder, (void*)&fonts, NULL, NOICON); browse_folder, (void*)&fonts, NULL, NOICON);
#endif #endif
MENUITEM_FUNCTION_WPARAM(browse_wps, ID2P(LANG_WHILE_PLAYING), MENUITEM_FUNCTION_WPARAM(browse_wps, ID2P(LANG_WHILE_PLAYING),
browse_folder, (void*)&wps, NULL, NOICON); browse_folder, (void*)&wps, NULL, NOICON);
#ifdef HAVE_REMOTE_LCD #ifdef HAVE_REMOTE_LCD
MENUITEM_FUNCTION_WPARAM(browse_rwps, ID2P(LANG_REMOTE_WHILE_PLAYING), MENUITEM_FUNCTION_WPARAM(browse_rwps, ID2P(LANG_REMOTE_WHILE_PLAYING),
browse_folder, (void*)&rwps, NULL, NOICON); browse_folder, (void*)&rwps, NULL, NOICON);
#endif #endif
MENUITEM_SETTING(show_icons, &global_settings.show_icons, NULL); MENUITEM_SETTING(show_icons, &global_settings.show_icons, NULL);

2
apps/menus/exported_menus.h
View file

@ -33,7 +33,7 @@ extern const struct menu_item_ex
sound_settings, /* sound_menu.c */ sound_settings, /* sound_menu.c */
settings_menu_item, /* settings_menu.c */ settings_menu_item, /* settings_menu.c */
playlist_menu_item, /* playlist_menu.c */ playlist_menu_item, /* playlist_menu.c */
equalizer_menu; /* eq_menu.c */ equalizer_menu; /* eq_menu.c */
#ifdef HAVE_WM8758 #ifdef HAVE_WM8758
extern const struct menu_item_ex hw_eq_menu; /* eq_menu.c */ extern const struct menu_item_ex hw_eq_menu; /* eq_menu.c */

22
apps/menus/main_menu.c
View file

@ -50,21 +50,21 @@
#endif #endif
/* lazy coders can use this function if the needed callback /* lazy coders can use this function if the needed callback
is just to say if the item is shown or not */ is just to say if the item is shown or not */
int dynamicitem_callback(int action,const struct menu_item_ex *this_item); int dynamicitem_callback(int action,const struct menu_item_ex *this_item);
struct browse_folder_info { struct browse_folder_info {
const char* dir; const char* dir;
int show_options; int show_options;
}; };
static struct browse_folder_info theme = {THEME_DIR, SHOW_CFG}; static struct browse_folder_info theme = {THEME_DIR, SHOW_CFG};
static struct browse_folder_info rocks = {PLUGIN_DIR, SHOW_PLUGINS}; static struct browse_folder_info rocks = {PLUGIN_DIR, SHOW_PLUGINS};
static struct browse_folder_info config = {ROCKBOX_DIR, SHOW_CFG}; static struct browse_folder_info config = {ROCKBOX_DIR, SHOW_CFG};
static int browse_folder(void *param) static int browse_folder(void *param)
{ {
const struct browse_folder_info *info = const struct browse_folder_info *info =
(const struct browse_folder_info*)param; (const struct browse_folder_info*)param;
return rockbox_browse(info->dir, info->show_options); return rockbox_browse(info->dir, info->show_options);
} }
@ -103,11 +103,11 @@ static int write_settings_file(void* param)
} }
MENUITEM_FUNCTION_WPARAM(browse_configs, ID2P(LANG_CUSTOM_CFG), MENUITEM_FUNCTION_WPARAM(browse_configs, ID2P(LANG_CUSTOM_CFG),
browse_folder, (void*)&config, NULL, NOICON); browse_folder, (void*)&config, NULL, NOICON);
MENUITEM_FUNCTION_WPARAM(save_settings_item, ID2P(LANG_SAVE_SETTINGS), MENUITEM_FUNCTION_WPARAM(save_settings_item, ID2P(LANG_SAVE_SETTINGS),
write_settings_file, (void*)SETTINGS_SAVE_ALL, NULL, NOICON); write_settings_file, (void*)SETTINGS_SAVE_ALL, NULL, NOICON);
MENUITEM_FUNCTION_WPARAM(save_theme_item, ID2P(LANG_SAVE_THEME), MENUITEM_FUNCTION_WPARAM(save_theme_item, ID2P(LANG_SAVE_THEME),
write_settings_file, (void*)SETTINGS_SAVE_THEME, NULL, NOICON); write_settings_file, (void*)SETTINGS_SAVE_THEME, NULL, NOICON);
MENUITEM_FUNCTION(reset_settings_item,ID2P(LANG_RESET),reset_settings, NULL, NOICON); MENUITEM_FUNCTION(reset_settings_item,ID2P(LANG_RESET),reset_settings, NULL, NOICON);
MAKE_MENU(manage_settings, ID2P(LANG_MANAGE_MENU), NULL, bitmap_icons_6x8[Icon_Config], MAKE_MENU(manage_settings, ID2P(LANG_MANAGE_MENU), NULL, bitmap_icons_6x8[Icon_Config],
@ -383,9 +383,9 @@ MAKE_MENU(info_menu, ID2P(LANG_INFO), 0, bitmap_icons_6x8[Icon_Questionmark],
/* MAIN MENU */ /* MAIN MENU */
MENUITEM_FUNCTION_WPARAM(browse_themes, ID2P(LANG_CUSTOM_THEME), MENUITEM_FUNCTION_WPARAM(browse_themes, ID2P(LANG_CUSTOM_THEME),
browse_folder, (void*)&theme, NULL, bitmap_icons_6x8[Icon_Folder]); browse_folder, (void*)&theme, NULL, bitmap_icons_6x8[Icon_Folder]);
MENUITEM_FUNCTION_WPARAM(browse_plugins, ID2P(LANG_PLUGINS), MENUITEM_FUNCTION_WPARAM(browse_plugins, ID2P(LANG_PLUGINS),
browse_folder, (void*)&rocks, NULL, bitmap_icons_6x8[Icon_Plugin]); browse_folder, (void*)&rocks, NULL, bitmap_icons_6x8[Icon_Plugin]);
#if CONFIG_TUNER #if CONFIG_TUNER
MENUITEM_FUNCTION(load_radio_screen, ID2P(LANG_FM_RADIO), MENUITEM_FUNCTION(load_radio_screen, ID2P(LANG_FM_RADIO),
@ -449,7 +449,7 @@ int dynamicitem_callback(int action,const struct menu_item_ex *this_item)
{ {
if (action != ACTION_ENTER_MENUITEM) if (action != ACTION_ENTER_MENUITEM)
return action; return action;
#if CONFIG_TUNER #if CONFIG_TUNER
if (this_item == &load_radio_screen) if (this_item == &load_radio_screen)
{ {

16
apps/metadata.c
View file

@ -536,7 +536,7 @@ static bool get_speex_metadata(int fd, struct mp3entry* id3)
serial = get_long_le(&buf[14]); serial = get_long_le(&buf[14]);
if ((lseek(fd, 33, SEEK_SET) < 0)||(read(fd, buf, 58) < 4)) if ((lseek(fd, 33, SEEK_SET) < 0)||(read(fd, buf, 58) < 4))
{ {
return false; return false;
} }
id3->frequency = get_slong(&buf[31]); id3->frequency = get_slong(&buf[31]);
@ -547,25 +547,25 @@ static bool get_speex_metadata(int fd, struct mp3entry* id3)
/* Comments are in second Ogg page */ /* Comments are in second Ogg page */
if (lseek(fd, 28+last_serial/*(temporary for header size)*/, SEEK_SET) < 0) if (lseek(fd, 28+last_serial/*(temporary for header size)*/, SEEK_SET) < 0)
{ {
return false; return false;
} }
/* Minimum header length for Ogg pages is 27. */ /* Minimum header length for Ogg pages is 27. */
if (read(fd, buf, 27) < 27) if (read(fd, buf, 27) < 27)
{ {
return false; return false;
} }
if (memcmp(buf, "OggS", 4) !=0 ) if (memcmp(buf, "OggS", 4) !=0 )
{ {
return false; return false;
} }
segments = buf[26]; segments = buf[26];
/* read in segment table */ /* read in segment table */
if (read(fd, buf, segments) < segments) if (read(fd, buf, segments) < segments)
{ {
return false; return false;
} }
/* The second packet in a vorbis stream is the comment packet. It *may* /* The second packet in a vorbis stream is the comment packet. It *may*
@ -595,7 +595,7 @@ static bool get_speex_metadata(int fd, struct mp3entry* id3)
/* A page is always < 64 kB */ /* A page is always < 64 kB */
if (lseek(fd, -(MIN(64 * 1024, id3->filesize)), SEEK_END) < 0) if (lseek(fd, -(MIN(64 * 1024, id3->filesize)), SEEK_END) < 0)
{ {
return false; return false;
} }
remaining = 0; remaining = 0;
@ -669,7 +669,7 @@ static bool get_speex_metadata(int fd, struct mp3entry* id3)
logf("serialno mismatch"); logf("serialno mismatch");
logf("%ld", serial); logf("%ld", serial);
logf("%ld", last_serial); logf("%ld", last_serial);
return false; return false;
} }
id3->length = (id3->samples / id3->frequency) * 1000; id3->length = (id3->samples / id3->frequency) * 1000;
@ -2190,7 +2190,7 @@ bool get_metadata(struct track_info* track, int fd, const char* trackname,
track->id3.vbr = false; track->id3.vbr = false;
track->id3.filesize = filesize(fd); track->id3.filesize = filesize(fd);
if (memcmp(buf,"NESM",4) && memcmp(buf,"NSFE",4)) return false; if (memcmp(buf,"NESM",4) && memcmp(buf,"NSFE",4)) return false;
break; break;
case AFMT_AIFF: case AFMT_AIFF:
if (!get_aiff_metadata(fd, &(track->id3))) if (!get_aiff_metadata(fd, &(track->id3)))

2
apps/onplay.c
View file

@ -210,7 +210,7 @@ static bool add_to_playlist(int position, bool queue)
else if ((selected_file_attr & TREE_ATTR_MASK) == TREE_ATTR_M3U) else if ((selected_file_attr & TREE_ATTR_MASK) == TREE_ATTR_M3U)
playlist_insert_playlist(NULL, selected_file, position, queue); playlist_insert_playlist(NULL, selected_file, position, queue);
} }
if (new_playlist && (playlist_amount() > 0)) if (new_playlist && (playlist_amount() > 0))
{ {
/* nothing is currently playing so begin playing what we just /* nothing is currently playing so begin playing what we just

4
apps/recorder/icons.c
View file

@ -77,8 +77,8 @@ const unsigned char bitmap_icons_6x8[][6] =
#if CONFIG_TUNER #if CONFIG_TUNER
{ 0x03, 0x05, 0x7f, 0x05, 0x03, 0x00 }, /* radio */ { 0x03, 0x05, 0x7f, 0x05, 0x03, 0x00 }, /* radio */
#endif #endif
{ 0x1f, 0x11, 0x7d, 0x46, 0x44, 0x78 }, /* File View Menu */ { 0x1f, 0x11, 0x7d, 0x46, 0x44, 0x78 }, /* File View Menu */
{ 0x06, 0x7f, 0x06, 0x18, 0x7f, 0x18 }, /* EQ menu */ { 0x06, 0x7f, 0x06, 0x18, 0x7f, 0x18 }, /* EQ menu */
}; };
const unsigned char bitmap_icons_7x8[][7] = const unsigned char bitmap_icons_7x8[][7] =

4
apps/recorder/icons.h
View file

@ -81,8 +81,8 @@ enum icons_6x8 {
#if CONFIG_TUNER #if CONFIG_TUNER
Icon_Radio_screen, Icon_Radio_screen,
#endif #endif
Icon_file_view_menu, Icon_file_view_menu,
Icon_EQ, Icon_EQ,
Icon6x8Last, Icon6x8Last,
}; };

156
apps/settings_list.c
View file

@ -852,56 +852,56 @@ const struct settings_list settings[] = {
NULL, NULL, crossfeed_hf_cutoff_helper), NULL, NULL, crossfeed_hf_cutoff_helper),
/* equalizer */ /* equalizer */
OFFON_SETTING(0,eq_enabled,LANG_EQUALIZER_ENABLED,false,"eq enabled",NULL), OFFON_SETTING(0,eq_enabled,LANG_EQUALIZER_ENABLED,false,"eq enabled",NULL),
INT_SETTING(0, eq_precut, LANG_EQUALIZER_PRECUT, 0, "eq precut", INT_SETTING(0, eq_precut, LANG_EQUALIZER_PRECUT, 0, "eq precut",
UNIT_DB, 0, 240, 5, eq_precut_format, NULL, dsp_set_eq_precut), UNIT_DB, 0, 240, 5, eq_precut_format, NULL, dsp_set_eq_precut),
/* 0..32768 Hz */ /* 0..32768 Hz */
INT_SETTING(0, eq_band0_cutoff, LANG_EQUALIZER_BAND_CUTOFF, 60, "eq band 0 cutoff", INT_SETTING(0, eq_band0_cutoff, LANG_EQUALIZER_BAND_CUTOFF, 60, "eq band 0 cutoff",
UNIT_HERTZ, EQ_CUTOFF_MIN, EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, UNIT_HERTZ, EQ_CUTOFF_MIN, EQ_CUTOFF_MAX, EQ_CUTOFF_STEP,
NULL, NULL, NULL), NULL, NULL, NULL),
INT_SETTING(0, eq_band1_cutoff, LANG_EQUALIZER_BAND_CENTER, 200, "eq band 1 cutoff", INT_SETTING(0, eq_band1_cutoff, LANG_EQUALIZER_BAND_CENTER, 200, "eq band 1 cutoff",
UNIT_HERTZ, EQ_CUTOFF_MIN, EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, UNIT_HERTZ, EQ_CUTOFF_MIN, EQ_CUTOFF_MAX, EQ_CUTOFF_STEP,
NULL, NULL, NULL), NULL, NULL, NULL),
INT_SETTING(0, eq_band2_cutoff, LANG_EQUALIZER_BAND_CENTER, 800, "eq band 2 cutoff", INT_SETTING(0, eq_band2_cutoff, LANG_EQUALIZER_BAND_CENTER, 800, "eq band 2 cutoff",
UNIT_HERTZ, EQ_CUTOFF_MIN, EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, UNIT_HERTZ, EQ_CUTOFF_MIN, EQ_CUTOFF_MAX, EQ_CUTOFF_STEP,
NULL, NULL, NULL), NULL, NULL, NULL),
INT_SETTING(0, eq_band3_cutoff, LANG_EQUALIZER_BAND_CENTER, 4000, "eq band 3 cutoff", INT_SETTING(0, eq_band3_cutoff, LANG_EQUALIZER_BAND_CENTER, 4000, "eq band 3 cutoff",
UNIT_HERTZ, EQ_CUTOFF_MIN, EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, UNIT_HERTZ, EQ_CUTOFF_MIN, EQ_CUTOFF_MAX, EQ_CUTOFF_STEP,
NULL, NULL, NULL), NULL, NULL, NULL),
INT_SETTING(0, eq_band4_cutoff, LANG_EQUALIZER_BAND_CUTOFF, 12000, "eq band 4 cutoff", INT_SETTING(0, eq_band4_cutoff, LANG_EQUALIZER_BAND_CUTOFF, 12000, "eq band 4 cutoff",
UNIT_HERTZ, EQ_CUTOFF_MIN, EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, UNIT_HERTZ, EQ_CUTOFF_MIN, EQ_CUTOFF_MAX, EQ_CUTOFF_STEP,
NULL, NULL, NULL), NULL, NULL, NULL),
/* 0..64 (or 0.0 to 6.4) */ /* 0..64 (or 0.0 to 6.4) */
INT_SETTING(0, eq_band0_q, LANG_EQUALIZER_BAND_Q, 7, "eq band 0 q", INT_SETTING(0, eq_band0_q, LANG_EQUALIZER_BAND_Q, 7, "eq band 0 q",
UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
eq_q_format, NULL, NULL), eq_q_format, NULL, NULL),
INT_SETTING(0, eq_band1_q, LANG_EQUALIZER_BAND_Q, 10, "eq band 1 q", INT_SETTING(0, eq_band1_q, LANG_EQUALIZER_BAND_Q, 10, "eq band 1 q",
UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
eq_q_format, NULL, NULL), eq_q_format, NULL, NULL),
INT_SETTING(0, eq_band2_q, LANG_EQUALIZER_BAND_Q, 10, "eq band 2 q", INT_SETTING(0, eq_band2_q, LANG_EQUALIZER_BAND_Q, 10, "eq band 2 q",
UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
eq_q_format, NULL, NULL), eq_q_format, NULL, NULL),
INT_SETTING(0, eq_band3_q, LANG_EQUALIZER_BAND_Q, 10, "eq band 3 q", INT_SETTING(0, eq_band3_q, LANG_EQUALIZER_BAND_Q, 10, "eq band 3 q",
UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
eq_q_format, NULL, NULL), eq_q_format, NULL, NULL),
INT_SETTING(0, eq_band4_q, LANG_EQUALIZER_BAND_Q, 7, "eq band 4 q", INT_SETTING(0, eq_band4_q, LANG_EQUALIZER_BAND_Q, 7, "eq band 4 q",
UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
eq_q_format, NULL, NULL), eq_q_format, NULL, NULL),
/* -240..240 (or -24db to +24db) */ /* -240..240 (or -24db to +24db) */
INT_SETTING(0, eq_band0_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 0 gain", INT_SETTING(0, eq_band0_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 0 gain",
UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP, UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP,
eq_gain_format, NULL, NULL), eq_gain_format, NULL, NULL),
INT_SETTING(0, eq_band1_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 1 gain", INT_SETTING(0, eq_band1_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 1 gain",
UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP, UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP,
eq_gain_format, NULL, NULL), eq_gain_format, NULL, NULL),
INT_SETTING(0, eq_band2_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 2 gain", INT_SETTING(0, eq_band2_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 2 gain",
UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP, UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP,
eq_gain_format, NULL, NULL), eq_gain_format, NULL, NULL),
INT_SETTING(0, eq_band3_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 3 gain", INT_SETTING(0, eq_band3_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 3 gain",
UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP, UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP,
eq_gain_format, NULL, NULL), eq_gain_format, NULL, NULL),
INT_SETTING(0, eq_band4_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 4 gain", INT_SETTING(0, eq_band4_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 4 gain",
UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP, UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP,
eq_gain_format, NULL, NULL), eq_gain_format, NULL, NULL),
/* dithering */ /* dithering */
OFFON_SETTING(0, dithering_enabled, LANG_DITHERING, OFFON_SETTING(0, dithering_enabled, LANG_DITHERING,
@ -959,57 +959,57 @@ const struct settings_list settings[] = {
OFFON_SETTING(0,eq_hw_enabled,LANG_EQUALIZER_HARDWARE_ENABLED,false, OFFON_SETTING(0,eq_hw_enabled,LANG_EQUALIZER_HARDWARE_ENABLED,false,
"eq hardware enabled",NULL), "eq hardware enabled",NULL),
STRINGCHOICE_SETTING(0, eq_hw_band0_cutoff, LANG_EQUALIZER_BAND_CUTOFF, 1, STRINGCHOICE_SETTING(0, eq_hw_band0_cutoff, LANG_EQUALIZER_BAND_CUTOFF, 1,
"eq hardware band 0 cutoff", "80Hz,105Hz,135Hz,175Hz", NULL, 4, "eq hardware band 0 cutoff", "80Hz,105Hz,135Hz,175Hz", NULL, 4,
TALK_ID(80, UNIT_HERTZ), TALK_ID(105, UNIT_HERTZ), TALK_ID(80, UNIT_HERTZ), TALK_ID(105, UNIT_HERTZ),
TALK_ID(135, UNIT_HERTZ), TALK_ID(175, UNIT_HERTZ)), TALK_ID(135, UNIT_HERTZ), TALK_ID(175, UNIT_HERTZ)),
INT_SETTING(0, eq_hw_band0_gain, LANG_EQUALIZER_BAND_GAIN, 0, INT_SETTING(0, eq_hw_band0_gain, LANG_EQUALIZER_BAND_GAIN, 0,
"eq hardware band 0 gain", UNIT_DB, EQ_HW_GAIN_MIN, "eq hardware band 0 gain", UNIT_DB, EQ_HW_GAIN_MIN,
EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL), EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL),
STRINGCHOICE_SETTING(0, eq_hw_band1_center, LANG_EQUALIZER_BAND_CENTER, 1, STRINGCHOICE_SETTING(0, eq_hw_band1_center, LANG_EQUALIZER_BAND_CENTER, 1,
"eq hardware band 1 center", "230Hz,300Hz,385Hz,500Hz", NULL, 4, "eq hardware band 1 center", "230Hz,300Hz,385Hz,500Hz", NULL, 4,
TALK_ID(230, UNIT_HERTZ), TALK_ID(300, UNIT_HERTZ), TALK_ID(230, UNIT_HERTZ), TALK_ID(300, UNIT_HERTZ),
TALK_ID(385, UNIT_HERTZ), TALK_ID(500, UNIT_HERTZ)), TALK_ID(385, UNIT_HERTZ), TALK_ID(500, UNIT_HERTZ)),
CHOICE_SETTING(0, eq_hw_band1_bandwidth, LANG_EQUALIZER_BANDWIDTH, 0, CHOICE_SETTING(0, eq_hw_band1_bandwidth, LANG_EQUALIZER_BANDWIDTH, 0,
"eq hardware band 1 bandwidth", "narrow,wide", NULL, 2, "eq hardware band 1 bandwidth", "narrow,wide", NULL, 2,
ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_NARROW), ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_NARROW),
ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_WIDE)), ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_WIDE)),
INT_SETTING(0, eq_hw_band1_gain, LANG_EQUALIZER_BAND_GAIN, 0, INT_SETTING(0, eq_hw_band1_gain, LANG_EQUALIZER_BAND_GAIN, 0,
"eq hardware band 1 gain", UNIT_DB, EQ_HW_GAIN_MIN, "eq hardware band 1 gain", UNIT_DB, EQ_HW_GAIN_MIN,
EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL), EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL),
STRINGCHOICE_SETTING(0, eq_hw_band2_center, LANG_EQUALIZER_BAND_CENTER, 1, STRINGCHOICE_SETTING(0, eq_hw_band2_center, LANG_EQUALIZER_BAND_CENTER, 1,
"eq hardware band 2 center", "650Hz,850Hz,1.1kHz,1.4kHz", NULL, 4, "eq hardware band 2 center", "650Hz,850Hz,1.1kHz,1.4kHz", NULL, 4,
TALK_ID(650, UNIT_HERTZ), TALK_ID(850, UNIT_HERTZ), TALK_ID(650, UNIT_HERTZ), TALK_ID(850, UNIT_HERTZ),
TALK_ID(1100, UNIT_HERTZ), TALK_ID(1400, UNIT_HERTZ)), TALK_ID(1100, UNIT_HERTZ), TALK_ID(1400, UNIT_HERTZ)),
CHOICE_SETTING(0, eq_hw_band2_bandwidth, LANG_EQUALIZER_BANDWIDTH, 0, CHOICE_SETTING(0, eq_hw_band2_bandwidth, LANG_EQUALIZER_BANDWIDTH, 0,
"eq hardware band 2 bandwidth", "narrow,wide", NULL, 2, "eq hardware band 2 bandwidth", "narrow,wide", NULL, 2,
ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_NARROW), ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_NARROW),
ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_WIDE)), ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_WIDE)),
INT_SETTING(0, eq_hw_band2_gain, LANG_EQUALIZER_BAND_GAIN, 0, INT_SETTING(0, eq_hw_band2_gain, LANG_EQUALIZER_BAND_GAIN, 0,
"eq hardware band 2 gain", UNIT_DB, EQ_HW_GAIN_MIN, "eq hardware band 2 gain", UNIT_DB, EQ_HW_GAIN_MIN,
EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL), EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL),
STRINGCHOICE_SETTING(0, eq_hw_band3_center, LANG_EQUALIZER_BAND_CENTER, 1, STRINGCHOICE_SETTING(0, eq_hw_band3_center, LANG_EQUALIZER_BAND_CENTER, 1,
"eq hardware band 3 center", "1.8kHz,2.4kHz,3.2kHz,4.1kHz", NULL, 4, "eq hardware band 3 center", "1.8kHz,2.4kHz,3.2kHz,4.1kHz", NULL, 4,
TALK_ID(1800, UNIT_HERTZ), TALK_ID(2400, UNIT_HERTZ), TALK_ID(1800, UNIT_HERTZ), TALK_ID(2400, UNIT_HERTZ),
TALK_ID(3200, UNIT_HERTZ), TALK_ID(4100, UNIT_HERTZ)), TALK_ID(3200, UNIT_HERTZ), TALK_ID(4100, UNIT_HERTZ)),
CHOICE_SETTING(0, eq_hw_band3_bandwidth, LANG_EQUALIZER_BANDWIDTH, 0, CHOICE_SETTING(0, eq_hw_band3_bandwidth, LANG_EQUALIZER_BANDWIDTH, 0,
"eq hardware band 3 bandwidth", "narrow,wide", NULL, 2, "eq hardware band 3 bandwidth", "narrow,wide", NULL, 2,
ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_NARROW), ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_NARROW),
ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_WIDE)), ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_WIDE)),
INT_SETTING(0, eq_hw_band3_gain, LANG_EQUALIZER_BAND_GAIN, 0, INT_SETTING(0, eq_hw_band3_gain, LANG_EQUALIZER_BAND_GAIN, 0,
"eq hardware band 3 gain", UNIT_DB, EQ_HW_GAIN_MIN, "eq hardware band 3 gain", UNIT_DB, EQ_HW_GAIN_MIN,
EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL), EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL),
STRINGCHOICE_SETTING(0, eq_hw_band4_cutoff, LANG_EQUALIZER_BAND_CUTOFF, 1, STRINGCHOICE_SETTING(0, eq_hw_band4_cutoff, LANG_EQUALIZER_BAND_CUTOFF, 1,
"eq hardware band 4 cutoff", "5.3kHz,6.9kHz,9kHz,11.7kHz", NULL, 4, "eq hardware band 4 cutoff", "5.3kHz,6.9kHz,9kHz,11.7kHz", NULL, 4,
TALK_ID(5300, UNIT_HERTZ), TALK_ID(6900, UNIT_HERTZ), TALK_ID(5300, UNIT_HERTZ), TALK_ID(6900, UNIT_HERTZ),
TALK_ID(9000, UNIT_HERTZ), TALK_ID(11700, UNIT_HERTZ)), TALK_ID(9000, UNIT_HERTZ), TALK_ID(11700, UNIT_HERTZ)),
INT_SETTING(0, eq_hw_band4_gain, LANG_EQUALIZER_BAND_GAIN, 0, INT_SETTING(0, eq_hw_band4_gain, LANG_EQUALIZER_BAND_GAIN, 0,
"eq hardware band 4 gain", UNIT_DB, EQ_HW_GAIN_MIN, "eq hardware band 4 gain", UNIT_DB, EQ_HW_GAIN_MIN,
EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL), EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL),
#endif #endif
OFFON_SETTING(0,hold_lr_for_scroll_in_list,-1,true, OFFON_SETTING(0,hold_lr_for_scroll_in_list,-1,true,

2
apps/settings_list.h
View file

@ -102,7 +102,7 @@ struct choice_setting {
- a NVRAM setting is removed - a NVRAM setting is removed
*/ */
#define F_TEMPVAR 0x400 /* used if the setting should be set using a temp var */ #define F_TEMPVAR 0x400 /* used if the setting should be set using a temp var */
#define F_FLIPLIST 0x800 /* used if the order in the setting screen is backwards */ #define F_FLIPLIST 0x800 /* used if the order in the setting screen is backwards */
struct settings_list { struct settings_list {
uint32_t flags; /* ____ ____ TFFF ____ NNN_ FTVC IFRB STTT */ uint32_t flags; /* ____ ____ TFFF ____ NNN_ FTVC IFRB STTT */

2
apps/tagcache.c
View file

@ -762,7 +762,7 @@ static bool check_against_clause(long numeric, const char *str,
case clause_begins_with: case clause_begins_with:
return (strcasestr(str, clause->str) == str); return (strcasestr(str, clause->str) == str);
case clause_not_begins_with: case clause_not_begins_with:
return (strcasestr(str, clause->str) != str); return (strcasestr(str, clause->str) != str);
case clause_ends_with: case clause_ends_with:
return str_ends_with(str, clause->str); return str_ends_with(str, clause->str);
case clause_not_ends_with: case clause_not_ends_with:

8
apps/tree.c
View file

@ -224,7 +224,7 @@ static void tree_get_fileicon(int selected_item, void * data, ICON * icon)
} }
else else
#endif #endif
{ {
struct entry* dc = local_tc->dircache; struct entry* dc = local_tc->dircache;
struct entry* e = &dc[selected_item]; struct entry* e = &dc[selected_item];
*icon = (ICON)filetype_get_icon(e->attr); *icon = (ICON)filetype_get_icon(e->attr);
@ -340,7 +340,7 @@ static int update_dir(void)
} }
else else
#endif #endif
{ {
/* if the tc.currdir has been changed, reload it ...*/ /* if the tc.currdir has been changed, reload it ...*/
if (strncmp(tc.currdir, lastdir, sizeof(lastdir)) || reload_dir) { if (strncmp(tc.currdir, lastdir, sizeof(lastdir)) || reload_dir) {
@ -365,9 +365,9 @@ static int update_dir(void)
{ {
if( if(
#ifdef HAVE_TAGCACHE #ifdef HAVE_TAGCACHE
!id3db && !id3db &&
#endif #endif
(tc.dirfull || (tc.dirfull ||
tc.filesindir == global_settings.max_files_in_dir) ) tc.filesindir == global_settings.max_files_in_dir) )
{ {
gui_syncsplash(HZ, true, str(LANG_SHOWDIR_BUFFER_FULL)); gui_syncsplash(HZ, true, str(LANG_SHOWDIR_BUFFER_FULL));