summaryrefslogtreecommitdiff
path: root/audio/fmodaudio.c
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-08-11 02:31:16 +0200
committermalc <av1474@comtv.ru>2009-08-11 20:51:23 +0400
commit2700efa3236d20879473d6b9c612f882a1b43dda (patch)
tree4098584a760177929300d1d10cad92cb00a23e53 /audio/fmodaudio.c
parentbee37f32d47a6c04ff57d18e01cf296607e22b30 (diff)
downloadqemu-2700efa3236d20879473d6b9c612f882a1b43dda.zip
Use C99 initializers for audio_option
Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'audio/fmodaudio.c')
-rw-r--r--audio/fmodaudio.c39
1 files changed, 25 insertions, 14 deletions
diff --git a/audio/fmodaudio.c b/audio/fmodaudio.c
index 8259551890..8239ed7d24 100644
--- a/audio/fmodaudio.c
+++ b/audio/fmodaudio.c
@@ -639,22 +639,33 @@ static void fmod_audio_fini (void *opaque)
}
static struct audio_option fmod_options[] = {
- {"DRV", AUD_OPT_STR, &conf.drvname,
- "FMOD driver", NULL, 0},
- {"FREQ", AUD_OPT_INT, &conf.freq,
- "Default frequency", NULL, 0},
- {"SAMPLES", AUD_OPT_INT, &conf.nb_samples,
- "Buffer size in samples", NULL, 0},
- {"CHANNELS", AUD_OPT_INT, &conf.nb_channels,
- "Number of default channels (1 - mono, 2 - stereo)", NULL, 0},
- {"BUFSIZE", AUD_OPT_INT, &conf.bufsize,
- "(undocumented)", NULL, 0},
+ {.name = "DRV",
+ .tag = AUD_OPT_STR,
+ .valp = &conf.drvname,
+ .descr = "FMOD driver"},
+ {.name = "FREQ",
+ .tag = AUD_OPT_INT,
+ .valp = &conf.freq,
+ .descr = "Default frequency"},
+ {.name = "SAMPLES",
+ .tag = AUD_OPT_INT,
+ .valp = &conf.nb_samples,
+ .descr = "Buffer size in samples"},
+ {.name = "CHANNELS",
+ .tag = AUD_OPT_INT,
+ .valp = &conf.nb_channels,
+ .descr = "Number of default channels (1 - mono, 2 - stereo)"},
+ {.name = "BUFSIZE",
+ .tag = AUD_OPT_INT,
+ .valp = &conf.bufsize,
+ .descr = "(undocumented)"}
#if 0
- {"THRESHOLD", AUD_OPT_INT, &conf.threshold,
- "(undocumented)"},
+ {.name = "THRESHOLD",
+ .tag = AUD_OPT_INT,
+ .valp = &conf.threshold,
+ .descr = "(undocumented)"}
#endif
-
- {NULL, 0, NULL, NULL, NULL, 0}
+ { /* End of list */ }
};
static struct audio_pcm_ops fmod_pcm_ops = {