From: malc <av1474@comtv.ru>
Date: Wed, 18 Nov 2009 16:15:19 +0000 (+0300)
Subject: audio: Remove conditional around sw which can not be NULL
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~9700
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7cbb28ed5dad73fc39b9cbc94f0e363e9ead6919;p=sdk%2Femulator%2Fqemu.git

audio: Remove conditional around sw which can not be NULL

Noticed by Steve Grubb.

Signed-off-by: malc <av1474@comtv.ru>
---

diff --git a/audio/audio_template.h b/audio/audio_template.h
index 14c648c..1a4707b 100644
--- a/audio/audio_template.h
+++ b/audio/audio_template.h
@@ -485,32 +485,30 @@ SW *glue (AUD_open_, TYPE) (
         }
     }
 
-    if (sw) {
-        sw->card = card;
-        sw->vol = nominal_volume;
-        sw->callback.fn = callback_fn;
-        sw->callback.opaque = callback_opaque;
+    sw->card = card;
+    sw->vol = nominal_volume;
+    sw->callback.fn = callback_fn;
+    sw->callback.opaque = callback_opaque;
 
 #ifdef DAC
-        if (live) {
-            int mixed =
-                (live << old_sw->info.shift)
-                * old_sw->info.bytes_per_second
-                / sw->info.bytes_per_second;
+    if (live) {
+        int mixed =
+            (live << old_sw->info.shift)
+            * old_sw->info.bytes_per_second
+            / sw->info.bytes_per_second;
 
 #ifdef DEBUG_PLIVE
-            dolog ("Silence will be mixed %d\n", mixed);
+        dolog ("Silence will be mixed %d\n", mixed);
 #endif
-            sw->total_hw_samples_mixed += mixed;
-        }
+        sw->total_hw_samples_mixed += mixed;
+    }
 #endif
 
 #ifdef DEBUG_AUDIO
-        dolog ("%s\n", name);
-        audio_pcm_print_info ("hw", &sw->hw->info);
-        audio_pcm_print_info ("sw", &sw->info);
+    dolog ("%s\n", name);
+    audio_pcm_print_info ("hw", &sw->hw->info);
+    audio_pcm_print_info ("sw", &sw->info);
 #endif
-    }
 
     return sw;