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

This commit is contained in:
Sebastian Dröge 2012-04-19 09:40:53 +02:00
parent a63451ecd7
commit deb7cdcdda
2 changed files with 3 additions and 3 deletions

View file

@ -178,7 +178,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
@ -191,7 +191,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,

View file

@ -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,