RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-01 23:00:41 +00:00
Code Issues Releases Wiki Activity

'-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@957 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
lgb 2001-06-03 00:24:49 +00:00
parent c5c6862d8f
commit 7ebd301178
3 changed files with 31 additions and 4 deletions

1
cfg-mplayer.h
View File

@ -36,6 +36,7 @@ struct config conf[]={
{"o", "Option -o has been renamed to -vo (video-out), use -vo !\n",
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},
#ifdef HAVE_X11

2
libao2/ao_oss.c
View File

@ -17,7 +17,7 @@
static ao_info_t info =
{
"OSS/ioctl audio output",
"null",
"oss",
"A'rpi",
""
};

32
mplayer.c
View File

@ -434,6 +434,7 @@ int frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode
char* title="MPlayer";
// screen info:
char* video_driver=NULL; //"mga"; // default
char* audio_driver=NULL;
int fullscreen=0;
int vidmode=0;
int softzoom=0;
@ -521,7 +522,17 @@ if ((conffile = get_path("")) == NULL) {
}
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
}
#endif
@ -544,12 +555,27 @@ if(!filename){
}
}
if(!video_out){
printf("Invalid video output driver name: %s\n",video_driver);
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];
//audio_out=audio_out_drivers[0];
// check codec.conf
if(!parse_codec_cfg(get_path("codecs.conf"))){