diff options
| author | Matthew Parlane <parlane@gmail.com> | 2015-05-24 19:54:21 +1000 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2015-05-24 19:54:21 +1000 |
| commit | 5213d85118ea11f447f17528e523e2860a602c45 (patch) | |
| tree | a5b86f7b0312d1bc9306a6299503df75c91de0fa /Source/Core/AudioCommon/AlsaSoundStream.cpp | |
| parent | a6e5fd1e27385bb68844584927d45ec32b99eb55 (diff) | |
| parent | 4695233c985143124000c45a50974bddf690c1d0 (diff) | |
Merge pull request #2445 from lioncash/mixer
AudioCommon: Construct the mixer inside the SoundStream base class.
Diffstat (limited to 'Source/Core/AudioCommon/AlsaSoundStream.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/AlsaSoundStream.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/Core/AudioCommon/AlsaSoundStream.cpp b/Source/Core/AudioCommon/AlsaSoundStream.cpp index 2bcb4ddbfb..b9e92d23a4 100644 --- a/Source/Core/AudioCommon/AlsaSoundStream.cpp +++ b/Source/Core/AudioCommon/AlsaSoundStream.cpp @@ -10,9 +10,8 @@ #define BUFFER_SIZE_MAX 8192 #define BUFFER_SIZE_BYTES (BUFFER_SIZE_MAX*2*2) -AlsaSound::AlsaSound(CMixer *mixer) - : SoundStream(mixer) - , m_thread_status(ALSAThreadStatus::STOPPED) +AlsaSound::AlsaSound() + : m_thread_status(ALSAThreadStatus::STOPPED) , handle(nullptr) , frames_to_deliver(FRAME_COUNT_MIN) { |