[xiph-cvs] cvs commit: vorbis/lib vorbisfile.c

[Monty]

xiphmont    03/09/12 14:30:17

  Modified:    lib      vorbisfile.c
  Log:
  State engine change broke seeking because ov_pcm_seek was actually
  using _make_decode_ready as a 'make sure decode is ready' even if it
  already was.  _make_decode_ready is now a no-op if decode is ready.
  
  Monty

Revision  Changes    Path
1.74      +3 -2      vorbis/lib/vorbisfile.c

Index: vorbisfile.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/vorbisfile.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- vorbisfile.c	2 Sep 2003 04:39:26 -0000	1.73
+++ vorbisfile.c	12 Sep 2003 18:30:16 -0000	1.74
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: stdio-based convenience library for opening/seeking/decoding
- last mod: $Id: vorbisfile.c,v 1.73 2003/09/02 04:39:26 xiphmont Exp $
+ last mod: $Id: vorbisfile.c,v 1.74 2003/09/12 18:30:16 xiphmont Exp $
 
  ********************************************************************/
 
@@ -388,7 +388,8 @@
 }
 
 static int _make_decode_ready(OggVorbis_File *vf){
-  if(vf->ready_state!=STREAMSET)return OV_EFAULT;
+  if(vf->ready_state>STREAMSET)return 0;
+  if(vf->ready_state<STREAMSET)return OV_EFAULT;
   if(vf->seekable){
     if(vorbis_synthesis_init(&vf->vd,vf->vi+vf->current_link))
       return OV_EBADLINK;

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.