summaryrefslogtreecommitdiffstats
path: root/sys/v4l2/gstv4l2object.h
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
commitd8769c7d84784114add39bc8d32018a64f1d4fd7 (patch)
tree679161a45a1f65d31801aaa100a05a5429af8314 /sys/v4l2/gstv4l2object.h
parenta9bc7aedaa0bc58dcd88eabac6906e7cd52715f5 (diff)
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/gstv4l2object.h')
-rw-r--r--sys/v4l2/gstv4l2object.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/v4l2/gstv4l2object.h b/sys/v4l2/gstv4l2object.h
index 9c0c51e4..34470739 100644
--- a/sys/v4l2/gstv4l2object.h
+++ b/sys/v4l2/gstv4l2object.h
@@ -82,12 +82,12 @@ struct _GstV4l2Object {
/* lists... */
GList *colors;
- GList *stds;
- GList *inputs;
+ GList *norms;
+ GList *channels;
/* properties */
- gchar *std;
- gchar *input;
+ gchar *norm;
+ gchar *channel;
gulong frequency;
/* X-overlay */
@@ -111,8 +111,8 @@ GType gst_v4l2_object_get_type(void);
PROP_DEVICE, \
PROP_DEVICE_NAME, \
PROP_FLAGS, \
- PROP_STD, \
- PROP_INPUT, \
+ PROP_NORM, \
+ PROP_CHANNEL, \
PROP_FREQUENCY