Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/qemu into mr1-staging

Change-Id: I8a4a71ac65b08e6e17f26c942f67a15b85211115

1 files changed, 63 insertions, 0 deletions

diff --git a/distrib/sdl-1.2.15/src/audio/dart/SDL_dart.h b/distrib/sdl-1.2.15/src/audio/dart/SDL_dart.h
new file mode 100644
index 0000000..68c27bd
--- /dev/null
+++ b/distrib/sdl-1.2.15/src/audio/dart/SDL_dart.h
@@ -0,0 +1,63 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2012 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#ifndef _SDL_lowaudio_h
+#define _SDL_lowaudio_h
+
+#define INCL_TYPES
+#define INCL_DOSSEMAPHORES
+#define INCL_DOSRESOURCES
+#define INCL_DOSMISC
+#define INCL_DOSERRORS
+
+#define INCL_OS2MM
+#define INCL_MMIOOS2
+#define INCL_MCIOS2
+#include <os2.h>
+#include <os2me.h>     // DART stuff and MMIO stuff
+
+#include "../SDL_sysaudio.h"
+
+/* Hidden "this" pointer for the audio functions */
+#define _THIS	SDL_AudioDevice *_this
+
+/* The DirectSound objects */
+struct SDL_PrivateAudioData
+{
+  int iCurrDeviceOrd;
+  int iCurrFreq;
+  int iCurrBits;
+  int iCurrChannels;
+  int iCurrNumBufs;
+  int iCurrBufSize;
+
+  int iLastPlayedBuf;
+  int iNextFreeBuffer;
+
+  MCI_BUFFER_PARMS BufferParms;     // Sound buffer parameters
+  MCI_MIX_BUFFER *pMixBuffers;      // Sound buffers
+  MCI_MIXSETUP_PARMS MixSetupParms; // Mixer setup parameters
+  HEV hevAudioBufferPlayed;         // Event semaphore to indicate that an audio buffer has been played by DART
+};
+
+#endif /* _SDL_lowaudio_h */