Mercurial > mplayer.hg

diff mplayer.c @ 33890:c51e44dd38e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove needless guiInfo member DiskChanged. Use existing member NewPlay for this, because DiskChanged means NewPlay but with the same file. The #ifdef CONFIG_DVDREAD has been removed, because this affects CONFIG_VCD as well and NewPlay is always available.
author ib
date Fri, 12 Aug 2011 13:14:13 +0000
parents ab5aca1a07ce
children efab1fd86316
line wrap: on
line diff
--- a/mplayer.c	Fri Aug 12 10:23:25 2011 +0000
+++ b/mplayer.c	Fri Aug 12 13:14:13 2011 +0000
@@ -3977,7 +3977,7 @@
                     break;                  // STOP
                 if (guiInfo.Playing == GUI_PAUSE)
                     mpctx->osd_function = OSD_PAUSE;
-                if (guiInfo.DiskChanged || guiInfo.NewPlay)
+                if (guiInfo.NewPlay)
                     goto goto_next_file;
 #ifdef CONFIG_DVDREAD
                 if (mpctx->stream->type == STREAMTYPE_DVD) {
@@ -4076,9 +4076,7 @@
 
 #ifdef CONFIG_GUI
     if (use_gui) {
-#ifdef CONFIG_DVDREAD
-        if (!guiInfo.DiskChanged)
-#endif
+        if (guiInfo.NewPlay != GUI_FILE_SAME)
         gui(GUI_END_FILE, 0);
     }
 #endif