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

Change-Id: I8a4a71ac65b08e6e17f26c942f67a15b85211115

1 files changed, 59 insertions, 0 deletions

diff --git a/distrib/sdl-1.2.15/src/audio/dma/SDL_dmaaudio.h b/distrib/sdl-1.2.15/src/audio/dma/SDL_dmaaudio.h
new file mode 100644
index 0000000..9a45f73
--- /dev/null
+++ b/distrib/sdl-1.2.15/src/audio/dma/SDL_dmaaudio.h
@@ -0,0 +1,59 @@
+/*
+    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_dspaudio_h
+#define _SDL_dspaudio_h
+
+#include "../SDL_sysaudio.h"
+
+/* Hidden "this" pointer for the video functions */
+#define _THIS	SDL_AudioDevice *this
+
+struct SDL_PrivateAudioData {
+	/* The file descriptor for the audio device */
+	int audio_fd;
+
+	/* The parent process id, to detect when application quits */
+	pid_t parent;
+
+	/* Raw mixing buffer */
+	Uint8 *dma_buf;
+	int    dma_len;
+	int num_buffers;
+
+	/* Support for audio timing using a timer, in addition to select() */
+	float frame_ticks;
+	float next_frame;
+};
+#define FUDGE_TICKS	10	/* The scheduler overhead ticks per frame */
+
+/* Old variable names */
+#define audio_fd		(this->hidden->audio_fd)
+#define parent			(this->hidden->parent)
+#define dma_buf			(this->hidden->dma_buf)
+#define dma_len			(this->hidden->dma_len)
+#define num_buffers		(this->hidden->num_buffers)
+#define frame_ticks		(this->hidden->frame_ticks)
+#define next_frame		(this->hidden->next_frame)
+
+#endif /* _SDL_dspaudio_h */