Changeset 2552

Timestamp:

2006-11-19 20:58:00 (2 years ago)

Author:

shans

Message:

Fixed ticket #219 (anxenc create files that oggz-validate rejects)

Files:

• libannodex/trunk/src/importers/anx_import_ogg.c (modified) (1 diff)
• libannodex/trunk/src/libannodex/anx_write.c (modified) (6 diffs)

libannodex/trunk/src/importers/anx_import_ogg.c

@@ -39 +39 @@
-#include <string.h>
-
-#define DEBUG
-#define DEBUG_VERBOSE
-#define DEBUG_FILE "/tmp/anx_import_ogg.out"
+ #define DEBUG 
+ #define DEBUG_VERBOSE 
+ #define DEBUG_FILE "/tmp/anx_import_ogg.out" 
-
-#define MIN(a,b) ((a)<(b)?(a):(b))

libannodex/trunk/src/libannodex/anx_write.c

@@ -876 +876 @@
-
-static long
-
+, double *min_time_return
-{
-  AnxWriter * writer = &annodex->x.writer;
@@ -898 +898 @@
-    media = (AnxSource *)l->data;
-    if (writer->secondary_headers_remaining == 0 ||
-       
+        
-      media_time = anx_media_tell_time (media);
-#ifdef DEBUG
-      printf ("anx_write: got media [%d] %p time %f %s\n", i++, media,
-       
+        
-#endif
-      if (!anx_media_eos (media) &&
-       
-       
-       
+        
+        
+        
-      }
-    }
@@ -914 +914 @@
-  if (soonest_media == NULL) return -1;
-
+  if (min_time_return != NULL) {
+    (*min_time_return) = min_time;
+  }
+  
-  writer->current_media = soonest_media;
-
@@ -1170 +1174 @@
-#endif
-
-
+, NULL
-#ifdef DEBUG
-        printf ("anx_writer_sync: get_soonest_media returned -1\n");
@@ -1196 +1200 @@
-          anx_command_get_time_offset (annodex, annodex->pending_command);
-
-
+
+
-  
-      /* While current offset >= pending offset and we haven't made a packet
@@ -1273 +1278 @@
-#endif
-      
-
+, NULL
-#ifdef DEBUG
-        printf ("anx_writer_sync: get_soonest_media returned -1\n");