[Mplayer-cvslog] CVS: main mplayer.c,1.77,1.78

[Zoltan Ponekker]

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

Modified Files:
	mplayer.c 
Log Message:
add sub autoread & remove 'c' key

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -r1.77 -r1.78
*** mplayer.c	2001/04/18 01:55:18	1.77
--- mplayer.c	2001/04/18 20:37:33	1.78
***************
*** 497,500 ****
--- 497,501 ----
  float sub_delay=0;
  float sub_fps=0;
+ int   sub_auto = 1;
  //int user_bpp=0;
  
***************
*** 587,592 ****
         if(!subtitles) printf("Can't load subtitles: %s\n",font_name);
    } else {
!       // try default:
!        subtitles=sub_read_file(get_path("default.sub"));
    }
  
--- 588,597 ----
         if(!subtitles) printf("Can't load subtitles: %s\n",font_name);
    } else {
!     if ( sub_auto )
!       {
!        // auto load sub file ...
!        subtitles=sub_read_file( sub_filename( filename ) );
!        if ( subtitles == NULL ) subtitles=sub_read_file(get_path("default.sub")); // try default:
!       } else subtitles=sub_read_file(get_path("default.sub")); // try default:
    }
  
***************
*** 1703,1710 ****
        break;
      case 'm':
!       mixer_usemaster=1;
!       break;;
!     case 'c':
!       mixer_usemaster=0;
        break;
    }
--- 1708,1712 ----
        break;
      case 'm':
!       mixer_usemaster=!mixer_usemaster;
        break;
    }


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