+2008-06-09 Sebastian Dröge <slomo@circular-chaos.org>
+
+ Patch by: Bastien Nocera <hadess at hadess dot net>
+
+ * sys/v4l2/gstv4l2vidorient.c:
+ * sys/v4l2/v4l2_calls.c: (gst_v4l2_fill_lists):
+ Fix compilation with newer GIT kernels that deprecated
+ V4L2_CID_HCENTER and V4L2_CID_VCENTER. Fixes bug #536317.
+
2008-06-07 Tim-Philipp Müller <tim.muller at collabora co uk>
* configure.ac:
GST_DEBUG_CATEGORY_STATIC (v4l2vo_debug);
#define GST_CAT_DEFAULT v4l2vo_debug
+/* Those are deprecated calls that have been replaced */
+#ifndef V4L2_CID_HCENTER
+#define V4L2_CID_HCENTER V4L2_CID_PAN_RESET
+#endif
+#ifndef V4L2_CID_VCENTER
+#define V4L2_CID_VCENTER V4L2_CID_TILT_RESET
+#endif
+
void
gst_v4l2_video_orientation_interface_init (GstVideoOrientationInterface * klass)
{
#include "gstv4l2src.h"
+/* Those are ioctl calls */
+#ifndef V4L2_CID_HCENTER
+#define V4L2_CID_HCENTER V4L2_CID_HCENTER_DEPRECATED
+#endif
+#ifndef V4L2_CID_VCENTER
+#define V4L2_CID_VCENTER V4L2_CID_VCENTER_DEPRECATED
+#endif
+
GST_DEBUG_CATEGORY_EXTERN (v4l2_debug);
#define GST_CAT_DEFAULT v4l2_debug
gst_v4l2_fill_lists (GstV4l2Object * v4l2object)
{
gint n;
+
GstElement *e;
e = v4l2object->element;
for (n = 0;; n++) {
struct v4l2_input input = { 0, };
GstV4l2TunerChannel *v4l2channel;
+
GstTunerChannel *channel;
input.index = n;
for (n = 0;; n++) {
struct v4l2_standard standard = { 0, };
GstV4l2TunerNorm *v4l2norm;
+
GstTunerNorm *norm;
/* fill in defaults */
for (n = V4L2_CID_BASE;; n++) {
struct v4l2_queryctrl control = { 0, };
GstV4l2ColorBalanceChannel *v4l2channel;
+
GstColorBalanceChannel *channel;
/* when we reached the last official CID, continue with private CIDs */
case V4L2_CID_VFLIP:
case V4L2_CID_HCENTER:
case V4L2_CID_VCENTER:
+#ifdef V4L2_CID_PAN_RESET
+ case V4L2_CID_PAN_RESET:
+#endif
+#ifdef V4L2_CID_TILT_RESET
+ case V4L2_CID_TILT_RESET:
+#endif
/* not handled here, handled by VideoOrientation interface */
control.id++;
break;
(currently none of base controls are of this type) */
if (control.type == V4L2_CTRL_TYPE_MENU) {
struct v4l2_querymenu menu, *mptr;
+
int i;
menu.id = n;
gint tunernum, gulong * frequency)
{
struct v4l2_frequency freq;
+
GstTunerChannel *channel;
GST_DEBUG_OBJECT (v4l2object->element, "getting current tuner frequency");
gint tunernum, gulong frequency)
{
struct v4l2_frequency freq;
+
GstTunerChannel *channel;
GST_DEBUG_OBJECT (v4l2object->element,