1 files changed, 5 insertions, 5 deletions

diff --git a/apps/playback.c b/apps/playback.c
index 6fd63d5a0f..1677e3138b 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -2008,7 +2008,7 @@ static void mp3_set_elapsed(struct mp3entry* id3)
             /* find wich percent we're at */
             for (i=0; i<100; i++ )
             {
-                if ( id3->offset < (int)(id3->toc[i] * (id3->filesize / 256)) )
+                if ( id3->offset < id3->toc[i] * (id3->filesize / 256) )
                 {
                     break;
                 }
@@ -2048,8 +2048,8 @@ static void mp3_set_elapsed(struct mp3entry* id3)
         }
     }
     else
-        /* constant bitrate == simple frame calculation */
-        id3->elapsed = id3->offset / id3->bpf * id3->tpf;
+        /* constant bitrate, use exact calculation */
+        id3->elapsed = id3->offset / (id3->bitrate / 8);
 }
 
 /* Copied from mpeg.c. Should be moved somewhere else. */
@@ -2092,8 +2092,8 @@ int mp3_get_file_pos(void)
                 (id3->elapsed / 1000);
         }
     }
-    else if (id3->bpf && id3->tpf)
-        pos = (id3->elapsed/id3->tpf)*id3->bpf;
+    else if (id3->bitrate)
+        pos = id3->elapsed * (id3->bitrate / 8);
     else
     {
         return -1;