[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.12,1.13 mplayer.c,1.40,1.41

[GEREOFFY]

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

Modified Files:
	cfg-mplayer.h mplayer.c 
Log Message:
changed fs+vm+zoom flags for libvo

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** cfg-mplayer.h	2001/04/07 21:27:57	1.12
--- cfg-mplayer.h	2001/04/11 00:35:57	1.13
***************
*** 45,56 ****
  	{"pp", &divx_quality, CONF_TYPE_INT, CONF_RANGE, 0, 63},
  	{"br", &encode_bitrate, CONF_TYPE_INT, CONF_RANGE, 10000, 10000000},
  	{"x", &screen_size_x, CONF_TYPE_INT, CONF_RANGE, 1, 4096},
  	{"y", &screen_size_y, CONF_TYPE_INT, CONF_RANGE, 1, 4096},
  	{"xy", &screen_size_xy, CONF_TYPE_INT, CONF_RANGE, 1, 4096},
- #ifdef HAVE_XF86VM
          {"vm", &vidmode, CONF_TYPE_FLAG, 0, 0, 1},
! #endif
  	{"fs", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1},
  	{"nofs", &fullscreen, CONF_TYPE_FLAG, 0, 1, 0},
  	{"idx", &no_index, CONF_TYPE_FLAG, 0, 1, 0},
  	{"noidx", &no_index, CONF_TYPE_FLAG, 0, 0, 1},
--- 45,59 ----
  	{"pp", &divx_quality, CONF_TYPE_INT, CONF_RANGE, 0, 63},
  	{"br", &encode_bitrate, CONF_TYPE_INT, CONF_RANGE, 10000, 10000000},
+ 
  	{"x", &screen_size_x, CONF_TYPE_INT, CONF_RANGE, 1, 4096},
  	{"y", &screen_size_y, CONF_TYPE_INT, CONF_RANGE, 1, 4096},
  	{"xy", &screen_size_xy, CONF_TYPE_INT, CONF_RANGE, 1, 4096},
          {"vm", &vidmode, CONF_TYPE_FLAG, 0, 0, 1},
!         {"novm", &vidmode, CONF_TYPE_FLAG, 0, 1, 0},
  	{"fs", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1},
  	{"nofs", &fullscreen, CONF_TYPE_FLAG, 0, 1, 0},
+         {"zoom", &softzoom, CONF_TYPE_FLAG, 0, 0, 1},
+         {"nozoom", &softzoom, CONF_TYPE_FLAG, 0, 1, 0},
+         
  	{"idx", &no_index, CONF_TYPE_FLAG, 0, 1, 0},
  	{"noidx", &no_index, CONF_TYPE_FLAG, 0, 0, 1},

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** mplayer.c	2001/04/10 23:18:01	1.40
--- mplayer.c	2001/04/11 00:35:57	1.41
***************
*** 420,428 ****
  char* video_driver=NULL; //"mga"; // default
  int fullscreen=0;
- #ifdef HAVE_XF86VM
  int vidmode=0;
! #endif
! int screen_size_x=SCREEN_SIZE_X;
! int screen_size_y=SCREEN_SIZE_Y;
  int screen_size_xy=0;
  // movie info:
--- 420,427 ----
  char* video_driver=NULL; //"mga"; // default
  int fullscreen=0;
  int vidmode=0;
! int softzoom=0;
! int screen_size_x=0;//SCREEN_SIZE_X;
! int screen_size_y=0;//SCREEN_SIZE_Y;
  int screen_size_xy=0;
  // movie info:
***************
*** 486,494 ****
  // check font
    if(font_name){
!        vo_font=read_font_desc(font_name,font_factor);
         if(!vo_font) printf("Can't load font: %s\n",font_name);
    } else {
        // try default:
!        vo_font=read_font_desc(get_path("font/font.desc"),font_factor);
    }
  
--- 485,493 ----
  // check font
    if(font_name){
!        vo_font=read_font_desc(font_name,font_factor,verbose>1);
         if(!vo_font) printf("Can't load font: %s\n",font_name);
    } else {
        // try default:
!        vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1);
    }
  
***************
*** 518,528 ****
    }
  
- #ifdef HAVE_XF86VM
- if (!video_driver)
-   vidmode=0;
- else if (strcmp(video_driver,"x11"))
-    vidmode=0;
- #endif
- 
  if(!filename){
    if(vcd_track) filename="/dev/cdrom"; 
--- 517,520 ----
***************
*** 1030,1039 ****
  #endif
  
- #ifdef HAVE_XF86VM
-   if (vidmode) {
-         if ( screen_size_x == SCREEN_SIZE_X ) screen_size_x = 0;
-         if ( screen_size_y == SCREEN_SIZE_Y ) screen_size_y = 0;
-   } else
- #endif
     if(screen_size_xy>0){
       if(screen_size_xy<=8){
--- 1022,1025 ----
***************
*** 1044,1048 ****
         screen_size_y=screen_size_xy*movie_size_y/movie_size_x;
       }
!    } else {
       if(screen_size_x<=8) screen_size_x*=movie_size_x;
       if(screen_size_y<=8) screen_size_y*=movie_size_y;
--- 1030,1036 ----
         screen_size_y=screen_size_xy*movie_size_y/movie_size_x;
       }
!    } else if(!vidmode){
!      if(!screen_size_x) screen_size_x=SCREEN_SIZE_X;
!      if(!screen_size_y) screen_size_y=SCREEN_SIZE_Y;
       if(screen_size_x<=8) screen_size_x*=movie_size_x;
       if(screen_size_y<=8) screen_size_y*=movie_size_y;
***************
*** 1052,1063 ****
                        screen_size_x,screen_size_y,out_fmt);
  
!    if(verbose) printf("video_out->init(%dx%d->%dx%d,fs=%d,'%s',0x%X)\n",
                        movie_size_x,movie_size_y,
                        screen_size_x,screen_size_y,
!                       fullscreen,title,out_fmt);
  
     if(video_out->init(movie_size_x,movie_size_y,
                        screen_size_x,screen_size_y,
!                       fullscreen,title,out_fmt)){
       printf("FATAL: Cannot initialize video driver!\n");exit(1);
     }
--- 1040,1053 ----
                        screen_size_x,screen_size_y,out_fmt);
  
!    if(verbose) printf("video_out->init(%dx%d->%dx%d,flags=%d,'%s',0x%X)\n",
                        movie_size_x,movie_size_y,
                        screen_size_x,screen_size_y,
!                       fullscreen|(vidmode<<1)|(softzoom<<2),
!                       title,out_fmt);
  
     if(video_out->init(movie_size_x,movie_size_y,
                        screen_size_x,screen_size_y,
!                       fullscreen|(vidmode<<1)|(softzoom<<2),
!                       title,out_fmt)){
       printf("FATAL: Cannot initialize video driver!\n");exit(1);
     }


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