summaryrefslogtreecommitdiff
path: root/apps/playlist.c
diff options
context:
space:
mode:
authorMiika Pekkarinen <miipekk@ihme.org>2005-08-20 11:13:19 +0000
committerMiika Pekkarinen <miipekk@ihme.org>2005-08-20 11:13:19 +0000
commit159c52dd36e5c008612458192904f57ea6dfdfad (patch)
tree4b6f7d8329069e90d72284ef73ba542d75705b55 /apps/playlist.c
parent329caa8ade0b78a3235e9d28983cb1c506e573a0 (diff)
downloadrockbox-159c52dd36e5c008612458192904f57ea6dfdfad.tar.gz
rockbox-159c52dd36e5c008612458192904f57ea6dfdfad.zip
Initial voice ui support for software codec platforms. Added also a
beep when changing tracks. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7360 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/playlist.c')
-rw-r--r--apps/playlist.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/apps/playlist.c b/apps/playlist.c
index 68fd8be369..bd443e4f38 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -1413,9 +1413,14 @@ int playlist_resume(void)
1413 }; 1413 };
1414 1414
1415 /* use mp3 buffer for maximum load speed */ 1415 /* use mp3 buffer for maximum load speed */
1416#if CONFIG_HWCODEC != MASNONE
1416 talk_buffer_steal(); /* we use the mp3 buffer, need to tell */ 1417 talk_buffer_steal(); /* we use the mp3 buffer, need to tell */
1417 buflen = (audiobufend - audiobuf); 1418 buflen = (audiobufend - audiobuf);
1418 buffer = audiobuf; 1419 buffer = audiobuf;
1420#else
1421 buflen = (audiobufend - audiobuf - talk_get_bufsize());
1422 buffer = &audiobuf[talk_get_bufsize()];
1423#endif
1419 1424
1420 empty_playlist(playlist, true); 1425 empty_playlist(playlist, true);
1421 1426
@@ -1827,7 +1832,9 @@ int playlist_start(int start_index, int offset)
1827 struct playlist_info* playlist = &current_playlist; 1832 struct playlist_info* playlist = &current_playlist;
1828 1833
1829 playlist->index = start_index; 1834 playlist->index = start_index;
1835#if CONFIG_HWCODEC != MASNONE
1830 talk_buffer_steal(); /* will use the mp3 buffer */ 1836 talk_buffer_steal(); /* will use the mp3 buffer */
1837#endif
1831 audio_play(offset); 1838 audio_play(offset);
1832 1839
1833 return 0; 1840 return 0;