[vlc-commits] v4l2: mark --v4l2-fps as obsolete

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jul 30 17:21:20 2012 +0300| [c0b661ceb412a10c41d7308011487754076e6045] | committer: Rémi Denis-Courmont

v4l2: mark --v4l2-fps as obsolete

The frame rate is retrieved from the capture parameters nowadays. This
option has no effects at the moment.

It might be nice to reintroduce it so that it can select one rate when
a device supports more than one. But that was never implemented so far.

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

 modules/access/v4l2/v4l2.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/access/v4l2/v4l2.c b/modules/access/v4l2/v4l2.c
index ec65a17..c30d181 100644
--- a/modules/access/v4l2/v4l2.c
+++ b/modules/access/v4l2/v4l2.c
@@ -59,9 +59,8 @@
 #define SIZE_LONGTEXT N_( \
     "The specified pixel resolution is forced " \
     "(if both width and height are strictly positive)." )
-#define FPS_TEXT N_( "Framerate" )
-#define FPS_LONGTEXT N_( "Framerate to capture, if applicable " \
-    "(0 for autodetect)." )
+/*#define FPS_TEXT N_( "Frame rate" )
+#define FPS_LONGTEXT N_( "Maximum frame rate to use (0 = no limits)." )*/
 
 #define CTRL_RESET_TEXT N_( "Reset controls" )
 #define CTRL_RESET_LONGTEXT N_( "Reset controls to defaults." )
@@ -300,8 +299,9 @@ vlc_module_begin ()
     add_string( CFG_PREFIX "aspect-ratio", "4:3", ASPECT_TEXT,
               ASPECT_LONGTEXT, true )
         change_safe()
-    add_float( CFG_PREFIX "fps", 0, FPS_TEXT, FPS_LONGTEXT, true )
-        change_safe()
+    /*add_float( CFG_PREFIX "fps", 0, FPS_TEXT, FPS_LONGTEXT, true )*/
+    add_obsolete_float( CFG_PREFIX "fps" )
+        change_safe() /* since 2.1.0 */
     add_obsolete_bool( CFG_PREFIX "use-libv4l2" ) /* since 2.1.0 */
 
     set_section( N_( "Tuner" ), NULL )