audio clean up (initial patch by malc)

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1131 c046a42c-6fe2-441c-8c8c-71466251a162

1 files changed, 16 insertions, 3 deletions

diff --git a/audio/wavaudio.c b/audio/wavaudio.c
index dee4a060dd..f8d6acb4a2 100644
--- a/audio/wavaudio.c
+++ b/audio/wavaudio.c
@@ -23,9 +23,22 @@
  */
 #include "vl.h"
 
-#define AUDIO_CAP "wav"
-#include "audio/audio.h"
-#include "audio/wavaudio.h"
+#include "audio/audio_int.h"
+
+typedef struct WAVVoice {
+    HWVoice hw;
+    QEMUFile *f;
+    int64_t old_ticks;
+    void *pcm_buf;
+    int total_samples;
+} WAVVoice;
+
+#define dolog(...) AUD_log ("wav", __VA_ARGS__)
+#ifdef DEBUG
+#define ldebug(...) dolog (__VA_ARGS__)
+#else
+#define ldebug(...)
+#endif
 
 static struct {
     const char *wav_path;