diff options
author | Benjamin Otte <otte@gnome.org> | 2009-10-19 16:48:45 +0200 |
---|---|---|
committer | Benjamin Otte <otte@gnome.org> | 2009-10-19 16:48:45 +0200 |
commit | 00996e9ecf02b26b698079ccc91daeb30e84c262 (patch) | |
tree | 0fc3198a22108b5b41cd018445817300f132e454 | |
parent | fbc83169fd779117019dd3b392c460399d76fba3 (diff) |
gst_cairo_format_get_frame_rate() => gst_cairo_format_get_framerate()
framerate is written like this in all of GStreamer, so for consistency,
use that spelling.
-rw-r--r-- | gst-libs/gst/cairo/gstcairoformat.c | 2 | ||||
-rw-r--r-- | gst-libs/gst/cairo/gstcairoformat.h | 2 | ||||
-rw-r--r-- | gst/cairo/gstcairomixer.c | 8 | ||||
-rw-r--r-- | gst/cairo/gstcairotestsrc.c | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/gst-libs/gst/cairo/gstcairoformat.c b/gst-libs/gst/cairo/gstcairoformat.c index 5bdb126..ab11c53 100644 --- a/gst-libs/gst/cairo/gstcairoformat.c +++ b/gst-libs/gst/cairo/gstcairoformat.c @@ -226,7 +226,7 @@ gst_cairo_format_get_height (const GstCairoFormat * format) } void -gst_cairo_format_get_frame_rate (const GstCairoFormat * format, +gst_cairo_format_get_framerate (const GstCairoFormat * format, guint * numerator, guint * denominator) { g_return_if_fail (format != NULL); diff --git a/gst-libs/gst/cairo/gstcairoformat.h b/gst-libs/gst/cairo/gstcairoformat.h index cbdf240..8d2b0e4 100644 --- a/gst-libs/gst/cairo/gstcairoformat.h +++ b/gst-libs/gst/cairo/gstcairoformat.h @@ -48,7 +48,7 @@ gboolean gst_cairo_format_is_native (const GstCairoFormat * guint gst_cairo_format_get_width (const GstCairoFormat * format); guint gst_cairo_format_get_height (const GstCairoFormat * format); gsize gst_cairo_format_get_buffer_size (const GstCairoFormat * format); -void gst_cairo_format_get_frame_rate (const GstCairoFormat * format, +void gst_cairo_format_get_framerate (const GstCairoFormat * format, guint * numerator, guint * denominator); gboolean gst_cairo_format_get_pixel_aspect_ratio (const GstCairoFormat * format, diff --git a/gst/cairo/gstcairomixer.c b/gst/cairo/gstcairomixer.c index 19ca656..3aaf0e0 100644 --- a/gst/cairo/gstcairomixer.c +++ b/gst/cairo/gstcairomixer.c @@ -344,7 +344,7 @@ gst_cairo_mixer_getcaps (GstPad * pad) g_assert (master->format); caps = gst_cairo_caps_any (); - gst_cairo_format_get_frame_rate (master->format, &fps_n, &fps_d); + gst_cairo_format_get_framerate (master->format, &fps_n, &fps_d); gst_caps_set_simple (caps, "framerate", GST_TYPE_FRACTION, fps_n, fps_d, NULL); @@ -423,7 +423,7 @@ gst_cairo_mixer_fill_queues (GstCairoMixer * mixer) /* no duration on the buffer, use the framerate */ if (!GST_CLOCK_TIME_IS_VALID (duration) && mixpad->format) { guint fps_n, fps_d; - gst_cairo_format_get_frame_rate (mixpad->format, &fps_n, &fps_d); + gst_cairo_format_get_framerate (mixpad->format, &fps_n, &fps_d); if (fps_n != 0) duration = GST_SECOND * fps_d / fps_n; } @@ -490,7 +490,7 @@ gst_cairo_mixer_update_queues (GstCairoMixer * mixer) if (interval <= 0) { guint fps_n, fps_d; - gst_cairo_format_get_frame_rate (mixer->out_format, &fps_n, &fps_d); + gst_cairo_format_get_framerate (mixer->out_format, &fps_n, &fps_d); if (fps_n == 0) { interval = G_MAXINT64; } else { @@ -992,7 +992,7 @@ gst_cairo_mixer_update_master (GstCairoMixer * mixer) if (mixpad->format == NULL) continue; - gst_cairo_format_get_frame_rate (mixpad->format, &padfps_n, &padfps_d); + gst_cairo_format_get_framerate (mixpad->format, &padfps_n, &padfps_d); if (fps_d == 0 || ((guint64) fps_n * padfps_d < (guint64) padfps_n * fps_d)) { fps_n = padfps_n; fps_d = padfps_d; diff --git a/gst/cairo/gstcairotestsrc.c b/gst/cairo/gstcairotestsrc.c index 039615d..6284167 100644 --- a/gst/cairo/gstcairotestsrc.c +++ b/gst/cairo/gstcairotestsrc.c @@ -710,7 +710,7 @@ gst_cairo_test_src_query (GstBaseSrc * bsrc, GstQuery * query) goto done; } - gst_cairo_format_get_frame_rate (src->format, &rate_num, &rate_denom); + gst_cairo_format_get_framerate (src->format, &rate_num, &rate_denom); switch (src_fmt) { case GST_FORMAT_DEFAULT: @@ -799,7 +799,7 @@ gst_cairo_test_src_do_seek (GstBaseSrc * bsrc, GstSegment * segment) segment->time = segment->start; time = segment->last_stop; - gst_cairo_format_get_frame_rate (src->format, &rate_num, &rate_denom); + gst_cairo_format_get_framerate (src->format, &rate_num, &rate_denom); /* now move to the time indicated */ if (rate_num) { @@ -841,7 +841,7 @@ gst_cairo_test_src_create (GstPushSrc * psrc, GstBuffer ** buffer) src = GST_CAIRO_TEST_SRC (psrc); - gst_cairo_format_get_frame_rate (src->format, &rate_num, &rate_denom); + gst_cairo_format_get_framerate (src->format, &rate_num, &rate_denom); /* 0 framerate and we are at the second frame, eos */ if (G_UNLIKELY (rate_num == 0 && src->n_frames == 1)) |