[MPlayer-DOCS] r24423 - in trunk: DOCS/man/en/mplayer.1 help/help_mp-en.h stream/stream_tv.c stream/tv.c

[voroshil]

Author: voroshil
Date: Mon Sep 10 19:09:35 2007
New Revision: 24423

Log:
Implementation of tv:// driver autodetection.
If user did not specify driver directly, all available
drivers will be probed (in order: v4l2,v4l1,bsdbt848,dummy).
In most cases first probed driver will be successfully autodetected
and used.
Autodetection will be disabled if user specified driver directly (in
command line or config).


Modified:
   trunk/DOCS/man/en/mplayer.1
   trunk/help/help_mp-en.h

Changes in other areas also in this revision:
Modified:
   trunk/stream/stream_tv.c
   trunk/stream/tv.c

Modified: trunk/DOCS/man/en/mplayer.1
==============================================================================
--- trunk/DOCS/man/en/mplayer.1	(original)
+++ trunk/DOCS/man/en/mplayer.1	Mon Sep 10 19:09:35 2007
@@ -1759,7 +1759,7 @@ In most cases automute=100 will be enoug
 Default is 0 (automute disabled).
 .IPs driver=<value>
 See \-tv driver=help for a list of compiled-in TV input drivers.
-available: dummy, v4l, v4l2, bsdbt848
+available: dummy, v4l, v4l2, bsdbt848 (default: autodetect)
 .IPs device=<value>
 Specify TV device (default: /dev/\:video0).
 .I NOTE:

Modified: trunk/help/help_mp-en.h
==============================================================================
--- trunk/help/help_mp-en.h	(original)
+++ trunk/help/help_mp-en.h	Mon Sep 10 19:09:35 2007
@@ -2081,6 +2081,7 @@ static char help_text[]=
 #define MSGTR_TV_AvailableDrivers "Available drivers:\n"
 #define MSGTR_TV_DriverInfo "Selected driver: %s\n name: %s\n author: %s\n comment: %s\n"
 #define MSGTR_TV_NoSuchDriver "No such driver: %s\n"
+#define MSGTR_TV_DriverAutoDetectionFailed "TV driver autodetection failed.\n"
 #define MSGTR_TV_UnknownColorOption "Unknown color option (%d) specified!\n"
 #define MSGTR_TV_CurrentFrequency "Current frequency: %lu (%.3f)\n"
 #define MSGTR_TV_NoTeletext "No teletext"