Merge lp://staging/~oberling/mixxx/feature_first-beat-in-bar into lp://staging/~mixxxdevelopers/mixxx/trunk
Proposed by
Stephan Bergemann
Status: | Needs review | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Proposed branch: | lp://staging/~oberling/mixxx/feature_first-beat-in-bar | ||||||||||||
Merge into: | lp://staging/~mixxxdevelopers/mixxx/trunk | ||||||||||||
Diff against target: |
660 lines (+97/-12) 29 files modified
mixxx/res/skins/Deere1280x1024-SXGA/skin.xml (+2/-0) mixxx/res/skins/Deere1280x800-WXGA/skin.xml (+2/-0) mixxx/res/skins/Deere1366x768-WXGA/skin.xml (+2/-0) mixxx/res/skins/Deere1440x900-WXGA+/skin.xml (+2/-0) mixxx/res/skins/Deere1920x1080-FullHD/skin.xml (+2/-0) mixxx/res/skins/Deere1920x1200-WUXGA/skin.xml (+2/-0) mixxx/res/skins/DeereSamplegrid1280x800-WXGA/skin.xml (+2/-0) mixxx/res/skins/LateNight1280x1024-SXGA/skin.xml (+2/-0) mixxx/res/skins/LateNight1280x800-WXGA/skin.xml (+2/-0) mixxx/res/skins/LateNight1366x768-WXGA/skin.xml (+2/-0) mixxx/res/skins/LateNightBlues1280x1024-SXGA/skin.xml (+2/-0) mixxx/res/skins/LateNightBlues1280x800-WXGA/skin.xml (+2/-0) mixxx/res/skins/LateNightBlues1366x768-WXGA/skin.xml (+2/-0) mixxx/res/skins/Outline1024x600-Netbook/skin.xml (+2/-0) mixxx/res/skins/Outline1024x768-XGA/skin.xml (+2/-0) mixxx/res/skins/Outline800x480-WVGA/skin.xml (+2/-0) mixxx/res/skins/Phoney1600x1200-UXGA/skin.xml (+2/-0) mixxx/res/skins/Phoney1680x1050-WSXGA/skin.xml (+2/-0) mixxx/res/skins/PhoneyDark1600x1200-UXGA/skin.xml (+2/-0) mixxx/res/skins/PhoneyDark1680x1050-WSXGA/skin.xml (+2/-0) mixxx/res/skins/Shade1024x600-Netbook/skin.xml (+2/-0) mixxx/res/skins/Shade1024x768-XGA/skin.xml (+2/-0) mixxx/res/skins/ShadeDark1024x600-Netbook/skin.xml (+2/-0) mixxx/res/skins/ShadeDark1024x768-XGA/skin.xml (+2/-0) mixxx/src/track/beatgrid.cpp (+17/-5) mixxx/src/track/beatmap.cpp (+11/-3) mixxx/src/track/beats.h (+1/-0) mixxx/src/waveform/renderers/waveformrenderbeat.cpp (+19/-4) mixxx/src/waveform/renderers/waveformrenderbeat.h (+1/-0) |
||||||||||||
To merge this branch: | bzr merge lp://staging/~oberling/mixxx/feature_first-beat-in-bar | ||||||||||||
Related bugs: |
|
||||||||||||
Related blueprints: |
Song Structure Awareness
(Undefined)
mark every 4 or 16 beats
(Undefined)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Schürmann | Abstain | ||
Review via email: mp+155096@code.staging.launchpad.net |
Commit message
Added a highlight on every first beat in a bar.
Description of the change
Added a highlight on every first beat in a bar.
This fixes one part of bug #753301 as it gives a usefull visual indicator for mixing tracks.
I also added a color for this highlighted beat to each existing theme.
To post a comment you must log in.
Unmerged revisions
- 3338. By Stephan Bergemann <email address hidden>
-
made first beat bar less bold; added a little efficiency;
- 3337. By Stephan Bergemann <email address hidden>
-
fixed firstBeatInBar-
Calculation in BeatMap - 3336. By Stephan Bergemann <email address hidden>
-
added new colour to every theme
- 3335. By Stephan Bergemann <email address hidden>
-
added red highlight for first beat of each bar
Hi Stephan,
Thank you very much for your branch. waveform/ renderers/ waveformrenderb eat.cpp line 110 should be combined with the expressions above.
From the coding side it looks good.
Except expression in mixxx/src/
Form the visual point of view IMHO the first beat bar is too highlighted (too red and bold). I would prefer an additional icon on the normal bars. I hope Jus, our design maintainer can also help out here.
While this is a good step to the final goal, I would not merge this branch yet because of the missing detection support.
Kind regards,
Daniel