From 0a783f97df41bcfd46586782ab690cf3f032b23d Mon Sep 17 00:00:00 2001 From: "munkyu.im" Date: Thu, 20 Sep 2012 17:24:31 +0900 Subject: [PATCH] audio/winwave: remove defines Because qemu mainstream apply and accept the patch I sent before (title: audio/winwave: previous audio buffer should be flushed git: 13ef7), Do not need defines any more. So removes it. --- audio/winwaveaudio.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/audio/winwaveaudio.c b/audio/winwaveaudio.c index 3d6f8f7..72babbf 100644 --- a/audio/winwaveaudio.c +++ b/audio/winwaveaudio.c @@ -72,7 +72,7 @@ static void winwave_log_mmresult (MMRESULT mr) break; case MMSYSERR_NOMEM: - str = "Unable to allocate or locl memory"; + str = "Unable to allocate or lock memory"; break; case WAVERR_SYNC: @@ -349,33 +349,16 @@ static int winwave_ctl_out (HWVoiceOut *hw, int cmd, ...) else { hw->poll_mode = 0; } -#if defined(CONFIG_MARU) - wave->paused = 0; -#else - if (wave->paused) { - mr = waveOutRestart (wave->hwo); - if (mr != MMSYSERR_NOERROR) { - winwave_logerr (mr, "waveOutRestart"); - } - wave->paused = 0; - } -#endif + wave->paused = 0; } return 0; case VOICE_DISABLE: if (!wave->paused) { -#if defined(CONFIG_MARU) - mr = waveOutReset (wave->hwo); + mr = waveOutReset (wave->hwo); if (mr != MMSYSERR_NOERROR) { winwave_logerr (mr, "waveOutReset"); } -#else - mr = waveOutPause (wave->hwo); - if (mr != MMSYSERR_NOERROR) { - winwave_logerr (mr, "waveOutPause"); - } -#endif else { wave->paused = 1; } -- 2.7.4