Handle mid-track resumes in RM.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23659 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 10 insertions, 1 deletions

diff --git a/apps/codecs/a52_rm.c b/apps/codecs/a52_rm.c
index 32b66d2826..1fe7312e03 100644
--- a/apps/codecs/a52_rm.c
+++ b/apps/codecs/a52_rm.c
@@ -131,7 +131,8 @@ enum codec_status codec_main(void)
     size_t n;
     uint8_t *filebuf;
     int retval, consumed, packet_offset;
-    int playback_on = -1;  
+    int playback_on = -1;
+    size_t resume_offset = ci->id3->offset;
 
     /* Generic codec initialisation */
     ci->configure(DSP_SET_STEREO_MODE, STEREO_NONINTERLEAVED);
@@ -155,6 +156,14 @@ next_track:
     ci->memset(&pkt,0,sizeof(RMPacket));
     init_rm(&rmctx);
 
+    /* check for a mid-track resume and force a seek time accordingly */
+    if(resume_offset > rmctx.data_offset + DATA_HEADER_SIZE) {
+        resume_offset -= rmctx.data_offset + DATA_HEADER_SIZE;
+        /* put number of subpackets to skip in resume_offset */
+        resume_offset /= (rmctx.block_align + PACKET_HEADER_SIZE);
+        ci->seek_time =  (int)resume_offset * ((rmctx.block_align * 8 * 1000)/rmctx.bit_rate);                
+    }
+    
     /* Seek to the first packet */
     ci->advance_buffer(rmctx.data_offset + DATA_HEADER_SIZE );