diff src/audio/alsa/SDL_alsa_audio.h @ 354:30935e76acb5

Updated ALSA audio support for ALSA 0.9
author Sam Lantinga <slouken@libsdl.org>
date Mon, 15 Apr 2002 07:38:54 +0000
parents f6ffac90895c
children 4f46fee887fe
line wrap: on
line diff
--- a/src/audio/alsa/SDL_alsa_audio.h	Mon Apr 15 04:53:41 2002 +0000
+++ b/src/audio/alsa/SDL_alsa_audio.h	Mon Apr 15 07:38:54 2002 +0000
@@ -24,38 +24,27 @@
 #define _ALSA_PCM_audio_h
 
 #include "SDL_sysaudio.h"
-#include <sys/asoundlib.h>
+#include <alsa/asoundlib.h>
 
 /* Hidden "this" pointer for the video functions */
 #define _THIS	SDL_AudioDevice *this
 
 struct SDL_PrivateAudioData {
 	/* The audio device handle */
-	 snd_pcm_t *audio_handle;
-
-	/* The audio file descriptor */
-	int audio_fd;
+	snd_pcm_t *pcm_handle;
 
 	/* The parent process id, to detect when application quits */
 	pid_t parent;
 
 	/* Raw mixing buffer */
-	Uint8 *pcm_buf;
-	int    pcm_len;
-
-	/* Support for audio timing using a timer, in addition to select() */
-	float frame_ticks;
-	float next_frame;
+	Uint8 *mixbuf;
+	int    mixlen;
 };
-#define FUDGE_TICKS	10	/* The scheduler overhead ticks per frame */
 
 /* Old variable names */
-#define audio_handle	(this->hidden->audio_handle)
-#define audio_fd		(this->hidden->audio_fd)
+#define pcm_handle		(this->hidden->pcm_handle)
 #define parent			(this->hidden->parent)
-#define pcm_buf			(this->hidden->pcm_buf)
-#define pcm_len			(this->hidden->pcm_len)
-#define frame_ticks		(this->hidden->frame_ticks)
-#define next_frame		(this->hidden->next_frame)
+#define mixbuf			(this->hidden->mixbuf)
+#define mixlen			(this->hidden->mixlen)
 
 #endif /* _ALSA_PCM_audio_h */