1 files changed, 12 insertions, 9 deletions

diff --git a/lib/rbcodec/codecs/atrac3_oma.c b/lib/rbcodec/codecs/atrac3_oma.c
index 50f7c8f163..65d9ed8b38 100644
--- a/lib/rbcodec/codecs/atrac3_oma.c
+++ b/lib/rbcodec/codecs/atrac3_oma.c
@@ -50,13 +50,15 @@ enum codec_status codec_run(void)
     int elapsed = 0;
     size_t resume_offset;
     intptr_t param;
-    enum codec_command_action action = CODEC_ACTION_NULL;
+    enum codec_command_action action;
 
     if (codec_init()) {
         DEBUGF("codec init failed\n");
         return CODEC_ERROR;
     }
 
+    action = CODEC_ACTION_NULL;
+    param = ci->id3->elapsed;
     resume_offset = ci->id3->offset;
 
     codec_set_replaygain(ci->id3);
@@ -79,11 +81,13 @@ enum codec_status codec_run(void)
     frame_counter = 0;
     
     /* check for a mid-track resume and force a seek time accordingly */
-    if(resume_offset > ci->id3->first_frame_offset) {
-        resume_offset -= ci->id3->first_frame_offset;
+    if (resume_offset) {
+        resume_offset -= MIN(resume_offset, ci->id3->first_frame_offset);
         /* calculate resume_offset in frames */
-        resume_offset = (int)resume_offset / FRAMESIZE;
-        param = (int)resume_offset * ((FRAMESIZE * 8)/BITRATE);
+        param = (resume_offset/FRAMESIZE) * ((FRAMESIZE * 8)/BITRATE);
+    }
+
+    if ((unsigned long)param) {
         action = CODEC_ACTION_SEEK_TIME;
     }
     else {
@@ -100,11 +104,9 @@ enum codec_status codec_run(void)
         if (action == CODEC_ACTION_HALT)
             break;
 
-        bit_buffer = (uint8_t *) ci->request_buffer(&buff_size, FRAMESIZE);
-
         if (action == CODEC_ACTION_SEEK_TIME) {
             /* Do not allow seeking beyond the file's length */
-            if ((unsigned) param > ci->id3->length) {
+            if ((unsigned long) param > ci->id3->length) {
                 ci->set_elapsed(ci->id3->length);
                 ci->seek_complete();
                 break;
@@ -123,7 +125,6 @@ enum codec_status codec_run(void)
             seek_frame_offset = (param * BITRATE) / (8 * FRAMESIZE);
             frame_counter = seek_frame_offset;
             ci->seek_buffer(ci->id3->first_frame_offset + seek_frame_offset* FRAMESIZE);
-            bit_buffer = (uint8_t *) ci->request_buffer(&buff_size, FRAMESIZE);
             elapsed = param;
             ci->set_elapsed(elapsed);
             ci->seek_complete(); 
@@ -131,6 +132,8 @@ enum codec_status codec_run(void)
 
         action = CODEC_ACTION_NULL;
 
+        bit_buffer = (uint8_t *) ci->request_buffer(&buff_size, FRAMESIZE);
+
         res = atrac3_decode_frame(FRAMESIZE, &q, &datasize, bit_buffer, FRAMESIZE);
 
         if(res != (int)FRAMESIZE) {