Use C99 initializers for audio_option

Signed-off-by: Juan Quintela <quintela@redhat.com>

1 files changed, 45 insertions, 31 deletions

diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index 61a8cd03ac..574531297c 100644
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -935,37 +935,51 @@ static void alsa_audio_fini (void *opaque)
 }
 
 static struct audio_option alsa_options[] = {
-    {"DAC_SIZE_IN_USEC", AUD_OPT_BOOL, &conf.size_in_usec_out,
-     "DAC period/buffer size in microseconds (otherwise in frames)", NULL, 0},
-    {"DAC_PERIOD_SIZE", AUD_OPT_INT, &conf.period_size_out,
-     "DAC period size (0 to go with system default)",
-     &conf.period_size_out_overridden, 0},
-    {"DAC_BUFFER_SIZE", AUD_OPT_INT, &conf.buffer_size_out,
-     "DAC buffer size (0 to go with system default)",
-     &conf.buffer_size_out_overridden, 0},
-
-    {"ADC_SIZE_IN_USEC", AUD_OPT_BOOL, &conf.size_in_usec_in,
-     "ADC period/buffer size in microseconds (otherwise in frames)", NULL, 0},
-    {"ADC_PERIOD_SIZE", AUD_OPT_INT, &conf.period_size_in,
-     "ADC period size (0 to go with system default)",
-     &conf.period_size_in_overridden, 0},
-    {"ADC_BUFFER_SIZE", AUD_OPT_INT, &conf.buffer_size_in,
-     "ADC buffer size (0 to go with system default)",
-     &conf.buffer_size_in_overridden, 0},
-
-    {"THRESHOLD", AUD_OPT_INT, &conf.threshold,
-     "(undocumented)", NULL, 0},
-
-    {"DAC_DEV", AUD_OPT_STR, &conf.pcm_name_out,
-     "DAC device name (for instance dmix)", NULL, 0},
-
-    {"ADC_DEV", AUD_OPT_STR, &conf.pcm_name_in,
-     "ADC device name", NULL, 0},
-
-    {"VERBOSE", AUD_OPT_BOOL, &conf.verbose,
-     "Behave in a more verbose way", NULL, 0},
-
-    {NULL, 0, NULL, NULL, NULL, 0}
+    {.name        = "DAC_SIZE_IN_USEC",
+     .tag         = AUD_OPT_BOOL,
+     .valp        = &conf.size_in_usec_out,
+     .descr       = "DAC period/buffer size in microseconds (otherwise in frames)"},
+    {.name        = "DAC_PERIOD_SIZE",
+     .tag         = AUD_OPT_INT,
+     .valp        = &conf.period_size_out,
+     .descr       = "DAC period size (0 to go with system default)",
+     .overriddenp = &conf.period_size_out_overridden},
+    {.name        = "DAC_BUFFER_SIZE",
+     .tag         = AUD_OPT_INT,
+     .valp        = &conf.buffer_size_out,
+     .descr       = "DAC buffer size (0 to go with system default)",
+     .overriddenp = &conf.buffer_size_out_overridden},
+    {.name        = "ADC_SIZE_IN_USEC",
+     .tag         = AUD_OPT_BOOL,
+     .valp        = &conf.size_in_usec_in,
+     .descr       = "ADC period/buffer size in microseconds (otherwise in frames)"},
+    {.name        = "ADC_PERIOD_SIZE",
+     .tag         = AUD_OPT_INT,
+     .valp        = &conf.period_size_in,
+     .descr       = "ADC period size (0 to go with system default)",
+     .overriddenp = &conf.period_size_in_overridden},
+    {.name        = "ADC_BUFFER_SIZE",
+     .tag         = AUD_OPT_INT,
+     .valp        = &conf.buffer_size_in,
+     .descr       = "ADC buffer size (0 to go with system default)",
+     .overriddenp = &conf.buffer_size_in_overridden},
+    {.name        = "THRESHOLD",
+     .tag         = AUD_OPT_INT,
+     .valp        = &conf.threshold,
+     .descr       = "(undocumented)"},
+    {.name        = "DAC_DEV",
+     .tag         = AUD_OPT_STR,
+     .valp        = &conf.pcm_name_out,
+     .descr       = "DAC device name (for instance dmix)"},
+    {.name        = "ADC_DEV",
+     .tag         = AUD_OPT_STR,
+     .valp        = &conf.pcm_name_in,
+     .descr       = "ADC device name"},
+    {.name        = "VERBOSE",
+     .tag         = AUD_OPT_BOOL,
+     .valp        = &conf.verbose,
+     .descr       = "Behave in a more verbose way"},
+    { /* End of list */ }
 };
 
 static struct audio_pcm_ops alsa_pcm_ops = {