[Mplayer-cvslog] CVS: main mplayer.c,1.136,1.137 cfg-mplayer.h,1.51,1.52

[Gabor Lenart]

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

Modified Files:
	mplayer.c cfg-mplayer.h 
Log Message:
'-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -r1.136 -r1.137
*** mplayer.c	2001/06/02 23:28:42	1.136
--- mplayer.c	2001/06/03 00:24:49	1.137
***************
*** 435,438 ****
--- 435,439 ----
  // screen info:
  char* video_driver=NULL; //"mga"; // default
+ char* audio_driver=NULL;
  int fullscreen=0;
  int vidmode=0;
***************
*** 522,526 ****
        printf("\n");
        exit(0);
!      }
  #ifdef HAVE_GUI
     }
--- 523,537 ----
        printf("\n");
        exit(0);
!     }
!     if(audio_driver && strcmp(audio_driver,"help")==0){
!       printf("Available audio output drivers:\n");
!       i=0;
!       while (audio_out_drivers[i]) {
!         const ao_info_t *info = audio_out_drivers[i++]->info;
! 	printf("\t%s\t%s\n", info->short_name, info->name);
!       }
!       printf("\n");
!       exit(0);
!     }
  #ifdef HAVE_GUI
     }
***************
*** 545,554 ****
    }
    if(!video_out){
!     printf("Invalid video output driver name: %s\n",video_driver);
      return 0;
    }
  
  // check audio_out
! audio_out=audio_out_drivers[0];
  
  // check codec.conf
--- 556,580 ----
    }
    if(!video_out){
!     printf("Invalid video output driver name: %s\nUse '-vo help' to get a list of available video drivers.\n",video_driver);
!     return 0;
!   }
!   
! // check audio_out driver name:
!   if(!audio_driver)
!     audio_out=audio_out_drivers[0];
!   else
!   for (i=0; audio_out_drivers[i] != NULL; i++){
!     const ao_info_t *info = audio_out_drivers[i]->info;
!     if(strcmp(info->short_name,audio_driver) == 0){
!       audio_out = audio_out_drivers[i];break;
!     }
!   }
!   if (!audio_out){
!     printf("Invalid audio output driver name: %s\nUse '-ao help' to get a list of available audio drivers.\n",audio_driver);
      return 0;
    }
  
  // check audio_out
! //audio_out=audio_out_drivers[0];
  
  // check codec.conf

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** cfg-mplayer.h	2001/06/02 23:30:26	1.51
--- cfg-mplayer.h	2001/06/03 00:24:49	1.52
***************
*** 37,40 ****
--- 37,41 ----
              CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
  	{"vo", &video_driver, CONF_TYPE_STRING, 0, 0, 0},
+ 	{"ao", &audio_driver, CONF_TYPE_STRING, 0, 0, 0},
  	{"dsp", &dsp, CONF_TYPE_STRING, 0, 0, 0},
          {"mixer", &mixer_device, CONF_TYPE_STRING, 0, 0, 0},


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