summaryrefslogtreecommitdiff
path: root/audio/audio.c
diff options
context:
space:
mode:
authorbk0121.shin <bk0121.shin@samsung.com>2015-10-29 16:53:24 +0900
committerSeokYeon Hwang <syeon.hwang@samsung.com>2015-10-30 13:16:33 +0900
commit7c3abec2d8364212ffca1b14057f402f3479fabd (patch)
tree14f7948dc877ab0eb7f9859ad45fefec97421ed6 /audio/audio.c
parent40802012a9069f4bcce4e330ad637ad244184fa6 (diff)
downloadqemu-7c3abec2d8364212ffca1b14057f402f3479fabd.tar.gz
qemu-7c3abec2d8364212ffca1b14057f402f3479fabd.tar.bz2
qemu-7c3abec2d8364212ffca1b14057f402f3479fabd.zip
audio: remove W/A codes for winwaveaudio
When sound is played without connecting of speaker on Windows, because winwaveaudio made process lock-up, the W/A were applied. However, qemu of tizen_3.0 does not support winwaveaudio, but, dsoundaudio for Windows host. And, as audio codes of qemu are updated, the W/A is no more valid code. Therefore, the W/A codes are removed. Change-Id: I63f4d73646f09b2af41238ce34102667f05f1d5e Signed-off-by: bk0121.shin <bk0121.shin@samsung.com>
Diffstat (limited to 'audio/audio.c')
-rw-r--r--audio/audio.c31
1 files changed, 0 insertions, 31 deletions
diff --git a/audio/audio.c b/audio/audio.c
index ad8804a2c1..4636a88940 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -37,12 +37,6 @@
#define SW_NAME(sw) (sw)->name ? (sw)->name : "unknown"
-
-#ifdef CONFIG_MARU
-#include "../tizen/src/debug_ch.h"
-MULTI_DEBUG_CHANNEL(tizen, qemu_audio);
-#endif
-
/* Order of CONFIG_AUDIO_DRIVERS is import.
The 1st one is the one used by default, that is the reason
that we generate the list.
@@ -1862,31 +1856,6 @@ static void audio_init (void)
}
}
-#ifdef CONFIG_MARU
-// Try to avoid certain wave out locking action in recent Windows...
-// If wave out is locked (because nothing is wired to output jack, ...),
-// QEMU can find voice out device, but open will failed. And it will cause guest audio lock-up.
-// So, we test whether opening is success or not.
-// It can not prevent lock-up caused by runtime voice out lock.
-// To prevent it, QEMU audio backend structure must be changed.
-// We should do it, but now we used simple fix temporarily.
- HWVoiceOut* hw = audio_calloc(AUDIO_FUNC, 1, s->drv->voice_size_out);
- if (!hw) {
- dolog ("Can not allocate voice `%s' size %d\n",
- s->drv->name, s->drv->voice_size_out);
- }
- if(s->drv->pcm_ops->init_out(hw, &conf.fixed_out.settings, s->drv)) {
- INFO("Host audio out [%s] is malfunction. Change to noaudio driver\n",
- s->drv->name);
- done = 0;
- }
- else {
- INFO("Host audio out [%s] is normal.\n", s->drv->name);
- s->drv->pcm_ops->fini_out(hw);
- }
- g_free(hw);
-#endif
-
if (!done) {
done = !audio_driver_init (s, &no_audio_driver);
if (!done) {