Changeset 2012

Timestamp:

2006-02-09 18:03:39 (3 years ago)

Author:

conrad

Message:

oggz_read_*(): when reading is stopped by the user, cache the return value
and return it on the subsequent read call (unless no data has been read, in
which case return it on this call as before). This ensures that when the
user returns OGGZ_STOP_OK or OGGZ_STOP_ERR in a read callback, that condition
is acknowledged in a subsequent call to oggz_read_*().

Files:

• liboggz/trunk/src/liboggz/oggz.c (modified) (1 diff)
• liboggz/trunk/src/liboggz/oggz_private.h (modified) (1 diff)
• liboggz/trunk/src/liboggz/oggz_read.c (modified) (7 diffs)
• liboggz/trunk/src/tests/read-stop-ok.c (modified) (2 diffs)

liboggz/trunk/src/liboggz/oggz.c

@@ -84 +84 @@
-  oggz->offset = 0;
-  oggz->offset_data_begin = 0;
+
+  oggz->cb_next = 0;
-
-  oggz->streams = oggz_vector_new ();

liboggz/trunk/src/liboggz/oggz_private.h

@@ -199 +199 @@
-  off_t offset_data_begin; /* offset of unit 0 page start */
-
+  int cb_next;
+
-  OggzVector * streams;
-  int all_at_eos; /* all streams are at eos */

liboggz/trunk/src/liboggz/oggz_read.c

@@ -286 +286 @@
-
-      if(result == -1) {
-
+
+
+
-        return -7;
-      }
@@ -368 +370 @@
-}
-
+/* Map callback return values to error return values for oggz_read_*() */
+static int
+map_return_value_to_error (int cb_ret)
+{
+  switch (cb_ret) {
+  case OGGZ_CONTINUE:
+  case OGGZ_READ_EMPTY:
+    return OGGZ_CONTINUE;
+  case OGGZ_STOP_OK:
+    return OGGZ_ERR_READ_STOP_OK;
+  case OGGZ_STOP_ERR:
+    return OGGZ_ERR_READ_STOP_ERR;
+  default:
+    return OGGZ_ERR_READ_STOP_ERR;
+  }
+}
+
-long
-oggz_read (OGGZ * oggz, long n)
@@ -380 +399 @@
-  if (oggz->flags & OGGZ_WRITE) {
-    return OGGZ_ERR_INVALID;
+  }
+
+  if ((cb_ret = oggz->cb_next) != OGGZ_CONTINUE) {
+    oggz->cb_next = 0;
+    return map_return_value_to_error (cb_ret);
-  }
-
@@ -432 +456 @@
-    }
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-  }
-
@@ -461 +481 @@
-  }
-
+  if ((cb_ret = oggz->cb_next) != OGGZ_CONTINUE) {
+    oggz->cb_next = 0;
+    return map_return_value_to_error (cb_ret);
+  }
+
-  reader = &oggz->x.reader;
-
@@ -473 +498 @@
-#endif
-
-
+
+
-    bytes = MIN (remaining, 4096);
-    buffer = ogg_sync_buffer (&reader->ogg_sync, bytes);
@@ -488 +514 @@
-  if (cb_ret == OGGZ_STOP_ERR) oggz_purge (oggz);
-
-  /* Don't return 0 unless it's actually an EOF condition */
-  if (nread == 0) {
-
-
-
-
-
-
+
+
-      return OGGZ_ERR_READ_STOP_OK;
-
-
-
-
+
+
+
+
+
+
-  }
-

liboggz/trunk/src/tests/read-stop-ok.c

@@ -132 +132 @@
-  OGGZ * reader, * writer;
-  unsigned char buf[READ_SIZE];
-
+, err
-
-  INFO ("Testing ability to pause while reading (OGGZ_STOP_OK)");
@@ -154 +154 @@
-    n = oggz_read_input (reader, buf, remaining);
-
-< remaining)
+== OGGZ_ERR_READ_STOP_OK) {
-      INFO ("+ Interrupted read detected");
+    } else {
+      remaining -= n;
-
-
+
+
+
+
+
+
+
-
-    n = oggz_read_input (reader, buf+n, remaining);