mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 18:05:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

sys/v4l2/gstv4l2element.c: Fix properties (channel, norm, frequency).

Browse source 
Original commit message from CVS:
* sys/v4l2/gstv4l2element.c: (gst_v4l2element_set_property):
Fix properties (channel, norm, frequency).
This commit is contained in:
Ronald S. Bultje 2004-10-24 19:37:32 +00:00
parent 145270dd7e
commit a7515956d1
2 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2004-10-24 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* sys/v4l2/gstv4l2element.c: (gst_v4l2element_set_property):
Fix properties (channel, norm, frequency).
2004-10-24 Ronald S. Bultje <rbultje@ronald.bitfreak.net> 2004-10-24 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* sys/v4l2/gstv4l2element.c: (gst_v4l2element_get_property): * sys/v4l2/gstv4l2element.c: (gst_v4l2element_get_property):

23
sys/v4l2/gstv4l2element.c
View file

@ -451,13 +451,10 @@ gst_v4l2element_set_property (GObject * object,
guint prop_id, const GValue * value, GParamSpec * pspec) guint prop_id, const GValue * value, GParamSpec * pspec)
{ {
GstV4l2Element *v4l2element; GstV4l2Element *v4l2element;
GstTuner *tuner;
/* it's not null if we got it, but it might not be ours */ /* it's not null if we got it, but it might not be ours */
g_return_if_fail (GST_IS_V4L2ELEMENT (object)); g_return_if_fail (GST_IS_V4L2ELEMENT (object));
v4l2element = GST_V4L2ELEMENT (object); v4l2element = GST_V4L2ELEMENT (object);
/* stupid GstInterface */
tuner = (GstTuner *) object;
switch (prop_id) { switch (prop_id) {
case ARG_DEVICE: case ARG_DEVICE:
@ -469,7 +466,9 @@ gst_v4l2element_set_property (GObject * object,
break; break;
case ARG_NORM: case ARG_NORM:
if (GST_V4L2_IS_OPEN (v4l2element)) { if (GST_V4L2_IS_OPEN (v4l2element)) {
GstTunerNorm *norm = gst_tuner_get_norm (tuner); GstTuner *tuner = GST_TUNER (v4l2element);
GstTunerNorm *norm = gst_tuner_find_norm_by_name (tuner,
(gchar *) g_value_get_string (value));
if (norm) { if (norm) {
gst_tuner_set_norm (tuner, norm); gst_tuner_set_norm (tuner, norm);
@ -482,7 +481,9 @@ gst_v4l2element_set_property (GObject * object,
break; break;
case ARG_CHANNEL: case ARG_CHANNEL:
if (GST_V4L2_IS_OPEN (v4l2element)) { if (GST_V4L2_IS_OPEN (v4l2element)) {
GstTunerChannel *channel = gst_tuner_get_channel (tuner); GstTuner *tuner = GST_TUNER (v4l2element);
GstTunerChannel *channel = gst_tuner_find_channel_by_name (tuner,
(gchar *) g_value_get_string (value));
if (channel) { if (channel) {
gst_tuner_set_channel (tuner, channel); gst_tuner_set_channel (tuner, channel);
@ -495,13 +496,13 @@ gst_v4l2element_set_property (GObject * object,
break; break;
case ARG_FREQUENCY: case ARG_FREQUENCY:
if (GST_V4L2_IS_OPEN (v4l2element)) { if (GST_V4L2_IS_OPEN (v4l2element)) {
GstTunerChannel *channel; GstTuner *tuner = GST_TUNER (v4l2element);
GstTunerChannel *channel = gst_tuner_get_channel (tuner);
if (!v4l2element->channel) if (channel &&
return; GST_TUNER_CHANNEL_HAS_FLAG (channel, GST_TUNER_CHANNEL_FREQUENCY)) {
channel = gst_tuner_get_channel (tuner); gst_tuner_set_frequency (tuner, channel, g_value_get_ulong (value));
g_assert (channel); }
gst_tuner_set_frequency (tuner, channel, g_value_get_ulong (value));
} else { } else {
v4l2element->frequency = g_value_get_ulong (value); v4l2element->frequency = g_value_get_ulong (value);
g_object_notify (object, "frequency"); g_object_notify (object, "frequency");