lp://staging/~mixxxdevelopers/mixxx/features_waveform

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~mixxxdevelopers/mixxx/features_sqlite

Albert Santoni: Approve on 2009-11-18

Diff: 2700 lines (+1330/-318)

30 files modified

mixxx/res/skins/Collusion (1280)/skin.xml (+34/-4)
mixxx/res/skins/Collusion (1280-WS)/skin.xml (+34/-4)
mixxx/res/skins/hercules/skin.xml (+34/-0)
mixxx/res/skins/nCut/skin.xml (+34/-0)
mixxx/res/skins/outline/skin.xml (+34/-4)
mixxx/res/skins/outlineClose/skin.xml (+34/-4)
mixxx/res/skins/outlineMini/skin.xml (+49/-20)
mixxx/res/skins/outlineNetbook/skin.xml (+34/-4)
mixxx/res/skins/outlineSmall/skin.xml (+35/-5)
mixxx/res/skins/traditional/skin.xml (+34/-0)
mixxx/src/SConscript (+2/-0)
mixxx/src/cachingreader.cpp (+1/-0)
mixxx/src/configobject.cpp (+10/-1)
mixxx/src/configobject.h (+1/-1)
mixxx/src/engine/loopingcontrol.cpp (+13/-2)
mixxx/src/engine/loopingcontrol.h (+1/-0)
mixxx/src/waveform/renderobject.cpp (+6/-7)
mixxx/src/waveform/renderobject.h (+6/-5)
mixxx/src/waveform/waveformrenderer.cpp (+103/-82)
mixxx/src/waveform/waveformrenderer.h (+13/-10)
mixxx/src/waveform/waveformrendermark.cpp (+224/-29)
mixxx/src/waveform/waveformrendermark.h (+21/-6)
mixxx/src/waveform/waveformrendermarkrange.cpp (+233/-0)
mixxx/src/waveform/waveformrendermarkrange.h (+60/-0)
mixxx/src/widget/wglwaveformviewer.cpp (+14/-48)
mixxx/src/widget/wglwaveformviewer.h (+3/-7)
mixxx/src/widget/woverview.cpp (+216/-55)
mixxx/src/widget/woverview.h (+37/-8)
mixxx/src/widget/wwaveformviewer.cpp (+8/-8)
mixxx/src/widget/wwidget.cpp (+2/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2371. By RJ Skerry-Ryan on 2011-02-12

Merging from lp:mixxx

2370. By RJ Skerry-Ryan on 2010-10-27

Merging from lp:mixxx

2369. By RJ Skerry-Ryan on 2010-10-21

Merging from lp:mixxx

2368. By RJ Skerry-Ryan on 2010-08-27

Merging from trunk.

2367. By RJ Skerry-Ryan on 2010-06-18

Merging from trunk.

2366. By RJ Skerry-Ryan on 2010-06-01

Merging from trunk.

2365. By RJ Skerry-Ryan on 2010-06-01

Merging from trunk.

2364. By RJ Skerry-Ryan on 2010-03-11

Merging fixes from trunk.

2363. By RJ Skerry-Ryan on 2010-03-11

Merging from features_waveform

2362. By RJ Skerry-Ryan on 2010-03-11

Switch on signal tile renderer. Draw the tile number in the middle of each tile. Make tiles have transparent backgrounds. Translate the signal tile renderer to the center so that rate changes zoom in and out.