Use C99 initializers for audio_option

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

1 files changed, 41 insertions, 21 deletions

diff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c
index 7c087903f4..6c52c65a61 100644
--- a/audio/dsoundaudio.c
+++ b/audio/dsoundaudio.c
@@ -1035,27 +1035,47 @@ static void *dsound_audio_init (void)
 }
 
 static struct audio_option dsound_options[] = {
-    {"LOCK_RETRIES", AUD_OPT_INT, &conf.lock_retries,
-     "Number of times to attempt locking the buffer", NULL, 0},
-    {"RESTOURE_RETRIES", AUD_OPT_INT, &conf.restore_retries,
-     "Number of times to attempt restoring the buffer", NULL, 0},
-    {"GETSTATUS_RETRIES", AUD_OPT_INT, &conf.getstatus_retries,
-     "Number of times to attempt getting status of the buffer", NULL, 0},
-    {"SET_PRIMARY", AUD_OPT_BOOL, &conf.set_primary,
-     "Set the parameters of primary buffer", NULL, 0},
-    {"LATENCY_MILLIS", AUD_OPT_INT, &conf.latency_millis,
-     "(undocumented)", NULL, 0},
-    {"PRIMARY_FREQ", AUD_OPT_INT, &conf.settings.freq,
-     "Primary buffer frequency", NULL, 0},
-    {"PRIMARY_CHANNELS", AUD_OPT_INT, &conf.settings.nchannels,
-     "Primary buffer number of channels (1 - mono, 2 - stereo)", NULL, 0},
-    {"PRIMARY_FMT", AUD_OPT_FMT, &conf.settings.fmt,
-     "Primary buffer format", NULL, 0},
-    {"BUFSIZE_OUT", AUD_OPT_INT, &conf.bufsize_out,
-     "(undocumented)", NULL, 0},
-    {"BUFSIZE_IN", AUD_OPT_INT, &conf.bufsize_in,
-     "(undocumented)", NULL, 0},
-    {NULL, 0, NULL, NULL, NULL, 0}
+    {.name  = "LOCK_RETRIES",
+     .tag   = AUD_OPT_INT,
+     .valp  = &conf.lock_retries,
+     .descr = "Number of times to attempt locking the buffer"},
+    {.name  = "RESTOURE_RETRIES",
+     .tag   = AUD_OPT_INT,
+     .valp  = &conf.restore_retries,
+     .descr = "Number of times to attempt restoring the buffer"},
+    {.name  = "GETSTATUS_RETRIES",
+     .tag   = AUD_OPT_INT,
+     .valp  = &conf.getstatus_retries,
+     .descr = "Number of times to attempt getting status of the buffer"},
+    {.name  = "SET_PRIMARY",
+     .tag   = AUD_OPT_BOOL,
+     .valp  = &conf.set_primary
+     .descr = "Set the parameters of primary buffer"},
+    {.name  = "LATENCY_MILLIS",
+     .tag   = AUD_OPT_INT,
+     .valp  = &conf.latency_millis,
+     .descr = "(undocumented)"},
+    {.name  = "PRIMARY_FREQ",
+     .tag   = AUD_OPT_INT,
+     .valp  = &conf.settings.freq,
+     .descr = "Primary buffer frequency"},
+    {.name  = "PRIMARY_CHANNELS",
+     .tag   = AUD_OPT_INT,
+     .valp  = &conf.settings.nchannels,
+     .descr = "Primary buffer number of channels (1 - mono, 2 - stereo)"},
+    {.name  = "PRIMARY_FMT",
+     .tag   = AUD_OPT_FMT,
+     .valp  = &conf.settings.fmt,
+     .descr = "Primary buffer format"},
+    {.name  = "BUFSIZE_OUT",
+     .tag   = AUD_OPT_INT,
+     .valp  = &conf.bufsize_out,
+     .descr = "(undocumented)"},
+    {.name  = "BUFSIZE_IN",
+     .tag   = AUD_OPT_INT,
+     .valp  = &conf.bufsize_in,
+     .descr = "(undocumented)"},
+    { /* End of list */ }
 };
 
 static struct audio_pcm_ops dsound_pcm_ops = {