V4L2: remove exposure control, this is for still cameras

diff --git a/modules/access/v4l2/controls.c b/modules/access/v4l2/controls.c
index d16362907b5917125efe2ba5ce840864d9b6759b..2bfbabbbe93e1904f668380510fa034fbbae37c9 100644 (file)
--- a/modules/access/v4l2/controls.c
+++ b/modules/access/v4l2/controls.c
@@ -56,7 +56,6 @@ static const vlc_v4l2_ctrl_name_t controls[] =
     { "red-balance", V4L2_CID_RED_BALANCE },
     { "blue-balance", V4L2_CID_BLUE_BALANCE },
     { "gamma", V4L2_CID_GAMMA },
-    { "exposure", V4L2_CID_EXPOSURE },
     { "autogain", V4L2_CID_AUTOGAIN },
     { "gain", V4L2_CID_GAIN },
     { "hflip", V4L2_CID_HFLIP },

diff --git a/modules/access/v4l2/video.c b/modules/access/v4l2/video.c
index 10ffee44076d8f5bd41c365abf00d9381b606faf..60aeedc2e0648436397f4235240da6b95f59592d 100644 (file)
--- a/modules/access/v4l2/video.c
+++ b/modules/access/v4l2/video.c
@@ -120,12 +120,9 @@
 #define GAMMA_TEXT N_( "Gamma" )
 #define GAMMA_LONGTEXT N_( \
     "Gamma adjust." )
-#define EXPOSURE_TEXT N_( "Exposure" )
-#define EXPOSURE_LONGTEXT N_( \
-    "Exposure." )
-#define AUTOGAIN_TEXT N_( "Automatic gain/exposure" )
+#define AUTOGAIN_TEXT N_( "Automatic gain" )
 #define AUTOGAIN_LONGTEXT N_( \
-    "Automatically set the video gain or exposure." )
+    "Automatically set the video gain." )
 #define GAIN_TEXT N_( "Gain" )
 #define GAIN_LONGTEXT N_( \
     "Picture gain." )
@@ -392,8 +389,6 @@ vlc_module_begin ()
                  BLUEBALANCE_LONGTEXT, true )
     add_integer( CFG_PREFIX "gamma", -1, GAMMA_TEXT,
                  GAMMA_LONGTEXT, true )
-    add_integer( CFG_PREFIX "exposure", -1, EXPOSURE_TEXT,
-                 EXPOSURE_LONGTEXT, true )
     add_integer( CFG_PREFIX "autogain", -1, AUTOGAIN_TEXT,
                  AUTOGAIN_LONGTEXT, true )
         change_integer_list( tristate_vlc, tristate_user )