lp:~vrince/mixxx/waveform-2.0_pure-gl

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~mixxxdevelopers/mixxx/trunk at revision 3167

RJ Skerry-Ryan: Pending requested 2012-05-12

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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #981235: Performance Issues with WF 2.0 on a Netbook	Medium	Fix Released
Bug #994633: Unify stack order of elements in the waveform display	Low	Fix Released
Bug #994647: Display all Hotcues in the waveform / waveform overview	Low	Fix Released
Bug #996464: No end-of-track warning on tracks <30s long	Low	Fix Released
Bug #997435: Changing visual gain in preferences does not affect "Filtered" display type	Medium	Fix Released
Bug #999247: when toggling waveform types, zoom doesn't remember previous level	Low	Fix Released
Bug #999249: waveform mousewheel zoom zone very small	Low	Fix Released

Link a bug report

Related blueprints

2791. By Thomas Vincent on 2012-05-17

Change defaul zoom to 3 (33%)
Fix zoom propagation of wavfeom type change

2790. By Thomas Vincent on 2012-05-17

Add DefaulMark support (see example in <visual> of Deere1280x800 skin)
Add protection again multiple declaration of hotcue in skin

2789. By Thomas Vincent on 2012-05-17

Waveform interactive zoom in accessible everywhere in the waveform viewer

2788. By Thomas Vincent on 2012-05-16

Some comments

2787. By Thomas Vincent on 2012-05-13

Add central waveform axe (and 'AxesColor' in skin) in all waveform renderer. Line is display under the signal.
Use 'AxesColor' to draw vertical line too.

2786. By Thomas Vincent on 2012-05-12

Merged from trunk

2785. By Thomas Vincent on 2012-05-12

Disable end of track display for track shorter than end of track trigger (fix #996464)

2784. By Thomas Vincent on 2012-05-12

Add support for alignment in software signal renderer (and fix global vertical scaling now consistent with other signal renderers)

2783. By Thomas Vincent on 2012-05-11

Use of visual gain in every waveform renderer (and add overall and per-band gain too) fix #997435

2782. By Thomas Vincent on 2012-05-08

Update software signal renderer with lst signal base