Changeset 4987:9335631d4e00 in roaraudio for roard/codecfilter_vorbis.c

Timestamp:

05/20/11 12:15:25 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

get codecfilter for ogg_vorbis working again

File:

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

roard/codecfilter_vorbis.c

@@ -50 +50 @@
  ROAR_DBG("cf_vorbis_vfvio_read(ptr=%p, size=%lu, nmemb=%lu, datasource=%p): r=%i", ptr, size, nmemb, datasource, r);
 
- if ( r == -1 )
+ if ( r == -1 ) {
+  ROAR_DBG("cf_vorbis_vfvio_read(ptr=%p, size=%lu, nmemb=%lu, datasource=%p) = 0 // roar_error=%i(%s)", ptr, size, nmemb, datasource, roar_error, roar_error2str(roar_error));
   return 0;
+ }
 
  if ( r > 0 )
@@ -235 +237 @@
  long todo = len;
  long done = 0;
-
-// printf("cf_vorbis_read(inst=%p, buf=%p, len=%i) = ?\n", inst, buf, len);
+ int ret;
+
+ ROAR_DBG("cf_vorbis_read(inst=%p, buf=%p, len=%i) = ?", inst, buf, len);
 
  self->opened++;
  if ( self->opened == 16 ) {
 
-  //printf("cf_vorbis_read(*): opening...\n");
-  if ( ov_open_callbacks((void*)self->stream, &(self->vf), NULL, 0, _g_cf_vorbis_vfvio) < 0 ) {
+  ROAR_DBG("cf_vorbis_read(*): opening...");
+  if ( (ret = ov_open_callbacks((void*)self->stream, &(self->vf), NULL, 0, _g_cf_vorbis_vfvio)) < 0 ) {
+   ROAR_DBG("cf_vorbis_read(*): ret=%i", ret);
+   ROAR_DBG("cf_vorbis_read(*) = 0");
    return 0;
   }
+
+  ROAR_DBG("cf_vorbis_read(*) = -1 // errno=EAGAIN");
   errno = EAGAIN;
   return -1;
@@ -250 +257 @@
 
  if ( self->opened < 16 ) {
+  ROAR_DBG("cf_vorbis_read(*) = -1 // errno=EAGAIN");
   errno = EAGAIN;
   return -1;
@@ -259 +267 @@
  while (todo) {
   r = ov_read(&(self->vf), buf+done, todo, self->bigendianp, 2, 1, &(self->current_section));
+  ROAR_DBG("cf_vorbis_read(*): r=%li", r);
   if ( r == OV_HOLE ) {
    ROAR_DBG("cf_vorbis_read(*): Hole in stream");
@@ -274 +283 @@
  }
 
-//printf("ov_read(*) = %i\n", done);
+ ROAR_DBG("ov_read(*) = %i", done);
 
  if ( done == 0 ) {