[Mplayer-cvslog] CVS: main mplayer.c,1.84,1.85

[GEREOFFY]

Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv21808

Modified Files:
	mplayer.c 
Log Message:
OSD progress bar for volume

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -r1.84 -r1.85
*** mplayer.c	2001/04/20 23:00:11	1.84
--- mplayer.c	2001/04/21 00:14:49	1.85
***************
*** 1594,1599 ****
      if(force_redraw){
        --force_redraw;
-       if(!force_redraw) osd_function=OSD_PLAY;
      }
  
  //    printf("A:%6.1f  V:%6.1f  A-V:%7.3f  frame=%5.2f   \r",d_audio->pts,d_video->pts,d_audio->pts-d_video->pts,a_frame);
--- 1594,1599 ----
      if(force_redraw){
        --force_redraw;
      }
+     if(!force_redraw) osd_function=OSD_PLAY;
  
  //    printf("A:%6.1f  V:%6.1f  A-V:%7.3f  frame=%5.2f   \r",d_audio->pts,d_video->pts,d_audio->pts-d_video->pts,a_frame);
***************
*** 1734,1742 ****
        break;
      case '*':
!       mixer_incvolume();
!       break;
!     case '/':
!       mixer_decvolume();
!       break;
      case 'm':
        mixer_usemaster=!mixer_usemaster;
--- 1734,1757 ----
        break;
      case '*':
!     case '/': {
!         int mixer_l=0; int mixer_r=0;
!         mixer_getvolume( &mixer_l,&mixer_r );
!         if(c=='*'){
!             if ( mixer_l < 100 ) mixer_l++;
!             if ( mixer_r < 100 ) mixer_r++;
!         } else {
!             if ( mixer_l > 0 ) mixer_l--;
!             if ( mixer_r > 0 ) mixer_r--;
!         }
!         mixer_setvolume( mixer_l,mixer_r );
! 
!         if(osd_level){
!           osd_visible=sh_video->fps; // 1 sec
!           vo_osd_progbar_type=OSD_VOLUME;
!           vo_osd_progbar_value=(mixer_l+mixer_r)*5/4;
!           //printf("volume: %d\n",vo_osd_progbar_value);
!         }
!       }
!       break; 
      case 'm':
        mixer_usemaster=!mixer_usemaster;


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog