diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-02-01 20:11:14 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-02-01 20:11:14 +0000 |
commit | 6921ab9e242e186a27db6e392f4ac352e3a003d9 (patch) | |
tree | a1dac369f15271a945e46a0b9a37e717417124a9 /libao2 | |
parent | ea8ae01ee0206a6747b8a05c4668576ce6dc5c26 (diff) | |
download | mpv-6921ab9e242e186a27db6e392f4ac352e3a003d9.tar.bz2 mpv-6921ab9e242e186a27db6e392f4ac352e3a003d9.tar.xz |
ao_functions_t should be const, part 1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25945 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
-rw-r--r-- | libao2/audio_out.c | 8 | ||||
-rw-r--r-- | libao2/audio_out.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libao2/audio_out.c b/libao2/audio_out.c index 2cc3d4dc6b..76d62c4365 100644 --- a/libao2/audio_out.c +++ b/libao2/audio_out.c @@ -75,7 +75,7 @@ extern ao_functions_t audio_out_mpegpes; extern ao_functions_t audio_out_pcm; extern ao_functions_t audio_out_pss; -ao_functions_t* audio_out_drivers[] = +const ao_functions_t* const audio_out_drivers[] = { // native: #ifdef HAVE_DIRECTX @@ -154,7 +154,7 @@ void list_audio_out(void){ mp_msg(MSGT_GLOBAL, MSGL_INFO,"\n"); } -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){ int i; // first try the preferred drivers, with their optional subdevice param: if(ao_list && ao_list[0]) @@ -177,7 +177,7 @@ ao_functions_t* init_best_audio_out(char** ao_list,int use_plugin,int rate,int c else ao_len = strlen(ao); for(i=0;audio_out_drivers[i];i++){ - ao_functions_t* audio_out=audio_out_drivers[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)) @@ -194,7 +194,7 @@ ao_functions_t* init_best_audio_out(char** ao_list,int use_plugin,int rate,int c } // now try the rest... for(i=0;audio_out_drivers[i];i++){ - 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->init(rate,channels,format,flags)) return audio_out; // success! diff --git a/libao2/audio_out.h b/libao2/audio_out.h index 0909264248..ff1745b6a0 100644 --- a/libao2/audio_out.h +++ b/libao2/audio_out.h @@ -45,10 +45,10 @@ extern char *ao_subdevice; extern ao_data_t ao_data; void list_audio_out(void); -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); // NULL terminated array of all drivers -extern ao_functions_t* audio_out_drivers[]; +extern const ao_functions_t* const audio_out_drivers[]; #define CONTROL_OK 1 #define CONTROL_TRUE 1 |