summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBrandon Low <lostlogic@rockbox.org>2006-01-21 22:58:08 +0000
committerBrandon Low <lostlogic@rockbox.org>2006-01-21 22:58:08 +0000
commit0a9179cb0a4bda8191fcfcb45404ea361fcacdc5 (patch)
tree1a02ff91647446a21ca51bd119660f690535598f /apps
parenta3868d35d3621e700abfd51de61ac6f83908a472 (diff)
downloadrockbox-0a9179cb0a4bda8191fcfcb45404ea361fcacdc5.tar.gz
rockbox-0a9179cb0a4bda8191fcfcb45404ea361fcacdc5.zip
Add seamless seeking support, this is needed for AB-repeat mode on swcodec.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8408 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/playback.c47
1 files changed, 31 insertions, 16 deletions
diff --git a/apps/playback.c b/apps/playback.c
index 48b993474b..932bf115f9 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -86,19 +86,20 @@ static volatile bool paused;
#define AUDIO_DEFAULT_WATERMARK (1024*512)
#define AUDIO_DEFAULT_FILECHUNK (1024*32)
-#define AUDIO_PLAY 1
-#define AUDIO_STOP 2
-#define AUDIO_PAUSE 3
-#define AUDIO_RESUME 4
-#define AUDIO_NEXT 5
-#define AUDIO_PREV 6
-#define AUDIO_FF_REWIND 7
-#define AUDIO_FLUSH_RELOAD 8
-#define AUDIO_CODEC_DONE 9
-#define AUDIO_FLUSH 10
+#define AUDIO_PLAY 1
+#define AUDIO_STOP 2
+#define AUDIO_PAUSE 3
+#define AUDIO_RESUME 4
+#define AUDIO_NEXT 5
+#define AUDIO_PREV 6
+#define AUDIO_FF_REWIND 7
+#define AUDIO_FLUSH_RELOAD 8
+#define AUDIO_CODEC_DONE 9
+#define AUDIO_FLUSH 10
#define AUDIO_TRACK_CHANGED 11
#define AUDIO_DIR_NEXT 12
#define AUDIO_DIR_PREV 13
+#define AUDIO_SEAMLESS_SEEK 14
#define CODEC_LOAD 1
#define CODEC_LOAD_DISK 2
@@ -306,13 +307,15 @@ bool codec_pcmbuf_insert_split_callback(void *ch1, void *ch2,
while (length > 0) {
/* This will prevent old audio from playing when skipping tracks. */
- if ((ci.reload_codec || ci.stop_codec) && current_codec != CODEC_IDX_VOICE)
+ if ((ci.reload_codec || ci.stop_codec) &&
+ current_codec != CODEC_IDX_VOICE)
return true;
while ((dest = pcmbuf_request_buffer(dsp_output_size(length),
&output_size)) == NULL) {
sleep(1);
- if ((ci.reload_codec || ci.stop_codec) && current_codec != CODEC_IDX_VOICE)
+ if ((ci.reload_codec || ci.stop_codec) &&
+ current_codec != CODEC_IDX_VOICE)
return true;
}
@@ -330,9 +333,10 @@ bool codec_pcmbuf_insert_split_callback(void *ch1, void *ch2,
DEBUGF("Warning: dsp_input_size(%ld=dsp_output_size(%ld))=%ld <= 0\n",
output_size, length, input_size);
/* should we really continue, or should we break?
- * We should probably continue because calling pcmbuf_flush_buffer(0)
- * will wrap the buffer if it was fully filled and so next call to
- * pcmbuf_request_buffer should give the requested output_size. */
+ * We should probably continue because calling
+ * pcmbuf_flush_buffer(0) will wrap the buffer if it was fully
+ * filled and so next call to pcmbuf_request_buffer should give
+ * the requested output_size. */
continue;
}
@@ -665,7 +669,6 @@ void codec_seek_complete_callback(void)
{
/* assume we're called from non-voice codec, as they shouldn't seek */
ci.seek_time = 0;
- pcmbuf_play_stop();
}
bool codec_seek_buffer_callback(off_t newpos)
@@ -1868,6 +1871,12 @@ void audio_thread(void)
ci.seek_time = (int)ev.data+1;
break ;
+ case AUDIO_SEAMLESS_SEEK:
+ if (!playing)
+ break ;
+ ci.seek_time = (int)ev.data+1;
+ break ;
+
case AUDIO_DIR_NEXT:
logf("audio_dir_next");
playlist_end = false;
@@ -2222,6 +2231,12 @@ void audio_ff_rewind(int newpos)
queue_post(&audio_queue, AUDIO_FF_REWIND, (int *)newpos);
}
+void audio_seamless_seek(int newpos)
+{
+ logf("seamless_seek: %d", newpos);
+ queue_post(&audio_queue, AUDIO_SEAMLESS_SEEK, (int *)newpos);
+}
+
void audio_flush_and_reload_tracks(void)
{
logf("flush & reload");