[Mplayer-cvslog] CVS: main/Gui/mplayer mw.h,1.66,1.67 sw.h,1.33,1.34 widgets.c,1.28,1.29

[Zoltan Ponekker]

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

Modified Files:
	mw.h sw.h widgets.c 
Log Message:
add -audiofile support for gui

Index: mw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- mw.h	2 Jul 2002 13:35:03 -0000	1.66
+++ mw.h	2 Jul 2002 22:31:49 -0000	1.67
@@ -351,6 +351,9 @@
         mplMainRender=1;
         gtkShow( evLoadSubtitle,NULL );
         break;
+   case evLoadAudioFile:
+	gtkShow( evLoadAudioFile,NULL );
+	break;
    case evPrev:
 	mplPrev();
         mplMainRender=1;
@@ -413,28 +416,28 @@
           case 1: wsIconify( appMPlayer.subWindow ); break;
          }
         break;
-   case evNormalSize:
+   case evDoubleSize:
         if ( guiIntfStruct.Playing )
          {
           appMPlayer.subWindow.isFullScreen=True;
-          appMPlayer.subWindow.OldX=( wsMaxX - guiIntfStruct.MovieWidth ) / 2;
-          appMPlayer.subWindow.OldY=( wsMaxY - guiIntfStruct.MovieHeight ) / 2;
-          appMPlayer.subWindow.OldWidth=guiIntfStruct.MovieWidth; appMPlayer.subWindow.OldHeight=guiIntfStruct.MovieHeight;
+          appMPlayer.subWindow.OldX=( wsMaxX - guiIntfStruct.MovieWidth * 2 ) / 2;
+          appMPlayer.subWindow.OldY=( wsMaxY - guiIntfStruct.MovieHeight * 2 ) / 2;
+          appMPlayer.subWindow.OldWidth=guiIntfStruct.MovieWidth * 2; appMPlayer.subWindow.OldHeight=guiIntfStruct.MovieHeight * 2;
           wsFullScreen( &appMPlayer.subWindow );
 	  vo_fs=0;
          }
         break;
-   case evDoubleSize:
+   case evNormalSize:
         if ( guiIntfStruct.Playing )
          {
           appMPlayer.subWindow.isFullScreen=True;
-          appMPlayer.subWindow.OldX=( wsMaxX - guiIntfStruct.MovieWidth * 2 ) / 2;
-          appMPlayer.subWindow.OldY=( wsMaxY - guiIntfStruct.MovieHeight * 2 ) / 2;
-          appMPlayer.subWindow.OldWidth=guiIntfStruct.MovieWidth * 2; appMPlayer.subWindow.OldHeight=guiIntfStruct.MovieHeight * 2;
+          appMPlayer.subWindow.OldX=( wsMaxX - guiIntfStruct.MovieWidth ) / 2;
+          appMPlayer.subWindow.OldY=( wsMaxY - guiIntfStruct.MovieHeight ) / 2;
+          appMPlayer.subWindow.OldWidth=guiIntfStruct.MovieWidth; appMPlayer.subWindow.OldHeight=guiIntfStruct.MovieHeight;
           wsFullScreen( &appMPlayer.subWindow );
 	  vo_fs=0;
-         }
-        break;
+	  break;
+         } else if ( !appMPlayer.subWindow.isFullScreen ) break;
    case evFullScreen:
         for ( j=0;j<appMPlayer.NumberOfItems + 1;j++ )
          {

Index: sw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/sw.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sw.h	2 Jul 2002 21:10:40 -0000	1.33
+++ sw.h	2 Jul 2002 22:31:49 -0000	1.34
@@ -66,7 +66,7 @@
            {
             if( SubVisible++%2 ) wsMoveTopWindow( wsDisplay,appMPlayer.mainWindow.WindowID );
              else if ( wsWMType != wsWMNetWM && wsWMType != wsWMKDE ) wsMoveTopWindow( wsDisplay,appMPlayer.subWindow.WindowID );
-    }
+	   }
           msButton=0;
           mplSubMoved=0;
           break;

Index: widgets.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/widgets.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- widgets.c	2 Jul 2002 21:10:40 -0000	1.28
+++ widgets.c	2 Jul 2002 22:31:49 -0000	1.29
@@ -174,6 +174,10 @@
         ShowFileSelect( fsSubtitleSelector,0 );
 	gtkSetLayer( fsFileSelect );
         break;
+   case evLoadAudioFile:
+	ShowFileSelect( fsAudioSelector,0 );
+	gtkSetLayer( fsFileSelect );
+	break;
    case evAbout:
 	ShowAboutBox();
 	gtkSetLayer( AboutBox );