summaryrefslogtreecommitdiff
path: root/apps/gui
diff options
context:
space:
mode:
authorBrandon Low <lostlogic@rockbox.org>2006-04-06 04:07:06 +0000
committerBrandon Low <lostlogic@rockbox.org>2006-04-06 04:07:06 +0000
commit857db456affc0b65e4fa3db1020117f547bcade5 (patch)
treef649f24e7b141cc3ed395def3a156a029799483d /apps/gui
parent295fdf294c5f7db3bfd1583b8f271ccfcb3063f6 (diff)
downloadrockbox-857db456affc0b65e4fa3db1020117f547bcade5.tar.gz
rockbox-857db456affc0b65e4fa3db1020117f547bcade5.zip
Fix seeking on swcodec, but probably break some cases of skipping. Another important rework here, buffer management is serialized along with most other operations on the audio thread. This has some minor performance issues on ipod that can lead to audio skips during buffer fill as well.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9529 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r--apps/gui/gwps-common.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index 231aa28162..41e20ecadd 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -2347,7 +2347,11 @@ bool ffwd_rew(int button)
2347 wps_state.id3 && wps_state.id3->length ) 2347 wps_state.id3 && wps_state.id3->length )
2348 { 2348 {
2349 if (!wps_state.paused) 2349 if (!wps_state.paused)
2350#if (CONFIG_CODEC == SWCODEC)
2351 audio_pre_ff_rewind();
2352#else
2350 audio_pause(); 2353 audio_pause();
2354#endif
2351#if CONFIG_KEYPAD == PLAYER_PAD 2355#if CONFIG_KEYPAD == PLAYER_PAD
2352 FOR_NB_SCREENS(i) 2356 FOR_NB_SCREENS(i)
2353 gui_wps[i].display->stop_scroll(); 2357 gui_wps[i].display->stop_scroll();
@@ -2399,8 +2403,10 @@ bool ffwd_rew(int button)
2399 ff_rewind_count = 0; 2403 ff_rewind_count = 0;
2400 wps_state.ff_rewind = false; 2404 wps_state.ff_rewind = false;
2401 status_set_ffmode(0); 2405 status_set_ffmode(0);
2406#if (CONFIG_CODEC != SWCODEC)
2402 if (!wps_state.paused) 2407 if (!wps_state.paused)
2403 audio_resume(); 2408 audio_resume();
2409#endif
2404#ifdef HAVE_LCD_CHARCELLS 2410#ifdef HAVE_LCD_CHARCELLS
2405 gui_wps_display(); 2411 gui_wps_display();
2406#endif 2412#endif