Changeset 744:ad382e33d5d0 in roaraudio

Timestamp:

09/05/08 01:01:00 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

got it working, need cleanup

File:

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

roard/codecfilter_vorbis.c

@@ -44 +44 @@
  ROAR_WARN("cf_vorbis_vfvio_read(ptr=%p, size=%lu, nmemb=%lu, datasource=%p): r=%i", ptr, size, nmemb, datasource, r);
 
+ errno = 0;
+
  if ( r == -1 )
   return 0;
@@ -49 +51 @@
  if ( r > 0 )
   errno = 0;
+
+ r /= size;
  
- return r/nmemb;
+ ROAR_WARN("cf_vorbis_vfvio_read(ptr=%p, size=%lu, nmemb=%lu, datasource=%p) = %i", ptr, size, nmemb, datasource, r);
+ return r;
 }
 
@@ -237 +242 @@
  self->opened++;
  if ( self->opened == 16 ) {
+
   //printf("cf_vorbis_read(*): opening...\n");
 //int ov_open_callbacks(void *datasource, OggVorbis_File *vf, char *initial, long ibytes, ov_callbacks callbacks);
@@ -258 +264 @@
  while (todo) {
   r = ov_read(&(self->vf), buf+done, todo, 0, 2, 1, &(self->current_section));
-  if ( r < 1 ) {
+  if ( r == OV_HOLE ) {
+   ROAR_WARN("cf_vorbis_read(*): Hole in stream");
+  } else if ( r < 1 ) {
    break;
   } else {
@@ -271 +279 @@
  }
 
- //printf("ov_read(*) = %i\n", done);
+//printf("ov_read(*) = %i\n", done);
 
  if ( done == 0 ) {