Mercurial > mplayer.hg

changeset 21897:c885b979fda3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
proper fix for avoiding file skipping when mplayer is already playing a file.
author vayne
date Sat, 13 Jan 2007 21:20:47 +0000
parents b2640a639ac7
children 0c7a8204dacf
files Gui/win32/dialogs.c Gui/win32/gui.c Gui/win32/interface.c
diffstat 3 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Gui/win32/dialogs.c	Sat Jan 13 12:56:42 2007 +0000
+++ b/Gui/win32/dialogs.c	Sat Jan 13 21:20:47 2007 +0000
@@ -529,7 +529,6 @@
                 case ID_PLAY:
                         if(selected) pl->current = selected - 1;
                         mplSetFileName(NULL, pl->tracks[pl->current]->filename, STREAMTYPE_STREAM);
-                        mplGotoTheNext = guiIntfStruct.Playing? 0 : 1;
                         gui->startplay(gui);
                     }
                     return 0;
--- a/Gui/win32/gui.c	Sat Jan 13 12:56:42 2007 +0000
+++ b/Gui/win32/gui.c	Sat Jan 13 21:20:47 2007 +0000
@@ -181,10 +181,7 @@
         case evLoadPlay:
         case evLoad:
             if(display_openfilewindow(gui, 0) && (msg == evLoadPlay))
-            {
-                mplGotoTheNext = guiIntfStruct.Playing? 0 : 1;
                 handlemsg(hWnd, evDropFile);
-            }
             return;
         case evLoadSubtitle:
             display_opensubtitlewindow(gui);
--- a/Gui/win32/interface.c	Sat Jan 13 12:56:42 2007 +0000
+++ b/Gui/win32/interface.c	Sat Jan 13 21:20:47 2007 +0000
@@ -280,6 +280,7 @@
             mplSetFileName(NULL, filename, STREAMTYPE_FILE);
             guiIntfStruct.FilenameChanged = guiIntfStruct.NewPlay = 1;
             update_playlistwindow();
+            mplGotoTheNext = guiIntfStruct.Playing? 0 : 1;
             guiGetEvent(guiCEvent, (void *) guiSetStop);
             guiGetEvent(guiCEvent, (void *) guiSetPlay);
             break;