gst/gstevent.*: fix #320529 - clean up new_segment API and structure.

Original commit message from CVS:

* gst/gstevent.c: (gst_event_new_new_segment),
(gst_event_parse_new_segment):
* gst/gstevent.h:
fix #320529 - clean up new_segment API and structure.
Let's hope everyone was using the methods, and not the structure.

diff --git a/ChangeLog b/ChangeLog
index a32c3e8..d25a5f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-29  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * gst/gstevent.c: (gst_event_new_new_segment),
+       (gst_event_parse_new_segment):
+       * gst/gstevent.h:
+         fix #320529 - clean up new_segment API and structure.
+         Let's hope everyone was using the methods, and not the structure.
+
 2005-11-29  Edward Hervey  <edward@fluendo.com>
 
        * gst/base/gstbasesink.c: (gst_base_sink_handle_object),

diff --git a/docs/random/thomasvs/0.10 b/docs/random/thomasvs/0.10
index afad355..37999a7 100644 (file)
--- a/docs/random/thomasvs/0.10
+++ b/docs/random/thomasvs/0.10
@@ -4,7 +4,7 @@ gstreamer
   - testsuite
     - check: unit tests
     - examples: example code
-    - tests: interactive tests
+    - interactive: interactive tests
 - move gst/base to libs/gst/base ?
   (but elements link against them)
 - move elements out of gst/ dir ?
@@ -13,9 +13,7 @@ gstreamer
 gst-plugins-base
 ----------------
 - gst-libs/gst/audio:
-  - is audiofilter still needed ? any reason not to fold it into audio ?
-    folded, DONE
-
+  - DONE: audiofilter folded in
 - gst:
   - adder: needs docs, an example, and a test
   - audioconvert: ok
@@ -26,8 +24,10 @@ gst-plugins-base
   - ffmpegcolorspace: needs a test
   - playback: example
   - sine: removed, DONE
-  - subparse: needs work
-    -> check if it works ? clean up dead code ? move to bad ?
+  - subparse:
+    - works, but how do we link it so we can display it ?
+    - example ?
+    - test with different files/sources ? can be inlined
   - tags:
     - contained a very small code file that wasn't built, and a copy of a header
       that was in the tag lib; removed; DONE
@@ -35,7 +35,7 @@ gst-plugins-base
     - works
     - need tests
     - need docs
-    - need possible porting to GNet
+    - need possible porting to GNet (later)
   - typefind:
     - works
     - need tests - this definately could use it
@@ -81,8 +81,6 @@ gst-plugins-base
     - interactive test should go somewhere
     - docs ok
 
-
-
 gst-plugins-good
 ----------------
 

diff --git a/gst/gstevent.c b/gst/gstevent.c
index da4c534..2f4dad8 100644 (file)
--- a/gst/gstevent.c
+++ b/gst/gstevent.c
@@ -407,9 +407,9 @@ gst_event_new_eos (void)
  * @update: is this segment an update to a previous one
  * @rate: a new rate for playback
  * @format: The format of the segment values
- * @start_value: the start value of the segment
- * @stop_value: the stop value of the segment
- * @stream_time: stream time for buffer timestamps.
+ * @start: the start value of the segment
+ * @stop: the stop value of the segment
+ * @position: stream position
  *
  * Allocate a new newsegment event with the given format/values tripplets.
  *
@@ -419,21 +419,21 @@ gst_event_new_eos (void)
  * unneeded packets.
  *
  * The stream time of the segment is used to convert the buffer timestamps
- * into the stream time again, this is usually done in sinks to report the 
+ * into the stream time again, this is usually done in sinks to report the
  * current stream_time. @stream_time cannot be -1.
  *
- * The @start_value cannot be -1, the @stop_value can be -1. If there
- * is a valid @stop_value given, it must be greater or equal than @start_value.
+ * @start cannot be -1, @stop can be -1. If there
+ * is a valid @stop given, it must be greater or equal than @start.
  *
  * After a newsegment event, the buffer stream time is calculated with:
  *
- *   stream_time + (TIMESTAMP(buf) - start_value) * ABS (rate)
+ *   stream_time + (TIMESTAMP(buf) - start) * ABS (rate)
  *
  * Returns: A new newsegment event.
  */
 GstEvent *
 gst_event_new_new_segment (gboolean update, gdouble rate, GstFormat format,
-    gint64 start_value, gint64 stop_value, gint64 stream_time)
+    gint64 start, gint64 stop, gint64 position)
 {
   g_return_val_if_fail (rate != 0.0, NULL);
 
@@ -441,32 +441,28 @@ gst_event_new_new_segment (gboolean update, gdouble rate, GstFormat format,
     GST_CAT_INFO (GST_CAT_EVENT,
         "creating newsegment update %d, rate %lf, format GST_FORMAT_TIME, "
         "start %" GST_TIME_FORMAT ", stop %" GST_TIME_FORMAT
-        ", stream_time %" GST_TIME_FORMAT,
-        update, rate, GST_TIME_ARGS (start_value),
-        GST_TIME_ARGS (stop_value), GST_TIME_ARGS (stream_time));
+        ", position %" GST_TIME_FORMAT,
+        update, rate, GST_TIME_ARGS (start),
+        GST_TIME_ARGS (stop), GST_TIME_ARGS (position));
   } else {
     GST_CAT_INFO (GST_CAT_EVENT,
         "creating newsegment update %d, rate %lf, format %d, "
-        "start %lld, stop %lld, stream_time %lld",
-        update, rate, format, start_value, stop_value, stream_time);
+        "start %" G_GINT64_FORMAT ", stop %" G_GINT64_FORMAT ", position %"
+        G_GINT64_FORMAT, update, rate, format, start, stop, position);
   }
