Changeset 1278

Timestamp:

2005-04-20 23:32:07 (4 years ago)

Author:

silvia

Message:

Implemented support for CMML 2.1 and libcmml 0.9.0 .
Passes "make distcheck" and "make check".
Have not valground yet, but this commit will enable me to do it on a remote linux box.

Files:

• libannodex/trunk/include/annodex/anx_general.h (modified) (1 diff)
• libannodex/trunk/include/annodex/anx_types.h (modified) (4 diffs)
• libannodex/trunk/src/importers/anx_import_cmml.c (modified) (5 diffs)
• libannodex/trunk/src/libannodex/Version_script.in (modified) (1 diff)
• libannodex/trunk/src/libannodex/anx_element.c (modified) (1 diff)

libannodex/trunk/include/annodex/anx_general.h

@@ -292 +292 @@
-AnxMetaElement * anx_meta_element_clone (AnxMetaElement * meta);
-
+/**
+ * Clone an AnxLinkElement structure
+ * \param link the link tag structure to clone
+ * \returns a new link tag structure
+ */
+AnxLinkElement * anx_link_element_clone (AnxLinkElement * link);
+
-#ifdef __cplusplus
-}

libannodex/trunk/include/annodex/anx_types.h

@@ -60 +60 @@
-typedef struct _AnxClip AnxClip;
-typedef struct _AnxMetaElement AnxMetaElement;
+typedef struct _AnxLinkElement AnxLinkElement;
-
-struct _AnxMetaElement {
@@ -69 +70 @@
-  const char *scheme;  /**< scheme name of meta element */
-};
+
+struct _AnxLinkElement {
+  char *id;      /**< id attribute of link */
+  char *class;   /**< class attribute of link */
+  char *title;   /**< title attribute of link */
+  char *lang;    /**< language code of link */
+  char *dir;     /**< directionality of lang (ltr/rtl) */
+  char *href;    /**< href attribute of link */
+  char *type;    /**< type attribute of link */
+  char *rel;     /**< rel attribute of link */
+  char *rev;     /**< rev attribute of link */
+  char *media;   /**< media attribute of link */
+};
+
-
-struct _AnxHead {
@@ -82 +97 @@
-  const char *base_href;  /**< href attribute of base element */
-  AnxList * meta;   /**< list of meta elements */
+  AnxList *link;    /**< list of link elements */
-};
-
-struct _AnxClip {
-  const char *clip_id;         /**< id attribute of clip */
+  const char *class;           /**< class attribute of clip */
+  const char *title;           /**< title attribute of clip */
-  const char *lang;            /**< language attribute of desc element */
-  const char *dir;             /**< directionality of lang */
-  const char *track;           /**< track attribute of clip */
-  const char *anchor_id;       /**< id attribute of anchor */
+  const char *anchor_class;    /**< class attribute of clip */
+  const char *anchor_title;    /**< title attribute of clip */
-  const char *anchor_lang;     /**< language of anchor */
-  const char *anchor_dir;      /**< directionality of lang */
-  const char *anchor_class;    /**< stylesheet of anchor */
-  const char *anchor_href;     /**< href out of clip */
-  const char *anchor_text;     /**< anchor text */
-  const char *img_id;          /**< id attribute of image */
+  const char *img_class;       /**< class attribute of image */
+  const char *img_title;       /**< title attribute of image */
-  const char *img_lang;        /**< language of img */
-  const char *img_dir;         /**< directionality of lang */
@@ -101 +122 @@
-  const char *img_alt;         /**< alternate text for image */
-  const char *desc_id;         /**< id attribute of desc element */
+  const char *desc_class;      /**< class attribute of desc */
+  const char *desc_title;      /**< title attribute of desc */
-  const char *desc_lang;       /**< language attribute of desc element */
-  const char *desc_dir;        /**< directionality of lang */

libannodex/trunk/src/importers/anx_import_cmml.c

@@ -91 +91 @@
-}
-
+static AnxLinkElement *
+anx_link_from_cmml_link (const CMML_LinkElement * link)
+{
+  AnxLinkElement * new_link;
+
+  if (link == NULL) return NULL;
+
+  new_link = (AnxLinkElement* ) anx_malloc (sizeof (AnxLinkElement));
+  new_link->id = anxcmml_strdup (link->id);
+  new_link->class = anxcmml_strdup (link->class);
+  new_link->title = anxcmml_strdup (link->title);
+  new_link->lang = anxcmml_strdup (link->lang);
+  new_link->dir = anxcmml_strdup (link->dir);
+  new_link->href = anxcmml_strdup (link->href);
+  new_link->type = anxcmml_strdup (link->type);
+  new_link->rel = anxcmml_strdup (link->rel);
+  new_link->rev = anxcmml_strdup (link->rev);
+  new_link->media = anxcmml_strdup (link->media);
+
+  return new_link;
+}
+
-static AnxHead *
-anx_head_from_cmml_head (const CMML_Head * head)
@@ -137 +159 @@
-    anx_list_clone_with ((AnxList*)head->meta,
-                         (AnxCloneFunc)anx_meta_from_cmml_meta);
+
+  /* list of meta elements */
+  h->link =
+    anx_list_clone_with ((AnxList*)head->link,
+                         (AnxCloneFunc)anx_link_from_cmml_link);
-
-  return h;
@@ -161 +188 @@
-
-    presentation_time = ac->start_time;
-timebase ? stream->timebas
+basetime ? stream->basetim
-    utc = stream->utc ? stream->utc->tstr : NULL;
-
@@ -232 +259 @@
-  /* copy clip data across */
-  a->clip_id = anxcmml_strdup (clip->clip_id);
+  a->class = anxcmml_strdup (clip->class);
+  a->title = anxcmml_strdup (clip->title);
-  a->lang = anxcmml_strdup (clip->lang);
-  a->dir = anxcmml_strdup (clip->dir);
-  a->track = anxcmml_strdup (clip->track);
-  a->anchor_id = anxcmml_strdup (clip->anchor_id);
+  a->anchor_class = anxcmml_strdup (clip->anchor_class);
+  a->anchor_title = anxcmml_strup (clip->anchor_title);
-  a->anchor_lang = anxcmml_strdup (clip->anchor_lang);
-  a->anchor_dir = anxcmml_strdup (clip->anchor_dir);
-  a->anchor_class = anxcmml_strdup (clip->anchor_class);
-  a->anchor_href = anxcmml_strdup (clip->anchor_href);
-  a->anchor_text = anxcmml_strdup (clip->anchor_text);
-  a->img_id = anxcmml_strdup (clip->img_id);
+  a->img_class = anxcmml_strdup (clip->img_class);
+  a->img_title = anxcmml_strdup (clip->img_title);
-  a->img_lang = anxcmml_strdup (clip->img_lang);
-  a->img_dir = anxcmml_strdup (clip->img_dir);
@@ -247 +279 @@
-  a->img_alt = anxcmml_strdup (clip->img_alt);
-  a->desc_id = anxcmml_strdup (clip->desc_id);
+  a->desc_class = anxcmml_strdup (clip->desc_class);
+  a->desc_title = anxcmml_strdup (clip->desc_title);
-  a->desc_lang = anxcmml_strdup (clip->desc_lang);
-  a->desc_dir = anxcmml_strdup (clip->desc_dir);

