2 files changed, 3 insertions, 6 deletions

diff --git a/apps/pcmbuf.c b/apps/pcmbuf.c
index cf6911b606..a8769e3829 100644
--- a/apps/pcmbuf.c
+++ b/apps/pcmbuf.c
@@ -202,8 +202,8 @@ unsigned int pcmbuf_get_latency(void)
 {
     int latency;
     
-    /* This has to be done better. */
-    latency = (pcmbuf_size - audiobuffer_free - CHUNK_SIZE)/4 / (44100/1000);
+    latency = (pcmbuf_unplayed_bytes + pcm_get_bytes_waiting())
+                / 4 / (44100/1000);
     if (latency < 0)
         latency = 0;
     
diff --git a/apps/playback.c b/apps/playback.c
index aadb1e289e..7aaff01e54 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -265,10 +265,7 @@ void codec_set_offset_callback(unsigned int value)
     if (ci.stop_codec)
         return ;
         
-    /* The 1000 here is a hack.  pcmbuf_get_latency() should
-     * be more accurate
-     */
-    latency = (pcmbuf_get_latency() + 1000) * cur_ti->id3.bitrate / 8;
+    latency = pcmbuf_get_latency() * cur_ti->id3.bitrate / 8;
     
     if (value < latency) {
         cur_ti->id3.offset = 0;