summaryrefslogtreecommitdiff
path: root/audio/wavaudio.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/wavaudio.c
parentbee37f32d47a6c04ff57d18e01cf296607e22b30 (diff)
downloadqemu-2700efa3236d20879473d6b9c612f882a1b43dda.tar.gz
Use C99 initializers for audio_option
Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'audio/wavaudio.c')
-rw-r--r--audio/wavaudio.c29
1 files changed, 17 insertions, 12 deletions
diff --git a/audio/wavaudio.c b/audio/wavaudio.c
index 96cc49d136..51ed6eb5dc 100644
--- a/audio/wavaudio.c
+++ b/audio/wavaudio.c
@@ -219,18 +219,23 @@ static void wav_audio_fini (void *opaque)
}
static struct audio_option wav_options[] = {
- {"FREQUENCY", AUD_OPT_INT, &conf.settings.freq,
- "Frequency", NULL, 0},
-
- {"FORMAT", AUD_OPT_FMT, &conf.settings.fmt,
- "Format", NULL, 0},
-
- {"DAC_FIXED_CHANNELS", AUD_OPT_INT, &conf.settings.nchannels,
- "Number of channels (1 - mono, 2 - stereo)", NULL, 0},
-
- {"PATH", AUD_OPT_STR, &conf.wav_path,
- "Path to wave file", NULL, 0},
- {NULL, 0, NULL, NULL, NULL, 0}
+ {.name = "FREQUENCY",
+ .tag = AUD_OPT_INT,
+ .valp = &conf.settings.freq,
+ .descr = "Frequency"},
+ {.name = "FORMAT",
+ .tag = AUD_OPT_FMT,
+ .valp = &conf.settings.fmt,
+ .descr = "Format"},
+ {.name = "DAC_FIXED_CHANNELS",
+ .tag = AUD_OPT_INT,
+ .valp = &conf.settings.nchannels,
+ .descr = "Number of channels (1 - mono, 2 - stereo)"},
+ {.name = "PATH",
+ .tag = AUD_OPT_STR,
+ .valp = &conf.wav_path,
+ .descr = "Path to wave file"},
+ { /* End of list */ }
};
static struct audio_pcm_ops wav_pcm_ops = {