Remove unused conf_preseek from buffering.c and all of its accountraments. This is _not_ a setting. This is a guessing tool used by either playback or buffering to serve its clients better. Use the REBUFFER_GUESS size in resume to help obviate pondlife's bug. This will also need to be used when FS8092 gets fixed correctly with a complete rebuffer for backward movements. It may also belong in buffering not playback, haven't decided for sure

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

1 files changed, 5 insertions, 6 deletions

diff --git a/apps/playback.c b/apps/playback.c
index 650a69bbed..b31db800ad 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -1663,10 +1663,6 @@ static void codec_configure_callback(int setting, intptr_t value)
         buf_set_conf(BUFFERING_SET_CHUNKSIZE, value);
         break;
 
-    case CODEC_SET_FILEBUF_PRESEEK:
-        buf_set_conf(BUFFERING_SET_PRESEEK, value);
-        break;
-
     default:
         if (!dsp_configure(setting, value)) { logf("Illegal key:%d", setting); }
     }
@@ -2295,7 +2291,6 @@ static bool audio_load_track(int offset, bool start_play)
         set_current_codec(CODEC_IDX_AUDIO);
         buf_set_conf(BUFFERING_SET_WATERMARK, AUDIO_DEFAULT_WATERMARK);
         buf_set_conf(BUFFERING_SET_CHUNKSIZE, AUDIO_DEFAULT_FILECHUNK);
-        buf_set_conf(BUFFERING_SET_PRESEEK, AUDIO_REBUFFER_GUESS_SIZE);
         dsp_configure(DSP_RESET, 0);
         set_current_codec(last_codec);
 
@@ -2441,8 +2436,12 @@ static bool audio_load_track(int offset, bool start_play)
 
     logf("alt:%s", trackname);
 
-    if (!file_offset && track_id3->first_frame_offset)
+    if (file_offset > AUDIO_REBUFFER_GUESS_SIZE)
+        file_offset -= AUDIO_REBUFFER_GUESS_SIZE;
+    else if (track_id3->first_frame_offset)
         file_offset = track_id3->first_frame_offset;
+    else
+        file_offset = 0;
 
     tracks[track_widx].audio_hid = bufopen(trackname, file_offset, type);