1 files changed, 37 insertions, 23 deletions

diff --git a/lib/rbcodec/codecs/speex.c b/lib/rbcodec/codecs/speex.c
index ac3bc963b1..a073151ee2 100644
--- a/lib/rbcodec/codecs/speex.c
+++ b/lib/rbcodec/codecs/speex.c
@@ -381,7 +381,6 @@ enum codec_status codec_run(void)
     int error = CODEC_ERROR;
 
     SpeexBits bits;
-    int eof = 0;
     spx_ogg_sync_state oy;
     spx_ogg_page og;
     spx_ogg_packet op;
@@ -403,9 +402,10 @@ enum codec_status codec_run(void)
     int packet_count = 0;
     int lookahead;
     int headerssize = 0;
-    unsigned long strtoffset = ci->id3->offset;
+    unsigned long strtoffset;
     void *st = NULL;
     int j = 0;
+    enum codec_command_action action;
     intptr_t param;
 
     memset(&bits, 0, sizeof(bits));
@@ -416,6 +416,10 @@ enum codec_status codec_run(void)
         goto exit;
     }
 
+    action = CODEC_ACTION_NULL;
+    param = ci->id3->elapsed;
+    strtoffset = ci->id3->offset;
+
     ci->seek_buffer(0);
     ci->set_elapsed(0);
 
@@ -425,29 +429,39 @@ enum codec_status codec_run(void)
 
     codec_set_replaygain(ci->id3);
 
-    eof = 0;
-    while (!eof) {
-        enum codec_command_action action = ci->get_command(&param);
-
-        if (action == CODEC_ACTION_HALT)
-            break;
-
-        /*seek (seeks to the page before the position) */
-        if (action == CODEC_ACTION_SEEK_TIME) {
-            if(samplerate!=0&&packet_count>1){
-                LOGF("Speex seek page:%lld,%lld,%ld,%lld,%d\n",
-                     ((spx_int64_t)param/1000) *
-                     (spx_int64_t)samplerate,
-                     page_granule, (long)param,
-                     (page_granule/samplerate)*1000, samplerate);
-
-                speex_seek_page_granule(((spx_int64_t)param/1000) *
-                                        (spx_int64_t)samplerate,
-                                        page_granule, &oy, headerssize);
+    if (!strtoffset && param) {
+        action = CODEC_ACTION_SEEK_TIME;
+    }
+
+    goto next_page;
+
+    while (1) {
+        if (action == CODEC_ACTION_NULL)
+            action = ci->get_command(&param);
+
+        if (action != CODEC_ACTION_NULL) {
+            if (action == CODEC_ACTION_HALT)
+                break;
+
+            /*seek (seeks to the page before the position) */
+            if (action == CODEC_ACTION_SEEK_TIME) {
+                if(samplerate!=0&&packet_count>1){
+                    LOGF("Speex seek page:%lld,%lld,%ld,%lld,%d\n",
+                         ((spx_int64_t)param/1000) *
+                         (spx_int64_t)samplerate,
+                         page_granule, (long)param,
+                         (page_granule/samplerate)*1000, samplerate);
+
+                    speex_seek_page_granule(((spx_int64_t)param/1000) *
+                                            (spx_int64_t)samplerate,
+                                            page_granule, &oy, headerssize);
+                }
+
+                ci->set_elapsed(param);
+                ci->seek_complete();
             }
 
-            ci->set_elapsed(param);
-            ci->seek_complete();
+            action = CODEC_ACTION_NULL;
         }
 
 next_page: