Mixxx

Display all Hotcues in the waveform / waveform overview

Bug #994647 reported by jus
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Mixxx
Fix Released
Low
Thomas Vincent
Mixxx 1.11.0

Bug Description

As of lp:mixxx r3093 only the first four hotcue markers are displayed in the waveform / waveform overview.
We should allow all 36 hotcues to be displayed like we did in v1.10

Steps to reproduce:
* Load a skin with more than 4 Hotcues ( e.g. Phoney)
* Set Hotcue>4
* Hotcue works but misses marker in waveform / waveform overview

Until now we have to define every single Hotcue per deck/sample deck in the skin.xml .
It would be nice to have a way to define a group of hotcues if they share the same attributes. Basically only have them displayed the hotcue number like we do now if no other attributes are defined.

This would make the skin.xml less bloated.

See original description
Tags: waveform

Related branches

lp:~vrince/mixxx/waveform-2.0_pure-gl
RJ Skerry-Ryan: Pending requested
Diff: 3454 lines (+1509/-1139)
39 files modified
mixxx/build/depends.py (+12/-3)
mixxx/res/skins/Deere1280x800-WXGA/skin.xml (+10/-448)
mixxx/src/engine/cuecontrol.cpp (+0/-2)
mixxx/src/engine/cuecontrol.h (+2/-0)
mixxx/src/skin/legacyskinparser.cpp (+2/-3)
mixxx/src/waveform/renderers/glslwaveformrenderersignal.cpp (+21/-7)
mixxx/src/waveform/renderers/glslwaveformrenderersignal.h (+4/-8)
mixxx/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp (+177/-324)
mixxx/src/waveform/renderers/glwaveformrendererfilteredsignal.h (+4/-34)
mixxx/src/waveform/renderers/glwaveformrenderersimplesignal.cpp (+120/-185)
mixxx/src/waveform/renderers/glwaveformrenderersimplesignal.h (+4/-21)
mixxx/src/waveform/renderers/qtwaveformrendererfilteredsignal.cpp (+346/-0)
mixxx/src/waveform/renderers/qtwaveformrendererfilteredsignal.h (+36/-0)
mixxx/src/waveform/renderers/qtwaveformrenderersimplesignal.cpp (+223/-0)
mixxx/src/waveform/renderers/qtwaveformrenderersimplesignal.h (+31/-0)
mixxx/src/waveform/renderers/waveformmark.cpp (+0/-4)
mixxx/src/waveform/renderers/waveformrendererendoftrack.cpp (+4/-0)
mixxx/src/waveform/renderers/waveformrendererfilteredsignal.cpp (+107/-34)
mixxx/src/waveform/renderers/waveformrendererfilteredsignal.h (+7/-12)
mixxx/src/waveform/renderers/waveformrenderersignalbase.cpp (+83/-0)
mixxx/src/waveform/renderers/waveformrenderersignalbase.h (+38/-0)
mixxx/src/waveform/renderers/waveformrendermark.cpp (+43/-5)
mixxx/src/waveform/renderers/waveformrendermark.h (+1/-0)
mixxx/src/waveform/renderers/waveformwidgetrenderer.cpp (+9/-3)
mixxx/src/waveform/renderers/waveformwidgetrenderer.h (+1/-1)
mixxx/src/waveform/waveformwidgetfactory.cpp (+31/-23)
mixxx/src/waveform/widgets/glsimplewaveformwidget.cpp (+2/-6)
mixxx/src/waveform/widgets/glsimplewaveformwidget.h (+0/-3)
mixxx/src/waveform/widgets/glslwaveformwidget.cpp (+4/-4)
mixxx/src/waveform/widgets/glslwaveformwidget.h (+1/-1)
mixxx/src/waveform/widgets/glwaveformwidget.cpp (+3/-2)
mixxx/src/waveform/widgets/qtsimplewaveformwidget.cpp (+57/-0)
mixxx/src/waveform/widgets/qtsimplewaveformwidget.h (+30/-0)
mixxx/src/waveform/widgets/qtwaveformwidget.cpp (+56/-0)
mixxx/src/waveform/widgets/qtwaveformwidget.h (+30/-0)
mixxx/src/waveform/widgets/softwarewaveformwidget.cpp (+3/-2)
mixxx/src/waveform/widgets/softwarewaveformwidget.h (+1/-1)
mixxx/src/waveform/widgets/waveformwidgettype.h (+3/-1)
mixxx/src/widget/wwaveformviewer.cpp (+3/-2)
lp:~mixxxdevelopers/mixxx/trunk
jus (jus)
tags: added: waveform
summary: - Display all Hotcues in the waveform
+ Display all Hotcues in the waveform / waveform overview
Changed in mixxx:
milestone: none → 1.11.0
status: New → Confirmed
importance: Undecided → Low
description: updated
Revision history for this message
Thomas Vincent (vrince) wrote :

I get your point. What about a 'default' cue style in skins that can be used for any non explicitly defined ones ?

Revision history for this message
jus (jus) wrote :

Having the possibility to define a 'default' cue style sounds excellent.

Thomas Vincent (vrince)
Changed in mixxx:
assignee: nobody → Thomas Vincent (vrince)
Revision history for this message
Thomas Vincent (vrince) wrote :

Implemented in pure-gl branch
A new <DefaultMark> tag shoul be present in skin to create all missing hotcues (from 1 to 36).

Changed in mixxx:
status: Confirmed → In Progress
Revision history for this message
jus (jus) wrote :

The <DefaultMark> tag which was merged to trunk does currently only works in the main Waveform Display <Visual> but not in the Waveform overview <Overview>.
It should work on both so we do not have to use mixed tags on each.

Revision history for this message
Thomas Vincent (vrince) wrote :

I thought 36 hot cues in overview was a little intense ... but you are right if it works for main display it should work for overview. Let me handle it ...

Revision history for this message
Thomas Vincent (vrince) wrote :

Jus can you give it a shot ?
I also add <DefaultMark> text field as the mark text pattern.
It takes the hot cue number as argument %1. Like " HOTCUE %1 " ...

Changed in mixxx:
status: In Progress → Fix Committed
Revision history for this message
jus (jus) wrote :

Thanks, Thomas.
Works fine - just committed the skin fixes to trunk.

BTW:
Whats up with the "no text draw triangle" in waveformrendermark.cpp around line 166 ff ? How can i use this one, could you please give an example... I tried to leave out <Text>...</Text> from within <DefaultMark>...</DefaultMark> with no success.

Revision history for this message
Thomas Vincent (vrince) wrote :

Hum ... this should work on the main waveform.
I need to check what append if the text pattern is empty like <Text></Text> but it should not be a problem.

RJ Skerry-Ryan (rryan)
Changed in mixxx:
status: Fix Committed → Fix Released
Revision history for this message
Swiftb0y (swiftb0y) wrote :

Mixxx now uses GitHub for bug tracking. This bug has been migrated to:
https://github.com/mixxxdj/mixxx/issues/6398

lock status: Metadata changes locked and limited to project staff
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.