Changeset 396

Timestamp:

2004-02-09 22:04:45 (5 years ago)

Author:

conrad

Message:

added query of oggz_io to get input length for seeking
+ fixed 'if (bytes = ERR_BLAH)' typo from friday :)

Files:

• liboggz/trunk/doc/Makefile.am (modified) (1 diff)
• liboggz/trunk/src/liboggz/oggz_read.c (modified) (7 diffs)

liboggz/trunk/doc/Makefile.am

@@ -70 +70 @@
-        rm -rf $(docdir)
-
-maintainer-
+
-        if test -d liboggz; then rm -rf liboggz; fi
+        if test -f doxygen-build.stamp; then rm -f doxygen-build.stamp; fi

liboggz/trunk/src/liboggz/oggz_read.c

@@ -206 +206 @@
-{
-  OggzReader * reader = &oggz->x.reader;
-  long nread = 0;
-
-  oggz_stream_t * stream;
@@ -456 +455 @@
-  }
-
-
-  offset_at = oggz_io_tell (oggz);
-
-  oggz->offset = offset_at;
-
-
-  ogg_sync_reset (&reader->ogg_sync);
@@ -516 +513 @@
-oggz_purge (OGGZ * oggz)
-{
-  long reset_ret;
-
-  if (oggz == NULL) return OGGZ_ERR_BAD_OGGZ;
-
@@ -560 +555 @@
-        /* schyeah! */
-      }
-
+=
-          /*oggz_set_error (oggz, OGGZ_ERR_SYSTEM);*/
-          return -1;
@@ -801 +796 @@
-  struct stat statbuf;
-  oggz_off_t offset_orig, offset_at, offset_guess;
-
+ = -1
-  ogg_int64_t granule_at;
-  ogg_int64_t unit_at, unit_begin = 0, unit_end = -1;
@@ -828 +823 @@
-    }
-
-#if 0
-#ifndef WIN32
-    if (S_ISREG(statbuf.st_mode) || S_ISLNK(statbuf.st_mode)) {
-      offset_end = statbuf.st_size;
-    } else {
-      /*oggz_set_error (oggz, OGGZ_ERR_NOSEEK);*/
-      return -1;
-    }
-#else
-    if (statbuf.st_mode & S_IFREG) {
-      offset_end = statbuf.st_size;
-    } else {
-      /*oggz_set_error (oggz, OGGZ_ERR_NOSEEK);*/
-      return -1;
-    }
-#endif
-#else
-    if (oggz_stat_regular (statbuf.st_mode)) {
-      offset_end = statbuf.st_size;
-    } else {
-      /*oggz_set_error (oggz, OGGZ_ERR_NOSEEK);*/
-
-
-
+
+
+
+
-  } else {
-
+
+
+
-      /* No file, and no io seek method */
-      return -1;
+    }
+
+    /* Get the offset of the end by querying the io seek method */
+    offset_save = oggz_io_tell (oggz);
+    if (oggz_io_seek (oggz, 0, SEEK_END) == -1) {
+      return -1;
+    }
+    offset_end = oggz_io_tell (oggz);
+    if (oggz_io_seek (oggz, offset_save, SEEK_SET) == -1) {
+      return -1; /* fubar */
+    }
-  }
-
@@ -994 +986 @@
-      break;
-    }
-
-
-  }
-