diff options
author | Jesse Hall <jessehall@google.com> | 2012-07-09 11:42:54 -0700 |
---|---|---|
committer | Jesse Hall <jessehall@google.com> | 2012-07-22 00:35:08 -0700 |
commit | e4c5d95ed37611acc6a186522315195b4ebfb9ef (patch) | |
tree | b39ee901bb528b7e3593117cde724ef75d438b67 /distrib/sdl-1.2.15/src/audio/windib/SDL_dibaudio.h | |
parent | 9682c8870b8ff5e4ac2e4c70b759f791c6f38c1f (diff) | |
download | external_qemu-e4c5d95ed37611acc6a186522315195b4ebfb9ef.zip external_qemu-e4c5d95ed37611acc6a186522315195b4ebfb9ef.tar.gz external_qemu-e4c5d95ed37611acc6a186522315195b4ebfb9ef.tar.bz2 |
Apply Android changes from sdl-1.2.12 to sdl-1.2.15
These changes come from diffing Android's sdl-1.2.12 tree against a
pure upstream sdl-1.2.12 tree, and then manually applying those
differences to the sdl-1.2.15 tree.
Change-Id: I05fa6e8004bb629fa2482f092b6ab127b7e51e73
Diffstat (limited to 'distrib/sdl-1.2.15/src/audio/windib/SDL_dibaudio.h')
-rw-r--r-- | distrib/sdl-1.2.15/src/audio/windib/SDL_dibaudio.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/distrib/sdl-1.2.15/src/audio/windib/SDL_dibaudio.h b/distrib/sdl-1.2.15/src/audio/windib/SDL_dibaudio.h index d2c6228..16fd078 100644 --- a/distrib/sdl-1.2.15/src/audio/windib/SDL_dibaudio.h +++ b/distrib/sdl-1.2.15/src/audio/windib/SDL_dibaudio.h @@ -33,17 +33,21 @@ struct SDL_PrivateAudioData { HWAVEOUT sound; - HANDLE audio_sem; - Uint8 *mixbuf; /* The raw allocated mixing buffer */ + CRITICAL_SECTION audio_cs; + HANDLE audio_event; + Uint8* mixbuf; /* The raw allocated mixing buffer */ WAVEHDR wavebuf[NUM_BUFFERS]; /* Wave audio fragments */ + int cur_buffer; int next_buffer; }; /* Old variable names */ #define sound (this->hidden->sound) -#define audio_sem (this->hidden->audio_sem) +#define audio_event (this->hidden->audio_event) +#define audio_cs (this->hidden->audio_cs) #define mixbuf (this->hidden->mixbuf) #define wavebuf (this->hidden->wavebuf) +#define cur_buffer (this->hidden->cur_buffer) #define next_buffer (this->hidden->next_buffer) #endif /* _SDL_lowaudio_h */ |