libannodex/trunk/src/libannodex/Version_script.in

@@ -51 +51 @@
-                anx_meta_element_clone;
-                anx_meta_element_free;
+
+                anx_link_element_clone;
+                anx_link_element_free;
-
-                anx_set_read_stream_callback;

libannodex/trunk/src/libannodex/anx_element.c

@@ -81 +81 @@
-  return NULL;
-}
+
+AnxLinkElement *
+anx_link_element_clone (AnxLinkElement * link)
+{
+  AnxLinkElement * new_link;
+
+  if (link == NULL) return NULL;
+
+  new_link = (AnxLinkElement* ) anx_malloc (sizeof(AnxLinkElement));
+  /* maybe consider memcpy for speedup and introduce reference counting!
+     memcpy (new_link, link, sizeof (*new_link));
+  */
+  new_link->id      = anx_strdup (link->id);
+  new_link->class   = anx_strdup (link->class);
+  new_link->title   = anx_strdup (link->title);
+  new_link->lang    = anx_strdup (link->lang);
+  new_link->dir     = anx_strdup (link->dir);
+  new_link->href    = anx_strdup (link->href);
+  new_link->type    = anx_strdup (link->type);
+  new_link->rel     = anx_strdup (link->rel);
+  new_link->rev     = anx_strdup (link->rev);
+  new_link->media   = anx_strdup (link->media);
+  return new_link;
+}
+
+AnxLinkElement *
+anx_link_element_free (AnxLinkElement * link)
+{
+  if (link == NULL) return NULL;
+  anx_free (link->id);
+  anx_free (link->class);
+  anx_free (link->title);
+  anx_free (link->lang);
+  anx_free (link->dir);
+  anx_free (link->href);
+  anx_free (link->type);
+  anx_free (link->rel);
+  anx_free (link->rev);
+  anx_free (link->media);
+  return NULL;
+}
+
-
-AnxHead *