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

Waveform: add track end markers #3137

Merged
merged 1 commit into from
Oct 1, 2020
Merged

Conversation

ronso0
Copy link
Member

@ronso0 ronso0 commented Sep 28, 2020

image

https://bugs.launchpad.net/mixxx/+bug/1799576
This should help understand that no loops can be created (or resized) that would cross the track end, as well as the
the protective loop move limitation in #3117 .

We could also use the end-of-track warning color for the post-roll triangles?

@ronso0 ronso0 added the skins label Sep 28, 2020
@ronso0 ronso0 added this to the 2.3.0 milestone Sep 28, 2020
Copy link
Member

@daschuer daschuer left a comment

Choose a reason for hiding this comment

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

Good Idea, Thank you.
Unfortunately it does not work for short tracks where the lead in is visible as well.

@ronso0
Copy link
Member Author

ronso0 commented Sep 28, 2020

Good point, didn't think of that.
I replaced if(preRollVisible) {} else {} with if(preRollVisible) {} if(postRollVisible) {} and squashed all changes.
It now can paint both pre and post roll:
image

@ronso0
Copy link
Member Author

ronso0 commented Sep 28, 2020

And now I think it's okay to paint both with SignalColor instead of potentially causing confusion with another color.

@daschuer
Copy link
Member

Unfortunatly the clang-format is complaining:

clang-format.............................................................Failed
- hook id: clang-format
- files were modified by this hook
[INFO] First pass: Reformatting added/changed lines...
[INFO] Reformatting src/waveform/renderers/waveformrendererpreroll.cpp [35-54, 73-94, 97-114]...
[INFO] Reformatting src/waveform/renderers/waveformwidgetrenderer.cpp [38-38, 137-138]...
[INFO] Reformatting src/waveform/renderers/waveformwidgetrenderer.h [80-80, 144-144]...
[INFO] Second pass: Breaking long added/changed lines...

@ronso0
Copy link
Member Author

ronso0 commented Oct 1, 2020

@daschuer
Copy link
Member

daschuer commented Oct 1, 2020

I don't mind in this case, because the surrounding code is written like that. So let's merge it.

In general I very much in favor that's all functions should be formated the same with no exceptions.
This improves readability IMHO.

Copy link
Member

@daschuer daschuer left a comment

Choose a reason for hiding this comment

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

Lgtm

@daschuer daschuer merged commit 7158758 into mixxxdj:2.3 Oct 1, 2020
@ronso0 ronso0 deleted the track-end-marker branch October 1, 2020 16:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants