Changeset 4581:f1a58ffe0be6 in roaraudio for libroar/vs.c

Timestamp:

11/03/10 14:33:08 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed some minor bugs and flushing problems

File:

• libroar/vs.c (modified) (3 diffs)

libroar/vs.c

@@ -1031 +1031 @@
   ret = roar_vio_read(vss->file, data, len);
 
+  ROAR_DBG("roar_vs_iterate(vss=%p, wait=%i, error=%p): ret=%lli", vss, wait, error, (long long int)ret);
+
   if ( ret == -1 ) {
+   ROAR_DBG("roar_vs_iterate(vss=%p, wait=%i, error=%p) = ?", vss, wait, error);
+
    roar_buffer_free(vss->writebuffer);
-   vss->readbuffer = NULL;
+   vss->writebuffer = NULL;
    return -1;
   } else if ( ret == 0 ) {
+   ROAR_DBG("roar_vs_iterate(vss=%p, wait=%i, error=%p) = ?", vss, wait, error);
+
    is_eof = 1;
    roar_buffer_free(vss->writebuffer);
-   vss->readbuffer = NULL;
+   vss->writebuffer = NULL;
   } else {
+   ROAR_DBG("roar_vs_iterate(vss=%p, wait=%i, error=%p) = ?", vss, wait, error);
+
    if ( len != ret ) {
     len = ret;
-    if ( roar_buffer_set_len(vss->readbuffer, len) == -1 )
+    if ( roar_buffer_set_len(vss->writebuffer, len) == -1 )
      return -1;
    }
+
+   ROAR_DBG("roar_vs_iterate(vss=%p, wait=%i, error=%p) = ?", vss, wait, error);
 
    ret = roar_vs_write(vss, data, len, error);
@@ -1070 +1080 @@
  while ((ret = roar_vs_iterate(vss, ROAR_VS_WAIT, error)) > 0);
 
+ ROAR_DBG("roar_vs_run(vss=%p, error=%p): ret=%i", vss, error, ret);
+
  if ( ret == 0 ) {
   // flush buffers:
@@ -1075 +1087 @@
  }
 
+ if ( roar_vs_sync(vss, ROAR_VS_WAIT, error) == -1 )
+  return -1;
+
  return ret;
 }