Mercurial > mplayer.hg

changeset 34401:af8838c2b60b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow uiPlay() without guiInfo.Filename for some stream types. The stream types allowed set their filenames later.
author ib
date Mon, 02 Jan 2012 16:24:06 +0000
parents 19b68f388735
children ec0ebcb1bd30
files gui/ui/actions.c
diffstat 1 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gui/ui/actions.c	Mon Jan 02 15:28:30 2012 +0000
+++ b/gui/ui/actions.c	Mon Jan 02 16:24:06 2012 +0000
@@ -62,9 +62,13 @@
 
 void uiPlay(void)
 {
-    if (!guiInfo.Filename ||
-        (guiInfo.Filename[0] == 0) ||
-        (guiInfo.Playing == GUI_PLAY))
+    if (guiInfo.Playing == GUI_PLAY)
+        return;
+
+    if (guiInfo.StreamType != STREAMTYPE_CDDA &&
+        guiInfo.StreamType != STREAMTYPE_VCD &&
+        guiInfo.StreamType != STREAMTYPE_DVD &&
+        (!guiInfo.Filename || (guiInfo.Filename[0] == 0)))
         return;
 
     if (guiInfo.Playing == GUI_PAUSE) {