Changeset 2171

Timestamp:

2006-03-13 02:19:04 (3 years ago)

Author:

silvia

Message:

Adapted libannodex for CMML 2.1.
This also fixes the problem where a c++ compiler would barf on some struct members named "class".

Files:

• libannodex/trunk/ChangeLog (modified) (1 diff)
• libannodex/trunk/configure.ac (modified) (2 diffs)
• libannodex/trunk/include/annodex/anx_types.h (modified) (2 diffs)
• libannodex/trunk/src/importers/anx_import_cmml.c (modified) (2 diffs)
• libannodex/trunk/src/libannodex/anx_element.c (modified) (15 diffs)

libannodex/trunk/ChangeLog

@@ +1 @@
+2006-03-13  Silvia Pfeiffer <silvia at silvia dot silvia-pfeiffer dot de>
+        * added the new files from Alex Krumm-Heller for windows port to Makefile.am
+        * fixed up libannodex for cmml 2.1
+        * changed previous struct member name from "class" to make it c++ compatible
+        
-2006-03-05  Thomas Vander Stichele  <thomas at apestaart dot org>
-

libannodex/trunk/configure.ac

@@ -216 +216 @@
-HAVE_LIBCMML=no
-
-0
+2
-                  HAVE_LIBCMML="yes", HAVE_LIBCMML="no")
-
@@ -229 +229 @@
-    AC_MSG_ERROR([
-***
-0
+2
-*** the pkg-config tool cannot find its build information.
-***

libannodex/trunk/include/annodex/anx_types.h

@@ -72 +72 @@
-
-struct _AnxLinkElement {
-
-class;  
-
-
-
-
-
-
-
-
+   
+link_class;
+   
+   
+   
+   
+   
+   
+   
+   
-};
-
@@ -102 +102 @@
-struct _AnxClip {
-  const char *clip_id;         /**< id attribute of clip */
-ass;     
+ip_class;
-  const char *title;           /**< title attribute of clip */
-  const char *lang;            /**< language attribute of desc element */

libannodex/trunk/src/importers/anx_import_cmml.c

@@ -100 +100 @@
-  new_link = (AnxLinkElement* ) anx_malloc (sizeof (AnxLinkElement));
-  new_link->id = anxcmml_strdup (link->id);
-class = anxcmml_strdup (link->
+link_class = anxcmml_strdup (link->link_
-  new_link->title = anxcmml_strdup (link->title);
-  new_link->lang = anxcmml_strdup (link->lang);
@@ -259 +259 @@
-  /* copy clip data across */
-  a->clip_id = anxcmml_strdup (clip->clip_id);
-ass = anxcmml_strdup (clip->
+ip_class = anxcmml_strdup (clip->clip_
-  a->title = anxcmml_strdup (clip->title);
-  a->lang = anxcmml_strdup (clip->lang);

libannodex/trunk/src/libannodex/anx_element.c

@@ -94 +94 @@
-  */
-  new_link->id      = anx_strdup (link->id);
-class   = anx_strdup (link->
+link_class   = anx_strdup (link->link_
-  new_link->title   = anx_strdup (link->title);
-  new_link->lang    = anx_strdup (link->lang);
@@ -111 +111 @@
-  if (link == NULL) return NULL;
-  anx_free (link->id);
-
+link_
-  anx_free (link->title);
-  anx_free (link->lang);
@@ -144 +144 @@
-  new_head->meta =
-    anx_list_clone_with (head->meta, (AnxCloneFunc)anx_meta_element_clone);
+  new_head->link =
+    anx_list_clone_with (head->link, (AnxCloneFunc)anx_link_element_clone);
-
-  return new_head;
@@ -165 +167 @@
-
-  anx_list_free_with (head->meta, (AnxFreeFunc)anx_meta_element_free);
+  anx_list_free_with (head->link, (AnxFreeFunc)anx_link_element_free);
-
-  anx_free (head);
@@ -176 +179 @@
-  AnxHead * head;
-  AnxMetaElement * meta;
+  AnxLinkElement * link;
-  XTag * child;
-
@@ -212 +216 @@
-  }
-
+  head->link = anx_list_new ();
+
+  for (child = xtag_first_child (tag, "link"); child;
+       child = xtag_next_child (tag, "link")) {
+    link = anx_malloc (sizeof (AnxLinkElement));
+    link->id = anx_strdup_attribute (child, "id");
+    link->link_class = anx_strdup_attribute (child, "class");
+    link->title = anx_strdup_attribute (child, "title");
+    link->lang = anx_strdup_attribute (child, "lang");
+    link->dir = anx_strdup_attribute (child, "dir");
+    link->href = anx_strdup_attribute (child, "href");
+    link->type = anx_strdup_attribute (child, "type");
+    link->rel = anx_strdup_attribute (child, "rel");
+    link->rev = anx_strdup_attribute (child, "rev");
+    link->media = anx_strdup_attribute (child, "media");
+
+    head->link = anx_list_append (head->link, link);
+  }
+
-  return head;
-}
@@ -223 +246 @@
-
-  new_clip->clip_id = anx_strdup (clip->clip_id);
+  new_clip->clip_class = anx_strdup (clip->clip_class);
+  new_clip->title = anx_strdup (clip->title);
-  new_clip->lang = anx_strdup (clip->lang);
-  new_clip->dir = anx_strdup (clip->dir);
@@ -228 +253 @@
-
-  new_clip->anchor_id = anx_strdup (clip->anchor_id);
+  new_clip->anchor_class = anx_strdup (clip->anchor_class);
+  new_clip->anchor_title = anx_strdup (clip->anchor_title); 
-  new_clip->anchor_lang = anx_strdup (clip->anchor_lang);
-  new_clip->anchor_dir = anx_strdup (clip->anchor_dir);
-  new_clip->anchor_class = anx_strdup (clip->anchor_class);
-  new_clip->anchor_href = anx_strdup (clip->anchor_href);
-  new_clip->anchor_text = anx_strdup (clip->anchor_text);
-
-  new_clip->img_id = anx_strdup (clip->img_id);
+  new_clip->img_class = anx_strdup (clip->img_class);
+  new_clip->img_title = anx_strdup (clip->img_title);
-  new_clip->img_lang = anx_strdup (clip->img_lang);
-  new_clip->img_dir = anx_strdup (clip->img_dir);
@@ -241 +269 @@
-
-  new_clip->desc_id = anx_strdup (clip->desc_id);
+  new_clip->desc_class = anx_strdup (clip->desc_class);
+  new_clip->desc_title = anx_strdup (clip->desc_title);
-  new_clip->desc_lang = anx_strdup (clip->desc_lang);
-  new_clip->desc_dir = anx_strdup (clip->desc_dir);
@@ -257 +287 @@
-
-  anx_free (clip->clip_id);
+  anx_free (clip->clip_class);
+  anx_free (clip->title);
-  anx_free (clip->lang);
-  anx_free (clip->dir);
-  anx_free (clip->track);
-  anx_free (clip->anchor_id);
+  anx_free (clip->anchor_class);
+  anx_free (clip->anchor_title);
-  anx_free (clip->anchor_lang);
-  anx_free (clip->anchor_dir);
-  anx_free (clip->anchor_class);
-  anx_free (clip->anchor_href);
-  anx_free (clip->anchor_text);
-  anx_free (clip->img_id);
+  anx_free (clip->img_class);
+  anx_free (clip->img_title);
-  anx_free (clip->img_lang);
-  anx_free (clip->img_dir);
@@ -272 +307 @@
-  anx_free (clip->img_alt);
-  anx_free (clip->desc_id);
+  anx_free (clip->desc_class);
+  anx_free (clip->desc_title);
-  anx_free (clip->desc_lang);
-  anx_free (clip->desc_dir);
@@ -293 +330 @@
-
-  clip->clip_id = anx_strdup_attribute (tag, "id");
+  clip->clip_class = anx_strdup_attribute (tag, "class");
+  clip->title = anx_strdup_attribute (tag, "title");
-  clip->lang = anx_strdup_attribute (tag, "lang");
-  clip->dir = anx_strdup_attribute (tag, "dir");
@@ -299 +338 @@
-  child = xtag_first_child (tag, "a");
-  clip->anchor_id = anx_strdup_attribute (child, "id");
+  clip->anchor_class = anx_strdup_attribute (child, "class");
+  clip->anchor_title = anx_strdup_attribute (child, "title");
-  clip->anchor_lang = anx_strdup_attribute (child, "lang");
-  clip->anchor_dir = anx_strdup_attribute (child, "dir");
-  clip->anchor_class = anx_strdup_attribute (child, "class");
-  clip->anchor_href = anx_strdup_attribute (child, "href");
-  clip->anchor_text = anx_strdup_pcdata (child);
@@ -307 +347 @@
-  child = xtag_first_child (tag, "img");
-  clip->img_id = anx_strdup_attribute (child, "id");
+  clip->img_class = anx_strdup_attribute (child, "class");
+  clip->img_title = anx_strdup_attribute (child, "title");
-  clip->img_lang = anx_strdup_attribute (child, "lang");
-  clip->img_dir = anx_strdup_attribute (child, "dir");
-  clip->img_src = anx_strdup_attribute (child, "src");
-  clip->img_alt = anx_strdup_attribute (child, "alt");
+
+  child = xtag_first_child (tag, "desc");
+  clip->desc_id = anx_strdup_attribute (child, "id");
+  clip->desc_class = anx_strdup_attribute (child, "class");
+  clip->desc_title = anx_strdup_attribute (child, "title");
+  clip->desc_lang = anx_strdup_attribute (child, "lang");
+  clip->desc_dir = anx_strdup_attribute (child, "dir");
+  clip->desc_text = anx_strdup_pcdata (child);
-
-  clip->meta = anx_list_new ();
@@ -326 +376 @@
-    clip->meta = anx_list_append (clip->meta, meta);
-  }
-
-  child = xtag_first_child (tag, "desc");
-  clip->desc_id = anx_strdup_attribute (child, "id");
-  clip->desc_lang = anx_strdup_attribute (child, "lang");
-  clip->desc_dir = anx_strdup_attribute (child, "dir");
-  clip->desc_text = anx_strdup_pcdata (child);
-
-  return clip;