Changeset 997:811183edb732 in roaraudio

Timestamp:

12/18/08 23:56:54 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

seems as if I finaly got cf fishsound working, debug code clean up

File:

• roard/codecfilter_fishsound.c (modified) (5 diffs)

roard/codecfilter_fishsound.c

@@ -40 +40 @@
  } data;
 
- ROAR_WARN("cf_fishsound_decoded_float(fsound=%p, pcm=%p, frames=%li, user_data=%p) = ?", fsound, pcm, frames, user_data);
-
- ROAR_WARN("cf_fishsound_decoded_float(*): self->opened=%i", self->opened);
+ ROAR_DBG("cf_fishsound_decoded_float(fsound=%p, pcm=%p, frames=%li, user_data=%p) = ?", fsound, pcm, frames, user_data);
+
+ ROAR_DBG("cf_fishsound_decoded_float(*): self->opened=%i", self->opened);
 
  if (!self->opened) {
@@ -156 +156 @@
  size_t stlen;
 
- ROAR_WARN("cf_fishsound_read(inst=%p, buf=%p, len=%i) = ?", inst, buf, len);
+ ROAR_DBG("cf_fishsound_read(inst=%p, buf=%p, len=%i) = ?", inst, buf, len);
 
 /*
@@ -185 +185 @@
  }
 
- ROAR_WARN("cf_fishsound_read(*): need_data=%i, self->opened=%i", need_data, self->opened);
-
- while (need_data) {
-  if ( (inlen = stream_vio_s_read(self->stream, buf, len)) == -1 )
-   return -1;
-
-  oggz_read_input(self->oggz, (unsigned char *)buf, inlen);
-
-  if ( roar_buffer_ring_stats(self->buffer, &stats) == -1 )
-   return -1;
-
-  if ( stats.bytes < len ) {
-   need_data = 1;
+ ROAR_DBG("cf_fishsound_read(*): need_data=%i, self->opened=%i", need_data, self->opened);
+
+// while (need_data) {
+  if ( (inlen = stream_vio_s_read(self->stream, buf, len)) == -1 ) {
+//   if ( errno != EAGAIN ) {
+    return -1;
+/*
+   } else {
+    return -1;
+   }
+*/
   } else {
-   need_data = 0;
+   if ( inlen == 0 )
+    return 0;
+
+   oggz_read_input(self->oggz, (unsigned char *)buf, inlen);
+
+   if( self->buffer != NULL ) {
+    if ( roar_buffer_ring_stats(self->buffer, &stats) == -1 )
+     return -1;
+
+    if ( stats.bytes < len ) {
+     need_data = 1;
+    } else {
+     need_data = 0;
+    }
+   }
   }
- }
-
- ROAR_WARN("cf_fishsound_read(*): need_data=%i, self->opened=%i", need_data, self->opened);
+// }
+
+ ROAR_DBG("cf_fishsound_read(*): need_data=%i, self->opened=%i", need_data, self->opened);
+
+ if ( need_data ) {
+  errno = EAGAIN;
+  return -1;
+ }
 
  if ( !self->opened ) {
@@ -212 +229 @@
   self->opened     = 1;
   errno            = EAGAIN;
-  ROAR_WARN("cf_fishsound_read(inst=%p, buf=%p, len=%i) = -1 // errno=EAGAIN", inst, buf, len);
+  ROAR_DBG("cf_fishsound_read(inst=%p, buf=%p, len=%i) = -1 // errno=EAGAIN", inst, buf, len);
   return -1;
  }
@@ -220 +237 @@
  stlen = len;
  if ( roar_buffer_shift_out(&(self->buffer), buf, &stlen) == -1 ) {
-  ROAR_WARN("cf_fishsound_read(inst=%p, buf=%p, len=%i) = -1 // roar_buffer_shift_out() failed", inst, buf, len);
-  return -1;
- }
-
- ROAR_WARN("cf_fishsound_read(inst=%p, buf=%p, len=%i) = %i", inst, buf, len, (int)stlen);
+  ROAR_DBG("cf_fishsound_read(inst=%p, buf=%p, len=%i) = -1 // roar_buffer_shift_out() failed", inst, buf, len);
+  return -1;
+ }
+
+ ROAR_DBG("cf_fishsound_read(inst=%p, buf=%p, len=%i) = %i", inst, buf, len, (int)stlen);
  return stlen;
 }