diff options
author | Juan Quintela <quintela@redhat.com> | 2009-08-11 02:31:15 +0200 |
---|---|---|
committer | malc <av1474@comtv.ru> | 2009-08-11 20:51:24 +0400 |
commit | 1dd3e4d13d0d59de61de518c9e504cb444782510 (patch) | |
tree | 3cff62b8d75f2548720f3dfa17aed7ade86af468 | |
parent | 2700efa3236d20879473d6b9c612f882a1b43dda (diff) |
use C99 initializers for audio_pcm_ops
Signed-off-by: Juan Quintela <quintela@redhat.com>
-rw-r--r-- | audio/alsaaudio.c | 22 | ||||
-rw-r--r-- | audio/coreaudio.c | 16 | ||||
-rw-r--r-- | audio/dsoundaudio.c | 22 | ||||
-rw-r--r-- | audio/esdaudio.c | 22 | ||||
-rw-r--r-- | audio/fmodaudio.c | 22 | ||||
-rw-r--r-- | audio/noaudio.c | 22 | ||||
-rw-r--r-- | audio/ossaudio.c | 22 | ||||
-rw-r--r-- | audio/paaudio.c | 21 | ||||
-rw-r--r-- | audio/sdlaudio.c | 16 | ||||
-rw-r--r-- | audio/wavaudio.c | 16 |
10 files changed, 92 insertions, 109 deletions
diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c index 574531297c..e079dba8a4 100644 --- a/audio/alsaaudio.c +++ b/audio/alsaaudio.c @@ -983,17 +983,17 @@ static struct audio_option alsa_options[] = { }; static struct audio_pcm_ops alsa_pcm_ops = { - alsa_init_out, - alsa_fini_out, - alsa_run_out, - alsa_write, - alsa_ctl_out, - - alsa_init_in, - alsa_fini_in, - alsa_run_in, - alsa_read, - alsa_ctl_in + .init_out = alsa_init_out, + .fini_out = alsa_fini_out, + .run_out = alsa_run_out, + .write = alsa_write, + .ctl_out = alsa_ctl_out, + + .init_in = alsa_init_in, + .fini_in = alsa_fini_in, + .run_in = alsa_run_in, + .read = alsa_read, + .ctl_in = alsa_ctl_in }; struct audio_driver alsa_audio_driver = { diff --git a/audio/coreaudio.c b/audio/coreaudio.c index ffeaa7f90b..349447099e 100644 --- a/audio/coreaudio.c +++ b/audio/coreaudio.c @@ -525,17 +525,11 @@ static struct audio_option coreaudio_options[] = { }; static struct audio_pcm_ops coreaudio_pcm_ops = { - coreaudio_init_out, - coreaudio_fini_out, - coreaudio_run_out, - coreaudio_write, - coreaudio_ctl_out, - - NULL, - NULL, - NULL, - NULL, - NULL + .init_out = coreaudio_init_out, + .fini_out = coreaudio_fini_out, + .run_out = coreaudio_run_out, + .write = coreaudio_write, + .ctl_out = coreaudio_ctl_out }; struct audio_driver coreaudio_audio_driver = { diff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c index 6c52c65a61..aff08177f8 100644 --- a/audio/dsoundaudio.c +++ b/audio/dsoundaudio.c @@ -1079,17 +1079,17 @@ static struct audio_option dsound_options[] = { }; static struct audio_pcm_ops dsound_pcm_ops = { - dsound_init_out, - dsound_fini_out, - dsound_run_out, - dsound_write, - dsound_ctl_out, - - dsound_init_in, - dsound_fini_in, - dsound_run_in, - dsound_read, - dsound_ctl_in + .init_out = dsound_init_out, + .fini_out = dsound_fini_out, + .run_out = dsound_run_out, + .write = dsound_write, + .ctl_out = dsound_ctl_out, + + .init_in = dsound_init_in, + .fini_in = dsound_fini_in, + .run_in = dsound_run_in, + .read = dsound_read, + .ctl_in = dsound_ctl_in }; struct audio_driver dsound_audio_driver = { diff --git a/audio/esdaudio.c b/audio/esdaudio.c index 83c18964fe..23e488a88c 100644 --- a/audio/esdaudio.c +++ b/audio/esdaudio.c @@ -571,17 +571,17 @@ struct audio_option qesd_options[] = { }; static struct audio_pcm_ops qesd_pcm_ops = { - qesd_init_out, - qesd_fini_out, - qesd_run_out, - qesd_write, - qesd_ctl_out, - - qesd_init_in, - qesd_fini_in, - qesd_run_in, - qesd_read, - qesd_ctl_in, + .init_out = qesd_init_out, + .fini_out = qesd_fini_out, + .run_out = qesd_run_out, + .write = qesd_write, + .ctl_out = qesd_ctl_out, + + .init_in = qesd_init_in, + .fini_in = qesd_fini_in, + .run_in = qesd_run_in, + .read = qesd_read, + .ctl_in = qesd_ctl_in, }; struct audio_driver esd_audio_driver = { diff --git a/audio/fmodaudio.c b/audio/fmodaudio.c index 8239ed7d24..17ade51dda 100644 --- a/audio/fmodaudio.c +++ b/audio/fmodaudio.c @@ -669,17 +669,17 @@ static struct audio_option fmod_options[] = { }; static struct audio_pcm_ops fmod_pcm_ops = { - fmod_init_out, - fmod_fini_out, - fmod_run_out, - fmod_write, - fmod_ctl_out, - - fmod_init_in, - fmod_fini_in, - fmod_run_in, - fmod_read, - fmod_ctl_in + .init_out = fmod_init_out, + .fini_out = fmod_fini_out, + .run_out = fmod_run_out, + .write = fmod_write, + .ctl_out = fmod_ctl_out, + + .init_in = fmod_init_in, + .fini_in = fmod_fini_in, + .run_in = fmod_run_in, + .read = fmod_read, + .ctl_in = fmod_ctl_in }; struct audio_driver fmod_audio_driver = { diff --git a/audio/noaudio.c b/audio/noaudio.c index 1a7529aa6b..40a1a2fee0 100644 --- a/audio/noaudio.c +++ b/audio/noaudio.c @@ -146,17 +146,17 @@ static void no_audio_fini (void *opaque) } static struct audio_pcm_ops no_pcm_ops = { - no_init_out, - no_fini_out, - no_run_out, - no_write, - no_ctl_out, - - no_init_in, - no_fini_in, - no_run_in, - no_read, - no_ctl_in + .init_out = no_init_out, + .fini_out = no_fini_out, + .run_out = no_run_out, + .write = no_write, + .ctl_out = no_ctl_out, + + .init_in = no_init_in, + .fini_in = no_fini_in, + .run_in = no_run_in, + .read = no_read, + .ctl_in = no_ctl_in }; struct audio_driver no_audio_driver = { diff --git a/audio/ossaudio.c b/audio/ossaudio.c index b8e6ec3615..03e17b5707 100644 --- a/audio/ossaudio.c +++ b/audio/ossaudio.c @@ -764,17 +764,17 @@ static struct audio_option oss_options[] = { }; static struct audio_pcm_ops oss_pcm_ops = { - oss_init_out, - oss_fini_out, - oss_run_out, - oss_write, - oss_ctl_out, - - oss_init_in, - oss_fini_in, - oss_run_in, - oss_read, - oss_ctl_in + .init_out = oss_init_out, + .fini_out = oss_fini_out, + .run_out = oss_run_out, + .write = oss_write, + .ctl_out = oss_ctl_out, + + .init_in = oss_init_in, + .fini_in = oss_fini_in, + .run_in = oss_run_in, + .read = oss_read, + .ctl_in = oss_ctl_in }; struct audio_driver oss_audio_driver = { diff --git a/audio/paaudio.c b/audio/paaudio.c index 2488f74d53..942e64f2b2 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -493,16 +493,17 @@ struct audio_option qpa_options[] = { }; static struct audio_pcm_ops qpa_pcm_ops = { - qpa_init_out, - qpa_fini_out, - qpa_run_out, - qpa_write, - qpa_ctl_out, - qpa_init_in, - qpa_fini_in, - qpa_run_in, - qpa_read, - qpa_ctl_in + .init_out = qpa_init_out, + .fini_out = qpa_fini_out, + .run_out = qpa_run_out, + .write = qpa_write, + .ctl_out = qpa_ctl_out, + + .init_in = qpa_init_in, + .fini_in = qpa_fini_in, + .run_in = qpa_run_in, + .read = qpa_read, + .ctl_in = qpa_ctl_in }; struct audio_driver pa_audio_driver = { diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c index e2563ba532..e8c6a2866b 100644 --- a/audio/sdlaudio.c +++ b/audio/sdlaudio.c @@ -428,17 +428,11 @@ static struct audio_option sdl_options[] = { }; static struct audio_pcm_ops sdl_pcm_ops = { - sdl_init_out, - sdl_fini_out, - sdl_run_out, - sdl_write_out, - sdl_ctl_out, - - NULL, - NULL, - NULL, - NULL, - NULL + .init_out = sdl_init_out, + .fini_out = sdl_fini_out, + .run_out = sdl_run_out, + .write = sdl_write_out, + .ctl_out = sdl_ctl_out, }; struct audio_driver sdl_audio_driver = { diff --git a/audio/wavaudio.c b/audio/wavaudio.c index 51ed6eb5dc..4c49f23e95 100644 --- a/audio/wavaudio.c +++ b/audio/wavaudio.c @@ -239,17 +239,11 @@ static struct audio_option wav_options[] = { }; static struct audio_pcm_ops wav_pcm_ops = { - wav_init_out, - wav_fini_out, - wav_run_out, - wav_write_out, - wav_ctl_out, - - NULL, - NULL, - NULL, - NULL, - NULL + .init_out = wav_init_out, + .fini_out = wav_fini_out, + .run_out = wav_run_out, + .write = wav_write_out, + .ctl_out = wav_ctl_out, }; struct audio_driver wav_audio_driver = { |