diff options
| author | JosJuice <josjuice@gmail.com> | 2017-06-27 08:15:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-27 08:15:02 +0200 |
| commit | 4ad46f1c7c9fba8de4214935fc4dea6a1c56cd3d (patch) | |
| tree | 4c8410fffa9eab8efbf1a464634a28e5e1dd0a53 /Source/Core/AudioCommon/OpenSLESStream.cpp | |
| parent | aa020040f6a1e47950d81d567a91101a42647901 (diff) | |
| parent | b2c9d6d21746cc23ae092f772194346eadef7aa0 (diff) | |
Merge pull request #5701 from ligfx/renamecmixertomixer
Rename CMixer to Mixer
Diffstat (limited to 'Source/Core/AudioCommon/OpenSLESStream.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/OpenSLESStream.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/AudioCommon/OpenSLESStream.cpp b/Source/Core/AudioCommon/OpenSLESStream.cpp index 339af3a5ad..a65e4407a8 100644 --- a/Source/Core/AudioCommon/OpenSLESStream.cpp +++ b/Source/Core/AudioCommon/OpenSLESStream.cpp @@ -24,7 +24,7 @@ static SLPlayItf bqPlayerPlay; static SLAndroidSimpleBufferQueueItf bqPlayerBufferQueue; static SLMuteSoloItf bqPlayerMuteSolo; static SLVolumeItf bqPlayerVolume; -static CMixer* g_mixer; +static Mixer* g_mixer; #define BUFFER_SIZE 512 #define BUFFER_SIZE_IN_SAMPLES (BUFFER_SIZE / 2) |