[MPlayer-cvslog] r21915 - in trunk/Gui/win32: dialogs.c gui.c interface.c

[vayne]

Author: vayne
Date: Sat Jan 13 22:20:47 2007
New Revision: 21915

Modified:
   trunk/Gui/win32/dialogs.c
   trunk/Gui/win32/gui.c
   trunk/Gui/win32/interface.c

Log:
proper fix for avoiding file skipping when mplayer is already playing a file.

Modified: trunk/Gui/win32/dialogs.c
==============================================================================
--- trunk/Gui/win32/dialogs.c	(original)
+++ trunk/Gui/win32/dialogs.c	Sat Jan 13 22:20:47 2007
@@ -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;

Modified: trunk/Gui/win32/gui.c
==============================================================================
--- trunk/Gui/win32/gui.c	(original)
+++ trunk/Gui/win32/gui.c	Sat Jan 13 22:20:47 2007
@@ -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);

Modified: trunk/Gui/win32/interface.c
==============================================================================
--- trunk/Gui/win32/interface.c	(original)
+++ trunk/Gui/win32/interface.c	Sat Jan 13 22:20:47 2007
@@ -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;