Changeset 1173

Timestamp:

2005-03-21 19:08:13 (4 years ago)

Author:

conrad

Message:

mod_annodex-ap13: add named offset handling (ticket:79)

Files:

• mod_annodex-ap13/trunk/mod_annodex.c (modified) (4 diffs)

mod_annodex-ap13/trunk/mod_annodex.c

@@ -301 +301 @@
-}
-
+static double
+ma_anxenc_clip_time (char * filename, char * content_type, char * id)
+{
+  ANNODEX * anx;
+  int ret;
+  unsigned char buf[1024];
+  long n = 1024;
+  double clip_offset;
+
+  anx = anx_new (ANX_WRITE);
+  ret = anx_write_import (anx, filename, NULL, content_type, 0.0, -1.0, 0);
+
+  /* Only spin through the file if the requested clip has not yet been
+   * inserted; avoid scanning media if 'filename' is a cmml file. */
+  if ((clip_offset = anx_get_clip_time_by_id (anx, id)) == -1.0) {
+    while ((n = anx_write_output (anx, buf, 1024)) > 0);
+
+    if ((clip_offset = anx_get_clip_time_by_id (anx, id)) == -1.0) {
+      clip_offset = 0.0;
+    }
+  }
+
+  if (anx_close (anx) != NULL) {
+  }
+
+  return clip_offset;
+}
+
-static int
-ma_anxenc (request_rec * r, char * filename, char * mime_type,
@@ -307 +335 @@
-  ANNODEX * anx;
-  int ret;
-
+, * id = NULL
-  double seek_offset = 0.0, seek_end = -1.0;
-  char buf[1024];
@@ -319 +347 @@
-  /*anx_init_importers (ANX_MIME_TYPE);*/
-  anx_init_importers ("*/*");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  /* Retrieve the current working directory */
-  getcwd (olddir, PATH_MAX);
@@ -342 +357 @@
-  chdir (newdir);
-
+  /* Get the start/end times or id */  
+  val = (char *)table_get (cgi_table, "t");
+  id = (char *)table_get (cgi_table, "id");
+  if (val) {
+    ma_parse_time (val, &seek_offset, &seek_end);
+  } else if (id) {
+    seek_offset = ma_anxenc_clip_time (filename, mime_type, id);
+  }
+
+#ifdef DEBUG
+    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
+                  "ma_anxenc: t=%s id=%s (%f/%f)",
+                  val, id, seek_offset, seek_end);
+#endif
+
+  anx_set_presentation_time (anx, seek_offset);
+  anx_set_basetime (anx, 0.0);
+  
-  ret = anx_write_import (anx, filename, NULL, mime_type,
-                          seek_offset, seek_end, 0);