Skip to content
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.

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

Mixer refactor #4894

Merged
merged 52 commits into from
Dec 11, 2020
Merged

Mixer refactor #4894

merged 52 commits into from
Dec 11, 2020

Conversation

M374LX
Copy link
Contributor

@M374LX M374LX commented Mar 13, 2019

Some refactoring of the Mixer class.

74fc3f2 moves the resizing of PlayHandles from Song to Mixer, since Mixer is the class that contains the PlayHandles.

src/core/Mixer.cpp Outdated Show resolved Hide resolved
@PhysSong
Copy link
Member

I'm not sure why we need 74fc3f2. Mixer holds PlayHandles, but the tempo is a property of Song. The other commits look fine to me.

@M374LX
Copy link
Contributor Author

M374LX commented Mar 14, 2019

74fc3f2 moves to Mixer only the part of the tempo change process that resizes the PlayHandles.

@JohannesLorenz
Copy link
Contributor

@M374LX Is this ready for review, or are you working on this?

@Reflexe Reflexe added the response required A response from OP is required or the issue is closed automatically within 14 days. label May 27, 2019
@Reflexe Reflexe closed this Jul 26, 2019
@BaraMGB
Copy link
Contributor

BaraMGB commented Jul 27, 2019

Should we close pull requests because of the opener is not answer for a while?

@Reflexe
Copy link
Member

Reflexe commented Jul 27, 2019

@BaraMGB IDK, What's the reason behind leaving abandoned WIP pull requests? it makes finding active PRs more difficult.

@JohannesLorenz
Copy link
Contributor

In theory you could just filter the "response required" out, and add the list of PRs with that filter to your bookmarks. In practice, I'm also too lazy to do that.

@M374LX
Copy link
Contributor Author

M374LX commented Jul 28, 2019

@JohannesLorenz
It is ready for review. I have updated the "mixer-refactor" branch.

I am sorry for being busy lately and unable to give attention to my own PRs.

Can this PR be reopened now?

@PhysSong PhysSong reopened this Jul 28, 2019
@JohannesLorenz
Copy link
Contributor

The other commits look fine to me.

If I read that right, @PhysSong has already confirmed that this can be merged?

@PhysSong PhysSong removed the response required A response from OP is required or the issue is closed automatically within 14 days. label Nov 22, 2019
@PhysSong
Copy link
Member

I'm still against 74fc3f2, but it's just an opinion. Maybe we can revert some formatting changes in order to reduce the amount of changes while keeping essential contents. For 2c695e2, I think a range-based for loop is better than a while loop.
There are minor conflicts with #4878, but they aren't hard to resolve.

@LmmsBot
Copy link

LmmsBot commented Jun 30, 2020

🤖 Hey, I'm @LmmsBot from github.com/lmms/bot and I made downloads for this pull request, click me to make them magically appear! 🎩

Linux

Windows

🤖
{"platform_name_to_artifacts": {"Linux": [{"artifact": {"title": {"title": "(AppImage)", "platform_name": "Linux"}, "link": {"link": "https://11184-15778896-gh.circle-artifacts.com/0/lmms-1.3.0-alpha.1.81%2Bg5b4a28e-linux-x86_64.AppImage"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/11184?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}], "Windows": [{"artifact": {"title": {"title": "32-bit", "platform_name": "Windows"}, "link": {"link": "https://11182-15778896-gh.circle-artifacts.com/0/lmms-1.3.0-alpha.1.81%2Bg5b4a28e32-mingw-win32.exe"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/11182?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://11183-15778896-gh.circle-artifacts.com/0/lmms-1.3.0-alpha.1.81%2Bg5b4a28e32-mingw-win64.exe"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/11183?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}, {"artifact": {"title": {"title": "32-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/m9rrna2h1st0b16y/artifacts/build/lmms-1.3.0-alpha-msvc2017-win32.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/36586466"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/d4mr40s035pon0oh/artifacts/build/lmms-1.3.0-alpha-msvc2017-win64.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/36586466"}]}, "commit_sha": "a200ce53981afda943d86e4be6af8c77eb69048e"}

@M374LX
Copy link
Contributor Author

M374LX commented Nov 27, 2020

Rebased.

Using a range-based for loop, as suggested by @PhysSong.

Should I undo 74fc3f2 (fcb0ce7 after the rebase)?

Other than that, anything preventing the merge?

@Veratil
Copy link
Contributor

Veratil commented Nov 27, 2020

At quick glance, many style updates need to be done.

@PhysSong
Copy link
Member

Should I undo 74fc3f2(fcb0ce7 after the rebase)?

IMO yes because Mixer is for rendering, routing and collecting audio signals.

@M374LX
Copy link
Contributor Author

M374LX commented Nov 29, 2020

Reverted.

@Veratil We can deal with style updates later.

M374LX and others added 16 commits November 30, 2020 13:53
Co-authored-by: Kevin Zander <veratil@gmail.com>
Co-authored-by: Kevin Zander <veratil@gmail.com>
Co-authored-by: Kevin Zander <veratil@gmail.com>
Co-authored-by: Kevin Zander <veratil@gmail.com>
Co-authored-by: Kevin Zander <veratil@gmail.com>
Co-authored-by: Kevin Zander <veratil@gmail.com>
Co-authored-by: Kevin Zander <veratil@gmail.com>
Co-authored-by: Kevin Zander <veratil@gmail.com>
Co-authored-by: Kevin Zander <veratil@gmail.com>
Co-authored-by: Kevin Zander <veratil@gmail.com>
Co-authored-by: Kevin Zander <veratil@gmail.com>
Co-authored-by: Kevin Zander <veratil@gmail.com>
Co-authored-by: Kevin Zander <veratil@gmail.com>
Co-authored-by: Kevin Zander <veratil@gmail.com>
Co-authored-by: Kevin Zander <veratil@gmail.com>
@M374LX M374LX requested a review from Veratil November 30, 2020 17:06
src/core/Mixer.cpp Outdated Show resolved Hide resolved
@PhysSong
Copy link
Member

@JohannesLorenz Could you review this or remove the review request?

@JohannesLorenz JohannesLorenz removed their request for review December 10, 2020 12:00
@JohannesLorenz
Copy link
Contributor

I removed my review requests, since @PhysSong has already approved the PR.

@PhysSong PhysSong merged commit 28ee260 into LMMS:master Dec 11, 2020
@M374LX M374LX deleted the mixer-refactor branch December 11, 2020 01:55
IanCaio pushed a commit to IanCaio/lmms that referenced this pull request Mar 28, 2021
Co-authored-by: Kevin Zander <veratil@gmail.com>
devnexen pushed a commit to devnexen/lmms that referenced this pull request Apr 10, 2021
Co-authored-by: Kevin Zander <veratil@gmail.com>
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
Co-authored-by: Kevin Zander <veratil@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants