RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-26 21:29:16 +00:00
Code Issues Releases Wiki Activity

cosmetics: reindent, detabify

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26133 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-03-01 09:04:00 +00:00
parent 4485a60c38
commit a09376d67b
1 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
libao2/audio_out.c
View File

@ -21,8 +21,8 @@ extern ao_functions_t audio_out_pulse;
extern ao_functions_t audio_out_jack; extern ao_functions_t audio_out_jack;
extern ao_functions_t audio_out_openal; extern ao_functions_t audio_out_openal;
extern ao_functions_t audio_out_null; extern ao_functions_t audio_out_null;
extern ao_functions_t audio_out_alsa5; extern ao_functions_t audio_out_alsa5;
extern ao_functions_t audio_out_alsa; extern ao_functions_t audio_out_alsa;
extern ao_functions_t audio_out_nas; extern ao_functions_t audio_out_nas;
extern ao_functions_t audio_out_sdl; extern ao_functions_t audio_out_sdl;
extern ao_functions_t audio_out_sun; extern ao_functions_t audio_out_sun;
@ -46,19 +46,19 @@ const ao_functions_t* const audio_out_drivers[] =
&audio_out_win32, &audio_out_win32,
#endif #endif
#ifdef MACOSX #ifdef MACOSX
&audio_out_macosx, &audio_out_macosx,
#endif #endif
#ifdef USE_OSS_AUDIO #ifdef USE_OSS_AUDIO
&audio_out_oss, &audio_out_oss,
#endif #endif
#ifdef HAVE_ALSA1X #ifdef HAVE_ALSA1X
&audio_out_alsa, &audio_out_alsa,
#endif #endif
#ifdef HAVE_ALSA9 #ifdef HAVE_ALSA9
&audio_out_alsa, &audio_out_alsa,
#endif #endif
#ifdef HAVE_ALSA5 #ifdef HAVE_ALSA5
&audio_out_alsa5, &audio_out_alsa5,
#endif #endif
#ifdef USE_SGI_AUDIO #ifdef USE_SGI_AUDIO
&audio_out_sgi, &audio_out_sgi,
@ -80,7 +80,7 @@ const ao_functions_t* const audio_out_drivers[] =
&audio_out_jack, &audio_out_jack,
#endif #endif
#ifdef HAVE_NAS #ifdef HAVE_NAS
&audio_out_nas, &audio_out_nas,
#endif #endif
#ifdef HAVE_SDL #ifdef HAVE_SDL
&audio_out_sdl, &audio_out_sdl,
@ -88,7 +88,7 @@ const ao_functions_t* const audio_out_drivers[] =
#ifdef USE_OPENAL #ifdef USE_OPENAL
&audio_out_openal, &audio_out_openal,
#endif #endif
&audio_out_mpegpes, &audio_out_mpegpes,
#ifdef HAVE_DXR2 #ifdef HAVE_DXR2
&audio_out_dxr2, &audio_out_dxr2,
#endif #endif
@ -100,19 +100,19 @@ const ao_functions_t* const audio_out_drivers[] =
#endif #endif
&audio_out_null, &audio_out_null,
// should not be auto-selected: // should not be auto-selected:
&audio_out_pcm, &audio_out_pcm,
NULL NULL
}; };
void list_audio_out(void){ void list_audio_out(void){
int i=0; int i=0;
mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AvailableAudioOutputDrivers); mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AvailableAudioOutputDrivers);
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_OUTPUTS\n"); mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_OUTPUTS\n");
while (audio_out_drivers[i]) { while (audio_out_drivers[i]) {
const ao_info_t *info = audio_out_drivers[i++]->info; const ao_info_t *info = audio_out_drivers[i++]->info;
mp_msg(MSGT_GLOBAL, MSGL_INFO,"\t%s\t%s\n", info->short_name, info->name); mp_msg(MSGT_GLOBAL, MSGL_INFO,"\t%s\t%s\n", info->short_name, info->name);
} }
mp_msg(MSGT_GLOBAL, MSGL_INFO,"\n"); mp_msg(MSGT_GLOBAL, MSGL_INFO,"\n");
} }
const ao_functions_t* init_best_audio_out(char** ao_list,int use_plugin,int rate,int channels,int format,int flags){ const ao_functions_t* init_best_audio_out(char** ao_list,int use_plugin,int rate,int channels,int format,int flags){
@ -123,42 +123,42 @@ const ao_functions_t* init_best_audio_out(char** ao_list,int use_plugin,int rate
char* ao=ao_list[0]; char* ao=ao_list[0];
int ao_len; int ao_len;
if (strncmp(ao, "alsa9", 5) == 0 || strncmp(ao, "alsa1x", 6) == 0) { if (strncmp(ao, "alsa9", 5) == 0 || strncmp(ao, "alsa1x", 6) == 0) {
mp_msg(MSGT_AO, MSGL_FATAL, MSGTR_AO_ALSA9_1x_Removed); mp_msg(MSGT_AO, MSGL_FATAL, MSGTR_AO_ALSA9_1x_Removed);
exit_player(NULL); exit_player(NULL);
} }
if (ao_subdevice) { if (ao_subdevice) {
free(ao_subdevice); free(ao_subdevice);
ao_subdevice = NULL; ao_subdevice = NULL;
}
ao_subdevice=strchr(ao,':');
if(ao_subdevice){
ao_len = ao_subdevice - ao;
ao_subdevice = strdup(&ao[ao_len + 1]);
}
else
ao_len = strlen(ao);
for(i=0;audio_out_drivers[i];i++){
const ao_functions_t* audio_out=audio_out_drivers[i];
if(!strncmp(audio_out->info->short_name,ao,ao_len)){
// name matches, try it
if(audio_out->init(rate,channels,format,flags))
return audio_out; // success!
}
} }
ao_subdevice=strchr(ao,':');
if(ao_subdevice){
ao_len = ao_subdevice - ao;
ao_subdevice = strdup(&ao[ao_len + 1]);
}
else
ao_len = strlen(ao);
for(i=0;audio_out_drivers[i];i++){
const ao_functions_t* audio_out=audio_out_drivers[i];
if(!strncmp(audio_out->info->short_name,ao,ao_len)){
// name matches, try it
if(audio_out->init(rate,channels,format,flags))
return audio_out; // success!
}
}
// continue... // continue...
++ao_list; ++ao_list;
if(!(ao_list[0])) return NULL; // do NOT fallback to others if(!(ao_list[0])) return NULL; // do NOT fallback to others
} }
if (ao_subdevice) { if (ao_subdevice) {
free(ao_subdevice); free(ao_subdevice);
ao_subdevice = NULL; ao_subdevice = NULL;
} }
// now try the rest... // now try the rest...
for(i=0;audio_out_drivers[i];i++){ for(i=0;audio_out_drivers[i];i++){
const ao_functions_t* audio_out=audio_out_drivers[i]; const ao_functions_t* audio_out=audio_out_drivers[i];
// if(audio_out->control(AOCONTROL_QUERY_FORMAT, (int)format) == CONTROL_TRUE) // if(audio_out->control(AOCONTROL_QUERY_FORMAT, (int)format) == CONTROL_TRUE)
if(audio_out->init(rate,channels,format,flags)) if(audio_out->init(rate,channels,format,flags))
return audio_out; // success! return audio_out; // success!
} }
return NULL; return NULL;
} }