diff options
| author | Juan Quintela <quintela@redhat.com> | 2009-07-20 20:57:00 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-07-22 10:58:47 -0500 |
| commit | 14658cd151da8e85e04946ac41f02676d53bc12d (patch) | |
| tree | 2c3ac3a768d77d86965e21433f15f04609ba90af /audio | |
| parent | 777aec7ac91b1306d77897aafc8097a87bf4a672 (diff) | |
use struct initializer for audio.c
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/audio.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/audio/audio.c b/audio/audio.c index 72a18ec03..f4eca6e9c 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -60,45 +60,45 @@ static struct { int plive; int log_to_monitor; } conf = { - { /* DAC fixed settings */ - 1, /* enabled */ - 1, /* nb_voices */ - 1, /* greedy */ - { - 44100, /* freq */ - 2, /* nchannels */ - AUD_FMT_S16, /* fmt */ - AUDIO_HOST_ENDIANNESS + .fixed_out = { /* DAC fixed settings */ + .enabled = 1, + .nb_voices = 1, + .greedy = 1, + .settings = { + .freq = 44100, + .nchannels = 2, + .fmt = AUD_FMT_S16, + .endianness = AUDIO_HOST_ENDIANNESS, } }, - { /* ADC fixed settings */ - 1, /* enabled */ - 1, /* nb_voices */ - 1, /* greedy */ - { - 44100, /* freq */ - 2, /* nchannels */ - AUD_FMT_S16, /* fmt */ - AUDIO_HOST_ENDIANNESS + .fixed_in = { /* ADC fixed settings */ + .enabled = 1, + .nb_voices = 1, + .greedy = 1, + .settings = { + .freq = 44100, + .nchannels = 2, + .fmt = AUD_FMT_S16, + .endianness = AUDIO_HOST_ENDIANNESS, } }, - { 250 }, /* period */ - 0, /* plive */ - 0 /* log_to_monitor */ + .period = { .ticks = 250 }, + .plive = 0, + .log_to_monitor = 0, }; static AudioState glob_audio_state; struct mixeng_volume nominal_volume = { - 0, + .mute = 0, #ifdef FLOAT_MIXENG - 1.0, - 1.0 + .r = 1.0, + .l = 1.0, #else - 1ULL << 32, - 1ULL << 32 + .r = 1ULL << 32, + .l = 1ULL << 32, #endif }; |