commit 3b4934caa1e3de9066f95ac109b1346e4c217b9c
author Konstantinos Menychtas <kmenychtas@google.com> Fri Aug 21 09:56:17 2015 -0700
committer Konstantinos Menychtas <kmenychtas@google.com> Wed Aug 26 13:49:59 2015 -0700
tree 1b935ac6c55879e1e056796ffe5cdc2b515dfbe0
parent 2239f8bed7db0cedc85b02bae7de2672f244fcfb

goldfish_audio: Cleanup of goldfish_audio_realize function

Cleaning up the layout of goldfish_audio_realize() function
to convey the code paths more clearly.

Change-Id: I501c8ade795cf211f7364e1bdd11b70676e94020

hw/audio/goldfish_audio.c

diff --git a/hw/audio/goldfish_audio.c b/hw/audio/goldfish_audio.c
index ad1bf7b..521fee9 100644
--- a/hw/audio/goldfish_audio.c
+++ b/hw/audio/goldfish_audio.c
@@ -474,12 +474,11 @@
 
     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 @@
             );
         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 @@
             );
         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[] = {