-  if (stream_time == -1)
-    g_return_val_if_fail (stream_time != -1, NULL);
-
-  if (start_value == -1)
-    g_return_val_if_fail (start_value != -1, NULL);
-
-  if (stop_value != -1)
-    g_return_val_if_fail (start_value <= stop_value, NULL);
+  g_return_val_if_fail (position != -1, NULL);
+  g_return_val_if_fail (start != -1, NULL);
+  if (stop != -1)
+    g_return_val_if_fail (start <= stop, NULL);
 
   return gst_event_new_custom (GST_EVENT_NEWSEGMENT,
       gst_structure_new ("GstEventNewsegment",
           "update", G_TYPE_BOOLEAN, update,
           "rate", G_TYPE_DOUBLE, rate,
           "format", GST_TYPE_FORMAT, format,
-          "start_val", G_TYPE_INT64, start_value,
-          "stop_val", G_TYPE_INT64, stop_value,
-          "stream_time", G_TYPE_INT64, stream_time, NULL));
+          "start", G_TYPE_INT64, start,
+          "stop", G_TYPE_INT64, stop,
+          "position", G_TYPE_INT64, position, NULL));
 }
 
 /**
@@ -475,16 +471,16 @@ gst_event_new_new_segment (gboolean update, gdouble rate, GstFormat format,
  * @update: A pointer to the update flag of the segment
  * @rate: A pointer to the rate of the segment
  * @format: A pointer to the format of the newsegment values
- * @start_value: A pointer to store the start value in
- * @stop_value: A pointer to store the stop value in
- * @stream_time: A pointer to store the stream time in
+ * @start: A pointer to store the start value in
+ * @stop: A pointer to store the stop value in
+ * @position: A pointer to store the stream time in
  *
- * Get the start, stop and format in the newsegment event.
+ * Get the format, start, stop and position in the newsegment event.
  */
 void
 gst_event_parse_new_segment (GstEvent * event, gboolean * update,
-    gdouble * rate, GstFormat * format, gint64 * start_value,
-    gint64 * stop_value, gint64 * stream_time)
+    gdouble * rate, GstFormat * format, gint64 * start,
+    gint64 * stop, gint64 * position)
 {
   const GstStructure *structure;
 
@@ -499,15 +495,13 @@ gst_event_parse_new_segment (GstEvent * event, gboolean * update,
     *rate = g_value_get_double (gst_structure_get_value (structure, "rate"));
   if (format)
     *format = g_value_get_enum (gst_structure_get_value (structure, "format"));
-  if (start_value)
-    *start_value =
-        g_value_get_int64 (gst_structure_get_value (structure, "start_val"));
-  if (stop_value)
-    *stop_value =
-        g_value_get_int64 (gst_structure_get_value (structure, "stop_val"));
-  if (stream_time)
-    *stream_time =
-        g_value_get_int64 (gst_structure_get_value (structure, "stream_time"));
+  if (start)
+    *start = g_value_get_int64 (gst_structure_get_value (structure, "start"));
+  if (stop)
+    *stop = g_value_get_int64 (gst_structure_get_value (structure, "stop"));
+  if (position)
+    *position =
+        g_value_get_int64 (gst_structure_get_value (structure, "position"));
 }
 
 /**

diff --git a/gst/gstevent.h b/gst/gstevent.h
index b9b4e0f..8ee123c 100644 (file)
--- a/gst/gstevent.h
+++ b/gst/gstevent.h
@@ -339,12 +339,16 @@ GstEvent *        gst_event_new_flush_stop        (void);
 GstEvent *     gst_event_new_eos               (void);
 
 /* newsegment events */
-GstEvent*      gst_event_new_new_segment       (gboolean update, gdouble rate, GstFormat format,
-                                                 gint64 start_value, gint64 stop_value,
-                                                gint64 stream_time);
-void           gst_event_parse_new_segment     (GstEvent *event, gboolean *update, gdouble *rate,
-                                                GstFormat *format, gint64 *start_value, gint64 *stop_value,
-                                                gint64 *stream_time);
+GstEvent*      gst_event_new_new_segment       (gboolean update, gdouble rate,
+                                                 GstFormat format,
+                                                 gint64 start, gint64 stop,
+                                                gint64 position);
+void           gst_event_parse_new_segment     (GstEvent *event,
+                                                 gboolean *update,
+                                                 gdouble *rate,
+                                                GstFormat *format,
+                                                 gint64 *start, gint64 *stop,
+                                                gint64 *position);
 /* tag event */
 GstEvent*      gst_event_new_tag               (GstTagList *taglist);
 void           gst_event_parse_tag             (GstEvent *event, GstTagList **taglist);