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

Rename MidiTime to TimePos #5684

Merged
merged 2 commits into from
Nov 29, 2020
Merged

Conversation

M374LX
Copy link
Contributor

@M374LX M374LX commented Sep 25, 2020

Redoing #4897 and #5295 after both were unsuccessfully closed.

Closes #4866.

@Spekular
Copy link
Member

This looks like a good candidate to be part of #5592 which is targeted around December.

@LmmsBot
Copy link

LmmsBot commented Sep 25, 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

macOS

🤖
{"platform_name_to_artifacts": {"Linux": [{"artifact": {"title": {"title": "(AppImage)", "platform_name": "Linux"}, "link": {"link": "https://10907-15778896-gh.circle-artifacts.com/0/lmms-1.3.0-alpha.1.29%2Bg18f5941-linux-x86_64.AppImage"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/10907?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://10905-15778896-gh.circle-artifacts.com/0/lmms-1.3.0-alpha.1.29%2Bg18f594118-mingw-win32.exe"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/10905?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://10906-15778896-gh.circle-artifacts.com/0/lmms-1.3.0-alpha.1.29%2Bg18f594118-mingw-win64.exe"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/10906?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/6qbs4km13op8giyu/artifacts/build/lmms-1.3.0-alpha-msvc2017-win32.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/36565864"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/86tp2jq7lwadsana/artifacts/build/lmms-1.3.0-alpha-msvc2017-win64.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/36565864"}], "macOS": [{"artifact": {"title": {"title": "", "platform_name": "macOS"}, "link": {"link": "https://10909-15778896-gh.circle-artifacts.com/0/lmms-1.3.0-alpha.1.29%2Bg18f594118-mac10.13.dmg"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/10909?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}]}, "commit_sha": "0ab37b98fda2a0c60ba96d8650388df9e50ccffa"}

Copy link
Contributor

@JohannesLorenz JohannesLorenz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only 3 minor comments.

If you make changes, please add new commits (instead of squashing), so I don't need to review this large diff again ;) I'll squash it together when merging then.

include/TimePos.h Show resolved Hide resolved
src/gui/editors/SongEditor.cpp Outdated Show resolved Hide resolved
include/TimePos.h Show resolved Hide resolved
Copy link
Contributor

@JohannesLorenz JohannesLorenz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All good, thanks for the PR!

I'll merge this right now.

@JohannesLorenz JohannesLorenz merged commit 6e08126 into LMMS:master Nov 29, 2020
@M374LX M374LX deleted the rename-miditime-timepos branch November 29, 2020 19:22
IanCaio added a commit to IanCaio/lmms that referenced this pull request Nov 30, 2020
IanCaio added a commit to IanCaio/lmms that referenced this pull request Dec 5, 2020
	Fixes conflicts introduced by recent commits (LMMS#5684 and LMMS#5806
mostly).
IanCaio pushed a commit to IanCaio/lmms that referenced this pull request Mar 28, 2021
devnexen pushed a commit to devnexen/lmms that referenced this pull request Apr 10, 2021
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
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.

Rename MidiTime class
4 participants