Merge lp://qastaging/~mixxxdevelopers/mixxx/features_trackbeats into lp://qastaging/~mixxxdevelopers/mixxx/trunk
Proposed by
Phillip Whelan
Status: | Superseded |
---|---|
Proposed branch: | lp://qastaging/~mixxxdevelopers/mixxx/features_trackbeats |
Merge into: | lp://qastaging/~mixxxdevelopers/mixxx/trunk |
Diff against target: |
929 lines (+573/-23) 12 files modified
mixxx/build/depends.py (+1/-0) mixxx/res/schema.xml (+8/-0) mixxx/src/analyserbpm.cpp (+25/-0) mixxx/src/analyserbpm.h (+1/-0) mixxx/src/library/dao/trackdao.cpp (+53/-9) mixxx/src/library/trackcollection.cpp (+1/-1) mixxx/src/trackbeats.cpp (+349/-0) mixxx/src/trackbeats.h (+59/-0) mixxx/src/trackinfoobject.cpp (+16/-0) mixxx/src/trackinfoobject.h (+12/-0) mixxx/src/waveform/waveformrenderbeat.cpp (+42/-13) mixxx/src/waveform/waveformrenderbeat.h (+6/-0) |
To merge this branch: | bzr merge lp://qastaging/~mixxxdevelopers/mixxx/features_trackbeats |
Related bugs: | |
Related blueprints: |
TrackBeats
(Essential)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mixxx Development Team | Pending | ||
Review via email:
|
This proposal supersedes a proposal from 2011-02-04.
This proposal has been superseded by a proposal from 2011-02-11.
Description of the change
This branch adds the TrackBeats data type for tracking beats as sample offsets. This version uses SoundTouch to derive the beats. A future version will work with aubio, possibly only in the Analyse pane.
To post a comment you must log in.