Mercurial > mplayer.hg

changeset 35565:5f7a983fc838

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Embrace several individual "if (guiInfo.Playing)" conditions. This simplifies the individual conditions.
author ib
date Mon, 10 Dec 2012 18:14:34 +0000
parents 8d4a7387d592
children 5053be8dbab2
files gui/interface.c
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gui/interface.c	Mon Dec 10 14:08:19 2012 +0000
+++ b/gui/interface.c	Mon Dec 10 18:14:34 2012 +0000
@@ -812,20 +812,21 @@
 
         uiEventHandling(ivRedraw, 1);
 
-        if (!guiInfo.PlaylistNext && guiInfo.Playing) {
+        if (guiInfo.Playing) {
+        if (!guiInfo.PlaylistNext) {
             guiInfo.PlaylistNext = True;
             break;
         }
 
-        if ((guiInfo.StreamType == STREAMTYPE_CDDA) && (guiInfo.Track < guiInfo.Tracks) && guiInfo.Playing) {
+        if (guiInfo.StreamType == STREAMTYPE_CDDA && guiInfo.Track < guiInfo.Tracks) {
             uiNext();
             break;
         }
 
-        if (guiInfo.Playing)
             next = listMgr(PLAYLIST_ITEM_GET_NEXT, 0);
+        }
 
-        if (guiInfo.Playing && next) {
+        if (next) {
             uiSetFile(next->path, next->name, STREAMTYPE_FILE);
             guiInfo.NewPlay = GUI_FILE_NEW;
             guiInfo.Track   = (int)listMgr(PLAYLIST_ITEM_GET_POS, next);