[xiph-cvs] cvs commit: icecast/src source.c

[Michael Smith]

msmith      02/10/06 05:57:07

  Modified:    src      source.c
  Log:
  Previous bugfix was incorrect, and made the problem worse, since it ensured
  it would be triggered in certain cases, instead of merely making it dependant
  on previous values written to the variable in those cases.
  
  Fixes source disconnect on some (but very few) ogg bitstreams (the vast
  majority of my files play fine)

Revision  Changes    Path
1.23      +1 -1      icecast/src/source.c

Index: source.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/source.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- source.c	3 Oct 2002 14:07:34 -0000	1.22
+++ source.c	6 Oct 2002 09:57:07 -0000	1.23
@@ -148,12 +148,12 @@
     stats_event(source->mount, "type", source->format->format_description);
 
         while (global.running == ICE_RUNNING) {
-        bytes = 0;
                 ret = source->format->get_buffer(source->format, NULL, 0, &refbuf);
         if(ret < 0) {
             WARN0("Bad data from source");
             break;
         }
+        bytes = 1; /* Set to > 0 so that the post-loop check won't be tripped */
                 while (refbuf == NULL) {
                         bytes = 0;
                         while (bytes <= 0) {

<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.