Mercurial > sdl-ios-xcode
diff src/audio/pulseaudio/SDL_pulseaudio.h @ 3672:878d8adf2fde
Merged r4210:5510 from branches/SDL-1.2/src/audio/pulse: PulseAudio updates.
This pulls all the PulseAudio reworking that was done for 1.2.14 into 1.3.
Fixes Bugzilla #801.
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Sun, 17 Jan 2010 06:14:04 +0000 |
| parents | 99210400e8b9 |
| children | f7b03b6838cb |
line wrap: on
line diff
--- a/src/audio/pulseaudio/SDL_pulseaudio.h Fri Jan 15 20:05:49 2010 +0000 +++ b/src/audio/pulseaudio/SDL_pulseaudio.h Sun Jan 17 06:14:04 2010 +0000 @@ -29,25 +29,20 @@ #include "../SDL_sysaudio.h" /* Hidden "this" pointer for the audio functions */ -#define _THIS SDL_AudioDevice *this +#define _THIS SDL_AudioDevice *this struct SDL_PrivateAudioData { - /* The audio stream handle */ - pa_simple *stream; - - /* The parent process id, to detect when application quits */ - pid_t parent; + /* pulseaudio structures */ + pa_mainloop *mainloop; + pa_mainloop_api *mainloop_api; + pa_context *context; + pa_stream *stream; /* Raw mixing buffer */ Uint8 *mixbuf; int mixlen; - - /* 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 */ #endif /* _SDL_pulseaudio_h */