Author: ib Date: Sat Dec 31 13:38:52 2011 New Revision: 34475 Log: Add audio CD playback support to the X11/GTK GUI. (The Win32 GUI already had this support. Add missing - although already used - user event evPlayCD here as well as internal event ivSetCDTrack - although it's unused - for consistency.) Modified: trunk/DOCS/xml/en/skin.xml trunk/help/help_mp-en.h Changes in other areas also in this revision: Added: trunk/gui/ui/pixmaps/cd.xpm trunk/gui/ui/pixmaps/playcd.xpm Modified: trunk/DOCS/xml/de/skin.xml trunk/gui/app.c trunk/gui/app.h trunk/gui/interface.c trunk/gui/ui/actions.c trunk/gui/ui/gtk/menu.c trunk/gui/ui/main.c trunk/gui/ui/pixmaps/dvd.xpm trunk/gui/ui/pixmaps/playdvd.xpm 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/xml/en/skin.xml ============================================================================== --- trunk/DOCS/xml/en/skin.xml Sat Dec 31 13:20:08 2011 (r34474) +++ trunk/DOCS/xml/en/skin.xml Sat Dec 31 13:38:52 2011 (r34475) @@ -559,7 +559,7 @@ blocks. </row> <row> <entry>$t</entry> - <entry>track number (DVD, VCD or playlist)</entry> + <entry>track number (DVD, VCD, CD or playlist)</entry> </row> <row> <entry>$o</entry> @@ -577,7 +577,7 @@ blocks. <entry>$T</entry> <entry> a character according to the stream type (file: <keycap>f</keycap>, - Video CD: <keycap>v</keycap>, DVD: <keycap>d</keycap>, + CD: <keycap>a</keycap>, Video CD: <keycap>v</keycap>, DVD: <keycap>d</keycap>, URL: <keycap>u</keycap>) </entry> </row> @@ -784,6 +784,7 @@ symbols (and thus require a different fo <row><entry><keycap>m</keycap></entry><entry>mono sound</entry></row> <row><entry><keycap>t</keycap></entry><entry>stereo sound</entry></row> <row><entry><keycap>f</keycap></entry><entry>stream is a file</entry></row> + <row><entry><keycap>a</keycap></entry><entry>stream is a CD</entry></row> <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> @@ -894,6 +895,13 @@ menu entries. </varlistentry> <varlistentry> + <term><emphasis role="bold">evPlayCD</emphasis></term> + <listitem><para> + Tries to open the disc in the given CD-ROM drive. + </para></listitem> +</varlistentry> + +<varlistentry> <term><emphasis role="bold">evPlayVCD</emphasis></term> <listitem><para> Tries to open the disc in the given CD-ROM drive. Modified: trunk/help/help_mp-en.h ============================================================================== --- trunk/help/help_mp-en.h Sat Dec 31 13:20:08 2011 (r34474) +++ trunk/help/help_mp-en.h Sat Dec 31 13:38:52 2011 (r34475) @@ -594,6 +594,7 @@ static const char help_text[]= #define MSGTR_MENU_AboutMPlayer "About MPlayer" #define MSGTR_MENU_Open "Open..." #define MSGTR_MENU_PlayFile "Play file..." +#define MSGTR_MENU_PlayCD "Play CD..." #define MSGTR_MENU_PlayVCD "Play VCD..." #define MSGTR_MENU_PlayDVD "Play DVD..." #define MSGTR_MENU_PlayURL "Play URL..." @@ -611,6 +612,7 @@ static const char help_text[]= #define MSGTR_MENU_NormalSize "Normal size" #define MSGTR_MENU_DoubleSize "Double size" #define MSGTR_MENU_FullScreen "Fullscreen" +#define MSGTR_MENU_CD "CD" #define MSGTR_MENU_DVD "DVD" #define MSGTR_MENU_VCD "VCD" #define MSGTR_MENU_PlayDisc "Open disc..."