7 files changed, 28 insertions, 11 deletions

diff --git a/Gui/mplayer/gtk/fs.h b/Gui/mplayer/gtk/fs.h
index 52bdd0beb5..b4998629bd 100644
--- a/Gui/mplayer/gtk/fs.h
+++ b/Gui/mplayer/gtk/fs.h
@@ -257,6 +257,7 @@ void fs_Ok_released( GtkButton * button,gpointer user_data )
         break;
   }
  strcpy( gtkShMem->fs.dir,fsSelectedDirectory );
+printf( "----gtk---> filname: %s\n",fsSelectedFile );
  strcpy( gtkShMem->fs.filename,fsSelectedFile );
  item=fsTopList_items;
  while( item )
diff --git a/Gui/mplayer/menu.h b/Gui/mplayer/menu.h
index 81d776db6b..78e21acddf 100644
--- a/Gui/mplayer/menu.h
+++ b/Gui/mplayer/menu.h
@@ -55,11 +55,11 @@ void mplMenuMouseHandle( int X,int Y,int RX,int RY )
    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 @@ void mplHideMenu( int mx,int my )
 
  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,
diff --git a/Gui/mplayer/mixer.c b/Gui/mplayer/mixer.c
index 2ea816977d..e8ad4a5f22 100644
--- a/Gui/mplayer/mixer.c
+++ b/Gui/mplayer/mixer.c
@@ -10,7 +10,7 @@
 
 float mixerGetVolume( void )
 {
- mplShMem->Volume=mixer_getbothvolume();
+// mplShMem->Volume=(float)mixer_getbothvolume();
  return mplShMem->Volume;
 }
 
@@ -22,13 +22,13 @@ void  mixerSetVolume( float v )
 
 void mixerIncVolume( void )
 {
- mixer_incvolume();
+// mixer_incvolume();
  mixerGetVolume();
 }
 
 void mixerDecVolume( void )
 {
- mixer_decvolume();
+// mixer_decvolume();
  mixerGetVolume();
 }
 
diff --git a/Gui/mplayer/mplayer.c b/Gui/mplayer/mplayer.c
index 147e0e9cc2..31008e3650 100644
--- a/Gui/mplayer/mplayer.c
+++ b/Gui/mplayer/mplayer.c
@@ -52,8 +52,6 @@ void mplTimerHandler( int signum )
 
 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 );
diff --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h
index 015f286f9c..04a5d3bfbc 100644
--- a/Gui/mplayer/mw.h
+++ b/Gui/mplayer/mw.h
@@ -91,6 +91,7 @@ calclengthmmmmss:
        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;
diff --git a/Gui/mplayer/play.h b/Gui/mplayer/play.h
index 49cd966782..26477c9610 100644
--- a/Gui/mplayer/play.h
+++ b/Gui/mplayer/play.h
@@ -46,6 +46,7 @@ typedef struct
    int    StreamType;
    int    TimeSec;
    int    LengthInSec;
+   int    FrameDrop;
    
    char   Filename[4096];
    int    FilenameChanged;
diff --git a/Gui/mplayer/sw.h b/Gui/mplayer/sw.h
index bd8f9e9caa..517dedf629 100644
--- a/Gui/mplayer/sw.h
+++ b/Gui/mplayer/sw.h
@@ -35,7 +35,6 @@ int VisibleMainWindow( void )
 
  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 @@ int count = 0;
 
 void mplSubDraw( wsParamDisplay )
 {
+// mainisvisible1=VisibleMainWindow();
+// printf( "--------> main: %d ---\n",mainisvisible1 );
+
+
 // if ( ( appMPlayer.subWindow.Visible == wsWindowNotVisible )||
 //      ( appMPlayer.subWindow.State != wsWindowExpose ) ) return;
 
@@ -67,6 +70,7 @@ void mplSubDraw( wsParamDisplay )
    XFlush( wsDisplay );
   }
  appMPlayer.subWindow.State=0; 
+// mainis=0;
 }
 
 void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY )
@@ -89,9 +93,7 @@ void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY )
           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 @@ void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY )
            }
           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 @@ void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY )
 wsMoveTopWindow( &appMPlayer.mainWindow );
 //	     else wsMoveTopWindow( &appMPlayer.mainWindow );
 	   }
+*/	   
           msButton=0;
           mplSubMoved=0;
           break;