Skip to content

Fix time display #3711

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

Jump to bottom
Merged
tresf merged 2 commits into from
Nov 15, 2017
Merged

Fix time display #3711

tresf merged 2 commits into from
Nov 15, 2017

Conversation

@PhysSong
Copy link
Member

@PhysSong PhysSong commented Jul 20, 2017 •
edited
Loading

It fixes #2112, also fixes #3701 (comment).
If #3701 (comment) is fixed by @michaelgregorius(or other person), I'll drop the fix for #3701 (comment) and modify my PR.

Edit: @michaelgregorius have done fix by bcdb5ec, so commif 8ffebbb have been dropped.

@michaelgregorius
Copy link
Contributor

michaelgregorius commented Jul 20, 2017

@PhysSong My commit to fix #3701 has introduced a conflict but it should hopefully be possible to resolve by dropping 8ffebbb as you have already mentioned. The difference to your fix is that I have introduced a second methods so that the version with tick_t can still be used.

@PhysSong
Copy link
Member Author

PhysSong commented Jul 20, 2017

@michaelgregorius Okay. I'll drop that commit and fix my PR.

@PhysSong
Copy link
Member Author

PhysSong commented Jul 21, 2017

I found that m_elapsedTicks and m_elapsedTacts are no longer used. Could I remove them?

@michaelgregorius
Copy link
Contributor

michaelgregorius commented Jul 21, 2017

If they are no longer used I'd say we should remove them.

@Umcaruje Umcaruje added this to the 1.3.0 milestone Oct 2, 2017
@PhysSong PhysSong closed this Oct 10, 2017
@PhysSong PhysSong deleted the timedisplay branch October 10, 2017 01:14
@PhysSong PhysSong restored the timedisplay branch October 15, 2017 11:05
@PhysSong PhysSong reopened this Oct 15, 2017
@tresf
Copy link
Member

tresf commented Nov 15, 2017

Tested, works.

@tresf tresf merged commit 57de274 into LMMS:master Nov 15, 2017
@tresf tresf mentioned this pull request Nov 15, 2017
Closed
@PhysSong PhysSong deleted the timedisplay branch November 15, 2017 05:08
@PhysSong PhysSong mentioned this pull request Feb 18, 2018
Open
@PhysSong PhysSong mentioned this pull request Apr 3, 2018
Closed
PhysSong added a commit that referenced this pull request May 2, 2018
@PhysSong
Fix a regression from #3711
4b36ba9
@PhysSong PhysSong mentioned this pull request May 2, 2018
Closed
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
@PhysSong @tresf
Fix time display (LMMS#3711)
f7673a0 
Make Bar:Beat:Tick / Min:Sec:Msec agree with playhead
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
@PhysSong
Fix a regression from LMMS#3711
49cc715
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

1.3

Development

Successfully merging this pull request may close these issues.

4 participants

@PhysSong @michaelgregorius @tresf @Umcaruje