[vlc-commits] V4L2: mark horizontal and vertical center controls obsolete

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Oct  1 22:58:21 2011 +0300| [4da99e58bd1b06267793ef728a368e4032789376] | committer: Rémi Denis-Courmont

V4L2: mark horizontal and vertical center controls obsolete

They were deprecated in Linux version 2.6.26.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4da99e58bd1b06267793ef728a368e4032789376
---

 modules/access/v4l2/controls.c |    2 --
 modules/access/v4l2/video.c    |   12 ++----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/modules/access/v4l2/controls.c b/modules/access/v4l2/controls.c
index 9cef84c..f88e16f 100644
--- a/modules/access/v4l2/controls.c
+++ b/modules/access/v4l2/controls.c
@@ -62,8 +62,6 @@ static const vlc_v4l2_ctrl_name_t controls[] =
     { "gain", V4L2_CID_GAIN },
     { "hflip", V4L2_CID_HFLIP },
     { "vflip", V4L2_CID_VFLIP },
-    { "hcenter", V4L2_CID_HCENTER },
-    { "vcenter", V4L2_CID_VCENTER },
     /* TODO: add more standardized controls */
 #define CTRL_CID_KNOWN(cid) \
     ((((uint32_t)cid) - V4L2_CID_BRIGHTNESS) \
diff --git a/modules/access/v4l2/video.c b/modules/access/v4l2/video.c
index 784c4ef..6dc724c 100644
--- a/modules/access/v4l2/video.c
+++ b/modules/access/v4l2/video.c
@@ -139,12 +139,6 @@
 #define VFLIP_TEXT N_( "Vertical flip" )
 #define VFLIP_LONGTEXT N_( \
     "Flip the video vertically (if supported by the v4l2 driver)." )
-#define HCENTER_TEXT N_( "Horizontal centering" )
-#define HCENTER_LONGTEXT N_( \
-    "Set the camera's horizontal centering (if supported by the v4l2 driver)." )
-#define VCENTER_TEXT N_( "Vertical centering" )
-#define VCENTER_LONGTEXT N_( \
-    "Set the camera's vertical centering (if supported by the v4l2 driver)." )
 
 #define AUDIO_VOLUME_TEXT N_( "Volume" )
 #define AUDIO_VOLUME_LONGTEXT N_( \
@@ -362,10 +356,8 @@ vlc_module_begin ()
                  GAIN_LONGTEXT, true )
     add_bool( CFG_PREFIX "hflip", false, HFLIP_TEXT, HFLIP_LONGTEXT, true )
     add_bool( CFG_PREFIX "vflip", false, VFLIP_TEXT, VFLIP_LONGTEXT, true )
-    add_integer( CFG_PREFIX "hcenter", -1, HCENTER_TEXT,
-                 HCENTER_LONGTEXT, true )
-    add_integer( CFG_PREFIX "vcenter", -1, VCENTER_TEXT,
-                 VCENTER_LONGTEXT, true )
+    add_obsolete_integer( CFG_PREFIX "hcenter" ) /* since Linux 2.6.26 */
+    add_obsolete_integer( CFG_PREFIX "vcenter" ) /* since Linux 2.6.26 */
     add_integer( CFG_PREFIX "audio-volume", -1, AUDIO_VOLUME_TEXT,
                 AUDIO_VOLUME_LONGTEXT, true )
     add_integer( CFG_PREFIX "audio-balance", -1, AUDIO_BALANCE_TEXT,