[Mplayer-cvslog] CVS: main/Gui/mplayer menu.h,1.1,1.2 mixer.c,1.2,1.3 mplayer.c,1.8,1.9 mw.h,1.19,1.20 play.h,1.8,1.9 sw.h,1.8,1.9
Zoltan Ponekker
pontscho at mplayer.dev.hu
Sat Sep 1 19:53:09 CEST 2001
Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mplayer:/var/tmp.root/cvs-serv4305/Gui/mplayer
Modified Files:
menu.h mixer.c mplayer.c mw.h play.h sw.h
Log Message:
fix some bug.
Index: menu.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/menu.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- menu.h 25 Aug 2001 21:04:28 -0000 1.1
+++ menu.h 1 Sep 2001 17:53:07 -0000 1.2
@@ -55,11 +55,11 @@
return;
}
- for( i=0;i<appMPlayer.NumberOfMenuItems+1;i++ )
+ for( i=0;i<=appMPlayer.NumberOfMenuItems;i++ )
{
if ( wgIsRect( x,y,
appMPlayer.MenuItems[i].x,appMPlayer.MenuItems[i].y,
- appMPlayer.MenuItems[i].x+appMPlayer.MenuItems[i].width,appMPlayer.MenuItems[i].y+appMPlayer.MenuItems[i].height ) ) mplMenuItem=i;
+ appMPlayer.MenuItems[i].x+appMPlayer.MenuItems[i].width,appMPlayer.MenuItems[i].y+appMPlayer.MenuItems[i].height ) ) { mplMenuItem=i; break; }
}
wsPostRedisplay( &appMPlayer.menuWindow );
}
@@ -92,11 +92,15 @@
x=mx-mplMenuX;
y=my-mplMenuY;
+// x=RX - appMPlayer.menuWindow.X;
+// y=RY - appMPlayer.menuWindow.Y;
wsVisibleWindow( &appMPlayer.menuWindow,wsHideWindow );
if ( ( x < 0 ) || ( y < 0 ) ) return;
+ printf( "---------> %d %d,%d\n",i,x,y );
+ printf( "--------> mi: %d,%d %dx%d\n",appMPlayer.MenuItems[i].x,appMPlayer.MenuItems[i].y,appMPlayer.MenuItems[i].width,appMPlayer.MenuItems[i].height );
if ( wgIsRect( x,y,
appMPlayer.MenuItems[i].x,appMPlayer.MenuItems[i].y,
appMPlayer.MenuItems[i].x+appMPlayer.MenuItems[i].width,
Index: mixer.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mixer.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mixer.c 1 Sep 2001 14:44:23 -0000 1.2
+++ mixer.c 1 Sep 2001 17:53:07 -0000 1.3
@@ -10,7 +10,7 @@
float mixerGetVolume( void )
{
- mplShMem->Volume=mixer_getbothvolume();
+// mplShMem->Volume=(float)mixer_getbothvolume();
return mplShMem->Volume;
}
@@ -22,13 +22,13 @@
void mixerIncVolume( void )
{
- mixer_incvolume();
+// mixer_incvolume();
mixerGetVolume();
}
void mixerDecVolume( void )
{
- mixer_decvolume();
+// mixer_decvolume();
mixerGetVolume();
}
Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mplayer.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mplayer.c 31 Aug 2001 13:05:37 -0000 1.8
+++ mplayer.c 1 Sep 2001 17:53:07 -0000 1.9
@@ -52,8 +52,6 @@
void mplInit( int argc,char* argv[], char *envp[], void* disp )
{
-// parse_cfgfiles( argc,argv,envp );
-
// allocates shmem to gtkShMem
// fork() a process which runs gtkThreadProc() [gtkPID]
gtkInit( argc,argv,envp );
Index: mw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mw.h 1 Sep 2001 14:58:12 -0000 1.19
+++ mw.h 1 Sep 2001 17:53:07 -0000 1.20
@@ -91,6 +91,7 @@
case 'V': sprintf( tmp,"%3.1f",mplShMem->Volume ); strcat( trbuf,tmp ); break;
case 'b': sprintf( tmp,"%3.2f%%",mplShMem->Balance ); strcat( trbuf,tmp ); break;
case 'B': sprintf( tmp,"%3.1f",mplShMem->Balance ); strcat( trbuf,tmp ); break;
+ case 'd': sprintf( tmp,"%d",mplShMem->FrameDrop ); strcat( trbuf,tmp ); break;
case 's': if ( mplShMem->Playing == 0 ) strcat( trbuf,"s" ); break;
case 'l': if ( mplShMem->Playing == 1 ) strcat( trbuf,"p" ); break;
case 'e': if ( mplShMem->Playing == 2 ) strcat( trbuf,"e" ); break;
Index: play.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- play.h 31 Aug 2001 21:23:55 -0000 1.8
+++ play.h 1 Sep 2001 17:53:07 -0000 1.9
@@ -46,6 +46,7 @@
int StreamType;
int TimeSec;
int LengthInSec;
+ int FrameDrop;
char Filename[4096];
int FilenameChanged;
Index: sw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/sw.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sw.h 31 Aug 2001 22:07:53 -0000 1.8
+++ sw.h 1 Sep 2001 17:53:07 -0000 1.9
@@ -35,7 +35,6 @@
for (i=0; i < nchilds; i++) if ( childs[i]==me ) break;
for ( ;i<nchilds;i++ ) if ( childs[i] == mainw ) visible=1;
-// printf( "-----------> visible main vindov: %d ---\n",visible );
return visible;
}
@@ -45,6 +44,10 @@
void mplSubDraw( wsParamDisplay )
{
+// mainisvisible1=VisibleMainWindow();
+// printf( "--------> main: %d ---\n",mainisvisible1 );
+
+
// if ( ( appMPlayer.subWindow.Visible == wsWindowNotVisible )||
// ( appMPlayer.subWindow.State != wsWindowExpose ) ) return;
@@ -67,6 +70,7 @@
XFlush( wsDisplay );
}
appMPlayer.subWindow.State=0;
+// mainis=0;
}
void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY )
@@ -89,9 +93,7 @@
break;
// ---
case wsPLMouseButton:
- oldmainisvisible=VisibleMainWindow();
- printf( "----> %d %d\n",mainisvisible1,mainisvisible2 );
- //=mainisvisible;
+//mainis=0;
sx=X; sy=Y;
msButton=wsPLMouseButton;
mplSubMoved=0;
@@ -110,6 +112,15 @@
}
break;
case wsRLMouseButton:
+// if ( ( appMPlayer.subWindow.Focused == 0 && appMPlayer.subWindow.OFocused == 2 ) )
+// ( appMPlayer.mainWindow.Focused == 0 && appMPlayer.mainWindow.OFocused == 2 ) )
+// if ( ( !mplSubMoved )&&( !appMPlayer.mainWindow.Focused ) )
+printf( "-----> mainis: %d ---- \n",mainis );
+if ( !mainis )
+{
+wsMoveTopWindow( &appMPlayer.mainWindow );
+}
+/*
if ( ( !mplSubMoved )&&
( appMPlayer.subWindow.isFullScreen )&&
( !VisibleMainWindow() ) )
@@ -117,6 +128,7 @@
wsMoveTopWindow( &appMPlayer.mainWindow );
// else wsMoveTopWindow( &appMPlayer.mainWindow );
}
+*/
msButton=0;
mplSubMoved=0;
break;
More information about the MPlayer-cvslog
mailing list