[xiph-commits] r3532 - libcmml/trunk/src

[silvia at svn.annodex.net]

Author: silvia
Date: 2008-03-30 06:39:27 -0700 (Sun, 30 Mar 2008)
New Revision: 3532

Modified:
   libcmml/trunk/src/cmml.c
   libcmml/trunk/src/cmml.h
   libcmml/trunk/src/cmml_element.c
Log:
committing patch by ogg.k.ogg.k

Modified: libcmml/trunk/src/cmml.c
===================================================================
--- libcmml/trunk/src/cmml.c	2008-03-30 01:48:41 UTC (rev 3531)
+++ libcmml/trunk/src/cmml.c	2008-03-30 13:39:27 UTC (rev 3532)
@@ -65,11 +65,11 @@
  * cmml_open: Takes a filename and opens it as read-only. Then checks
  * whether it is an XML file satisfying the CMML specification with
  * the xml directive and the cmml tag. It returns a CMML object.
- * If you're working on an already opened file, use cmml_open_stdio
+ * If you're working on an already opened file, use cmml_new
  * instead.
  */
 CMML * 
-cmml_open (char *XMLfilename)
+cmml_open (const char *XMLfilename)
 {
   FILE * file;
   CMML_Context * context;

Modified: libcmml/trunk/src/cmml.h
===================================================================
--- libcmml/trunk/src/cmml.h	2008-03-30 01:48:41 UTC (rev 3531)
+++ libcmml/trunk/src/cmml.h	2008-03-30 13:39:27 UTC (rev 3532)
@@ -80,7 +80,7 @@
 
 /**
  * CMML_Time: a time specification in CMML: either seconds or utc
- * time; keeps the orininal time string for reuse, too
+ * time; keeps the original time string for reuse, too
  */
 typedef struct {
   char *tstr;          /**< copy of original time string for reuse in printing */
@@ -90,7 +90,7 @@
     CMML_UTC * utc;    /**< actual time in utc */
     double sec;        /**< actual time in seconds */
   } t;
-} CMML_Time ;
+} CMML_Time;
 
 
 /**
@@ -169,7 +169,7 @@
   CMML_Time * start_time; /**< insertion time in annodex bitstream */
   CMML_Time * end_time;   /**< end time of this logical  bitstream */
   char *title;            /**< comment on the import bitstream */
-  CMML_List * param;      /**< list of optional further nam-value
+  CMML_List * param;      /**< list of optional further name-value
 			     metadata for the import bitstreams */
 } CMML_ImportElement;
 
@@ -189,7 +189,7 @@
 
 /**
  * CMML_MetaElement: a struct to keep the details of the meta tag in
- * either a head or an clip
+ * either a head or a clip
  */
 typedef struct {
   char *id;      /**< id attribute of meta element */
@@ -237,7 +237,7 @@
 
 
 /**
- * CMML_Clip: an clip element as presented in the CMML document.
+ * CMML_Clip: a clip element as presented in the CMML document.
  */
 typedef struct {
   char *clip_id;         /**< id attribute of clip */
@@ -307,7 +307,7 @@
  * - general processing feedback (CMML_OK, CMML_EOF)
  * - fatal processing feedback (these errors render the CMML file useless)
  * - tolerable processing errors (these lead to ignoring certain tags)
- * The user may select to 
+ * The user may select to ignore sloppy errors
  */
 typedef enum _CMML_Error_Type {
   /* general processing feedback */
@@ -395,13 +395,13 @@
  * cmml_open: Takes a filename and opens it as read-only. Then checks
  * whether it is an XML file satisfying the CMML specification with
  * the xml directive and the cmml tag. It returns a CMML object.  If
- * you're working on an already opened FILE*, use cmml_open_stdio instead.
+ * you're working on an already opened FILE*, use cmml_new instead.
  *
  * \param XMLfilename a CMML file to open
  *
  * \returns a CMML* handle
  */
-CMML * cmml_open (char *XMLfilename);
+CMML * cmml_open (const char *XMLfilename);
 
 /**
  * cmml_attach_parser: Takes a FILE pointer to an already-opened CMML
@@ -624,7 +624,7 @@
  *
  * \returns a CMML preamble
  */
-CMML_Preamble * cmml_preamble_new (char *encoding, char *id, char *lang, char *dir, char *granulerate);
+CMML_Preamble * cmml_preamble_new (const char *encoding, const char *id, const char *lang, const char *dir, const char *granulerate);
 
 /**
  * cmml_element_new: Create a new CMML_Element.
@@ -652,7 +652,7 @@
 /**
  * cmml_clip_new: Create a new CMML_Anchr.
  *
- * \param start_time the start time at which to create an clip
+ * \param start_time the start time at which to create a clip
  * \param end_time the end time at which to end the clip
  *
  * \returns a clip element

Modified: libcmml/trunk/src/cmml_element.c
===================================================================
--- libcmml/trunk/src/cmml_element.c	2008-03-30 01:48:41 UTC (rev 3531)
+++ libcmml/trunk/src/cmml_element.c	2008-03-30 13:39:27 UTC (rev 3532)
@@ -54,7 +54,7 @@
  * cmml_preamble_new: Create a new CMML_Preamble.
  */
 CMML_Preamble * 
-cmml_preamble_new (char *encoding, char *id, char *lang, char *dir, char *granulerate)
+cmml_preamble_new (const char *encoding, const char *id, const char *lang, const char *dir, const char *granulerate)
 {
   CMML_Preamble * p;
   p = (CMML_Preamble *) cmml_malloc(sizeof(CMML_Preamble));