summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2007-02-27 11:09:09 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2007-02-27 11:09:09 +0000
commit8ca99d3288e416e15b1d48d2b81ea9f8bb774425 (patch)
tree037061249dacc7dc256740e91a969d3e362b8aa4
parent96016e40598006c4e78837f3714163055af99b40 (diff)
Code Police: Remove tabs throught apps/ . Hopefully no actual code
change git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12504 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/debug_menu.c22
-rw-r--r--apps/keymaps/keymap-gigabeat.c2
-rw-r--r--apps/menu.h24
-rw-r--r--apps/menus/display_menu.c14
-rw-r--r--apps/menus/exported_menus.h2
-rw-r--r--apps/menus/main_menu.c22
-rw-r--r--apps/metadata.c16
-rw-r--r--apps/onplay.c2
-rw-r--r--apps/recorder/icons.c4
-rw-r--r--apps/recorder/icons.h4
-rw-r--r--apps/settings_list.c156
-rw-r--r--apps/settings_list.h2
-rw-r--r--apps/tagcache.c2
-rw-r--r--apps/tree.c8
14 files changed, 140 insertions, 140 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 6df8f6bbef..135c35047b 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -2081,14 +2081,14 @@ static bool dbg_lcd_power_off(void)
while(1)
{
- int button;
+ int button;
lcd_clear_display();
lcd_puts(0, 0, "LCD Power Off");
- if(lcd_poweroff)
- lcd_puts(1, 1, "Yes");
- else
- lcd_puts(1, 1, "No");
+ if(lcd_poweroff)
+ lcd_puts(1, 1, "Yes");
+ else
+ lcd_puts(1, 1, "No");
lcd_update();
@@ -2099,13 +2099,13 @@ static bool dbg_lcd_power_off(void)
case ACTION_STD_NEXT:
lcd_poweroff = !lcd_poweroff;
break;
- case ACTION_STD_OK:
- case ACTION_STD_CANCEL:
- action_signalscreenchange();
- return false;
- default:
+ case ACTION_STD_OK:
+ case ACTION_STD_CANCEL:
+ action_signalscreenchange();
+ return false;
+ default:
sleep(HZ/10);
- break;
+ break;
}
}
return false;
diff --git a/apps/keymaps/keymap-gigabeat.c b/apps/keymaps/keymap-gigabeat.c
index 1287b240fb..3f4f8b6ac9 100644
--- a/apps/keymaps/keymap-gigabeat.c
+++ b/apps/keymaps/keymap-gigabeat.c
@@ -78,7 +78,7 @@ static const struct button_mapping button_context_wps[] = {
{ ACTION_WPS_STOP, BUTTON_A|BUTTON_REL, BUTTON_A },
{ ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, 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_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
diff --git a/apps/menu.h b/apps/menu.h
index c7d6cdbeed..655c9112c4 100644
--- a/apps/menu.h
+++ b/apps/menu.h
@@ -91,9 +91,9 @@ struct menu_item_ex {
const char **strings; /* used with MT_RETURN_ID */
};
union {
- /* For settings */
+ /* For settings */
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 {
int (*menu_callback)(int action,
const struct menu_item_ex *this_item);
@@ -102,16 +102,16 @@ struct menu_item_ex {
ICON icon; /* Icon to display */
#endif
} *callback_and_desc;
- /* For when the item text is dynamic */
- const struct menu_get_name_and_icon {
- int (*menu_callback)(int action,
+ /* For when the item text is dynamic */
+ const struct menu_get_name_and_icon {
+ int (*menu_callback)(int action,
const struct menu_item_ex *this_item);
- char *(*list_get_name)(int selected_item, void * data, char *buffer);
- void *list_get_name_data;
+ char *(*list_get_name)(int selected_item, void * data, char *buffer);
+ void *list_get_name_data;
#ifdef HAVE_LCD_BITMAP
ICON icon; /* Icon to display */
#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, \
{ .func_with_param = &name##__}, \
{.callback_and_desc = & name##_}};
-
+
/* As above, except the text is dynamic */
#define MENUITEM_FUNCTION_WPARAM_DYNTEXT(name, func, param, callback, \
- text_callback, text_cb_data, icon) \
- static const struct menu_get_name_and_icon name##_ \
- = {callback,text_callback,text_cb_data,icon};\
+ text_callback, text_cb_data, icon) \
+ static const struct menu_get_name_and_icon name##_ \
+ = {callback,text_callback,text_cb_data,icon};\
static const struct menu_func_with_param name##__ = {func, param}; \
static const struct menu_item_ex name = \
{ MT_FUNCTION_WITH_PARAM|MENU_DYNAMIC_DESC, \
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c
index 143b47e3c1..254162e7f0 100644
--- a/apps/menus/display_menu.c
+++ b/apps/menus/display_menu.c
@@ -508,8 +508,8 @@ MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, NOICON,
struct browse_folder_info {
- const char* dir;
- int show_options;
+ const char* dir;
+ int show_options;
};
#ifdef HAVE_LCD_BITMAP
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)
{
- const struct browse_folder_info *info =
- (const struct browse_folder_info*)param;
+ const struct browse_folder_info *info =
+ (const struct browse_folder_info*)param;
return rockbox_browse(info->dir, info->show_options);
}
#ifdef HAVE_LCD_BITMAP
MENUITEM_FUNCTION_WPARAM(browse_fonts, ID2P(LANG_CUSTOM_FONT),
- browse_folder, (void*)&fonts, NULL, NOICON);
+ browse_folder, (void*)&fonts, NULL, NOICON);
#endif
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
MENUITEM_FUNCTION_WPARAM(browse_rwps, ID2P(LANG_REMOTE_WHILE_PLAYING),
- browse_folder, (void*)&rwps, NULL, NOICON);
+ browse_folder, (void*)&rwps, NULL, NOICON);
#endif
MENUITEM_SETTING(show_icons, &global_settings.show_icons, NULL);
diff --git a/apps/menus/exported_menus.h b/apps/menus/exported_menus.h
index ec5a28af21..f6b6f5a708 100644
--- a/apps/menus/exported_menus.h
+++ b/apps/menus/exported_menus.h
@@ -33,7 +33,7 @@ extern const struct menu_item_ex
sound_settings, /* sound_menu.c */
settings_menu_item, /* settings_menu.c */
playlist_menu_item, /* playlist_menu.c */
- equalizer_menu; /* eq_menu.c */
+ equalizer_menu; /* eq_menu.c */
#ifdef HAVE_WM8758
extern const struct menu_item_ex hw_eq_menu; /* eq_menu.c */
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index 361090adb7..f821212a5c 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -50,21 +50,21 @@
#endif
/* 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);
struct browse_folder_info {
- const char* dir;
- int show_options;
+ const char* dir;
+ int show_options;
};
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 config = {ROCKBOX_DIR, SHOW_CFG};
static int browse_folder(void *param)
{
- const struct browse_folder_info *info =
- (const struct browse_folder_info*)param;
+ const struct browse_folder_info *info =
+ (const struct browse_folder_info*)param;
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),
- browse_folder, (void*)&config, NULL, NOICON);
+ browse_folder, (void*)&config, NULL, NOICON);
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),
- 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);
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 */
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),
- browse_folder, (void*)&rocks, NULL, bitmap_icons_6x8[Icon_Plugin]);
+ browse_folder, (void*)&rocks, NULL, bitmap_icons_6x8[Icon_Plugin]);
#if CONFIG_TUNER
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)
return action;
-
+
#if CONFIG_TUNER
if (this_item == &load_radio_screen)
{
diff --git a/apps/metadata.c b/apps/metadata.c
index 0c7c69841b..8a941e88e0 100644
--- a/apps/metadata.c
+++ b/apps/metadata.c
@@ -536,7 +536,7 @@ static bool get_speex_metadata(int fd, struct mp3entry* id3)
serial = get_long_le(&buf[14]);
if ((lseek(fd, 33, SEEK_SET) < 0)||(read(fd, buf, 58) < 4))
{
- return false;
+ return false;
}
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 */
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. */
if (read(fd, buf, 27) < 27)
{
- return false;
+ return false;
}
if (memcmp(buf, "OggS", 4) !=0 )
{
- return false;
+ return false;
}
segments = buf[26];
/* read in segment table */
if (read(fd, buf, segments) < segments)
{
- return false;
+ return false;
}
/* 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 */
if (lseek(fd, -(MIN(64 * 1024, id3->filesize)), SEEK_END) < 0)
{
- return false;
+ return false;
}
remaining = 0;
@@ -669,7 +669,7 @@ static bool get_speex_metadata(int fd, struct mp3entry* id3)
logf("serialno mismatch");
logf("%ld", serial);
logf("%ld", last_serial);
- return false;
+ return false;
}
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.filesize = filesize(fd);
if (memcmp(buf,"NESM",4) && memcmp(buf,"NSFE",4)) return false;
- break;
+ break;
case AFMT_AIFF:
if (!get_aiff_metadata(fd, &(track->id3)))
diff --git a/apps/onplay.c b/apps/onplay.c
index 64080195b7..2ad1d7b5f0 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -210,7 +210,7 @@ static bool add_to_playlist(int position, bool queue)
else if ((selected_file_attr & TREE_ATTR_MASK) == TREE_ATTR_M3U)
playlist_insert_playlist(NULL, selected_file, position, queue);
}
-
+
if (new_playlist && (playlist_amount() > 0))
{
/* nothing is currently playing so begin playing what we just
diff --git a/apps/recorder/icons.c b/apps/recorder/icons.c
index 8f2ecc4b80..d3a4f97763 100644
--- a/apps/recorder/icons.c
+++ b/apps/recorder/icons.c
@@ -77,8 +77,8 @@ const unsigned char bitmap_icons_6x8[][6] =
#if CONFIG_TUNER
{ 0x03, 0x05, 0x7f, 0x05, 0x03, 0x00 }, /* radio */
#endif
- { 0x1f, 0x11, 0x7d, 0x46, 0x44, 0x78 }, /* File View Menu */
- { 0x06, 0x7f, 0x06, 0x18, 0x7f, 0x18 }, /* EQ menu */
+ { 0x1f, 0x11, 0x7d, 0x46, 0x44, 0x78 }, /* File View Menu */
+ { 0x06, 0x7f, 0x06, 0x18, 0x7f, 0x18 }, /* EQ menu */
};
const unsigned char bitmap_icons_7x8[][7] =
diff --git a/apps/recorder/icons.h b/apps/recorder/icons.h
index 782dc9a1e3..605341593a 100644
--- a/apps/recorder/icons.h
+++ b/apps/recorder/icons.h
@@ -81,8 +81,8 @@ enum icons_6x8 {
#if CONFIG_TUNER
Icon_Radio_screen,
#endif
- Icon_file_view_menu,
- Icon_EQ,
+ Icon_file_view_menu,
+ Icon_EQ,
Icon6x8Last,
};
diff --git a/apps/settings_list.c b/apps/settings_list.c
index b3a48553f1..b1c78dec68 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -852,56 +852,56 @@ const struct settings_list settings[] = {
NULL, NULL, crossfeed_hf_cutoff_helper),
/* equalizer */
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),
/* 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,
- NULL, NULL, NULL),
- INT_SETTING(0, eq_band1_cutoff, LANG_EQUALIZER_BAND_CENTER, 200, "eq band 1 cutoff",
+ NULL, NULL, NULL),
+ 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,
- NULL, NULL, NULL),
- INT_SETTING(0, eq_band2_cutoff, LANG_EQUALIZER_BAND_CENTER, 800, "eq band 2 cutoff",
+ NULL, NULL, NULL),
+ 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,
- NULL, NULL, NULL),
- INT_SETTING(0, eq_band3_cutoff, LANG_EQUALIZER_BAND_CENTER, 4000, "eq band 3 cutoff",
+ NULL, NULL, NULL),
+ 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,
- NULL, NULL, NULL),
- INT_SETTING(0, eq_band4_cutoff, LANG_EQUALIZER_BAND_CUTOFF, 12000, "eq band 4 cutoff",
+ NULL, NULL, NULL),
+ 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,
- NULL, NULL, NULL),
+ NULL, NULL, NULL),
/* 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,
- eq_q_format, NULL, NULL),
- INT_SETTING(0, eq_band1_q, LANG_EQUALIZER_BAND_Q, 10, "eq band 1 q",
+ eq_q_format, NULL, NULL),
+ 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,
- eq_q_format, NULL, NULL),
- INT_SETTING(0, eq_band2_q, LANG_EQUALIZER_BAND_Q, 10, "eq band 2 q",
+ eq_q_format, NULL, NULL),
+ 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,
- eq_q_format, NULL, NULL),
- INT_SETTING(0, eq_band3_q, LANG_EQUALIZER_BAND_Q, 10, "eq band 3 q",
+ eq_q_format, NULL, NULL),
+ 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,
- eq_q_format, NULL, NULL),
- INT_SETTING(0, eq_band4_q, LANG_EQUALIZER_BAND_Q, 7, "eq band 4 q",
+ eq_q_format, NULL, NULL),
+ 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,
- eq_q_format, NULL, NULL),
+ eq_q_format, NULL, NULL),
/* -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,
- eq_gain_format, NULL, NULL),
- INT_SETTING(0, eq_band1_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 1 gain",
+ eq_gain_format, NULL, NULL),
+ 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,
- eq_gain_format, NULL, NULL),
- INT_SETTING(0, eq_band2_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 2 gain",
+ eq_gain_format, NULL, NULL),
+ 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,
- eq_gain_format, NULL, NULL),
- INT_SETTING(0, eq_band3_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 3 gain",
+ eq_gain_format, NULL, NULL),
+ 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,
- eq_gain_format, NULL, NULL),
- INT_SETTING(0, eq_band4_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 4 gain",
+ eq_gain_format, NULL, NULL),
+ 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,
- eq_gain_format, NULL, NULL),
+ eq_gain_format, NULL, NULL),
/* 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,
"eq hardware enabled",NULL),
- STRINGCHOICE_SETTING(0, eq_hw_band0_cutoff, LANG_EQUALIZER_BAND_CUTOFF, 1,
- "eq hardware band 0 cutoff", "80Hz,105Hz,135Hz,175Hz", NULL, 4,
- TALK_ID(80, UNIT_HERTZ), TALK_ID(105, UNIT_HERTZ),
- TALK_ID(135, UNIT_HERTZ), TALK_ID(175, UNIT_HERTZ)),
- INT_SETTING(0, eq_hw_band0_gain, LANG_EQUALIZER_BAND_GAIN, 0,
- "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),
+ STRINGCHOICE_SETTING(0, eq_hw_band0_cutoff, LANG_EQUALIZER_BAND_CUTOFF, 1,
+ "eq hardware band 0 cutoff", "80Hz,105Hz,135Hz,175Hz", NULL, 4,
+ TALK_ID(80, UNIT_HERTZ), TALK_ID(105, UNIT_HERTZ),
+ TALK_ID(135, UNIT_HERTZ), TALK_ID(175, UNIT_HERTZ)),
+ INT_SETTING(0, eq_hw_band0_gain, LANG_EQUALIZER_BAND_GAIN, 0,
+ "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),
- STRINGCHOICE_SETTING(0, eq_hw_band1_center, LANG_EQUALIZER_BAND_CENTER, 1,
- "eq hardware band 1 center", "230Hz,300Hz,385Hz,500Hz", NULL, 4,
- TALK_ID(230, UNIT_HERTZ), TALK_ID(300, UNIT_HERTZ),
- TALK_ID(385, UNIT_HERTZ), TALK_ID(500, UNIT_HERTZ)),
- CHOICE_SETTING(0, eq_hw_band1_bandwidth, LANG_EQUALIZER_BANDWIDTH, 0,
- "eq hardware band 1 bandwidth", "narrow,wide", NULL, 2,
- ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_NARROW),
- ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_WIDE)),
- INT_SETTING(0, eq_hw_band1_gain, LANG_EQUALIZER_BAND_GAIN, 0,
- "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),
+ STRINGCHOICE_SETTING(0, eq_hw_band1_center, LANG_EQUALIZER_BAND_CENTER, 1,
+ "eq hardware band 1 center", "230Hz,300Hz,385Hz,500Hz", NULL, 4,
+ TALK_ID(230, UNIT_HERTZ), TALK_ID(300, UNIT_HERTZ),
+ TALK_ID(385, UNIT_HERTZ), TALK_ID(500, UNIT_HERTZ)),
+ CHOICE_SETTING(0, eq_hw_band1_bandwidth, LANG_EQUALIZER_BANDWIDTH, 0,
+ "eq hardware band 1 bandwidth", "narrow,wide", NULL, 2,
+ ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_NARROW),
+ ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_WIDE)),
+ INT_SETTING(0, eq_hw_band1_gain, LANG_EQUALIZER_BAND_GAIN, 0,
+ "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),
- 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,
- TALK_ID(650, UNIT_HERTZ), TALK_ID(850, UNIT_HERTZ),
- TALK_ID(1100, UNIT_HERTZ), TALK_ID(1400, UNIT_HERTZ)),
- CHOICE_SETTING(0, eq_hw_band2_bandwidth, LANG_EQUALIZER_BANDWIDTH, 0,
- "eq hardware band 2 bandwidth", "narrow,wide", NULL, 2,
- ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_NARROW),
- ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_WIDE)),
- INT_SETTING(0, eq_hw_band2_gain, LANG_EQUALIZER_BAND_GAIN, 0,
- "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),
+ 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,
+ TALK_ID(650, UNIT_HERTZ), TALK_ID(850, UNIT_HERTZ),
+ TALK_ID(1100, UNIT_HERTZ), TALK_ID(1400, UNIT_HERTZ)),
+ CHOICE_SETTING(0, eq_hw_band2_bandwidth, LANG_EQUALIZER_BANDWIDTH, 0,
+ "eq hardware band 2 bandwidth", "narrow,wide", NULL, 2,
+ ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_NARROW),
+ ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_WIDE)),
+ INT_SETTING(0, eq_hw_band2_gain, LANG_EQUALIZER_BAND_GAIN, 0,
+ "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),
- 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,
- TALK_ID(1800, UNIT_HERTZ), TALK_ID(2400, UNIT_HERTZ),
- TALK_ID(3200, UNIT_HERTZ), TALK_ID(4100, UNIT_HERTZ)),
- CHOICE_SETTING(0, eq_hw_band3_bandwidth, LANG_EQUALIZER_BANDWIDTH, 0,
- "eq hardware band 3 bandwidth", "narrow,wide", NULL, 2,
- ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_NARROW),
- ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_WIDE)),
- INT_SETTING(0, eq_hw_band3_gain, LANG_EQUALIZER_BAND_GAIN, 0,
- "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),
+ 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,
+ TALK_ID(1800, UNIT_HERTZ), TALK_ID(2400, UNIT_HERTZ),
+ TALK_ID(3200, UNIT_HERTZ), TALK_ID(4100, UNIT_HERTZ)),
+ CHOICE_SETTING(0, eq_hw_band3_bandwidth, LANG_EQUALIZER_BANDWIDTH, 0,
+ "eq hardware band 3 bandwidth", "narrow,wide", NULL, 2,
+ ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_NARROW),
+ ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_WIDE)),
+ INT_SETTING(0, eq_hw_band3_gain, LANG_EQUALIZER_BAND_GAIN, 0,
+ "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),
- 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,
- TALK_ID(5300, UNIT_HERTZ), TALK_ID(6900, UNIT_HERTZ),
- TALK_ID(9000, UNIT_HERTZ), TALK_ID(11700, UNIT_HERTZ)),
- INT_SETTING(0, eq_hw_band4_gain, LANG_EQUALIZER_BAND_GAIN, 0,
- "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),
+ 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,
+ TALK_ID(5300, UNIT_HERTZ), TALK_ID(6900, UNIT_HERTZ),
+ TALK_ID(9000, UNIT_HERTZ), TALK_ID(11700, UNIT_HERTZ)),
+ INT_SETTING(0, eq_hw_band4_gain, LANG_EQUALIZER_BAND_GAIN, 0,
+ "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),
#endif
OFFON_SETTING(0,hold_lr_for_scroll_in_list,-1,true,
diff --git a/apps/settings_list.h b/apps/settings_list.h
index 061f20799f..97443e35be 100644
--- a/apps/settings_list.h
+++ b/apps/settings_list.h
@@ -102,7 +102,7 @@ struct choice_setting {
- a NVRAM setting is removed
*/
#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 {
uint32_t flags; /* ____ ____ TFFF ____ NNN_ FTVC IFRB STTT */
diff --git a/apps/tagcache.c b/apps/tagcache.c
index 9e3a4440e0..1d87f29b50 100644
--- a/apps/tagcache.c
+++ b/apps/tagcache.c
@@ -762,7 +762,7 @@ static bool check_against_clause(long numeric, const char *str,
case clause_begins_with:
return (strcasestr(str, clause->str) == str);
case clause_not_begins_with:
- return (strcasestr(str, clause->str) != str);
+ return (strcasestr(str, clause->str) != str);
case clause_ends_with:
return str_ends_with(str, clause->str);
case clause_not_ends_with:
diff --git a/apps/tree.c b/apps/tree.c
index 3074752add..a8eaea6aa6 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -224,7 +224,7 @@ static void tree_get_fileicon(int selected_item, void * data, ICON * icon)
}
else
#endif
- {
+ {
struct entry* dc = local_tc->dircache;
struct entry* e = &dc[selected_item];
*icon = (ICON)filetype_get_icon(e->attr);
@@ -340,7 +340,7 @@ static int update_dir(void)
}
else
#endif
- {
+ {
/* if the tc.currdir has been changed, reload it ...*/
if (strncmp(tc.currdir, lastdir, sizeof(lastdir)) || reload_dir) {
@@ -365,9 +365,9 @@ static int update_dir(void)
{
if(
#ifdef HAVE_TAGCACHE
- !id3db &&
+ !id3db &&
#endif
- (tc.dirfull ||
+ (tc.dirfull ||
tc.filesindir == global_settings.max_files_in_dir) )
{
gui_syncsplash(HZ, true, str(LANG_SHOWDIR_BUFFER_FULL));