Skip to content

Mixer refactor #4894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PhysSong merged 52 commits into from
Dec 11, 2020
Merged

Mixer refactor #4894

Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
3c9e370
Fix merge conflicts
M374LX Nov 27, 2020
017c53d
New swapBuffers method
M374LX Mar 13, 2019
aecafdd
Simplify Mixer buffers
M374LX Mar 13, 2019
9df68a5
Handle tempo change in mixer
M374LX Mar 13, 2019
2d01e3e
Swap buffers with std::swap()
M374LX Mar 14, 2019
5a13c79
Replace verbose for by while
M374LX Mar 16, 2019
ac8fc9a
Remove underscore parameter prefixes
M374LX Mar 16, 2019
62d71e5
Fixes
M374LX Nov 27, 2020
52d520a
Use range-based "for" loop
M374LX Nov 27, 2020
7a8cb43
Revert "Handle tempo change in mixer"
M374LX Nov 29, 2020
e3f1dc4
Rename MidiTime to TimePos (fixes)
M374LX Nov 29, 2020
5d9d9ec
Update style on new Mixer methods
M374LX Nov 29, 2020
0d66ef7
Update src/core/Mixer.cpp
M374LX Nov 30, 2020
27fd6d5
Update include/Mixer.h
M374LX Nov 30, 2020
e9d207c
Update include/Mixer.h
M374LX Nov 30, 2020
3b65290
Update src/core/Mixer.cpp
M374LX Nov 30, 2020
a5dd0bc
Update src/core/Mixer.cpp
M374LX Nov 30, 2020
07f9cc5
Update include/Mixer.h
M374LX Nov 30, 2020
07bcd94
Update include/Mixer.h
M374LX Nov 30, 2020
e7425a2
Update include/Mixer.h
M374LX Nov 30, 2020
dbed523
Update src/core/Mixer.cpp
M374LX Nov 30, 2020
ac56d3f
Update src/core/Mixer.cpp
M374LX Nov 30, 2020
9d0c89c
Update src/core/Mixer.cpp
M374LX Nov 30, 2020
7e59f4e
Update include/Mixer.h
M374LX Nov 30, 2020
d5f5ef8
Update include/Mixer.h
M374LX Nov 30, 2020
87ac69c
Update include/Mixer.h
M374LX Nov 30, 2020
4f320a4
Update include/Mixer.h
M374LX Nov 30, 2020
c49809f
Update include/Mixer.h
M374LX Nov 30, 2020
b3c253e
Update include/Mixer.h
M374LX Nov 30, 2020
2f6974d
Update include/Mixer.h
M374LX Nov 30, 2020
783e8fa
Update include/Mixer.h
M374LX Nov 30, 2020
4c6a0aa
Update src/core/Mixer.cpp
M374LX Nov 30, 2020
6b44c44
Update include/Mixer.h
M374LX Nov 30, 2020
675f0f8
Update src/core/Mixer.cpp
M374LX Nov 30, 2020
2372148
Update src/core/Mixer.cpp
M374LX Nov 30, 2020
94eef9f
Update src/core/Mixer.cpp
M374LX Nov 30, 2020
5d800ea
Update src/core/Mixer.cpp
M374LX Nov 30, 2020
310b11a
Update src/core/Mixer.cpp
M374LX Nov 30, 2020
85aad06
Update src/core/Mixer.cpp
M374LX Nov 30, 2020
77f41b7
Update src/core/Mixer.cpp
M374LX Nov 30, 2020
509a8f0
Update src/core/Mixer.cpp
M374LX Nov 30, 2020
a9930a7
Update src/core/Mixer.cpp
M374LX Nov 30, 2020
05e3043
Update src/core/Mixer.cpp
M374LX Nov 30, 2020
7279325
Update src/core/Mixer.cpp
M374LX Nov 30, 2020
dd043c6
Update src/core/Mixer.cpp
M374LX Nov 30, 2020
d8b5b7e
Update src/core/Mixer.cpp
M374LX Nov 30, 2020
b5f478a
Update src/core/Mixer.cpp
M374LX Nov 30, 2020
aa4e433
Update src/core/Mixer.cpp
M374LX Nov 30, 2020
b7dc727
Update src/core/Mixer.cpp
M374LX Nov 30, 2020
4875451
Update src/core/Mixer.cpp
M374LX Nov 30, 2020
72b879a
Use single lines
M374LX Nov 30, 2020
a200ce5
Use static_cast
M374LX Nov 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update src/core/Mixer.cpp 
Co-authored-by: Kevin Zander <veratil@gmail.com>
  • Loading branch information
@M374LX @Veratil
M374LX and Veratil authored Nov 30, 2020
commit 675f0f8fcce5b004dbf36aa22ddfd5921e0ed654
4 changes: 2 additions & 2 deletions src/core/Mixer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ Mixer::Mixer( bool renderOnly ) :
m_framesPerPeriod( DEFAULT_BUFFER_SIZE ),
m_inputBufferRead( 0 ),
m_inputBufferWrite( 1 ),
m_outputBufferRead( NULL ),
m_outputBufferWrite( NULL ),
m_outputBufferRead(nullptr),
m_outputBufferWrite(nullptr),
m_workers(),
m_numWorkers( QThread::idealThreadCount()-1 ),
m_newPlayHandles( PlayHandle::MaxNumber ),
Expand Down