[MPlayer-cvslog] r35659 - trunk/gui/interface.c

[ib]

Author: ib
Date: Mon Dec 10 19:14:34 2012
New Revision: 35659

Log:
Embrace several individual "if (guiInfo.Playing)" conditions.

This simplifies the individual conditions.

Modified:
   trunk/gui/interface.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Mon Dec 10 15:08:19 2012	(r35658)
+++ trunk/gui/interface.c	Mon Dec 10 19:14:34 2012	(r35659)
@@ -812,20 +812,21 @@ int gui(int what, void *data)
 
         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);