From d8769c7d84784114add39bc8d32018a64f1d4fd7 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 27 Sep 2006 17:04:22 +0000 Subject: sys/v4l2/: Renamed some properties to match the tuner interface naming. Original commit message from CVS: * sys/v4l2/gstv4l2object.c: (gst_v4l2_object_install_properties_helper), (gst_v4l2_object_new), (gst_v4l2_object_set_property_helper), (gst_v4l2_object_get_property_helper), (gst_v4l2_set_defaults): * sys/v4l2/gstv4l2object.h: * sys/v4l2/gstv4l2src.c: (gst_v4l2src_class_init), (gst_v4l2src_create): * sys/v4l2/gstv4l2tuner.c: (gst_v4l2_tuner_contains_channel), (gst_v4l2_tuner_list_channels), (gst_v4l2_tuner_set_channel_and_notify), (gst_v4l2_tuner_get_channel), (gst_v4l2_tuner_contains_norm), (gst_v4l2_tuner_list_norms), (gst_v4l2_tuner_set_norm_and_notify), (gst_v4l2_tuner_get_norm): * sys/v4l2/v4l2_calls.c: (gst_v4l2_get_capabilities), (gst_v4l2_fill_lists), (gst_v4l2_empty_lists): * sys/v4l2/v4l2src_calls.c: (gst_v4l2src_get_fps): Renamed some properties to match the tuner interface naming. --- sys/v4l2/v4l2src_calls.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sys/v4l2/v4l2src_calls.c') diff --git a/sys/v4l2/v4l2src_calls.c b/sys/v4l2/v4l2src_calls.c index 22995ee0..64a1acac 100644 --- a/sys/v4l2/v4l2src_calls.c +++ b/sys/v4l2/v4l2src_calls.c @@ -773,7 +773,7 @@ gboolean gst_v4l2src_get_fps (GstV4l2Src * v4l2src, guint * fps_n, guint * fps_d) { GstV4l2Object *v4l2object = v4l2src->v4l2object; - v4l2_std_id std; + v4l2_std_id norm; struct v4l2_streamparm stream; const GList *item; gboolean found; @@ -806,14 +806,14 @@ gst_v4l2src_get_fps (GstV4l2Src * v4l2src, guint * fps_n, guint * fps_d) try_stds: /* If G_PARM failed, try to get the same information from the video standard */ - if (!gst_v4l2_get_norm (v4l2object, &std)) + if (!gst_v4l2_get_norm (v4l2object, &norm)) return FALSE; found = FALSE; - for (item = v4l2object->stds; item != NULL; item = item->next) { + for (item = v4l2object->norms; item != NULL; item = item->next) { GstV4l2TunerNorm *v4l2norm = item->data; - if (v4l2norm->index == std) { + if (v4l2norm->index == norm) { GValue *framerate = &GST_TUNER_NORM (v4l2norm)->framerate; *fps_n = gst_value_get_fraction_numerator (framerate); -- cgit