diff options
| author | Juan Quintela <quintela@redhat.com> | 2009-08-11 02:31:17 +0200 |
|---|---|---|
| committer | malc <av1474@comtv.ru> | 2009-08-11 20:51:24 +0400 |
| commit | 1a40d5e23577b955265fe12a2b7b5222ec2df0f2 (patch) | |
| tree | a5d043000b861d524237dcb6d581ee1026f99f86 /audio/fmodaudio.c | |
| parent | 1dd3e4d13d0d59de61de518c9e504cb444782510 (diff) | |
| download | qemu-1a40d5e23577b955265fe12a2b7b5222ec2df0f2.tar.gz | |
use C99 initializers for all audio/*
Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'audio/fmodaudio.c')
| -rw-r--r-- | audio/fmodaudio.c | 49 |
1 files changed, 29 insertions, 20 deletions
diff --git a/audio/fmodaudio.c b/audio/fmodaudio.c index 17ade51dda..11ad09bb29 100644 --- a/audio/fmodaudio.c +++ b/audio/fmodaudio.c @@ -50,13 +50,9 @@ static struct { int threshold; int broken_adc; } conf = { - NULL, - 2048 * 2, - 44100, - 2, - 0, - 0, - 0 + .nb_samples = 2048 * 2, + .freq = 44100, + .nb_channels = 2, }; static void GCC_FMT_ATTR (1, 2) fmod_logerr (const char *fmt, ...) @@ -517,27 +513,40 @@ static struct { const char *name; int type; } drvtab[] = { - {"none", FSOUND_OUTPUT_NOSOUND}, + {.name = "none", + .type = FSOUND_OUTPUT_NOSOUND}, #ifdef _WIN32 - {"winmm", FSOUND_OUTPUT_WINMM}, - {"dsound", FSOUND_OUTPUT_DSOUND}, - {"a3d", FSOUND_OUTPUT_A3D}, - {"asio", FSOUND_OUTPUT_ASIO}, + {.name = "winmm", + .type = FSOUND_OUTPUT_WINMM}, + {.name = "dsound", + .type = FSOUND_OUTPUT_DSOUND}, + {.name = "a3d", + .type = FSOUND_OUTPUT_A3D}, + {.name = "asio", + .type = FSOUND_OUTPUT_ASIO}, #endif #ifdef __linux__ - {"oss", FSOUND_OUTPUT_OSS}, - {"alsa", FSOUND_OUTPUT_ALSA}, - {"esd", FSOUND_OUTPUT_ESD}, + {.name = "oss", + .type = FSOUND_OUTPUT_OSS}, + {.name = "alsa", + .type = FSOUND_OUTPUT_ALSA}, + {.name = "esd", + .type = FSOUND_OUTPUT_ESD}, #endif #ifdef __APPLE__ - {"mac", FSOUND_OUTPUT_MAC}, + {.name = "mac", + .type = FSOUND_OUTPUT_MAC}, #endif #if 0 - {"xbox", FSOUND_OUTPUT_XBOX}, - {"ps2", FSOUND_OUTPUT_PS2}, - {"gcube", FSOUND_OUTPUT_GC}, + {.name = "xbox", + .type = FSOUND_OUTPUT_XBOX}, + {.name = "ps2", + .type = FSOUND_OUTPUT_PS2}, + {.name = "gcube", + .type = FSOUND_OUTPUT_GC}, #endif - {"none-realtime", FSOUND_OUTPUT_NOSOUND_NONREALTIME} + {.name = "none-realtime", + .type = FSOUND_OUTPUT_NOSOUND_NONREALTIME} }; static void *fmod_audio_init (void) |