Commit 8869defe624e939a35309deee24f82cf2283d3e8
1 parent
d4a9eb1f
Make audio_pcm_opsstatic const
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5422 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
11 changed files
with
14 additions
and
14 deletions
audio/alsaaudio.c
... | ... | @@ -917,7 +917,7 @@ static struct audio_option alsa_options[] = { |
917 | 917 | {NULL, 0, NULL, NULL, NULL, 0} |
918 | 918 | }; |
919 | 919 | |
920 | -static struct audio_pcm_ops alsa_pcm_ops = { | |
920 | +static const struct audio_pcm_ops alsa_pcm_ops = { | |
921 | 921 | alsa_init_out, |
922 | 922 | alsa_fini_out, |
923 | 923 | alsa_run_out, | ... | ... |
audio/audio_int.h
... | ... | @@ -81,7 +81,7 @@ typedef struct HWVoiceOut { |
81 | 81 | int samples; |
82 | 82 | LIST_HEAD (sw_out_listhead, SWVoiceOut) sw_head; |
83 | 83 | LIST_HEAD (sw_cap_listhead, SWVoiceCap) cap_head; |
84 | - struct audio_pcm_ops *pcm_ops; | |
84 | + const struct audio_pcm_ops *pcm_ops; | |
85 | 85 | LIST_ENTRY (HWVoiceOut) entries; |
86 | 86 | } HWVoiceOut; |
87 | 87 | |
... | ... | @@ -99,7 +99,7 @@ typedef struct HWVoiceIn { |
99 | 99 | |
100 | 100 | int samples; |
101 | 101 | LIST_HEAD (sw_in_listhead, SWVoiceIn) sw_head; |
102 | - struct audio_pcm_ops *pcm_ops; | |
102 | + const struct audio_pcm_ops *pcm_ops; | |
103 | 103 | LIST_ENTRY (HWVoiceIn) entries; |
104 | 104 | } HWVoiceIn; |
105 | 105 | |
... | ... | @@ -140,7 +140,7 @@ struct audio_driver { |
140 | 140 | struct audio_option *options; |
141 | 141 | void *(*init) (void); |
142 | 142 | void (*fini) (void *); |
143 | - struct audio_pcm_ops *pcm_ops; | |
143 | + const struct audio_pcm_ops *pcm_ops; | |
144 | 144 | int can_be_default; |
145 | 145 | int max_voices_out; |
146 | 146 | int max_voices_in; | ... | ... |
audio/coreaudio.c
... | ... | @@ -520,7 +520,7 @@ static struct audio_option coreaudio_options[] = { |
520 | 520 | {NULL, 0, NULL, NULL, NULL, 0} |
521 | 521 | }; |
522 | 522 | |
523 | -static struct audio_pcm_ops coreaudio_pcm_ops = { | |
523 | +static const struct audio_pcm_ops coreaudio_pcm_ops = { | |
524 | 524 | coreaudio_init_out, |
525 | 525 | coreaudio_fini_out, |
526 | 526 | coreaudio_run_out, | ... | ... |
audio/dsoundaudio.c
... | ... | @@ -1057,7 +1057,7 @@ static struct audio_option dsound_options[] = { |
1057 | 1057 | {NULL, 0, NULL, NULL, NULL, 0} |
1058 | 1058 | }; |
1059 | 1059 | |
1060 | -static struct audio_pcm_ops dsound_pcm_ops = { | |
1060 | +static const struct audio_pcm_ops dsound_pcm_ops = { | |
1061 | 1061 | dsound_init_out, |
1062 | 1062 | dsound_fini_out, |
1063 | 1063 | dsound_run_out, | ... | ... |
audio/esdaudio.c
audio/fmodaudio.c
... | ... | @@ -657,7 +657,7 @@ static struct audio_option fmod_options[] = { |
657 | 657 | {NULL, 0, NULL, NULL, NULL, 0} |
658 | 658 | }; |
659 | 659 | |
660 | -static struct audio_pcm_ops fmod_pcm_ops = { | |
660 | +static const struct audio_pcm_ops fmod_pcm_ops = { | |
661 | 661 | fmod_init_out, |
662 | 662 | fmod_fini_out, |
663 | 663 | fmod_run_out, | ... | ... |
audio/noaudio.c
audio/ossaudio.c
... | ... | @@ -751,7 +751,7 @@ static struct audio_option oss_options[] = { |
751 | 751 | {NULL, 0, NULL, NULL, NULL, 0} |
752 | 752 | }; |
753 | 753 | |
754 | -static struct audio_pcm_ops oss_pcm_ops = { | |
754 | +static const struct audio_pcm_ops oss_pcm_ops = { | |
755 | 755 | oss_init_out, |
756 | 756 | oss_fini_out, |
757 | 757 | oss_run_out, | ... | ... |
audio/paaudio.c
audio/sdlaudio.c
... | ... | @@ -423,7 +423,7 @@ static struct audio_option sdl_options[] = { |
423 | 423 | {NULL, 0, NULL, NULL, NULL, 0} |
424 | 424 | }; |
425 | 425 | |
426 | -static struct audio_pcm_ops sdl_pcm_ops = { | |
426 | +static const struct audio_pcm_ops sdl_pcm_ops = { | |
427 | 427 | sdl_init_out, |
428 | 428 | sdl_fini_out, |
429 | 429 | sdl_run_out, | ... | ... |
audio/wavaudio.c
... | ... | @@ -218,7 +218,7 @@ static void wav_audio_fini (void *opaque) |
218 | 218 | ldebug ("wav_fini"); |
219 | 219 | } |
220 | 220 | |
221 | -struct audio_option wav_options[] = { | |
221 | +static struct audio_option wav_options[] = { | |
222 | 222 | {"FREQUENCY", AUD_OPT_INT, &conf.settings.freq, |
223 | 223 | "Frequency", NULL, 0}, |
224 | 224 | |
... | ... | @@ -233,7 +233,7 @@ struct audio_option wav_options[] = { |
233 | 233 | {NULL, 0, NULL, NULL, NULL, 0} |
234 | 234 | }; |
235 | 235 | |
236 | -struct audio_pcm_ops wav_pcm_ops = { | |
236 | +static const struct audio_pcm_ops wav_pcm_ops = { | |
237 | 237 | wav_init_out, |
238 | 238 | wav_fini_out, |
239 | 239 | wav_run_out, | ... | ... |