multi-playlist-crates : Code : Mixxx

Get this branch:: bzr branch lp://staging/~mixxxdevelopers/mixxx/multi-playlist-crates

Members of Mixxx Development Team can upload to this branch. Log in for directions.

Branch merges

No branches dependent on this one.

Merged into lp://staging/~mhaulo/mixxx/multilevel_crates_playlists

Mika Haulo: Pending requested 2011-04-22

Diff: 15201 lines (+7559/-3035)

160 files modified

mixxx/SConstruct (+1/-0)
mixxx/build/depends.py (+15/-1)
mixxx/build/features.py (+31/-3)
mixxx/build/qtcreator/mixxx.pro (+1/-0)
mixxx/lib/xwax/lut.c (+110/-0)
mixxx/lib/xwax/lut.cpp (+110/-0)
mixxx/lib/xwax/lut.h (+42/-0)
mixxx/lib/xwax/pitch.h (+71/-0)
mixxx/lib/xwax/timecoder.c (+381/-449)
mixxx/lib/xwax/timecoder.h (+80/-42)
mixxx/lib/xwax/timecoder_win32.cpp (+346/-411)
mixxx/res/mixxx.qrc (+1/-0)
mixxx/res/schema.xml (+2/-2)
mixxx/res/skins/Outline1024x600-Netbook/skin.xml (+77/-0)
mixxx/src/analyserwaveform.cpp (+1/-0)
mixxx/src/audiotagger.cpp (+52/-45)
mixxx/src/audiotagger.h (+3/-3)
mixxx/src/basetrackplayer.cpp (+5/-3)
mixxx/src/cachingreader.cpp (+25/-3)
mixxx/src/circularbuffer.h (+97/-0)
mixxx/src/configobject.cpp (+4/-0)
mixxx/src/configobject.h (+7/-4)
mixxx/src/controllogpotmeter.cpp (+5/-0)
mixxx/src/controlobject.cpp (+14/-2)
mixxx/src/controlobject.h (+4/-0)
mixxx/src/controlobjectthread.cpp (+4/-4)
mixxx/src/controlobjectthread.h (+1/-1)
mixxx/src/controlobjectthreadmain.cpp (+4/-5)
mixxx/src/controlobjectthreadmain.h (+3/-3)
mixxx/src/controlobjectthreadwidget.cpp (+3/-4)
mixxx/src/controlobjectthreadwidget.h (+2/-2)
mixxx/src/controlpotmeter.cpp (+12/-8)
mixxx/src/controlpotmeter.h (+9/-8)
mixxx/src/controlpushbutton.cpp (+25/-44)
mixxx/src/controlpushbutton.h (+2/-0)
mixxx/src/controlvaluedelegate.cpp (+3/-0)
mixxx/src/dlgautodj.cpp (+21/-2)
mixxx/src/dlgautodj.h (+4/-1)
mixxx/src/dlgautodj.ui (+10/-0)
mixxx/src/dlgprefcontrols.cpp (+13/-0)
mixxx/src/dlgprefcontrols.h (+1/-0)
mixxx/src/dlgprefcontrolsdlg.ui (+10/-0)
mixxx/src/dlgpreferences.cpp (+22/-4)
mixxx/src/dlgpreferences.h (+16/-11)
mixxx/src/dlgprefnovinyl.cpp (+32/-0)
mixxx/src/dlgprefnovinyl.h (+39/-0)
mixxx/src/dlgprefnovinyldlg.ui (+475/-0)
mixxx/src/dlgprefrecord.cpp (+138/-113)
mixxx/src/dlgprefrecord.h (+11/-7)
mixxx/src/dlgprefrecorddlg.ui (+229/-316)
mixxx/src/dlgprefshoutcastdlg.ui (+14/-2)
mixxx/src/dlgprefsound.cpp (+105/-67)
mixxx/src/dlgprefsound.h (+9/-3)
mixxx/src/dlgprefsounditem.h (+3/-1)
mixxx/src/dlgprefvinyl.cpp (+77/-120)
mixxx/src/dlgprefvinyl.h (+3/-9)
mixxx/src/dlgprefvinyldlg.ui (+130/-28)
mixxx/src/dlgrecording.cpp (+177/-0)
mixxx/src/dlgrecording.h (+63/-0)
mixxx/src/dlgrecording.ui (+87/-0)
mixxx/src/engine/bpmcontrol.cpp (+2/-1)
mixxx/src/engine/cuecontrol.cpp (+29/-6)
mixxx/src/engine/cuecontrol.h (+2/-1)
mixxx/src/engine/enginebuffer.cpp (+123/-48)
mixxx/src/engine/enginebuffer.h (+23/-5)
mixxx/src/engine/enginebufferscalelinear.cpp (+225/-125)
mixxx/src/engine/enginebufferscalelinear.h (+13/-3)
mixxx/src/engine/enginechannel.cpp (+10/-53)
mixxx/src/engine/enginechannel.h (+13/-18)
mixxx/src/engine/enginecontrol.cpp (+8/-2)
mixxx/src/engine/enginecontrol.h (+4/-2)
mixxx/src/engine/enginedeck.cpp (+77/-0)
mixxx/src/engine/enginedeck.h (+59/-0)
mixxx/src/engine/enginefilterblock.cpp (+27/-18)
mixxx/src/engine/enginefilterblock.h (+3/-2)
mixxx/src/engine/enginemaster.cpp (+56/-13)
mixxx/src/engine/enginemaster.h (+18/-9)
mixxx/src/engine/enginemicrophone.cpp (+127/-0)
mixxx/src/engine/enginemicrophone.h (+53/-0)
mixxx/src/engine/enginepassthrough.cpp (+121/-0)
mixxx/src/engine/enginepassthrough.h (+51/-0)
mixxx/src/engine/enginepregain.cpp (+14/-14)
mixxx/src/engine/enginepregain.h (+4/-2)
mixxx/src/engine/enginesidechain.cpp (+5/-0)
mixxx/src/engine/enginesidechain.h (+8/-3)
mixxx/src/engine/loopingcontrol.cpp (+170/-8)
mixxx/src/engine/loopingcontrol.h (+36/-0)
mixxx/src/engine/quantizecontrol.cpp (+93/-0)
mixxx/src/engine/quantizecontrol.h (+43/-0)
mixxx/src/engine/ratecontrol.cpp (+20/-1)
mixxx/src/engine/ratecontrol.h (+11/-8)
mixxx/src/engine/readaheadmanager.cpp (+12/-10)
mixxx/src/engine/vinylcontrolcontrol.cpp (+104/-0)
mixxx/src/engine/vinylcontrolcontrol.h (+31/-0)
mixxx/src/library/autodjfeature.cpp (+2/-1)
mixxx/src/library/browse/browsefeature.cpp (+4/-2)
mixxx/src/library/browse/browsefeature.h (+2/-1)
mixxx/src/library/browse/browsetablemodel.cpp (+198/-17)
mixxx/src/library/browse/browsetablemodel.h (+46/-38)
mixxx/src/library/browse/browsethread.cpp (+3/-0)
mixxx/src/library/browse/browsethread.h (+3/-1)
mixxx/src/library/cratefeature.cpp (+55/-77)
mixxx/src/library/cratefeature.h (+2/-3)
mixxx/src/library/dao/cratedao.cpp (+22/-0)
mixxx/src/library/dao/cratedao.h (+7/-1)
mixxx/src/library/library.cpp (+7/-3)
mixxx/src/library/library.h (+3/-1)
mixxx/src/library/playlisttablemodel.cpp (+32/-0)
mixxx/src/library/playlisttablemodel.h (+1/-0)
mixxx/src/library/recording/recordingfeature.cpp (+98/-0)
mixxx/src/library/recording/recordingfeature.h (+62/-0)
mixxx/src/library/sidebarmodel.cpp (+2/-0)
mixxx/src/library/traktor/traktorfeature.cpp (+1/-1)
mixxx/src/library/traktor/traktorplaylistmodel.cpp (+1/-1)
mixxx/src/library/traktor/traktortablemodel.cpp (+5/-2)
mixxx/src/library/treeitem.cpp (+16/-1)
mixxx/src/library/treeitem.h (+8/-0)
mixxx/src/library/treeitemmodel.cpp (+11/-0)
mixxx/src/library/treeitemmodel.h (+2/-0)
mixxx/src/mathstuff.cpp (+10/-0)
mixxx/src/mathstuff.h (+9/-0)
mixxx/src/midi/midiscriptengine.cpp (+3/-3)
mixxx/src/mixxx.cpp (+211/-126)
mixxx/src/mixxx.h (+10/-3)
mixxx/src/playermanager.cpp (+2/-0)
mixxx/src/recording/defs_recording.h (+19/-0)
mixxx/src/recording/enginerecord.cpp (+23/-18)
mixxx/src/recording/enginerecord.h (+5/-1)
mixxx/src/recording/recordingmanager.cpp (+168/-0)
mixxx/src/recording/recordingmanager.h (+81/-0)
mixxx/src/samplerbank.cpp (+2/-0)
mixxx/src/skin/legacyskinparser.cpp (+6/-4)
mixxx/src/sounddevice.cpp (+1/-1)
mixxx/src/sounddeviceportaudio.cpp (+3/-3)
mixxx/src/soundmanager.cpp (+122/-61)
mixxx/src/soundmanager.h (+20/-5)
mixxx/src/soundmanagerconfig.cpp (+1/-1)
mixxx/src/soundmanagerconfig.h (+2/-2)
mixxx/src/soundmanagerutil.cpp (+21/-17)
mixxx/src/soundmanagerutil.h (+22/-6)
mixxx/src/soundsourcemp3.cpp (+8/-3)
mixxx/src/test/enginemastertest.cpp (+29/-39)
mixxx/src/test/enginemicrophonetest.cpp (+136/-0)
mixxx/src/vinylcontrol.cpp (+41/-24)
mixxx/src/vinylcontrol.h (+68/-46)
mixxx/src/vinylcontrolproxy.cpp (+39/-3)
mixxx/src/vinylcontrolproxy.h (+16/-11)
mixxx/src/vinylcontrolsignalwidget.cpp (+115/-150)
mixxx/src/vinylcontrolsignalwidget.h (+21/-16)
mixxx/src/vinylcontrolxwax.cpp (+704/-162)
mixxx/src/vinylcontrolxwax.h (+72/-31)
mixxx/src/waveform/waveformrenderer.cpp (+2/-2)
mixxx/src/waveform/waveformrendersignal.cpp (+1/-3)
mixxx/src/widget/wnumberpos.cpp (+10/-4)
mixxx/src/widget/wnumberrate.cpp (+0/-1)
mixxx/src/widget/wnumberrate.h (+1/-0)
mixxx/src/widget/woverview.cpp (+15/-8)
mixxx/src/widget/wstatuslight.cpp (+95/-37)
mixxx/src/widget/wstatuslight.h (+7/-7)
mixxx/src/widget/wtracktableview.cpp (+8/-4)

