diff options
author | Brandon Low <lostlogic@rockbox.org> | 2007-11-05 16:02:12 +0000 |
---|---|---|
committer | Brandon Low <lostlogic@rockbox.org> | 2007-11-05 16:02:12 +0000 |
commit | 1df1e7b0c7f1932f45cfb189b43e873db1a85410 (patch) | |
tree | edf57cc1bd9f3f7ba68b48c703f832798f16f122 /apps/buffering.c | |
parent | 2d95fd524db6de67e91024ee4d947a4ee25c43b6 (diff) | |
download | rockbox-1df1e7b0c7f1932f45cfb189b43e873db1a85410.tar.gz rockbox-1df1e7b0c7f1932f45cfb189b43e873db1a85410.zip |
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
Diffstat (limited to 'apps/buffering.c')
-rw-r--r-- | apps/buffering.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/apps/buffering.c b/apps/buffering.c index e448e4238f..811c1e5d65 100644 --- a/apps/buffering.c +++ b/apps/buffering.c | |||
@@ -135,8 +135,6 @@ static volatile size_t buf_ridx; /* current reading position */ | |||
135 | static size_t conf_watermark = 0; /* Level to trigger filebuf fill */ | 135 | static size_t conf_watermark = 0; /* Level to trigger filebuf fill */ |
136 | static size_t conf_filechunk = 0; /* Bytes-per-read for buffering (impacts | 136 | static size_t conf_filechunk = 0; /* Bytes-per-read for buffering (impacts |
137 | responsiveness of buffering thread) */ | 137 | responsiveness of buffering thread) */ |
138 | static size_t conf_preseek = 0; /* Distance a codec may look backwards after | ||
139 | seeking, to prevent double rebuffers */ | ||
140 | #if MEM > 8 | 138 | #if MEM > 8 |
141 | static size_t high_watermark = 0; /* High watermark for rebuffer */ | 139 | static size_t high_watermark = 0; /* High watermark for rebuffer */ |
142 | #endif | 140 | #endif |
@@ -178,7 +176,6 @@ enum { | |||
178 | /* Configuration: */ | 176 | /* Configuration: */ |
179 | Q_SET_WATERMARK, | 177 | Q_SET_WATERMARK, |
180 | Q_SET_CHUNKSIZE, | 178 | Q_SET_CHUNKSIZE, |
181 | Q_SET_PRESEEK, | ||
182 | Q_FILL_BUFFER, /* Request that the buffering thread initiate a buffer | 179 | Q_FILL_BUFFER, /* Request that the buffering thread initiate a buffer |
183 | fill at its earliest convenience */ | 180 | fill at its earliest convenience */ |
184 | }; | 181 | }; |
@@ -1117,10 +1114,6 @@ void buf_set_conf(int setting, size_t value) | |||
1117 | msg = Q_SET_CHUNKSIZE; | 1114 | msg = Q_SET_CHUNKSIZE; |
1118 | break; | 1115 | break; |
1119 | 1116 | ||
1120 | case BUFFERING_SET_PRESEEK: | ||
1121 | msg = Q_SET_PRESEEK; | ||
1122 | break; | ||
1123 | |||
1124 | default: | 1117 | default: |
1125 | return; | 1118 | return; |
1126 | } | 1119 | } |
@@ -1254,11 +1247,6 @@ void buffering_thread(void) | |||
1254 | } | 1247 | } |
1255 | break; | 1248 | break; |
1256 | 1249 | ||
1257 | case Q_SET_PRESEEK: | ||
1258 | LOGFQUEUE("buffering < Q_SET_PRESEEK"); | ||
1259 | conf_preseek = (size_t)ev.data; | ||
1260 | break; | ||
1261 | |||
1262 | #ifndef SIMULATOR | 1250 | #ifndef SIMULATOR |
1263 | case SYS_USB_CONNECTED: | 1251 | case SYS_USB_CONNECTED: |
1264 | LOGFQUEUE("buffering < SYS_USB_CONNECTED"); | 1252 | LOGFQUEUE("buffering < SYS_USB_CONNECTED"); |