diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-17 00:01:32 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 8cb555460ff79e636a7907fb2589e16db98c8600 (patch) | |
tree | 930a3878c7641c9ce045b24f0ade1309e36d5806 /apps/tree.c | |
parent | 0c4f89370d05056faa789aa9cabcccc4e509fb9f (diff) | |
download | rockbox-8cb555460ff79e636a7907fb2589e16db98c8600.tar.gz rockbox-8cb555460ff79e636a7907fb2589e16db98c8600.zip |
[3/4] Completely remove HWCODEC support
'swcodec' is now always set (and recording_swcodec for recording-capable
units) in feature.txt so the manual and language strings don't need to
all be fixed up.
Change-Id: Ib2c9d5d157af8d33653e2d4b4a12881b9aa6ddb0
Diffstat (limited to 'apps/tree.c')
-rw-r--r-- | apps/tree.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/apps/tree.c b/apps/tree.c index fb0d0a3ac5..e159c3465f 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -650,9 +650,7 @@ static int dirbrowse(void) | |||
650 | if (tc.dirlevel < 0) | 650 | if (tc.dirlevel < 0) |
651 | tc.dirlevel = 0; /* shouldnt be needed.. this code needs work! */ | 651 | tc.dirlevel = 0; /* shouldnt be needed.. this code needs work! */ |
652 | 652 | ||
653 | #if CONFIG_CODEC == SWCODEC | ||
654 | keyclick_set_callback(gui_synclist_keyclick_callback, &tree_lists); | 653 | keyclick_set_callback(gui_synclist_keyclick_callback, &tree_lists); |
655 | #endif | ||
656 | button = get_action(CONTEXT_TREE, | 654 | button = get_action(CONTEXT_TREE, |
657 | list_do_action_timeout(&tree_lists, HZ/2)); | 655 | list_do_action_timeout(&tree_lists, HZ/2)); |
658 | #ifdef HAVE_LCD_BITMAP | 656 | #ifdef HAVE_LCD_BITMAP |
@@ -1175,11 +1173,6 @@ static void say_filetype(int attr) | |||
1175 | 1173 | ||
1176 | static int ft_play_dirname(char* name) | 1174 | static int ft_play_dirname(char* name) |
1177 | { | 1175 | { |
1178 | #if CONFIG_CODEC != SWCODEC | ||
1179 | if (audio_status() & AUDIO_STATUS_PLAY) | ||
1180 | return 0; | ||
1181 | #endif | ||
1182 | |||
1183 | return talk_file(tc.currdir, name, dir_thumbnail_name, NULL, | 1176 | return talk_file(tc.currdir, name, dir_thumbnail_name, NULL, |
1184 | global_settings.talk_filetype ? | 1177 | global_settings.talk_filetype ? |
1185 | TALK_IDARRAY(VOICE_DIR) : NULL, | 1178 | TALK_IDARRAY(VOICE_DIR) : NULL, |
@@ -1188,11 +1181,6 @@ static int ft_play_dirname(char* name) | |||
1188 | 1181 | ||
1189 | static int ft_play_filename(char *dir, char *file, int attr) | 1182 | static int ft_play_filename(char *dir, char *file, int attr) |
1190 | { | 1183 | { |
1191 | #if CONFIG_CODEC != SWCODEC | ||
1192 | if (audio_status() & AUDIO_STATUS_PLAY) | ||
1193 | return 0; | ||
1194 | #endif | ||
1195 | |||
1196 | if (strlen(file) >= strlen(file_thumbnail_ext) | 1184 | if (strlen(file) >= strlen(file_thumbnail_ext) |
1197 | && strcasecmp(&file[strlen(file) - strlen(file_thumbnail_ext)], | 1185 | && strcasecmp(&file[strlen(file) - strlen(file_thumbnail_ext)], |
1198 | file_thumbnail_ext)) | 1186 | file_thumbnail_ext)) |