Related bugs

Link a bug report

Related blueprints

Branch information

Owner:: Mixxx Development Team

Project:: Mixxx

Status:: Development

Recent revisions

2762. By Raffitea on 2011-04-22: Removed an unused method.
2761. By Raffitea on 2011-04-22: Fixed some bug for multi-lavel-crates. Should be all good now.
2760. By Raffitea on 2011-04-22: fixed deletion of subcrates if other subtree are ellapsed.
2759. By Raffitea on 2011-04-21: Implemented multi-level crates
2758. By Raffitea on 2011-04-21: Interim commit to get multi-level crates working
2757. By Raffitea on 2011-04-21: Merging from lp:~mhaulo/mixxx/multilevel_crates_playlists
2756. By RJ Skerry-Ryan on 2011-04-17: Delete random controls that weren't getting deleted.
2755. By RJ Skerry-Ryan on 2011-04-17: Delete QuantizeControl control objects on destruction.
2754. By RJ Skerry-Ryan on 2011-04-17: Strip most VC-specific code out of EngineBuffer and into VinylControlControl. Pulled the creation of vinylcontrol_enabled/cueing/mode from RateControl and stuck it in VinylControlControl. Added a getTotalSamples() method to the EngineControl interface because VinylControlControl needs to know the total samples, and I think passing it through track_samples for EngineObjects is a hack.
2753. By RJ Skerry-Ryan on 2011-04-17: Merging lp:~ywwg/mixxx/features_xwax2 into Mixxx. Huge thanks to Owen Williams for his herculean effort with this branch!

»

Branch metadata

Branch format:: Branch format 7

Repository format:: Bazaar repository format 2a (needs bzr 1.16 or later)

Stacked on:: lp://staging/~mixxxdevelopers/mixxx/trunk

Mixxx

lp://staging/~mixxxdevelopers/mixxx/multi-playlist-crates

Branch merges

Related source package recipes

Related snap packages

Related bugs

Related blueprints

Branch information

Recent revisions

Branch metadata

Nearby

Subscribers