diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-09-14 14:32:27 -0700 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2009-09-14 14:32:27 -0700 |
| commit | 5d8f37ad78fc66901af50c762029a501561f3b23 (patch) | |
| tree | 206790f8f21000850a98c4f9590a79e779106278 /audio/coreaudio.c | |
| parent | cd059b15f2c7df69f4a087bd66900eb172e41d1c (diff) | |
| download | external_qemu-5d8f37ad78fc66901af50c762029a501561f3b23.zip external_qemu-5d8f37ad78fc66901af50c762029a501561f3b23.tar.gz external_qemu-5d8f37ad78fc66901af50c762029a501561f3b23.tar.bz2 | |
Merge upstream QEMU 10.0.50 into the Android source tree.
This change integrates many changes from the upstream QEMU sources.
Its main purpose is to enable correct ARMv6 and ARMv7 support to the
Android emulator. Due to the nature of the upstream code base, this
unfortunately also required changes to many other parts of the source.
Note that to ensure easier integrations in the future, some source files
and directories that have heavy Android-specific customization have been
renamed with an -android suffix. The original files are still there for
easier integration tracking, but *never* compiled. For example:
net.c net-android.c
qemu-char.c qemu-char-android.c
slirp/ slirp-android/
etc...
Tested on linux-x86, darwin-x86 and windows host machines.
Diffstat (limited to 'audio/coreaudio.c')
| -rw-r--r-- | audio/coreaudio.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/audio/coreaudio.c b/audio/coreaudio.c index f23ebee..8abe0c4 100644 --- a/audio/coreaudio.c +++ b/audio/coreaudio.c @@ -283,7 +283,7 @@ coreaudio_voice_fini (coreaudioVoice* core) static int coreaudio_voice_init (coreaudioVoice* core, - audsettings_t* as, + struct audsettings* as, int frameSize, AudioDeviceIOProc ioproc, void* hw, @@ -510,7 +510,7 @@ audioOutDeviceIOProc( HWVoiceOut *hw = hwptr; coreaudioVoice *core = CORE_OUT(hw); int rpos, live; - st_sample_t *src; + struct st_sample *src; #ifndef FLOAT_MIXENG #ifdef RECIPROCAL const float scale = 1.f / UINT_MAX; @@ -568,7 +568,7 @@ coreaudio_write (SWVoiceOut *sw, void *buf, int len) } static int -coreaudio_init_out (HWVoiceOut *hw, audsettings_t *as) +coreaudio_init_out (HWVoiceOut *hw, struct audsettings *as) { coreaudioVoice* core = CORE_OUT(hw); int err; @@ -654,7 +654,7 @@ audioInDeviceIOProc( HWVoiceIn *hw = hwptr; coreaudioVoice *core = CORE_IN(hw); int wpos, avail; - st_sample_t *dst; + struct st_sample *dst; #ifndef FLOAT_MIXENG #ifdef RECIPROCAL const float scale = 1.f / UINT_MAX; @@ -718,7 +718,7 @@ coreaudio_read (SWVoiceIn *sw, void *buf, int len) } static int -coreaudio_init_in (HWVoiceIn *hw, audsettings_t *as) +coreaudio_init_in (HWVoiceIn *hw, struct audsettings *as) { coreaudioVoice* core = CORE_IN(hw); int err; |