diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-02-27 11:09:09 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-02-27 11:09:09 +0000 |
commit | 8ca99d3288e416e15b1d48d2b81ea9f8bb774425 (patch) | |
tree | 037061249dacc7dc256740e91a969d3e362b8aa4 | |
parent | 96016e40598006c4e78837f3714163055af99b40 (diff) | |
download | rockbox-8ca99d3288e416e15b1d48d2b81ea9f8bb774425.tar.gz rockbox-8ca99d3288e416e15b1d48d2b81ea9f8bb774425.zip |
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.c | 22 | ||||
-rw-r--r-- | apps/keymaps/keymap-gigabeat.c | 2 | ||||
-rw-r--r-- | apps/menu.h | 24 | ||||
-rw-r--r-- | apps/menus/display_menu.c | 14 | ||||
-rw-r--r-- | apps/menus/exported_menus.h | 2 | ||||
-rw-r--r-- | apps/menus/main_menu.c | 22 | ||||
-rw-r--r-- | apps/metadata.c | 16 | ||||
-rw-r--r-- | apps/onplay.c | 2 | ||||
-rw-r--r-- | apps/recorder/icons.c | 4 | ||||
-rw-r--r-- | apps/recorder/icons.h | 4 | ||||
-rw-r--r-- | apps/settings_list.c | 156 | ||||
-rw-r--r-- | apps/settings_list.h | 2 | ||||
-rw-r--r-- | apps/tagcache.c | 2 | ||||
-rw-r--r-- | apps/tree.c | 8 |
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) | |||
2081 | 2081 | ||
2082 | while(1) | 2082 | while(1) |
2083 | { | 2083 | { |
2084 | int button; | 2084 | int button; |
2085 | 2085 | ||
2086 | lcd_clear_display(); | 2086 | lcd_clear_display(); |
2087 | lcd_puts(0, 0, "LCD Power Off"); | 2087 | lcd_puts(0, 0, "LCD Power Off"); |
2088 | if(lcd_poweroff) | 2088 | if(lcd_poweroff) |
2089 | lcd_puts(1, 1, "Yes"); | 2089 | lcd_puts(1, 1, "Yes"); |
2090 | else | 2090 | else |
2091 | lcd_puts(1, 1, "No"); | 2091 | lcd_puts(1, 1, "No"); |
2092 | 2092 | ||
2093 | lcd_update(); | 2093 | lcd_update(); |
2094 | 2094 | ||
@@ -2099,13 +2099,13 @@ static bool dbg_lcd_power_off(void) | |||
2099 | case ACTION_STD_NEXT: | 2099 | case ACTION_STD_NEXT: |
2100 | lcd_poweroff = !lcd_poweroff; | 2100 | lcd_poweroff = !lcd_poweroff; |
2101 | break; | 2101 | break; |
2102 | case ACTION_STD_OK: | 2102 | case ACTION_STD_OK: |
2103 | case ACTION_STD_CANCEL: | 2103 | case ACTION_STD_CANCEL: |
2104 | action_signalscreenchange(); | 2104 | action_signalscreenchange(); |
2105 | return false; | 2105 | return false; |
2106 | default: | 2106 | default: |
2107 | sleep(HZ/10); | 2107 | sleep(HZ/10); |
2108 | break; | 2108 | break; |
2109 | } | 2109 | } |
2110 | } | 2110 | } |
2111 | return false; | 2111 | 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[] = { | |||
78 | { ACTION_WPS_STOP, BUTTON_A|BUTTON_REL, BUTTON_A }, | 78 | { ACTION_WPS_STOP, BUTTON_A|BUTTON_REL, BUTTON_A }, |
79 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 79 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
80 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, | 80 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, |
81 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, | 81 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, |
82 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 82 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
83 | 83 | ||
84 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 84 | { 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 { | |||
91 | const char **strings; /* used with MT_RETURN_ID */ | 91 | const char **strings; /* used with MT_RETURN_ID */ |
92 | }; | 92 | }; |
93 | union { | 93 | union { |
94 | /* For settings */ | 94 | /* For settings */ |
95 | int (*menu_callback)(int action, const struct menu_item_ex *this_item); | 95 | int (*menu_callback)(int action, const struct menu_item_ex *this_item); |
96 | /* For everything else, except if the text is dynamic */ | 96 | /* For everything else, except if the text is dynamic */ |
97 | const struct menu_callback_with_desc { | 97 | const struct menu_callback_with_desc { |
98 | int (*menu_callback)(int action, | 98 | int (*menu_callback)(int action, |
99 | const struct menu_item_ex *this_item); | 99 | const struct menu_item_ex *this_item); |
@@ -102,16 +102,16 @@ struct menu_item_ex { | |||
102 | ICON icon; /* Icon to display */ | 102 | ICON icon; /* Icon to display */ |
103 | #endif | 103 | #endif |
104 | } *callback_and_desc; | 104 | } *callback_and_desc; |
105 | /* For when the item text is dynamic */ | 105 | /* For when the item text is dynamic */ |
106 | const struct menu_get_name_and_icon { | 106 | const struct menu_get_name_and_icon { |
107 | int (*menu_callback)(int action, | 107 | int (*menu_callback)(int action, |
108 | const struct menu_item_ex *this_item); | 108 | const struct menu_item_ex *this_item); |
109 | char *(*list_get_name)(int selected_item, void * data, char *buffer); | 109 | char *(*list_get_name)(int selected_item, void * data, char *buffer); |
110 | void *list_get_name_data; | 110 | void *list_get_name_data; |
111 | #ifdef HAVE_LCD_BITMAP | 111 | #ifdef HAVE_LCD_BITMAP |
112 | ICON icon; /* Icon to display */ | 112 | ICON icon; /* Icon to display */ |
113 | #endif | 113 | #endif |
114 | } *menu_get_name_and_icon; | 114 | } *menu_get_name_and_icon; |
115 | }; | 115 | }; |
116 | }; | 116 | }; |
117 | 117 | ||
@@ -168,12 +168,12 @@ bool do_setting_from_menu(const struct menu_item_ex *temp); | |||
168 | { MT_FUNCTION_WITH_PARAM|MENU_HAS_DESC, \ | 168 | { MT_FUNCTION_WITH_PARAM|MENU_HAS_DESC, \ |
169 | { .func_with_param = &name##__}, \ | 169 | { .func_with_param = &name##__}, \ |
170 | {.callback_and_desc = & name##_}}; | 170 | {.callback_and_desc = & name##_}}; |
171 | 171 | ||
172 | /* As above, except the text is dynamic */ | 172 | /* As above, except the text is dynamic */ |
173 | #define MENUITEM_FUNCTION_WPARAM_DYNTEXT(name, func, param, callback, \ | 173 | #define MENUITEM_FUNCTION_WPARAM_DYNTEXT(name, func, param, callback, \ |
174 | text_callback, text_cb_data, icon) \ | 174 | text_callback, text_cb_data, icon) \ |
175 | static const struct menu_get_name_and_icon name##_ \ | 175 | static const struct menu_get_name_and_icon name##_ \ |
176 | = {callback,text_callback,text_cb_data,icon};\ | 176 | = {callback,text_callback,text_cb_data,icon};\ |
177 | static const struct menu_func_with_param name##__ = {func, param}; \ | 177 | static const struct menu_func_with_param name##__ = {func, param}; \ |
178 | static const struct menu_item_ex name = \ | 178 | static const struct menu_item_ex name = \ |
179 | { MT_FUNCTION_WITH_PARAM|MENU_DYNAMIC_DESC, \ | 179 | { 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, | |||
508 | 508 | ||
509 | 509 | ||
510 | struct browse_folder_info { | 510 | struct browse_folder_info { |
511 | const char* dir; | 511 | const char* dir; |
512 | int show_options; | 512 | int show_options; |
513 | }; | 513 | }; |
514 | #ifdef HAVE_LCD_BITMAP | 514 | #ifdef HAVE_LCD_BITMAP |
515 | static struct browse_folder_info fonts = {FONT_DIR, SHOW_FONT}; | 515 | static struct browse_folder_info fonts = {FONT_DIR, SHOW_FONT}; |
@@ -521,20 +521,20 @@ static struct browse_folder_info rwps = {WPS_DIR, SHOW_RWPS}; | |||
521 | 521 | ||
522 | static int browse_folder(void *param) | 522 | static int browse_folder(void *param) |
523 | { | 523 | { |
524 | const struct browse_folder_info *info = | 524 | const struct browse_folder_info *info = |
525 | (const struct browse_folder_info*)param; | 525 | (const struct browse_folder_info*)param; |
526 | return rockbox_browse(info->dir, info->show_options); | 526 | return rockbox_browse(info->dir, info->show_options); |
527 | } | 527 | } |
528 | 528 | ||
529 | #ifdef HAVE_LCD_BITMAP | 529 | #ifdef HAVE_LCD_BITMAP |
530 | MENUITEM_FUNCTION_WPARAM(browse_fonts, ID2P(LANG_CUSTOM_FONT), | 530 | MENUITEM_FUNCTION_WPARAM(browse_fonts, ID2P(LANG_CUSTOM_FONT), |
531 | browse_folder, (void*)&fonts, NULL, NOICON); | 531 | browse_folder, (void*)&fonts, NULL, NOICON); |
532 | #endif | 532 | #endif |
533 | MENUITEM_FUNCTION_WPARAM(browse_wps, ID2P(LANG_WHILE_PLAYING), | 533 | MENUITEM_FUNCTION_WPARAM(browse_wps, ID2P(LANG_WHILE_PLAYING), |
534 | browse_folder, (void*)&wps, NULL, NOICON); | 534 | browse_folder, (void*)&wps, NULL, NOICON); |
535 | #ifdef HAVE_REMOTE_LCD | 535 | #ifdef HAVE_REMOTE_LCD |
536 | MENUITEM_FUNCTION_WPARAM(browse_rwps, ID2P(LANG_REMOTE_WHILE_PLAYING), | 536 | MENUITEM_FUNCTION_WPARAM(browse_rwps, ID2P(LANG_REMOTE_WHILE_PLAYING), |
537 | browse_folder, (void*)&rwps, NULL, NOICON); | 537 | browse_folder, (void*)&rwps, NULL, NOICON); |
538 | #endif | 538 | #endif |
539 | 539 | ||
540 | MENUITEM_SETTING(show_icons, &global_settings.show_icons, NULL); | 540 | 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 | |||
33 | sound_settings, /* sound_menu.c */ | 33 | sound_settings, /* sound_menu.c */ |
34 | settings_menu_item, /* settings_menu.c */ | 34 | settings_menu_item, /* settings_menu.c */ |
35 | playlist_menu_item, /* playlist_menu.c */ | 35 | playlist_menu_item, /* playlist_menu.c */ |
36 | equalizer_menu; /* eq_menu.c */ | 36 | equalizer_menu; /* eq_menu.c */ |
37 | 37 | ||
38 | #ifdef HAVE_WM8758 | 38 | #ifdef HAVE_WM8758 |
39 | extern const struct menu_item_ex hw_eq_menu; /* eq_menu.c */ | 39 | 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 @@ | |||
50 | #endif | 50 | #endif |
51 | 51 | ||
52 | /* lazy coders can use this function if the needed callback | 52 | /* lazy coders can use this function if the needed callback |
53 | is just to say if the item is shown or not */ | 53 | is just to say if the item is shown or not */ |
54 | int dynamicitem_callback(int action,const struct menu_item_ex *this_item); | 54 | int dynamicitem_callback(int action,const struct menu_item_ex *this_item); |
55 | 55 | ||
56 | 56 | ||
57 | struct browse_folder_info { | 57 | struct browse_folder_info { |
58 | const char* dir; | 58 | const char* dir; |
59 | int show_options; | 59 | int show_options; |
60 | }; | 60 | }; |
61 | static struct browse_folder_info theme = {THEME_DIR, SHOW_CFG}; | 61 | static struct browse_folder_info theme = {THEME_DIR, SHOW_CFG}; |
62 | static struct browse_folder_info rocks = {PLUGIN_DIR, SHOW_PLUGINS}; | 62 | static struct browse_folder_info rocks = {PLUGIN_DIR, SHOW_PLUGINS}; |
63 | static struct browse_folder_info config = {ROCKBOX_DIR, SHOW_CFG}; | 63 | static struct browse_folder_info config = {ROCKBOX_DIR, SHOW_CFG}; |
64 | static int browse_folder(void *param) | 64 | static int browse_folder(void *param) |
65 | { | 65 | { |
66 | const struct browse_folder_info *info = | 66 | const struct browse_folder_info *info = |
67 | (const struct browse_folder_info*)param; | 67 | (const struct browse_folder_info*)param; |
68 | return rockbox_browse(info->dir, info->show_options); | 68 | return rockbox_browse(info->dir, info->show_options); |
69 | } | 69 | } |
70 | 70 | ||
@@ -103,11 +103,11 @@ static int write_settings_file(void* param) | |||
103 | } | 103 | } |
104 | 104 | ||
105 | MENUITEM_FUNCTION_WPARAM(browse_configs, ID2P(LANG_CUSTOM_CFG), | 105 | MENUITEM_FUNCTION_WPARAM(browse_configs, ID2P(LANG_CUSTOM_CFG), |
106 | browse_folder, (void*)&config, NULL, NOICON); | 106 | browse_folder, (void*)&config, NULL, NOICON); |
107 | MENUITEM_FUNCTION_WPARAM(save_settings_item, ID2P(LANG_SAVE_SETTINGS), | 107 | MENUITEM_FUNCTION_WPARAM(save_settings_item, ID2P(LANG_SAVE_SETTINGS), |
108 | write_settings_file, (void*)SETTINGS_SAVE_ALL, NULL, NOICON); | 108 | write_settings_file, (void*)SETTINGS_SAVE_ALL, NULL, NOICON); |
109 | MENUITEM_FUNCTION_WPARAM(save_theme_item, ID2P(LANG_SAVE_THEME), | 109 | MENUITEM_FUNCTION_WPARAM(save_theme_item, ID2P(LANG_SAVE_THEME), |
110 | write_settings_file, (void*)SETTINGS_SAVE_THEME, NULL, NOICON); | 110 | write_settings_file, (void*)SETTINGS_SAVE_THEME, NULL, NOICON); |
111 | MENUITEM_FUNCTION(reset_settings_item,ID2P(LANG_RESET),reset_settings, NULL, NOICON); | 111 | MENUITEM_FUNCTION(reset_settings_item,ID2P(LANG_RESET),reset_settings, NULL, NOICON); |
112 | 112 | ||
113 | MAKE_MENU(manage_settings, ID2P(LANG_MANAGE_MENU), NULL, bitmap_icons_6x8[Icon_Config], | 113 | 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], | |||
383 | /* MAIN MENU */ | 383 | /* MAIN MENU */ |
384 | 384 | ||
385 | MENUITEM_FUNCTION_WPARAM(browse_themes, ID2P(LANG_CUSTOM_THEME), | 385 | MENUITEM_FUNCTION_WPARAM(browse_themes, ID2P(LANG_CUSTOM_THEME), |
386 | browse_folder, (void*)&theme, NULL, bitmap_icons_6x8[Icon_Folder]); | 386 | browse_folder, (void*)&theme, NULL, bitmap_icons_6x8[Icon_Folder]); |
387 | MENUITEM_FUNCTION_WPARAM(browse_plugins, ID2P(LANG_PLUGINS), | 387 | MENUITEM_FUNCTION_WPARAM(browse_plugins, ID2P(LANG_PLUGINS), |
388 | browse_folder, (void*)&rocks, NULL, bitmap_icons_6x8[Icon_Plugin]); | 388 | browse_folder, (void*)&rocks, NULL, bitmap_icons_6x8[Icon_Plugin]); |
389 | 389 | ||
390 | #if CONFIG_TUNER | 390 | #if CONFIG_TUNER |
391 | MENUITEM_FUNCTION(load_radio_screen, ID2P(LANG_FM_RADIO), | 391 | 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) | |||
449 | { | 449 | { |
450 | if (action != ACTION_ENTER_MENUITEM) | 450 | if (action != ACTION_ENTER_MENUITEM) |
451 | return action; | 451 | return action; |
452 | 452 | ||
453 | #if CONFIG_TUNER | 453 | #if CONFIG_TUNER |
454 | if (this_item == &load_radio_screen) | 454 | if (this_item == &load_radio_screen) |
455 | { | 455 | { |
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) | |||
536 | serial = get_long_le(&buf[14]); | 536 | serial = get_long_le(&buf[14]); |
537 | if ((lseek(fd, 33, SEEK_SET) < 0)||(read(fd, buf, 58) < 4)) | 537 | if ((lseek(fd, 33, SEEK_SET) < 0)||(read(fd, buf, 58) < 4)) |
538 | { | 538 | { |
539 | return false; | 539 | return false; |
540 | } | 540 | } |
541 | 541 | ||
542 | id3->frequency = get_slong(&buf[31]); | 542 | id3->frequency = get_slong(&buf[31]); |
@@ -547,25 +547,25 @@ static bool get_speex_metadata(int fd, struct mp3entry* id3) | |||
547 | /* Comments are in second Ogg page */ | 547 | /* Comments are in second Ogg page */ |
548 | if (lseek(fd, 28+last_serial/*(temporary for header size)*/, SEEK_SET) < 0) | 548 | if (lseek(fd, 28+last_serial/*(temporary for header size)*/, SEEK_SET) < 0) |
549 | { | 549 | { |
550 | return false; | 550 | return false; |
551 | } | 551 | } |
552 | 552 | ||
553 | /* Minimum header length for Ogg pages is 27. */ | 553 | /* Minimum header length for Ogg pages is 27. */ |
554 | if (read(fd, buf, 27) < 27) | 554 | if (read(fd, buf, 27) < 27) |
555 | { | 555 | { |
556 | return false; | 556 | return false; |
557 | } | 557 | } |
558 | 558 | ||
559 | if (memcmp(buf, "OggS", 4) !=0 ) | 559 | if (memcmp(buf, "OggS", 4) !=0 ) |
560 | { | 560 | { |
561 | return false; | 561 | return false; |
562 | } | 562 | } |
563 | 563 | ||
564 | segments = buf[26]; | 564 | segments = buf[26]; |
565 | /* read in segment table */ | 565 | /* read in segment table */ |
566 | if (read(fd, buf, segments) < segments) | 566 | if (read(fd, buf, segments) < segments) |
567 | { | 567 | { |
568 | return false; | 568 | return false; |
569 | } | 569 | } |
570 | 570 | ||
571 | /* The second packet in a vorbis stream is the comment packet. It *may* | 571 | /* 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) | |||
595 | /* A page is always < 64 kB */ | 595 | /* A page is always < 64 kB */ |
596 | if (lseek(fd, -(MIN(64 * 1024, id3->filesize)), SEEK_END) < 0) | 596 | if (lseek(fd, -(MIN(64 * 1024, id3->filesize)), SEEK_END) < 0) |
597 | { | 597 | { |
598 | return false; | 598 | return false; |
599 | } | 599 | } |
600 | 600 | ||
601 | remaining = 0; | 601 | remaining = 0; |
@@ -669,7 +669,7 @@ static bool get_speex_metadata(int fd, struct mp3entry* id3) | |||
669 | logf("serialno mismatch"); | 669 | logf("serialno mismatch"); |
670 | logf("%ld", serial); | 670 | logf("%ld", serial); |
671 | logf("%ld", last_serial); | 671 | logf("%ld", last_serial); |
672 | return false; | 672 | return false; |
673 | } | 673 | } |
674 | 674 | ||
675 | id3->length = (id3->samples / id3->frequency) * 1000; | 675 | id3->length = (id3->samples / id3->frequency) * 1000; |
@@ -2190,7 +2190,7 @@ bool get_metadata(struct track_info* track, int fd, const char* trackname, | |||
2190 | track->id3.vbr = false; | 2190 | track->id3.vbr = false; |
2191 | track->id3.filesize = filesize(fd); | 2191 | track->id3.filesize = filesize(fd); |
2192 | if (memcmp(buf,"NESM",4) && memcmp(buf,"NSFE",4)) return false; | 2192 | if (memcmp(buf,"NESM",4) && memcmp(buf,"NSFE",4)) return false; |
2193 | break; | 2193 | break; |
2194 | 2194 | ||
2195 | case AFMT_AIFF: | 2195 | case AFMT_AIFF: |
2196 | if (!get_aiff_metadata(fd, &(track->id3))) | 2196 | 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) | |||
210 | else if ((selected_file_attr & TREE_ATTR_MASK) == TREE_ATTR_M3U) | 210 | else if ((selected_file_attr & TREE_ATTR_MASK) == TREE_ATTR_M3U) |
211 | playlist_insert_playlist(NULL, selected_file, position, queue); | 211 | playlist_insert_playlist(NULL, selected_file, position, queue); |
212 | } | 212 | } |
213 | 213 | ||
214 | if (new_playlist && (playlist_amount() > 0)) | 214 | if (new_playlist && (playlist_amount() > 0)) |
215 | { | 215 | { |
216 | /* nothing is currently playing so begin playing what we just | 216 | /* 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] = | |||
77 | #if CONFIG_TUNER | 77 | #if CONFIG_TUNER |
78 | { 0x03, 0x05, 0x7f, 0x05, 0x03, 0x00 }, /* radio */ | 78 | { 0x03, 0x05, 0x7f, 0x05, 0x03, 0x00 }, /* radio */ |
79 | #endif | 79 | #endif |
80 | { 0x1f, 0x11, 0x7d, 0x46, 0x44, 0x78 }, /* File View Menu */ | 80 | { 0x1f, 0x11, 0x7d, 0x46, 0x44, 0x78 }, /* File View Menu */ |
81 | { 0x06, 0x7f, 0x06, 0x18, 0x7f, 0x18 }, /* EQ menu */ | 81 | { 0x06, 0x7f, 0x06, 0x18, 0x7f, 0x18 }, /* EQ menu */ |
82 | }; | 82 | }; |
83 | 83 | ||
84 | const unsigned char bitmap_icons_7x8[][7] = | 84 | 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 { | |||
81 | #if CONFIG_TUNER | 81 | #if CONFIG_TUNER |
82 | Icon_Radio_screen, | 82 | Icon_Radio_screen, |
83 | #endif | 83 | #endif |
84 | Icon_file_view_menu, | 84 | Icon_file_view_menu, |
85 | Icon_EQ, | 85 | Icon_EQ, |
86 | Icon6x8Last, | 86 | Icon6x8Last, |
87 | }; | 87 | }; |
88 | 88 | ||
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[] = { | |||
852 | NULL, NULL, crossfeed_hf_cutoff_helper), | 852 | NULL, NULL, crossfeed_hf_cutoff_helper), |
853 | /* equalizer */ | 853 | /* equalizer */ |
854 | OFFON_SETTING(0,eq_enabled,LANG_EQUALIZER_ENABLED,false,"eq enabled",NULL), | 854 | OFFON_SETTING(0,eq_enabled,LANG_EQUALIZER_ENABLED,false,"eq enabled",NULL), |
855 | INT_SETTING(0, eq_precut, LANG_EQUALIZER_PRECUT, 0, "eq precut", | 855 | INT_SETTING(0, eq_precut, LANG_EQUALIZER_PRECUT, 0, "eq precut", |
856 | UNIT_DB, 0, 240, 5, eq_precut_format, NULL, dsp_set_eq_precut), | 856 | UNIT_DB, 0, 240, 5, eq_precut_format, NULL, dsp_set_eq_precut), |
857 | /* 0..32768 Hz */ | 857 | /* 0..32768 Hz */ |
858 | INT_SETTING(0, eq_band0_cutoff, LANG_EQUALIZER_BAND_CUTOFF, 60, "eq band 0 cutoff", | 858 | INT_SETTING(0, eq_band0_cutoff, LANG_EQUALIZER_BAND_CUTOFF, 60, "eq band 0 cutoff", |
859 | UNIT_HERTZ, EQ_CUTOFF_MIN, EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, | 859 | UNIT_HERTZ, EQ_CUTOFF_MIN, EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, |
860 | NULL, NULL, NULL), | 860 | NULL, NULL, NULL), |
861 | INT_SETTING(0, eq_band1_cutoff, LANG_EQUALIZER_BAND_CENTER, 200, "eq band 1 cutoff", | 861 | INT_SETTING(0, eq_band1_cutoff, LANG_EQUALIZER_BAND_CENTER, 200, "eq band 1 cutoff", |
862 | UNIT_HERTZ, EQ_CUTOFF_MIN, EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, | 862 | UNIT_HERTZ, EQ_CUTOFF_MIN, EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, |
863 | NULL, NULL, NULL), | 863 | NULL, NULL, NULL), |
864 | INT_SETTING(0, eq_band2_cutoff, LANG_EQUALIZER_BAND_CENTER, 800, "eq band 2 cutoff", | 864 | INT_SETTING(0, eq_band2_cutoff, LANG_EQUALIZER_BAND_CENTER, 800, "eq band 2 cutoff", |
865 | UNIT_HERTZ, EQ_CUTOFF_MIN, EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, | 865 | UNIT_HERTZ, EQ_CUTOFF_MIN, EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, |
866 | NULL, NULL, NULL), | 866 | NULL, NULL, NULL), |
867 | INT_SETTING(0, eq_band3_cutoff, LANG_EQUALIZER_BAND_CENTER, 4000, "eq band 3 cutoff", | 867 | INT_SETTING(0, eq_band3_cutoff, LANG_EQUALIZER_BAND_CENTER, 4000, "eq band 3 cutoff", |
868 | UNIT_HERTZ, EQ_CUTOFF_MIN, EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, | 868 | UNIT_HERTZ, EQ_CUTOFF_MIN, EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, |
869 | NULL, NULL, NULL), | 869 | NULL, NULL, NULL), |
870 | INT_SETTING(0, eq_band4_cutoff, LANG_EQUALIZER_BAND_CUTOFF, 12000, "eq band 4 cutoff", | 870 | INT_SETTING(0, eq_band4_cutoff, LANG_EQUALIZER_BAND_CUTOFF, 12000, "eq band 4 cutoff", |
871 | UNIT_HERTZ, EQ_CUTOFF_MIN, EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, | 871 | UNIT_HERTZ, EQ_CUTOFF_MIN, EQ_CUTOFF_MAX, EQ_CUTOFF_STEP, |
872 | NULL, NULL, NULL), | 872 | NULL, NULL, NULL), |
873 | /* 0..64 (or 0.0 to 6.4) */ | 873 | /* 0..64 (or 0.0 to 6.4) */ |
874 | INT_SETTING(0, eq_band0_q, LANG_EQUALIZER_BAND_Q, 7, "eq band 0 q", | 874 | INT_SETTING(0, eq_band0_q, LANG_EQUALIZER_BAND_Q, 7, "eq band 0 q", |
875 | UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, | 875 | UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, |
876 | eq_q_format, NULL, NULL), | 876 | eq_q_format, NULL, NULL), |
877 | INT_SETTING(0, eq_band1_q, LANG_EQUALIZER_BAND_Q, 10, "eq band 1 q", | 877 | INT_SETTING(0, eq_band1_q, LANG_EQUALIZER_BAND_Q, 10, "eq band 1 q", |
878 | UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, | 878 | UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, |
879 | eq_q_format, NULL, NULL), | 879 | eq_q_format, NULL, NULL), |
880 | INT_SETTING(0, eq_band2_q, LANG_EQUALIZER_BAND_Q, 10, "eq band 2 q", | 880 | INT_SETTING(0, eq_band2_q, LANG_EQUALIZER_BAND_Q, 10, "eq band 2 q", |
881 | UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, | 881 | UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, |
882 | eq_q_format, NULL, NULL), | 882 | eq_q_format, NULL, NULL), |
883 | INT_SETTING(0, eq_band3_q, LANG_EQUALIZER_BAND_Q, 10, "eq band 3 q", | 883 | INT_SETTING(0, eq_band3_q, LANG_EQUALIZER_BAND_Q, 10, "eq band 3 q", |
884 | UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, | 884 | UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, |
885 | eq_q_format, NULL, NULL), | 885 | eq_q_format, NULL, NULL), |
886 | INT_SETTING(0, eq_band4_q, LANG_EQUALIZER_BAND_Q, 7, "eq band 4 q", | 886 | INT_SETTING(0, eq_band4_q, LANG_EQUALIZER_BAND_Q, 7, "eq band 4 q", |
887 | UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, | 887 | UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP, |
888 | eq_q_format, NULL, NULL), | 888 | eq_q_format, NULL, NULL), |
889 | /* -240..240 (or -24db to +24db) */ | 889 | /* -240..240 (or -24db to +24db) */ |
890 | INT_SETTING(0, eq_band0_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 0 gain", | 890 | INT_SETTING(0, eq_band0_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 0 gain", |
891 | UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP, | 891 | UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP, |
892 | eq_gain_format, NULL, NULL), | 892 | eq_gain_format, NULL, NULL), |
893 | INT_SETTING(0, eq_band1_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 1 gain", | 893 | INT_SETTING(0, eq_band1_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 1 gain", |
894 | UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP, | 894 | UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP, |
895 | eq_gain_format, NULL, NULL), | 895 | eq_gain_format, NULL, NULL), |
896 | INT_SETTING(0, eq_band2_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 2 gain", | 896 | INT_SETTING(0, eq_band2_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 2 gain", |
897 | UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP, | 897 | UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP, |
898 | eq_gain_format, NULL, NULL), | 898 | eq_gain_format, NULL, NULL), |
899 | INT_SETTING(0, eq_band3_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 3 gain", | 899 | INT_SETTING(0, eq_band3_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 3 gain", |
900 | UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP, | 900 | UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP, |
901 | eq_gain_format, NULL, NULL), | 901 | eq_gain_format, NULL, NULL), |
902 | INT_SETTING(0, eq_band4_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 4 gain", | 902 | INT_SETTING(0, eq_band4_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 4 gain", |
903 | UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP, | 903 | UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP, |
904 | eq_gain_format, NULL, NULL), | 904 | eq_gain_format, NULL, NULL), |
905 | 905 | ||
906 | /* dithering */ | 906 | /* dithering */ |
907 | OFFON_SETTING(0, dithering_enabled, LANG_DITHERING, | 907 | OFFON_SETTING(0, dithering_enabled, LANG_DITHERING, |
@@ -959,57 +959,57 @@ const struct settings_list settings[] = { | |||
959 | OFFON_SETTING(0,eq_hw_enabled,LANG_EQUALIZER_HARDWARE_ENABLED,false, | 959 | OFFON_SETTING(0,eq_hw_enabled,LANG_EQUALIZER_HARDWARE_ENABLED,false, |
960 | "eq hardware enabled",NULL), | 960 | "eq hardware enabled",NULL), |
961 | 961 | ||
962 | STRINGCHOICE_SETTING(0, eq_hw_band0_cutoff, LANG_EQUALIZER_BAND_CUTOFF, 1, | 962 | STRINGCHOICE_SETTING(0, eq_hw_band0_cutoff, LANG_EQUALIZER_BAND_CUTOFF, 1, |
963 | "eq hardware band 0 cutoff", "80Hz,105Hz,135Hz,175Hz", NULL, 4, | 963 | "eq hardware band 0 cutoff", "80Hz,105Hz,135Hz,175Hz", NULL, 4, |
964 | TALK_ID(80, UNIT_HERTZ), TALK_ID(105, UNIT_HERTZ), | 964 | TALK_ID(80, UNIT_HERTZ), TALK_ID(105, UNIT_HERTZ), |
965 | TALK_ID(135, UNIT_HERTZ), TALK_ID(175, UNIT_HERTZ)), | 965 | TALK_ID(135, UNIT_HERTZ), TALK_ID(175, UNIT_HERTZ)), |
966 | INT_SETTING(0, eq_hw_band0_gain, LANG_EQUALIZER_BAND_GAIN, 0, | 966 | INT_SETTING(0, eq_hw_band0_gain, LANG_EQUALIZER_BAND_GAIN, 0, |
967 | "eq hardware band 0 gain", UNIT_DB, EQ_HW_GAIN_MIN, | 967 | "eq hardware band 0 gain", UNIT_DB, EQ_HW_GAIN_MIN, |
968 | EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL), | 968 | EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL), |
969 | 969 | ||
970 | STRINGCHOICE_SETTING(0, eq_hw_band1_center, LANG_EQUALIZER_BAND_CENTER, 1, | 970 | STRINGCHOICE_SETTING(0, eq_hw_band1_center, LANG_EQUALIZER_BAND_CENTER, 1, |
971 | "eq hardware band 1 center", "230Hz,300Hz,385Hz,500Hz", NULL, 4, | 971 | "eq hardware band 1 center", "230Hz,300Hz,385Hz,500Hz", NULL, 4, |
972 | TALK_ID(230, UNIT_HERTZ), TALK_ID(300, UNIT_HERTZ), | 972 | TALK_ID(230, UNIT_HERTZ), TALK_ID(300, UNIT_HERTZ), |
973 | TALK_ID(385, UNIT_HERTZ), TALK_ID(500, UNIT_HERTZ)), | 973 | TALK_ID(385, UNIT_HERTZ), TALK_ID(500, UNIT_HERTZ)), |
974 | CHOICE_SETTING(0, eq_hw_band1_bandwidth, LANG_EQUALIZER_BANDWIDTH, 0, | 974 | CHOICE_SETTING(0, eq_hw_band1_bandwidth, LANG_EQUALIZER_BANDWIDTH, 0, |
975 | "eq hardware band 1 bandwidth", "narrow,wide", NULL, 2, | 975 | "eq hardware band 1 bandwidth", "narrow,wide", NULL, 2, |
976 | ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_NARROW), | 976 | ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_NARROW), |
977 | ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_WIDE)), | 977 | ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_WIDE)), |
978 | INT_SETTING(0, eq_hw_band1_gain, LANG_EQUALIZER_BAND_GAIN, 0, | 978 | INT_SETTING(0, eq_hw_band1_gain, LANG_EQUALIZER_BAND_GAIN, 0, |
979 | "eq hardware band 1 gain", UNIT_DB, EQ_HW_GAIN_MIN, | 979 | "eq hardware band 1 gain", UNIT_DB, EQ_HW_GAIN_MIN, |
980 | EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL), | 980 | EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL), |
981 | 981 | ||
982 | STRINGCHOICE_SETTING(0, eq_hw_band2_center, LANG_EQUALIZER_BAND_CENTER, 1, | 982 | STRINGCHOICE_SETTING(0, eq_hw_band2_center, LANG_EQUALIZER_BAND_CENTER, 1, |
983 | "eq hardware band 2 center", "650Hz,850Hz,1.1kHz,1.4kHz", NULL, 4, | 983 | "eq hardware band 2 center", "650Hz,850Hz,1.1kHz,1.4kHz", NULL, 4, |
984 | TALK_ID(650, UNIT_HERTZ), TALK_ID(850, UNIT_HERTZ), | 984 | TALK_ID(650, UNIT_HERTZ), TALK_ID(850, UNIT_HERTZ), |
985 | TALK_ID(1100, UNIT_HERTZ), TALK_ID(1400, UNIT_HERTZ)), | 985 | TALK_ID(1100, UNIT_HERTZ), TALK_ID(1400, UNIT_HERTZ)), |
986 | CHOICE_SETTING(0, eq_hw_band2_bandwidth, LANG_EQUALIZER_BANDWIDTH, 0, | 986 | CHOICE_SETTING(0, eq_hw_band2_bandwidth, LANG_EQUALIZER_BANDWIDTH, 0, |
987 | "eq hardware band 2 bandwidth", "narrow,wide", NULL, 2, | 987 | "eq hardware band 2 bandwidth", "narrow,wide", NULL, 2, |
988 | ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_NARROW), | 988 | ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_NARROW), |
989 | ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_WIDE)), | 989 | ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_WIDE)), |
990 | INT_SETTING(0, eq_hw_band2_gain, LANG_EQUALIZER_BAND_GAIN, 0, | 990 | INT_SETTING(0, eq_hw_band2_gain, LANG_EQUALIZER_BAND_GAIN, 0, |
991 | "eq hardware band 2 gain", UNIT_DB, EQ_HW_GAIN_MIN, | 991 | "eq hardware band 2 gain", UNIT_DB, EQ_HW_GAIN_MIN, |
992 | EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL), | 992 | EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL), |
993 | 993 | ||
994 | STRINGCHOICE_SETTING(0, eq_hw_band3_center, LANG_EQUALIZER_BAND_CENTER, 1, | 994 | STRINGCHOICE_SETTING(0, eq_hw_band3_center, LANG_EQUALIZER_BAND_CENTER, 1, |
995 | "eq hardware band 3 center", "1.8kHz,2.4kHz,3.2kHz,4.1kHz", NULL, 4, | 995 | "eq hardware band 3 center", "1.8kHz,2.4kHz,3.2kHz,4.1kHz", NULL, 4, |
996 | TALK_ID(1800, UNIT_HERTZ), TALK_ID(2400, UNIT_HERTZ), | 996 | TALK_ID(1800, UNIT_HERTZ), TALK_ID(2400, UNIT_HERTZ), |
997 | TALK_ID(3200, UNIT_HERTZ), TALK_ID(4100, UNIT_HERTZ)), | 997 | TALK_ID(3200, UNIT_HERTZ), TALK_ID(4100, UNIT_HERTZ)), |
998 | CHOICE_SETTING(0, eq_hw_band3_bandwidth, LANG_EQUALIZER_BANDWIDTH, 0, | 998 | CHOICE_SETTING(0, eq_hw_band3_bandwidth, LANG_EQUALIZER_BANDWIDTH, 0, |
999 | "eq hardware band 3 bandwidth", "narrow,wide", NULL, 2, | 999 | "eq hardware band 3 bandwidth", "narrow,wide", NULL, 2, |
1000 | ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_NARROW), | 1000 | ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_NARROW), |
1001 | ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_WIDE)), | 1001 | ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_WIDE)), |
1002 | INT_SETTING(0, eq_hw_band3_gain, LANG_EQUALIZER_BAND_GAIN, 0, | 1002 | INT_SETTING(0, eq_hw_band3_gain, LANG_EQUALIZER_BAND_GAIN, 0, |
1003 | "eq hardware band 3 gain", UNIT_DB, EQ_HW_GAIN_MIN, | 1003 | "eq hardware band 3 gain", UNIT_DB, EQ_HW_GAIN_MIN, |
1004 | EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL), | 1004 | EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL), |
1005 | 1005 | ||
1006 | STRINGCHOICE_SETTING(0, eq_hw_band4_cutoff, LANG_EQUALIZER_BAND_CUTOFF, 1, | 1006 | STRINGCHOICE_SETTING(0, eq_hw_band4_cutoff, LANG_EQUALIZER_BAND_CUTOFF, 1, |
1007 | "eq hardware band 4 cutoff", "5.3kHz,6.9kHz,9kHz,11.7kHz", NULL, 4, | 1007 | "eq hardware band 4 cutoff", "5.3kHz,6.9kHz,9kHz,11.7kHz", NULL, 4, |
1008 | TALK_ID(5300, UNIT_HERTZ), TALK_ID(6900, UNIT_HERTZ), | 1008 | TALK_ID(5300, UNIT_HERTZ), TALK_ID(6900, UNIT_HERTZ), |
1009 | TALK_ID(9000, UNIT_HERTZ), TALK_ID(11700, UNIT_HERTZ)), | 1009 | TALK_ID(9000, UNIT_HERTZ), TALK_ID(11700, UNIT_HERTZ)), |
1010 | INT_SETTING(0, eq_hw_band4_gain, LANG_EQUALIZER_BAND_GAIN, 0, | 1010 | INT_SETTING(0, eq_hw_band4_gain, LANG_EQUALIZER_BAND_GAIN, 0, |
1011 | "eq hardware band 4 gain", UNIT_DB, EQ_HW_GAIN_MIN, | 1011 | "eq hardware band 4 gain", UNIT_DB, EQ_HW_GAIN_MIN, |
1012 | EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL), | 1012 | EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL), |
1013 | #endif | 1013 | #endif |
1014 | 1014 | ||
1015 | OFFON_SETTING(0,hold_lr_for_scroll_in_list,-1,true, | 1015 | 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 { | |||
102 | - a NVRAM setting is removed | 102 | - a NVRAM setting is removed |
103 | */ | 103 | */ |
104 | #define F_TEMPVAR 0x400 /* used if the setting should be set using a temp var */ | 104 | #define F_TEMPVAR 0x400 /* used if the setting should be set using a temp var */ |
105 | #define F_FLIPLIST 0x800 /* used if the order in the setting screen is backwards */ | 105 | #define F_FLIPLIST 0x800 /* used if the order in the setting screen is backwards */ |
106 | 106 | ||
107 | struct settings_list { | 107 | struct settings_list { |
108 | uint32_t flags; /* ____ ____ TFFF ____ NNN_ FTVC IFRB STTT */ | 108 | 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, | |||
762 | case clause_begins_with: | 762 | case clause_begins_with: |
763 | return (strcasestr(str, clause->str) == str); | 763 | return (strcasestr(str, clause->str) == str); |
764 | case clause_not_begins_with: | 764 | case clause_not_begins_with: |
765 | return (strcasestr(str, clause->str) != str); | 765 | return (strcasestr(str, clause->str) != str); |
766 | case clause_ends_with: | 766 | case clause_ends_with: |
767 | return str_ends_with(str, clause->str); | 767 | return str_ends_with(str, clause->str); |
768 | case clause_not_ends_with: | 768 | 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) | |||
224 | } | 224 | } |
225 | else | 225 | else |
226 | #endif | 226 | #endif |
227 | { | 227 | { |
228 | struct entry* dc = local_tc->dircache; | 228 | struct entry* dc = local_tc->dircache; |
229 | struct entry* e = &dc[selected_item]; | 229 | struct entry* e = &dc[selected_item]; |
230 | *icon = (ICON)filetype_get_icon(e->attr); | 230 | *icon = (ICON)filetype_get_icon(e->attr); |
@@ -340,7 +340,7 @@ static int update_dir(void) | |||
340 | } | 340 | } |
341 | else | 341 | else |
342 | #endif | 342 | #endif |
343 | { | 343 | { |
344 | /* if the tc.currdir has been changed, reload it ...*/ | 344 | /* if the tc.currdir has been changed, reload it ...*/ |
345 | if (strncmp(tc.currdir, lastdir, sizeof(lastdir)) || reload_dir) { | 345 | if (strncmp(tc.currdir, lastdir, sizeof(lastdir)) || reload_dir) { |
346 | 346 | ||
@@ -365,9 +365,9 @@ static int update_dir(void) | |||
365 | { | 365 | { |
366 | if( | 366 | if( |
367 | #ifdef HAVE_TAGCACHE | 367 | #ifdef HAVE_TAGCACHE |
368 | !id3db && | 368 | !id3db && |
369 | #endif | 369 | #endif |
370 | (tc.dirfull || | 370 | (tc.dirfull || |
371 | tc.filesindir == global_settings.max_files_in_dir) ) | 371 | tc.filesindir == global_settings.max_files_in_dir) ) |
372 | { | 372 | { |
373 | gui_syncsplash(HZ, true, str(LANG_SHOWDIR_BUFFER_FULL)); | 373 | gui_syncsplash(HZ, true, str(LANG_SHOWDIR_BUFFER_FULL)); |