summaryrefslogtreecommitdiffstats
path: root/sys/v4l2/gstv4l2tuner.c
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2006-09-27 17:04:22 +0000
committerWim Taymans <wim.taymans@gmail.com>2006-09-27 17:04:22 +0000
commit23695a094daea74be91061f833a90201d61eb962 (patch)
treefc7ff21ea66ff1b4a421c44227ce7e9fb44ddf08 /sys/v4l2/gstv4l2tuner.c
parent668add505e154984bcba8e7d4a0f7b7b0a3c3358 (diff)
downloadgst-plugins-bad-23695a094daea74be91061f833a90201d61eb962.tar.gz
gst-plugins-bad-23695a094daea74be91061f833a90201d61eb962.tar.bz2
gst-plugins-bad-23695a094daea74be91061f833a90201d61eb962.zip
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.
Diffstat (limited to 'sys/v4l2/gstv4l2tuner.c')
-rw-r--r--sys/v4l2/gstv4l2tuner.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/v4l2/gstv4l2tuner.c b/sys/v4l2/gstv4l2tuner.c
index acc0c78b..5eb78776 100644
--- a/sys/v4l2/gstv4l2tuner.c
+++ b/sys/v4l2/gstv4l2tuner.c
@@ -128,7 +128,7 @@ gst_v4l2_tuner_contains_channel (GstV4l2Object * v4l2object,
{
const GList *item;
- for (item = v4l2object->inputs; item != NULL; item = item->next)
+ for (item = v4l2object->channels; item != NULL; item = item->next)
if (item->data == v4l2channel)
return TRUE;
@@ -138,7 +138,7 @@ gst_v4l2_tuner_contains_channel (GstV4l2Object * v4l2object,
const GList *
gst_v4l2_tuner_list_channels (GstV4l2Object * v4l2object)
{
- return v4l2object->inputs;
+ return v4l2object->channels;
}
void
@@ -146,7 +146,7 @@ gst_v4l2_tuner_set_channel_and_notify (GstV4l2Object * v4l2object,
GstTunerChannel * channel)
{
if (gst_v4l2_tuner_set_channel (v4l2object, channel)) {
- g_object_notify (G_OBJECT (v4l2object->element), "input");
+ g_object_notify (G_OBJECT (v4l2object->element), "channel");
}
}
@@ -182,7 +182,7 @@ gst_v4l2_tuner_get_channel (GstV4l2Object * v4l2object)
v4l2object->get_in_out_func (v4l2object, &channel);
- for (item = v4l2object->inputs; item != NULL; item = item->next) {
+ for (item = v4l2object->channels; item != NULL; item = item->next) {
if (channel == GST_V4L2_TUNER_CHANNEL (item->data)->index)
return (GstTunerChannel *) item->data;
}
@@ -196,7 +196,7 @@ gst_v4l2_tuner_contains_norm (GstV4l2Object * v4l2object,
{
const GList *item;
- for (item = v4l2object->stds; item != NULL; item = item->next)
+ for (item = v4l2object->norms; item != NULL; item = item->next)
if (item->data == v4l2norm)
return TRUE;
@@ -206,7 +206,7 @@ gst_v4l2_tuner_contains_norm (GstV4l2Object * v4l2object,
const GList *
gst_v4l2_tuner_list_norms (GstV4l2Object * v4l2object)
{
- return v4l2object->stds;
+ return v4l2object->norms;
}
void
@@ -214,7 +214,7 @@ gst_v4l2_tuner_set_norm_and_notify (GstV4l2Object * v4l2object,
GstTunerNorm * norm)
{
if (gst_v4l2_tuner_set_norm (v4l2object, norm)) {
- g_object_notify (G_OBJECT (v4l2object->element), "std");
+ g_object_notify (G_OBJECT (v4l2object->element), "norm");
}
}
@@ -249,7 +249,7 @@ gst_v4l2_tuner_get_norm (GstV4l2Object * v4l2object)
gst_v4l2_get_norm (v4l2object, &norm);
- for (item = v4l2object->stds; item != NULL; item = item->next) {
+ for (item = v4l2object->norms; item != NULL; item = item->next) {
if (norm == GST_V4L2_TUNER_NORM (item->data)->index)
return (GstTunerNorm *) item->data;
}