[0.10] gst-plugins-good: v4l2src: Rename pre-set-format signal to prepare-format

[Sebastian Dröge]

Module: gst-plugins-good
Branch: 0.10
Commit: 3bd50184563a522a8d0960e59916d744ef1d319d
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=3bd50184563a522a8d0960e59916d744ef1d319d

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Thu Apr 19 09:40:53 2012 +0200

v4l2src: Rename pre-set-format signal to prepare-format

---

 sys/v4l2/gstv4l2src.c    |    4 ++--
 sys/v4l2/v4l2src_calls.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c
index 7e8d858..b2204b2 100644
--- a/sys/v4l2/gstv4l2src.c
+++ b/sys/v4l2/gstv4l2src.c
@@ -296,7 +296,7 @@ gst_v4l2src_class_init (GstV4l2SrcClass * klass)
           PROP_DEF_DECIMATE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   /**
-   * GstV4l2Src::pre-set-format:
+   * GstV4l2Src::prepare-format:
    * @v4l2src: the v4l2src instance
    * @fd: the file descriptor of the current device
    * @fourcc: the fourcc of the format being set
@@ -309,7 +309,7 @@ gst_v4l2src_class_init (GstV4l2SrcClass * klass)
    * This is mostly useful for UVC H264 encoding cameras which need the H264
    * Probe & Commit to happen prior to the normal Probe & Commit.
    */
-  gst_v4l2_signals[SIGNAL_PRE_SET_FORMAT] = g_signal_new ("pre-set-format",
+  gst_v4l2_signals[SIGNAL_PRE_SET_FORMAT] = g_signal_new ("prepare-format",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
       0,
diff --git a/sys/v4l2/v4l2src_calls.c b/sys/v4l2/v4l2src_calls.c
index f50a581..fa9a55c 100644
--- a/sys/v4l2/v4l2src_calls.c
+++ b/sys/v4l2/v4l2src_calls.c
@@ -218,7 +218,7 @@ gst_v4l2src_set_capture (GstV4l2Src * v4l2src, guint32 pixelformat,
   if (pixelformat == GST_MAKE_FOURCC ('M', 'P', 'E', 'G'))
     return TRUE;
 
-  g_signal_emit_by_name (v4l2src, "pre-set-format",
+  g_signal_emit_by_name (v4l2src, "prepare-format",
       v4l2src->v4l2object->video_fd, pixelformat, width, height);
 
   if (!gst_v4l2_object_set_format (v4l2src->v4l2object, pixelformat, width,