diff options
| author | Konstantinos Menychtas <kmenychtas@google.com> | 2015-08-21 09:56:17 -0700 |
|---|---|---|
| committer | Konstantinos Menychtas <kmenychtas@google.com> | 2015-08-26 13:49:59 -0700 |
| commit | 3b4934caa1e3de9066f95ac109b1346e4c217b9c (patch) | |
| tree | 1b935ac6c55879e1e056796ffe5cdc2b515dfbe0 | |
| parent | 2239f8bed7db0cedc85b02bae7de2672f244fcfb (diff) | |
| download | qemu-android-emu-1.4-release.tar.gz | |
goldfish_audio: Cleanup of goldfish_audio_realize functionemu-1.4-release
Cleaning up the layout of goldfish_audio_realize() function
to convey the code paths more clearly.
Change-Id: I501c8ade795cf211f7364e1bdd11b70676e94020
| -rw-r--r-- | hw/audio/goldfish_audio.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/hw/audio/goldfish_audio.c b/hw/audio/goldfish_audio.c index ad1bf7b8fc..521fee92a2 100644 --- a/hw/audio/goldfish_audio.c +++ b/hw/audio/goldfish_audio.c @@ -474,12 +474,11 @@ static void goldfish_audio_realize(DeviceState *dev, Error **errp) AUD_register_card( "goldfish_audio", &s->card); - as.freq = 44100; - as.nchannels = 2; - as.fmt = AUD_FMT_S16; - as.endianness = AUDIO_HOST_ENDIANNESS; - if (s->output) { + as.freq = 44100; + as.nchannels = 2; + as.fmt = AUD_FMT_S16; + as.endianness = AUDIO_HOST_ENDIANNESS; s->voice = AUD_open_out ( &s->card, NULL, @@ -490,15 +489,17 @@ static void goldfish_audio_realize(DeviceState *dev, Error **errp) ); if (!s->voice) { error_report("warning: opening audio output failed"); + } else { + goldfish_audio_buff_init( &s->out_buffs[0] ); + goldfish_audio_buff_init( &s->out_buffs[1] ); } } - as.freq = 8000; - as.nchannels = 1; - as.fmt = AUD_FMT_S16; - as.endianness = AUDIO_HOST_ENDIANNESS; - if (s->input) { + as.freq = 8000; + as.nchannels = 1; + as.fmt = AUD_FMT_S16; + as.endianness = AUDIO_HOST_ENDIANNESS; s->voicein = AUD_open_in ( &s->card, NULL, @@ -509,12 +510,10 @@ static void goldfish_audio_realize(DeviceState *dev, Error **errp) ); if (!s->voicein) { error_report("warning: opening audio input failed"); + } else { + goldfish_audio_buff_init( &s->in_buff ); } } - - goldfish_audio_buff_init( &s->out_buffs[0] ); - goldfish_audio_buff_init( &s->out_buffs[1] ); - goldfish_audio_buff_init( &s->in_buff ); } static Property goldfish_audio_properties[] = { |