diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-02-17 09:40:43 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-17 09:40:43 -0800 |
| commit | 1b094ee8f7fe7eca65bf3d2f983ba95eef6db93d (patch) | |
| tree | 5b3509943e54e317cc30a56cdf1712dc50d7528a /services/audioflinger/AudioMixer.h | |
| parent | 29dcfcd66d884801e9907d04e81d407ee770802c (diff) | |
| parent | a111792f1314479c649d1d44c30c2caf70c00c2a (diff) | |
| download | frameworks_av-1b094ee8f7fe7eca65bf3d2f983ba95eef6db93d.zip frameworks_av-1b094ee8f7fe7eca65bf3d2f983ba95eef6db93d.tar.gz frameworks_av-1b094ee8f7fe7eca65bf3d2f983ba95eef6db93d.tar.bz2 | |
Merge "Simplify code"
Diffstat (limited to 'services/audioflinger/AudioMixer.h')
| -rw-r--r-- | services/audioflinger/AudioMixer.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h index f442671..c3174ae 100644 --- a/services/audioflinger/AudioMixer.h +++ b/services/audioflinger/AudioMixer.h @@ -114,7 +114,6 @@ private: struct state_t; struct track_t; - typedef void (*mix_t)(state_t* state, int64_t pts); typedef void (*hook_t)(track_t* t, int32_t* output, size_t numOutFrames, int32_t* temp, int32_t* aux); static const int BLOCKSIZE = 16; // 4 cache lines @@ -167,7 +166,7 @@ private: uint32_t enabledTracks; uint32_t needsChanged; size_t frameCount; - mix_t hook; + void (*hook)(state_t* state, int64_t pts); // one of process__*, never NULL int32_t *outputTemp; int32_t *resampleTemp; int32_t reserved[2]; |