src/audio/alsa/SDL_alsa_audio.h
changeset 354 30935e76acb5
parent 297 f6ffac90895c
child 757 4f46fee887fe
     1.1 --- a/src/audio/alsa/SDL_alsa_audio.h	Mon Apr 15 04:53:41 2002 +0000
     1.2 +++ b/src/audio/alsa/SDL_alsa_audio.h	Mon Apr 15 07:38:54 2002 +0000
     1.3 @@ -24,38 +24,27 @@
     1.4  #define _ALSA_PCM_audio_h
     1.5  
     1.6  #include "SDL_sysaudio.h"
     1.7 -#include <sys/asoundlib.h>
     1.8 +#include <alsa/asoundlib.h>
     1.9  
    1.10  /* Hidden "this" pointer for the video functions */
    1.11  #define _THIS	SDL_AudioDevice *this
    1.12  
    1.13  struct SDL_PrivateAudioData {
    1.14  	/* The audio device handle */
    1.15 -	 snd_pcm_t *audio_handle;
    1.16 -
    1.17 -	/* The audio file descriptor */
    1.18 -	int audio_fd;
    1.19 +	snd_pcm_t *pcm_handle;
    1.20  
    1.21  	/* The parent process id, to detect when application quits */
    1.22  	pid_t parent;
    1.23  
    1.24  	/* Raw mixing buffer */
    1.25 -	Uint8 *pcm_buf;
    1.26 -	int    pcm_len;
    1.27 -
    1.28 -	/* Support for audio timing using a timer, in addition to select() */
    1.29 -	float frame_ticks;
    1.30 -	float next_frame;
    1.31 +	Uint8 *mixbuf;
    1.32 +	int    mixlen;
    1.33  };
    1.34 -#define FUDGE_TICKS	10	/* The scheduler overhead ticks per frame */
    1.35  
    1.36  /* Old variable names */
    1.37 -#define audio_handle	(this->hidden->audio_handle)
    1.38 -#define audio_fd		(this->hidden->audio_fd)
    1.39 +#define pcm_handle		(this->hidden->pcm_handle)
    1.40  #define parent			(this->hidden->parent)
    1.41 -#define pcm_buf			(this->hidden->pcm_buf)
    1.42 -#define pcm_len			(this->hidden->pcm_len)
    1.43 -#define frame_ticks		(this->hidden->frame_ticks)
    1.44 -#define next_frame		(this->hidden->next_frame)
    1.45 +#define mixbuf			(this->hidden->mixbuf)
    1.46 +#define mixlen			(this->hidden->mixlen)
    1.47  
    1.48  #endif /* _ALSA_PCM_audio_h */