[MPlayer-DOCS] r36525 - in trunk: Changelog DOCS/man/de/mplayer.1 DOCS/man/en/mplayer.1 DOCS/xml/de/skin.xml DOCS/xml/en/skin.xml gui/app/app.c gui/app/app.h gui/app/cfg.c gui/app/cfg.h gui/app/gui.h gui/dialog/m...

[ib]

Author: ib
Date: Fri Nov 29 13:41:32 2013
New Revision: 36525

Log:
Add support for TV/DVB to the GUI.

Support is limited to a single (resp. the first) card.

At the same time, add the new GUI option 'gui_tv_digital',
the new GUI message 'evPlayTV' and the new GUI font symbol 'b'.

Additionally, update the documentation.

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

Changes in other areas also in this revision:
Added:
   trunk/gui/dialog/pixmaps/tv.xpm
Modified:
   trunk/Changelog
   trunk/DOCS/man/de/mplayer.1
   trunk/DOCS/xml/de/skin.xml
   trunk/gui/app/app.c
   trunk/gui/app/app.h
   trunk/gui/app/cfg.c
   trunk/gui/app/cfg.h
   trunk/gui/app/gui.h
   trunk/gui/dialog/menu.c
   trunk/gui/dialog/preferences.c
   trunk/gui/interface.c
   trunk/gui/ui/actions.c
   trunk/gui/ui/render.c
   trunk/gui/util/string.c
   trunk/gui/win32/skinload.c
   trunk/gui/win32/skinload.h
   trunk/help/help_mp-de.h

Modified: trunk/DOCS/man/en/mplayer.1
==============================================================================
--- trunk/DOCS/man/en/mplayer.1	Fri Nov 29 13:34:21 2013	(r36524)
+++ trunk/DOCS/man/en/mplayer.1	Fri Nov 29 13:41:32 2013	(r36525)
@@ -31,7 +31,7 @@
 .\" Title
 .\" --------------------------------------------------------------------------
 .
-.TH MPlayer 1 "2012-03-03" "The MPlayer Project" "The Movie Player"
+.TH MPlayer 1 "2013-11-19" "The MPlayer Project" "The Movie Player"
 .
 .SH NAME
 mplayer  \- movie player
@@ -603,6 +603,7 @@ equ_channel_1 ... equ_channel_6
 gui_main_pos_x,
 gui_main_pos_y,
 gui_save_pos (yes/no),
+gui_tv_digital (yes/no),
 gui_video_out_pos_x,
 gui_video_out_pos_y,
 load_fullscreen  (yes/no),

Modified: trunk/DOCS/xml/en/skin.xml
==============================================================================
--- trunk/DOCS/xml/en/skin.xml	Fri Nov 29 13:34:21 2013	(r36524)
+++ trunk/DOCS/xml/en/skin.xml	Fri Nov 29 13:41:32 2013	(r36525)
@@ -795,6 +795,7 @@ symbols (and thus require a different fo
   <row><entry><keycap>v</keycap></entry><entry>stream is a Video CD</entry></row>
   <row><entry><keycap>d</keycap></entry><entry>stream is a DVD</entry></row>
   <row><entry><keycap>u</keycap></entry><entry>stream is a URL</entry></row>
+  <row><entry><keycap>b</keycap></entry><entry>stream is a TV/DVB broadcast</entry></row>
 </tbody>
 </tgroup>
 </informaltable>
@@ -931,6 +932,13 @@ menu entries.
 </varlistentry>
 
 <varlistentry>
+  <term><emphasis role="bold">evPlayTV</emphasis></term>
+  <listitem><para>
+  Tries to start TV/DVB broadcast.
+  </para></listitem>
+</varlistentry>
+
+<varlistentry>
   <term><emphasis role="bold">evPlaySwitchToPause</emphasis></term>
   <listitem><para>
   The opposite of <literal>evPauseSwitchToPlay</literal>. This message starts

Modified: trunk/help/help_mp-en.h
==============================================================================
--- trunk/help/help_mp-en.h	Fri Nov 29 13:34:21 2013	(r36524)
+++ trunk/help/help_mp-en.h	Fri Nov 29 13:41:32 2013	(r36525)
@@ -557,6 +557,7 @@ static const char help_text[]=
 #define MSGTR_Title "Title %d"
 #define MSGTR_NoChapter "No chapter"
 #define MSGTR_Chapter "Chapter %d"
+#define MSGTR_NoChannelName "No channel name"
 #define MSGTR_NoFileLoaded "No file loaded."
 #define MSGTR_Filter_UTF8Subtitles "UTF-8 encoded subtitles (*.utf, *.utf-8, *.utf8)"
 #define MSGTR_Filter_AllSubtitles "All subtitles"
@@ -641,6 +642,7 @@ static const char help_text[]=
 #define MSGTR_MENU_PlayVCD "Play VCD..."
 #define MSGTR_MENU_PlayDVD "Play DVD..."
 #define MSGTR_MENU_PlayURL "Play URL..."
+#define MSGTR_MENU_PlayTV "Play TV..."
 #define MSGTR_MENU_LoadSubtitle "Load subtitle..."
 #define MSGTR_MENU_DropSubtitle "Drop subtitle..."
 #define MSGTR_MENU_LoadExternAudioFile "Load external audio file..."
@@ -808,6 +810,7 @@ static const char help_text[]=
 #define MSGTR_PREFERENCES_SaveWinPos "Save window position"
 #define MSGTR_PREFERENCES_XSCREENSAVER "Stop XScreenSaver"
 #define MSGTR_PREFERENCES_PlayBar "Enable playbar"
+#define MSGTR_PREFERENCES_TV_Digital "Digital TV reception"
 #define MSGTR_PREFERENCES_NoIdle "Quit after playing"
 #define MSGTR_PREFERENCES_AutoSync "AutoSync on/off"
 #define MSGTR_PREFERENCES_AutoSyncValue "Autosync: "