diff options
| author | Steve Bavin <pondlife@pondlife.me> | 2008-07-29 13:32:47 +0000 |
|---|---|---|
| committer | Steve Bavin <pondlife@pondlife.me> | 2008-07-29 13:32:47 +0000 |
| commit | fa98298983c9d6b5e165ef077359f5786b43566f (patch) | |
| tree | ab66807dd1cba0c5b5420c66c7e2106604dc8f3e /apps | |
| parent | 34dc7c445adcf41d0bf1820c361ca8017e9cfddd (diff) | |
| download | rockbox-fa98298983c9d6b5e165ef077359f5786b43566f.tar.gz rockbox-fa98298983c9d6b5e165ef077359f5786b43566f.zip | |
Only voice track insertion splash if voice menus enabled - fix for FS#9223
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18147 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/playlist.c | 2 | ||||
| -rw-r--r-- | apps/playlist_catalog.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/playlist.c b/apps/playlist.c index 53becb9fc1..f6d536fa25 100644 --- a/apps/playlist.c +++ b/apps/playlist.c | |||
| @@ -2916,7 +2916,7 @@ int playlist_insert_directory(struct playlist_info* playlist, | |||
| 2916 | if (queue) | 2916 | if (queue) |
| 2917 | count_str = ID2P(LANG_PLAYLIST_QUEUE_COUNT); | 2917 | count_str = ID2P(LANG_PLAYLIST_QUEUE_COUNT); |
| 2918 | else | 2918 | else |
| 2919 | count_str = ID2P(LANG_PLAYLIST_INSERT_COUNT); | 2919 | count_str = ID2P(LANG_PLAYLIST_INSERT_COUNT); |
| 2920 | 2920 | ||
| 2921 | display_playlist_count(0, count_str, false); | 2921 | display_playlist_count(0, count_str, false); |
| 2922 | 2922 | ||
diff --git a/apps/playlist_catalog.c b/apps/playlist_catalog.c index 15d74fa363..cadad9f464 100644 --- a/apps/playlist_catalog.c +++ b/apps/playlist_catalog.c | |||
| @@ -319,8 +319,8 @@ static int display_playlists(char* playlist, bool view) | |||
| 319 | static void display_insert_count(int count) | 319 | static void display_insert_count(int count) |
| 320 | { | 320 | { |
| 321 | static long talked_tick = 0; | 321 | static long talked_tick = 0; |
| 322 | if(count && (talked_tick == 0 | 322 | if(global_settings.talk_menu && count && |
| 323 | || TIME_AFTER(current_tick, talked_tick+5*HZ))) | 323 | (talked_tick == 0 || TIME_AFTER(current_tick, talked_tick+5*HZ))) |
| 324 | { | 324 | { |
| 325 | talked_tick = current_tick; | 325 | talked_tick = current_tick; |
| 326 | talk_number(count, false); | 326 | talk_number(count, false); |