gst/gstmessage.*: don't use new, it's a C++ keyword

Original commit message from CVS:

* gst/gstmessage.c: (gst_message_new_state_changed),
(gst_message_parse_state_changed):
* gst/gstmessage.h:
don't use new, it's a C++ keyword

diff --git a/ChangeLog b/ChangeLog
index a0a9f16..74f157a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-09  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * gst/gstmessage.c: (gst_message_new_state_changed),
+       (gst_message_parse_state_changed):
+       * gst/gstmessage.h:
+         don't use "new", it's a C++ keyword
+
 2005-10-08  Wim Taymans  <wim@fluendo.com>
 
        * gst/gstbin.c: (is_eos), (update_degree), (gst_bin_query):
@@ -11,7 +18,7 @@
        * gst/gstelementfactory.c:
        * gst/gstevent.c:
        * gst/gsttaglist.c:
-          more docs
+         more docs
 
 2005-10-08  Wim Taymans  <wim@fluendo.com>
 
@@ -22,7 +29,7 @@
        in a threadsafe way.
        Get base time in a threadsafe way too.
        Fix confusing debug in the change_state function.
-       Various other mall cleanups.
+       Various other small cleanups.
        
        * gst/gstelement.c: (gst_element_post_message):
        Fix very verbose bus posting code.

diff --git a/gst/gstmessage.c b/gst/gstmessage.c
index 3a0fad8..30681a6 100644 (file)
--- a/gst/gstmessage.c
+++ b/gst/gstmessage.c
@@ -381,13 +381,13 @@ gst_message_new_tag (GstObject * src, GstTagList * tag_list)
 
 /**
  * gst_message_new_state_changed:
- * @src: The object originating the message.
- * @old: The previous state.
- * @new: The new (current) state.
- * @pending: The pending (target) state.
+ * @src: the object originating the message
+ * @oldstate: the previous state
+ * @newstate: the new (current) state
+ * @pending: the pending (target) state
  *
- * Create a state change message. This message is posted whenever an element changed
- * its state.
+ * Create a state change message. This message is posted whenever an element
+ * changed its state.
  *
  * Returns: The new state change message.
  *
@@ -395,14 +395,14 @@ gst_message_new_tag (GstObject * src, GstTagList * tag_list)
  */
 GstMessage *
 gst_message_new_state_changed (GstObject * src,
-    GstState old, GstState new, GstState pending)
+    GstState oldstate, GstState newstate, GstState pending)
 {
   GstMessage *message;
 
   message = gst_message_new_custom (GST_MESSAGE_STATE_CHANGED, src,
       gst_structure_new ("GstMessageState",
-          "old-state", GST_TYPE_STATE, (gint) old,
-          "new-state", GST_TYPE_STATE, (gint) new,
+          "old-state", GST_TYPE_STATE, (gint) oldstate,
+          "new-state", GST_TYPE_STATE, (gint) newstate,
           "pending-state", GST_TYPE_STATE, (gint) pending, NULL));
 
   return message;
@@ -624,18 +624,18 @@ gst_message_parse_tag (GstMessage * message, GstTagList ** tag_list)
 
 /**
  * gst_message_parse_state_changed:
- * @message: A valid #GstMessage of type GST_MESSAGE_STATE_CHANGED.
- * @old: The previous state.
- * @new: The new (current) state.
- * @pending: The pending (target) state.
+ * @message: a valid #GstMessage of type GST_MESSAGE_STATE_CHANGED
+ * @oldstate: the previous state
+ * @newstate: the new (current) state
+ * @pending: the pending (target) state
  *
  * Extracts the old and new states from the GstMessage.
  *
  * MT safe.
  */
 void
-gst_message_parse_state_changed (GstMessage * message, GstState * old,
-    GstState * new, GstState * pending)
+gst_message_parse_state_changed (GstMessage * message, GstState * oldstate,
+    GstState * newstate, GstState * pending)
 {
   g_return_if_fail (GST_IS_MESSAGE (message));
   g_return_if_fail (GST_MESSAGE_TYPE (message) == GST_MESSAGE_STATE_CHANGED);

diff --git a/gst/gstmessage.h b/gst/gstmessage.h
index bf49bec..3d01fd1 100644 (file)
--- a/gst/gstmessage.h
+++ b/gst/gstmessage.h
@@ -41,8 +41,8 @@ typedef struct _GstMessageClass GstMessageClass;
  * @GST_MESSAGE_CLOCK_PROVIDE: an element notifies it capability of providing
  *                             a clock.
  * @GST_MESSAGE_CLOCK_LOST: The current clock as selected by the pipeline became
- *                          unusable. The pipeline will select a new clock on the
- *                          next PLAYING state change.
+ *                          unusable. The pipeline will select a new clock on
+ *                          the next PLAYING state change.
  * @GST_MESSAGE_NEW_CLOCK: a new clock was selected in the pipeline
  * @GST_MESSAGE_STRUCTURE_CHANGE: the structure of the pipeline changed.
  * @GST_MESSAGE_STREAM_STATUS: status about a stream, emitted when it starts,
@@ -188,8 +188,8 @@ GstMessage *        gst_message_new_eos             (GstObject * src);
 GstMessage *   gst_message_new_error           (GstObject * src, GError * error, gchar * debug);
 GstMessage *   gst_message_new_warning         (GstObject * src, GError * error, gchar * debug);
 GstMessage *   gst_message_new_tag             (GstObject * src, GstTagList * tag_list);
-GstMessage *   gst_message_new_state_changed   (GstObject * src, GstState old,
-                                                 GstState new, GstState pending);
+GstMessage *   gst_message_new_state_changed   (GstObject * src, GstState oldstate,
+                                                 GstState newstate, GstState pending);
 GstMessage *   gst_message_new_clock_provide   (GstObject * src, GstClock *clock, gboolean ready);
 GstMessage *   gst_message_new_clock_lost      (GstObject * src, GstClock *clock);
 GstMessage *   gst_message_new_new_clock       (GstObject * src, GstClock *clock);
@@ -204,8 +204,8 @@ GstMessage *        gst_message_new_custom          (GstMessageType type,
 void           gst_message_parse_error         (GstMessage *message, GError **gerror, gchar **debug);
 void           gst_message_parse_warning       (GstMessage *message, GError **gerror, gchar **debug);
 void           gst_message_parse_tag           (GstMessage *message, GstTagList **tag_list);
-void           gst_message_parse_state_changed (GstMessage *message, GstState *old,
-                                                 GstState *new, GstState *pending);
+void           gst_message_parse_state_changed (GstMessage *message, GstState *oldstate,
+                                                 GstState *newstate, GstState *pending);
 void           gst_message_parse_clock_provide (GstMessage *message, GstClock **clock, gboolean *ready);
 void           gst_message_parse_clock_lost    (GstMessage *message, GstClock **clock);
 void           gst_message_parse_new_clock     (GstMessage *message, GstClock **clock);