[Mplayer-cvslog] CVS: main/Gui/mplayer mw.c,1.98,1.99 play.c,1.79,1.80

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mail:/var/tmp.root/cvs-serv23745/Gui/mplayer

Modified Files:
	mw.c play.c 
Log Message:


- fix (?) "mixer bug"
- fix audio_id/video_id changing
- fix some other bug



Index: mw.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- mw.c	16 Dec 2002 20:16:29 -0000	1.98
+++ mw.c	16 Dec 2002 22:25:15 -0000	1.99
@@ -273,14 +273,12 @@
    case evSetAudio:
         if ( !guiIntfStruct.demuxer || audio_id == iparam ) break;
 	audio_id=iparam;
-	guiIntfStruct.NewPlay=1;
-	break;
+	goto play;
 
    case evSetVideo:
         if ( !guiIntfStruct.demuxer || video_id == iparam ) break;
 	video_id=iparam;
-	guiIntfStruct.NewPlay=1;
-	break;
+	goto play;
 
 #ifdef HAVE_VCD
    case evSetVCDTrack:

Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- play.c	11 Dec 2002 01:21:09 -0000	1.79
+++ play.c	16 Dec 2002 22:25:15 -0000	1.80
@@ -106,7 +106,7 @@
   } 
   else
     {
-     if ( guiIntfStruct.FilenameChanged ) return;
+     if ( guiIntfStruct.FilenameChanged || guiIntfStruct.NewPlay ) return;
 
      guiIntfStruct.TimeSec=0;
      guiIntfStruct.Position=0;