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

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21915 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
vayne 2007-01-13 21:20:47 +00:00
parent cc05fc22e8
commit bfa0a1c441
3 changed files with 1 additions and 4 deletions

View File

@ -529,7 +529,6 @@ static LRESULT CALLBACK PlayListWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPA
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;

View File

@ -181,10 +181,7 @@ static void handlemsg(HWND hWnd, int msg)
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);

View File

@ -280,6 +280,7 @@ static void guiSetEvent(int event)
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;