commit ca9cc28c62a2c2877186569f4ab0cf1034502a73
author balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> Mon Jan 14 04:24:29 2008 +0000
committer balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> Mon Jan 14 04:24:29 2008 +0000
tree d46c878d8f03c294452d625c851d6bb3668c5087
parent b34d259a81500d75e4cf435f1e8b262ba7e1421a

pthreads-based audio and miscellaneous audio clean-up (malc).
ESD support (malc, Frederick Reeve).


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

audio/dsound_template.h

diff --git a/audio/dsound_template.h b/audio/dsound_template.h
index 0896b04..d517c90 100644
--- a/audio/dsound_template.h
+++ b/audio/dsound_template.h
@@ -23,16 +23,20 @@
  */
 #ifdef DSBTYPE_IN
 #define NAME "capture buffer"
+#define NAME2 "DirectSoundCapture"
 #define TYPE in
 #define IFACE IDirectSoundCaptureBuffer
 #define BUFPTR LPDIRECTSOUNDCAPTUREBUFFER
 #define FIELD dsound_capture_buffer
+#define FIELD2 dsound_capture
 #else
 #define NAME "playback buffer"
+#define NAME2 "DirectSound"
 #define TYPE out
 #define IFACE IDirectSoundBuffer
 #define BUFPTR LPDIRECTSOUNDBUFFER
 #define FIELD dsound_buffer
+#define FIELD2 dsound
 #endif
 
 static int glue (dsound_unlock_, TYPE) (
@@ -192,6 +196,11 @@
     DSBCAPS bc;
 #endif
 
+    if (!s->FIELD2) {
+        dsound_logerr ("Attempt to initialize voice without " NAME2 " object");
+        return -1;
+    }
+
     err = waveformat_from_audio_settings (&wfx, as);
     if (err) {
         return -1;