diff options
author | Ryan Jackson <rdjackso@rockbox.org> | 2005-07-14 03:58:22 +0000 |
---|---|---|
committer | Ryan Jackson <rdjackso@rockbox.org> | 2005-07-14 03:58:22 +0000 |
commit | 4d45987e374737af5e2aa7215c608d4501c07672 (patch) | |
tree | 6fe6a587c0ec1a892a1660fb054317d372066b9b /apps/codecs | |
parent | 680fe7082f8c279f15d6cfa4e0f36aef3f52b904 (diff) | |
download | rockbox-4d45987e374737af5e2aa7215c608d4501c07672.tar.gz rockbox-4d45987e374737af5e2aa7215c608d4501c07672.zip |
Removed unnecessary code that also caused playback glitches when changing tracks
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7136 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs')
-rw-r--r-- | apps/codecs/vorbis.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/apps/codecs/vorbis.c b/apps/codecs/vorbis.c index 20fb79aa1d..720745fb0e 100644 --- a/apps/codecs/vorbis.c +++ b/apps/codecs/vorbis.c | |||
@@ -232,8 +232,8 @@ enum codec_status codec_start(struct codec_api* api) | |||
232 | } | 232 | } |
233 | 233 | ||
234 | eof=0; | 234 | eof=0; |
235 | rb->yield(); | ||
236 | while (!eof) { | 235 | while (!eof) { |
236 | rb->yield(); | ||
237 | if (rb->stop_codec || rb->reload_codec) | 237 | if (rb->stop_codec || rb->reload_codec) |
238 | break ; | 238 | break ; |
239 | 239 | ||
@@ -264,18 +264,11 @@ enum codec_status codec_start(struct codec_api* api) | |||
264 | } else { | 264 | } else { |
265 | while (!rb->pcmbuf_insert(pcmbuf, n)) { | 265 | while (!rb->pcmbuf_insert(pcmbuf, n)) { |
266 | rb->sleep(1); | 266 | rb->sleep(1); |
267 | if ( rb->seek_time ) { | ||
268 | /* Hmmm, a seek was requested. Throw out the | ||
269 | * buffer and go back to the top of the loop. | ||
270 | */ | ||
271 | break; | ||
272 | } | ||
273 | } | 267 | } |
274 | if ( !rb->seek_time ) { | 268 | |
275 | rb->set_offset(ov_raw_tell(&vf)); | 269 | rb->set_offset(ov_raw_tell(&vf)); |
276 | rb->set_elapsed(ov_time_tell(&vf)); | 270 | rb->set_elapsed(ov_time_tell(&vf)); |
277 | rb->yield(); | 271 | |
278 | } | ||
279 | } | 272 | } |
280 | } | 273 | } |
281 | 274 | ||