[Cvs-annodex] commit (annodex): libannodex/trunk/src/importers/anx_import_ogg.c libannodex/trunk/src/libannodex/anx_write.c

[shans]

Update of /var/local/lib/svn/annodex (new revision 2552)

Modified files:
   libannodex/trunk/src/importers/anx_import_ogg.c
   libannodex/trunk/src/libannodex/anx_write.c

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



Modified: libannodex/trunk/src/importers/anx_import_ogg.c
===================================================================
--- libannodex/trunk/src/importers/anx_import_ogg.c	2006-11-20 00:50:21 UTC (rev 2551)
+++ libannodex/trunk/src/importers/anx_import_ogg.c	2006-11-20 04:58:00 UTC (rev 2552)
@@ -38,9 +38,9 @@
 #include <stdlib.h>
 #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))
 

Modified: libannodex/trunk/src/libannodex/anx_write.c
===================================================================
--- libannodex/trunk/src/libannodex/anx_write.c	2006-11-20 00:50:21 UTC (rev 2551)
+++ libannodex/trunk/src/libannodex/anx_write.c	2006-11-20 04:58:00 UTC (rev 2552)
@@ -875,7 +875,7 @@
 }
 
 static long
-anx_writer_get_soonest_media (ANNODEX * annodex)
+anx_writer_get_soonest_media (ANNODEX * annodex, double *min_time_return)
 {
   AnxWriter * writer = &annodex->x.writer;
   AnxSource * media, * soonest_media = NULL;
@@ -897,22 +897,26 @@
   for (l = writer->medias; l; l = l->next) {
     media = (AnxSource *)l->data;
     if (writer->secondary_headers_remaining == 0 ||
-	!anx_media_written_secondaries (media)) {
+        !anx_media_written_secondaries (media)) {
       media_time = anx_media_tell_time (media);
 #ifdef DEBUG
       printf ("anx_write: got media [%d] %p time %f %s\n", i++, media,
-	      media_time, anx_media_eos (media) ? "(eos)" : "");
+              media_time, anx_media_eos (media) ? "(eos)" : "");
 #endif
       if (!anx_media_eos (media) &&
-	  (media_time != -1 && media_time < min_time)) {
-	soonest_media = media;
-	min_time = media_time;
+          (media_time != -1 && media_time < min_time)) {
+        soonest_media = media;
+        min_time = media_time;
       }
     }
   }
 
   if (soonest_media == NULL) return -1;
 
+  if (min_time_return != NULL) {
+    (*min_time_return) = min_time;
+  }
+  
   writer->current_media = soonest_media;
 
   return 0;
@@ -1169,7 +1173,7 @@
         writer->secondary_headers_remaining);
 #endif
 
-      if (anx_writer_get_soonest_media (annodex) == -1) {
+      if (anx_writer_get_soonest_media (annodex, NULL) == -1) {
 #ifdef DEBUG
         printf ("anx_writer_sync: get_soonest_media returned -1\n");
 #endif
@@ -1195,7 +1199,8 @@
       command_offset =
           anx_command_get_time_offset (annodex, annodex->pending_command);
 
-      current_offset = anx_tell_time (annodex);
+      //current_offset = anx_tell_time (annodex);
+      anx_writer_get_soonest_media(annodex, &current_offset);
   
       /* While current offset >= pending offset and we haven't made a packet
        * yet, handle next command */
@@ -1272,7 +1277,7 @@
       printf ("anx_writer_sync: no packet, creating one\n");
 #endif
       
-      if (anx_writer_get_soonest_media (annodex) == -1) {
+      if (anx_writer_get_soonest_media (annodex, NULL) == -1) {
 #ifdef DEBUG
         printf ("anx_writer_sync: get_soonest_media returned -1\n");
 #endif


-- 
shans