[Mplayer-cvslog] CVS: main/Gui/mplayer pb.c,1.2,1.3

[Zoltan Ponekker]

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

Modified Files:
	pb.c 
Log Message:


- fix -fs 
- set sub_fps to null for new files
- fix one sig11, if you play vcd, and the disc is not vcd, playtree is dead
- add playbar vertical position support
- etc.


Index: pb.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/pb.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pb.c	17 Jan 2003 23:29:14 -0000	1.2
+++ pb.c	25 Jan 2003 10:04:02 -0000	1.3
@@ -39,11 +39,19 @@
 
 void mplPBDraw( void )
 {
+ int x;
+ 
  if ( !appMPlayer.subWindow.isFullScreen ) return;
  if ( !mplPBVisible || !appMPlayer.barIsPresent ) return;
 
- appMPlayer.bar.x=( appMPlayer.subWindow.Width - appMPlayer.bar.width ) / 2;
-
+// appMPlayer.bar.x=( appMPlayer.subWindow.Width - appMPlayer.bar.width ) / 2;
+ switch( appMPlayer.bar.x )
+  {
+   case -1: x=( appMPlayer.subWindow.Width - appMPlayer.bar.width ) / 2; break;
+   case -2: x=( appMPlayer.subWindow.Width - appMPlayer.bar.width ); break;
+   default: x=appMPlayer.bar.x;
+  }
+	      
  switch ( mplPBFade )
   {
    case 1: // fade in
@@ -54,7 +62,7 @@
 	  mplPBFade=0;
 	  vo_mouse_autohide=0;
 	 }
-        wsMoveWindow( &appMPlayer.barWindow,0,appMPlayer.bar.x,mplPBLength ); 
+        wsMoveWindow( &appMPlayer.barWindow,0,x,mplPBLength ); 
 	break;
    case 2: // fade out
 	mplPBLength+=10;
@@ -66,7 +74,7 @@
           wsVisibleWindow( &appMPlayer.barWindow,wsHideWindow ); 
 	  return;
 	 }
-        wsMoveWindow( &appMPlayer.barWindow,0,appMPlayer.bar.x,mplPBLength ); 
+        wsMoveWindow( &appMPlayer.barWindow,0,x,mplPBLength ); 
 	break;
   }