Merge lp:~keithsalisbury/mixxx/track_selector_feature into lp:~mixxxdevelopers/mixxx/trunk

[globalkeith]

Implments a new library view called Selector which enables the user to filter the library using the currently active track details with controls like 'genre', 'bpm', 'year', 'rating', 'key'. Probably the biggest impact it has on other code is to enable a onHide method so it can activate and deactivate - which enables the auto-selection to only occur when the view is visible.

For a screen grab here:

http://www.mixxx.org/forums/viewtopic.php?f=1&t=3448&start=10#p14226

[lp:~keithsalisbury/mixxx/track_selector_feature]

3017. By globalkeith on 2012-06-01

merged with trunk

3018. By globalkeith on 2012-06-01

merged with trunk

3019. By globalkeith on 2012-06-27

disable the filter controls when the filter value is not available in the currently playing track meta data

3020. By globalkeith on 2012-06-27

merge with trunk

3021. By globalkeith on 2012-06-27

merge from trunk

Unmerged revisions

3021. By globalkeith on 2012-06-27

merge from trunk

3020. By globalkeith on 2012-06-27

merge with trunk

3019. By globalkeith on 2012-06-27

disable the filter controls when the filter value is not available in the currently playing track meta data

3018. By globalkeith on 2012-06-01

merged with trunk

3017. By globalkeith on 2012-06-01

merged with trunk

3016. By globalkeith on 2012-05-27

good ol clean up, and separated the harmonics into separate checkboxes

3015. By globalkeith on 2012-05-24

------------
This line and the following will be ignored --------------

removed:
  mixxx/lib/replaygain/replaygain_analysis.c
  mixxx/lib/replaygain/replaygain_analysis.h
  mixxx/res/images/library/ic_library_setlog.png
  mixxx/res/images/library/ic_library_setlog_current.png
  mixxx/src/analysergainvamp.cpp
  mixxx/src/analysergainvamp.h
  mixxx/vamp-plugins/plugins/replaygain.cpp
  mixxx/vamp-plugins/plugins/replaygain.h
added:
  mixxx/lib/replaygain/replaygain.cpp
  mixxx/lib/replaygain/replaygain.h
  mixxx/res/controllers/common-hid-packet-parser.js
  mixxx/res/images/library/ic_library_history.png
  mixxx/res/images/library/ic_library_history_current.png
  mixxx/res/keyboard/cs_CZ.kbd.cfg
  mixxx/res/keyboard/da_DK.kbd.cfg
  mixxx/res/keyboard/de_DE.kbd.cfg
  mixxx/res/keyboard/el_GR.kbd.cfg
  mixxx/res/keyboard/es_ES.kbd.cfg
  mixxx/res/keyboard/fi_FI.kbd.cfg
  mixxx/res/keyboard/fr_FR.kbd.cfg
  mixxx/res/keyboard/it_IT.kbd.cfg
  mixxx/res/keyboard/ru_RU.kbd.cfg
  mixxx/res/skins/Deere1280x1024-SXGA/CHANGELOG.txt
  mixxx/res/skins/Deere1280x800-WXGA/CHANGELOG.txt
  mixxx/res/skins/Deere1440x900-WXGA+/CHANGELOG.txt
  mixxx/res/skins/Deere1920x1080-FullHD/CHANGELOG.txt
  mixxx/res/skins/Deere1920x1200-WUXGA/CHANGELOG.txt
  mixxx/res/skins/LateNight1280x1024-SXGA/CHANGELOG.txt
  mixxx/res/skins/LateNight1280x800-WXGA/CHANGELOG.txt
  mixxx/res/skins/LateNight1366x768-WXGA/CHANGELOG.txt
  mixxx/res/skins/LateNightBlues1280x1024-SXGA/CHANGELOG.txt
  mixxx/res/skins/LateNightBlues1280x800-WXGA/CHANGELOG.txt
  mixxx/res/skins/LateNightBlues1366x768-WXGA/CHANGELOG.txt
  mixxx/res/skins/Outline1024x600-Netbook/CHANGELOG.txt
  mixxx/res/skins/Outline1024x768-XGA/CHANGELOG.txt
  mixxx/res/skins/Outline800x480-WVGA/CHANGELOG.txt
  mixxx/res/skins/Phoney1600x1200-UXGA/CHANGELOG.txt
  mixxx/res/skins/Phoney1680x1050-WSXGA/CHANGELOG.txt
  mixxx/res/skins/PhoneyDark1600x1200-UXGA/CHANGELOG.txt
  mixxx/res/skins/PhoneyDark1680x1050-WSXGA/CHANGELOG.txt
  mixxx/res/skins/Shade1024x600-Netbook/CHANGELOG.txt
  mixxx/res/skins/Shade1024x768-XGA/CHANGELOG.txt
  mixxx/res/skins/ShadeDark1024x600-Netbook/CHANGELOG.txt
  mixxx/res/skins/ShadeDark1024x768-XGA/CHANGELOG.txt
  mixxx/res/translations/mixxx/te.po
  mixxx/res/translations/mixxx_te.qm
  mixxx/res/translations/mixxx_te.ts
  mixxx/src/controllers/hid/hidblacklist.h
  mixxx/src/library/baseexternallibraryfeature.cpp
  mixxx/src/library/baseexternallibraryfeature.h
  mixxx/src/shoutcast/
  mixxx/src/shoutcast/defs_shoutcast.h
  mixxx/src/skin/tooltips.cpp
  mixxx/src/skin/tooltips.h
  mixxx/src/waveform/renderers/qtwaveformrendererfilteredsignal.cpp
  mixxx/src/waveform/renderers/qtwaveformrendererfilteredsignal.h
  mixxx/src/waveform/renderers/qtwaveformrenderersimplesignal.cpp
  mixxx/src/waveform/renderers/qtwaveformrenderersimplesignal.h
  mixxx/src/waveform/renderers/waveformmarkset.cpp
  mixxx/src/waveform/renderers/waveformmarkset.h
  mixxx/src/waveform/renderers/waveformrenderersignalbase.cpp
  mixxx/src/waveform/renderers/waveformrenderersignalbase.h
  mixxx/src/waveform/widgets/qtsimplewaveformwidget.cpp
  mixxx/src/waveform/widgets/qtsimplewaveformwidget.h
  mixxx/src/waveform/widgets/qtwaveformwidget.cpp
  mixxx/src/waveform/widgets/qtwaveformwidget.h
renamed:
  mixxx/res/controllers/Eks Otus.cntrlr.xml => mixxx/res/controllers/EKS Otus.cntrlr.xml
  mixxx/res/keyboard/Standard.kbd.cfg => mixxx/res/keyboard/en_US.kbd.cfg
modified:
  mixxx/build/debian/mixxx.install
  mixxx/build/depends.py
  mixxx/build/features.py
  mixxx/build/nsis/Mixxx.nsi
  mixxx/lib/hidapi-0.7.0/linux/hid-libusb.c
  mixxx/lib/vamp-2.3/src/vamp-hostsdk/PluginLoader.cpp
  mixxx/res/controllers/EKS Otus.js
  mixxx/res/images/templates/ic_template_library_and_preferences.svg
  mixxx/res/mixxx.qrc
  mixxx/res/skins/Deere1280x1024-SXGA/skin.xml
  mixxx/res/skins/Deere1280x800-WXGA/skin.xml
  mixxx/res/skins/Deere1440x900-WXGA+/skin.xml
  mixxx/res/skins/Deere1920x1080-FullHD/skin.xml
  mixxx/res/skins/Deere1920x1200-WUXGA/skin.xml
  mixxx/res/skins/LateNight1280x1024-SXGA/skin.xml
  mixxx/res/skins/LateNight1280x800-WXGA/skin.xml
  mixxx/res/skins/LateNight1366x768-WXGA/skin.xml
  mixxx/res/skins/LateNightBlues1280x1024-SXGA/skin.xml
  mixxx/res/skins/LateNightBlues1280x800-WXGA/skin.xml
  mixxx/res/skins/LateNightBlues1366x768-WXGA/skin.xml
  mixxx/res/skins/Outline1024x600-Netbook/skin.xml
  mixxx/res/skins/Outline1024x768-XGA/skin.xml
  mixxx/res/skins/Outline800x480-WVGA/skin.xml
  mixxx/res/skins/Phoney1600x1200-UXGA/skin.xml
  mixxx/res/skins/Phoney1680x1050-WSXGA/skin.xml
  mixxx/res/skins/PhoneyDark1600x1200-UXGA/skin.xml
  mixxx/res/skins/PhoneyDark1680x1050-WSXGA/skin.xml
  mixxx/res/skins/Shade1024x600-Netbook/skin.xml
  mixxx/res/skins/Shade1024x768-XGA/skin.xml
  mixxx/res/skins/ShadeDark1024x600-Netbook/skin.xml
  mixxx/res/skins/ShadeDark1024x768-XGA/skin.xml
  mixxx/res/translations/mixxx.ts
  mixxx/res/translations/mixxx/ar.po
  mixxx/res/translations/mixxx/ast.po
  mixxx/res/translations/mixxx/bg.po
  mixxx/res/translations/mixxx/br.po
  mixxx/res/translations/mixxx/bs.po
  mixxx/res/translations/mixxx/ca.po
  mixxx/res/translations/mixxx/cs.po
  mixxx/res/translations/mixxx/da.po
  mixxx/res/translations/mixxx/de.po
  mixxx/res/translations/mixxx/el.po
  mixxx/res/translations/mixxx/en_GB.po
  mixxx/res/translations/mixxx/eo.po
  mixxx/res/translations/mixxx/es.po
  mixxx/res/translations/mixxx/et.po
  mixxx/res/translations/mixxx/eu.po
  mixxx/res/translations/mixxx/fi.po
  mixxx/res/translations/mixxx/fr.po
  mixxx/res/translations/mixxx/ga.po
  mixxx/res/translations/mixxx/gl.po
  mixxx/res/translations/mixxx/he.po
  mixxx/res/translations/mixxx/hu.po
  mixxx/res/translations/mixxx/hy.po
  mixxx/res/translations/mixxx/ia.po
  mixxx/res/translations/mixxx/id.po
  mixxx/res/translations/mixxx/is.po
  mixxx/res/translations/mixxx/it.po
  mixxx/res/translations/mixxx/ja.po
  mixxx/res/translations/mixxx/lb.po
  mixxx/res/translations/mixxx/mixxx.pot
  mixxx/res/translations/mixxx/ml.po
  mixxx/res/translations/mixxx/mn.po
  mixxx/res/translations/mixxx/mr.po
  mixxx/res/translations/mixxx/ms.po
  mixxx/res/translations/mixxx/nb.po
  mixxx/res/translations/mixxx/nl.po
  mixxx/res/translations/mixxx/nn.po
  mixxx/res/translations/mixxx/oc.po
  mixxx/res/translations/mixxx/pl.po
  mixxx/res/translations/mixxx/pt.po
  mixxx/res/translations/mixxx/pt_BR.po
  mixxx/res/translations/mixxx/ro.po
  mixxx/res/translations/mixxx/ru.po
  mixxx/res/translations/mixxx/sl.po
  mixxx/res/translations/mixxx/sr.po
  mixxx/res/translations/mixxx/sv.po
  mixxx/res/translations/mixxx/tr.po
  mixxx/res/translations/mixxx/uk.po
  mixxx/res/translations/mixxx/uz.po
  mixxx/res/translations/mixxx/zh_CN.po
  mixxx/res/translations/mixxx/zh_TW.po
  mixxx/res/translations/mixxx_ar.qm
  mixxx/res/translations/mixxx_ar.ts
  mixxx/res/translations/mixxx_ast.qm
  mixxx/res/translations/mixxx_ast.ts
  mixxx/res/translations/mixxx_bg.qm
  mixxx/res/translations/mixxx_bg.ts
  mixxx/res/translations/mixxx_br.qm
  mixxx/res/translations/mixxx_br.ts
  mixxx/res/translations/mixxx_bs.qm
  mixxx/res/translations/mixxx_bs.ts
  mixxx/res/translations/mixxx_ca.qm
  mixxx/res/translations/mixxx_ca.ts
  mixxx/res/translations/mixxx_cs.qm
  mixxx/res/translations/mixxx_cs.ts
  mixxx/res/translations/mixxx_da.qm
  mixxx/res/translations/mixxx_da.ts
  mixxx/res/translations/mixxx_de.qm
  mixxx/res/translations/mixxx_de.ts
  mixxx/res/translations/mixxx_el.qm
  mixxx/res/translations/mixxx_el.ts
  mixxx/res/translations/mixxx_en_GB.qm
  mixxx/res/translations/mixxx_en_GB.ts
  mixxx/res/translations/mixxx_eo.qm
  mixxx/res/translations/mixxx_eo.ts
  mixxx/res/translations/mixxx_es.qm
  mixxx/res/translations/mixxx_es.ts
  mixxx/res/translations/mixxx_et.qm
  mixxx/res/translations/mixxx_et.ts
  mixxx/res/translations/mixxx_eu.qm
  mixxx/res/translations/mixxx_eu.ts
  mixxx/res/translations/mixxx_fi.qm
  mixxx/res/translations/mixxx_fi.ts
  mixxx/res/translations/mixxx_fr.qm
  mixxx/res/translations/mixxx_fr.ts
  mixxx/res/translations/mixxx_ga.qm
  mixxx/res/translations/mixxx_ga.ts
  mixxx/res/translations/mixxx_gl.qm
  mixxx/res/translations/mixxx_gl.ts
  mixxx/res/translations/mixxx_he.qm
  mixxx/res/translations/mixxx_he.ts
  mixxx/res/translations/mixxx_hu.qm
  mixxx/res/translations/mixxx_hu.ts
  mixxx/res/translations/mixxx_hy.ts
  mixxx/res/translations/mixxx_ia.qm
  mixxx/res/translations/mixxx_ia.ts
  mixxx/res/translations/mixxx_id.qm
  mixxx/res/translations/mixxx_id.ts
  mixxx/res/translations/mixxx_is.qm
  mixxx/res/translations/mixxx_is.ts
  mixxx/res/translations/mixxx_it.qm
  mixxx/res/translations/mixxx_it.ts
  mixxx/res/translations/mixxx_ja.qm
  mixxx/res/translations/mixxx_ja.ts
  mixxx/res/translations/mixxx_lb.qm
  mixxx/res/translations/mixxx_lb.ts
  mixxx/res/translations/mixxx_ml.qm
  mixxx/res/translations/mixxx_ml.ts
  mixxx/res/translations/mixxx_mn.qm
  mixxx/res/translations/mixxx_mn.ts
  mixxx/res/translations/mixxx_mr.qm
  mixxx/res/translations/mixxx_mr.ts
  mixxx/res/translations/mixxx_ms.qm
  mixxx/res/translations/mixxx_ms.ts
  mixxx/res/translations/mixxx_nb.qm
  mixxx/res/translations/mixxx_nb.ts
  mixxx/res/translations/mixxx_nl.qm
  mixxx/res/translations/mixxx_nl.ts
  mixxx/res/translations/mixxx_nn.qm
  mixxx/res/translations/mixxx_nn.ts
  mixxx/res/translations/mixxx_oc.qm
  mixxx/res/translations/mixxx_oc.ts
  mixxx/res/translations/mixxx_pl.qm
  mixxx/res/translations/mixxx_pl.ts
  mixxx/res/translations/mixxx_pt.qm
  mixxx/res/translations/mixxx_pt.ts
  mixxx/res/translations/mixxx_pt_BR.qm
  mixxx/res/translations/mixxx_pt_BR.ts
  mixxx/res/translations/mixxx_ro.qm
  mixxx/res/translations/mixxx_ro.ts
  mixxx/res/translations/mixxx_ru.qm
  mixxx/res/translations/mixxx_ru.ts
  mixxx/res/translations/mixxx_sl.qm
  mixxx/res/translations/mixxx_sl.ts
  mixxx/res/translations/mixxx_sr.qm
  mixxx/res/translations/mixxx_sr.ts
  mixxx/res/translations/mixxx_sv.qm
  mixxx/res/translations/mixxx_sv.ts
  mixxx/res/translations/mixxx_tr.qm
  mixxx/res/translations/mixxx_tr.ts
  mixxx/res/translations/mixxx_uk.qm
  mixxx/res/translations/mixxx_uk.ts
  mixxx/res/translations/mixxx_uz.qm
  mixxx/res/translations/mixxx_uz.ts
  mixxx/res/translations/mixxx_zh_CN.qm
  mixxx/res/translations/mixxx_zh_CN.ts
  mixxx/res/translations/mixxx_zh_TW.ts
  mixxx/src/analyser.h
  mixxx/src/analyserbeats.cpp
  mixxx/src/analyserbeats.h
  mixxx/src/analyserbpm.cpp
  mixxx/src/analyserbpm.h
  mixxx/src/analyserqueue.cpp
  mixxx/src/analyserqueue.h
  mixxx/src/analyserrg.cpp
  mixxx/src/analyserrg.h
  mixxx/src/analyserwaveform.cpp
  mixxx/src/analyserwaveform.h
  mixxx/src/basetrackplayer.cpp
  mixxx/src/configobject.cpp
  mixxx/src/configobject.h
  mixxx/src/controllers/dlgcontrollerlearning.cpp
  mixxx/src/controllers/hid/hidcontroller.cpp
  mixxx/src/controllers/hid/hidcontroller.h
  mixxx/src/controllers/hid/hidenumerator.cpp
  mixxx/src/dlgautodj.cpp
  mixxx/src/dlgautodj.ui
  mixxx/src/dlgprefbeats.cpp
  mixxx/src/dlgprefbeatsdlg.ui
  mixxx/src/dlgprefcontrols.cpp
  mixxx/src/dlgprefcontrols.h
  mixxx/src/dlgprefcontrolsdlg.ui
  mixxx/src/dlgprefcrossfaderdlg.ui
  mixxx/src/dlgprefeqdlg.ui
  mixxx/src/dlgprefplaylist.cpp
  mixxx/src/dlgprefplaylistdlg.ui
  mixxx/src/dlgprefrecord.cpp
  mixxx/src/dlgprefreplaygaindlg.ui
  mixxx/src/dlgprefshoutcast.cpp
  mixxx/src/dlgprefshoutcastdlg.ui
  mixxx/src/dlgprefsounditem.cpp
  mixxx/src/dlgprefsounditem.h
  mixxx/src/dlgprepare.ui
  mixxx/src/dlgtrackinfo.cpp
  mixxx/src/dlgtrackinfo.ui
  mixxx/src/engine/cuecontrol.cpp
  mixxx/src/engine/cuecontrol.h
  mixxx/src/engine/engineshoutcast.cpp
  mixxx/src/engine/engineshoutcast.h
  mixxx/src/errordialoghandler.cpp
  mixxx/src/errordialoghandler.h
  mixxx/src/library/baseplaylistfeature.cpp
  mixxx/src/library/basesqltablemodel.cpp
  mixxx/src/library/basesqltablemodel.h
  mixxx/src/library/browse/browsefeature.cpp
  mixxx/src/library/browse/browsefeature.h
  mixxx/src/library/browse/browsethread.cpp
  mixxx/src/library/cratetablemodel.cpp
  mixxx/src/library/cratetablemodel.h
  mixxx/src/library/dao/analysisdao.cpp
  mixxx/src/library/dao/analysisdao.h
  mixxx/src/library/dao/cratedao.cpp
  mixxx/src/library/dao/libraryhashdao.cpp
  mixxx/src/library/dao/playlistdao.cpp
  mixxx/src/library/dao/playlistdao.h
  mixxx/src/library/dao/trackdao.cpp
  mixxx/src/library/dao/trackdao.h
  mixxx/src/library/itunes/itunesfeature.cpp
  mixxx/src/library/itunes/itunesfeature.h
  mixxx/src/library/itunes/itunesplaylistmodel.cpp
  mixxx/src/library/itunes/itunestrackmodel.cpp
  mixxx/src/library/library.cpp
  mixxx/src/library/libraryscanner.cpp
  mixxx/src/library/libraryscanner.h
  mixxx/src/library/librarytablemodel.cpp
  mixxx/src/library/librarytablemodel.h
  mixxx/src/library/missingtablemodel.cpp
  mixxx/src/library/missingtablemodel.h
  mixxx/src/library/playlisttablemodel.cpp
  mixxx/src/library/playlisttablemodel.h
  mixxx/src/library/proxytrackmodel.cpp
  mixxx/src/library/proxytrackmodel.h
  mixxx/src/library/queryutil.h
  mixxx/src/library/rhythmbox/rhythmboxfeature.cpp
  mixxx/src/library/rhythmbox/rhythmboxfeature.h
  mixxx/src/library/schemamanager.cpp
  mixxx/src/library/setlogfeature.cpp
  mixxx/src/library/stardelegate.h
  mixxx/src/library/trackcollection.cpp
  mixxx/src/library/trackcollection.h
  mixxx/src/library/trackmodel.h
  mixxx/src/library/traktor/traktorfeature.cpp
  mixxx/src/library/traktor/traktorfeature.h
  mixxx/src/library/treeitem.cpp
  mixxx/src/library/treeitem.h
  mixxx/src/mixxx.cpp
  mixxx/src/mixxxkeyboard.cpp
  mixxx/src/mixxxkeyboard.h
  mixxx/src/playerinfo.cpp
  mixxx/src/playerinfo.h
  mixxx/src/recording/defs_recording.h
  mixxx/src/recording/encodermp3.cpp
  mixxx/src/recording/enginerecord.cpp
  mixxx/src/recording/enginerecord.h
  mixxx/src/recording/recordingmanager.cpp
  mixxx/src/recording/recordingmanager.h
  mixxx/src/skin/legacyskinparser.cpp
  mixxx/src/skin/legacyskinparser.h
  mixxx/src/soundmanager.cpp
  mixxx/src/soundmanager.h
  mixxx/src/track/beatgrid.cpp
  mixxx/src/track/beatgrid.h
  mixxx/src/track/beatmap.cpp
  mixxx/src/track/beatmap.h
  mixxx/src/track/beats.h
  mixxx/src/trackinfoobject.cpp
  mixxx/src/trackinfoobject.h
  mixxx/src/vamp/vampanalyser.cpp
  mixxx/src/waveform/renderers/glslwaveformrenderersignal.cpp
  mixxx/src/waveform/renderers/glslwaveformrenderersignal.h
  mixxx/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp
  mixxx/src/waveform/renderers/glwaveformrendererfilteredsignal.h
  mixxx/src/waveform/renderers/glwaveformrenderersimplesignal.cpp
  mixxx/src/waveform/renderers/glwaveformrenderersimplesignal.h
  mixxx/src/waveform/renderers/waveformmark.cpp
  mixxx/src/waveform/renderers/waveformmark.h
  mixxx/src/waveform/renderers/waveformrenderbeat.cpp
  mixxx/src/waveform/renderers/waveformrenderbeat.h
  mixxx/src/waveform/renderers/waveformrendererendoftrack.cpp
  mixxx/src/waveform/renderers/waveformrendererfilteredsignal.cpp
  mixxx/src/waveform/renderers/waveformrendererfilteredsignal.h
  mixxx/src/waveform/renderers/waveformrendermark.cpp
  mixxx/src/waveform/renderers/waveformrendermark.h
  mixxx/src/waveform/renderers/waveformwidgetrenderer.cpp
  mixxx/src/waveform/renderers/waveformwidgetrenderer.h
  mixxx/src/waveform/waveform.cpp
  mixxx/src/waveform/waveform.h
  mixxx/src/waveform/waveformfactory.cpp
  mixxx/src/waveform/waveformfactory.h
  mixxx/src/waveform/waveformwidgetfactory.cpp
  mixxx/src/waveform/widgets/glsimplewaveformwidget.cpp
  mixxx/src/waveform/widgets/glsimplewaveformwidget.h
  mixxx/src/waveform/widgets/glslwaveformwidget.cpp
  mixxx/src/waveform/widgets/glslwaveformwidget.h
  mixxx/src/waveform/widgets/glwaveformwidget.cpp
  mixxx/src/waveform/widgets/softwarewaveformwidget.cpp
  mixxx/src/waveform/widgets/softwarewaveformwidget.h
  mixxx/src/waveform/widgets/waveformwidgettype.h
  mixxx/src/widget/wlibrarytableview.cpp
  mixxx/src/widget/woverview.cpp
  mixxx/src/widget/woverview.h
  mixxx/src/widget/wslidercomposed.h
  mixxx/src/widget/wspinny.cpp
  mixxx/src/widget/wstatuslight.cpp
  mixxx/src/widget/wtracktableview.cpp
  mixxx/src/widget/wtracktableview.h
  mixxx/src/widget/wwaveformviewer.cpp
  mixxx/vamp-plugins/SConscript
  mixxx/vamp-plugins/libmain.cpp
  mixxx/res/controllers/EKS Otus.cntrlr.xml
unknown:
  mixxx/.sconf_temp/
  mixxx/.sconsign.dblite
  mixxx/Mixxx/
  mixxx/cache/
  mixxx/config.log
  mixxx/lin32_build/
  mixxx/mixxx
  mixxx/output.txt
  mixxx/lib/vamp-2.3/src/vamp-sdk/PluginAdapter.os
  mixxx/lib/vamp-2.3/src/vamp-sdk/RealTime.os
  mixxx/res/qrc_mixxx.cc
pending merges:
  RJ Ryan 2012-05-24 [merge] Merging from lp:~mixxxdevelopers/mixxx/trunk_translations. Upda...
    Launchpad Translation... 2012-05-20 Launchpad automatic translations update.
    Launchpad Translation... 2012-05-18 Launchpad automatic translations update.
    Launchpad Translation... 2012-05-17 Launchpad automatic translations update.
    Launchpad Translation... 2012-05-16 Launchpad automatic translations update.
    Launchpad Translation... 2012-05-15 Launchpad automatic translations update.
    Launchpad Translation... 2012-05-14 Launchpad automatic translations update.
    Launchpad Translation... 2012-05-13 Launchpad automatic translations update.
    Launchpad Translation... 2012-05-12 Launchpad automatic translations update.
    Launchpad Translation... 2012-05-11 Launchpad automatic translations update.
    Launchpad Translation... 2012-05-10 Launchpad automatic translations update.
    Launchpad Translation... 2012-05-09 Launchpad automatic translations update.
    Launchpad Translation... 2012-05-08 Launchpad automatic translations update.
    Launchpad Translation... 2012-05-07 Launchpad automatic translations update.
    Launchpad Translation... 2012-05-06 Launchpad automatic translations update.
    Launchpad Translation... 2012-05-05 Launchpad automatic translations update.
    Launchpad Translation... 2012-05-04 Launchpad automatic translations update.
    Launchpad Translation... 2012-05-03 Launchpad automatic translations update.
    Launchpad Translation... 2012-05-02 Launchpad automatic translations update.
    Launchpad Translation... 2012-05-01 Launchpad automatic translations update.
    Launchpad Translation... 2012-04-30 Launchpad automatic translations update.
    RJ Ryan 2012-05-24 Fix improper use of MultiByteToWideChar and WideCharToMultiByte in ...
    RJ Ryan 2012-05-24 Revert all debug output I added to debug the VAMP plugin on Windows...
    RJ Ryan 2012-05-24 Revert noisy plugin-path debug output.
    RJ Ryan 2012-05-24 Fix usage of MultiByteToWideChar in VAMP PluginLoader to include an...
    RJ Ryan 2012-05-23 Getting closer to a Windows VAMP plugin fix.
    RJ Ryan 2012-05-23 Getting closer to a Windows VAMP plugin fix.
    vrince 2012-05-23 [merge] Merge from trunk
    RJ Ryan 2012-05-23 Disable some debug console stuff I was trying.
    vrince 2012-05-23 Add WaveformMarkSet in order to generalize WaveformMark skin extract...
    RJ Ryan 2012-05-23 Disable DEBUGCONSOLE ifdef.
    RJ Ryan 2012-05-23 Add Max Linke's patch to put delegateForColumn in BSTM. Fixes Bug #...
    RJ Ryan 2012-05-22 Remove UNICODE definition. Write stdout/stderr/cerr/cout to file on...
    RJ Ryan 2012-05-22 Sigh. Adding excessive logging to PluginLoader. Will revert later.
    Daniel Schürmann 2012-05-22 check if track exists without cache, fix bug #974640
    RJ Ryan 2012-05-22 Try to fix Windows VAMP plugin loading by defining UNICODE.
    RJ Ryan 2012-05-22 Add windows debug output to VAMP plugin detection.
    RJ Ryan 2012-05-22 Use Int32_t instead of int32_t.
    RJ Ryan 2012-05-20 Fix BPM lock checkbox inconsistent behavior. Fixes Bug #1002051
    RJ Ryan 2012-05-20 Check BPM-lock for selection to decide whether to allow the clear-b...
    RJ Ryan 2012-05-20 Do not save waveforms immediately after generating them since the t...
    RJ Ryan 2012-05-20 Remove Qt::WA_ForceUpdatesDisabled from WWaveformViewer. Fixes Bug ...
    RJ Ryan 2012-05-20 Don't set StarDelegate as the delegate for every single cell. Inste...
    RJ Ryan 2012-05-20 [merge] Merging from lp:~hile/mixxx/hidscripts
    Ilkka Tuohela 2012-05-20 Imported latest fixes to hidscripts
    Ilkka Tuohela 2012-05-20 Imported latest fixes to hidscripts
    Ilkka Tuohela 2012-05-20 Imported latest fixes to hidscripts
    Ilkka Tuohela 2012-05-18 Minor fixes for LED control
    Ilkka Tuohela 2012-05-18 Imported latest big API changes
    Ilkka Tuohela 2012-05-18 Renamed field add functions, fix sparse bitVector index parsing
    Ilkka Tuohela 2012-05-18 Imported common-hid-packet-parser.js and latest Otus HID updates
    Daniel Schürmann 2012-05-20 fixed recording folder, Bug #925663
    RJ Ryan 2012-05-19 Update blacklisting logic and add comments.
    RJ Ryan 2012-05-19 [merge] Merging from lp:~hile/mixxx/hidblacklist.
    Ilkka Tuohela 2012-05-16 Imported HID blacklist patch proposal
    RJ Ryan 2012-05-19 Fix build. Mea culpa.
    RJ Ryan 2012-05-18 Fix widget names for translation.
    RJ Ryan 2012-05-18 [merge] Merging from lp:~vrince/mixxx/waveform-2.0_pure-gl
    vrince 2012-05-16 Change defaul zoom to 3 (33%)
    vrince 2012-05-16 Add DefaulMark support (see example in <visual> of Deere1280x800 skin)
    vrince 2012-05-16 Waveform interactive zoom in accessible everywhere in the waveform v...
    vrince 2012-05-15 Some comments
    vrince 2012-05-13 Add central waveform axe (and 'AxesColor' in skin) in all waveform r...
    vrince 2012-05-12 [merge] Merged from trunk
    vrince 2012-05-11 Disable end of track display for track shorter than end of track tri...
    vrince 2012-05-11 Add support for alignment in software signal renderer (and fix globa...
    vrince 2012-05-10 Use of visual gain in every waveform renderer (and add overall and p...
    vrince 2012-05-08 Update software signal renderer with lst signal base
    vrince 2012-05-08 Add QtSimpleWaveform and QtWaveformRendererSimpleSignal (move conten...
    vrince 2012-05-08 Add support for alignment in GLWaveformRendererFilteredSignal
    vrince 2012-05-08 Add new waveform widget QtWaveformWidget
    vrince 2012-05-08 Add WaveformRendererSignalBase to avoid duplicated code
    vrince 2012-05-07 [merge] Merge from trunk
    vrince 2012-05-07 Integrate test version with pure gl with triangles
    vrince 2012-05-03 introduce pure opengl signal render based on triangles (from old tes...
    Owen Williams 2012-05-16 Protect against NULL trackpointer when load fails
    Daniel Schürmann 2012-05-16 two more __OSX__->__APPLE__
    Daniel Schürmann 2012-05-16 __OSX__->__APPLE__, fix bug #999560
    Daniel Schürmann 2012-05-16 redo changes from #3157, which where lost in #3159
    Daniel Schürmann 2012-05-16 Add to Auto-DJ Top with empty Auto-DJ, fix bug #982652
    Daniel Schürmann 2012-05-15 fixed shortcuts for eject and LoadSelectedTrack, a partial...
    Daniel Schürmann 2012-05-15 [merge] fixed missing shortcuts in tooltips, bug #696058
    Daniel Schürmann 2012-05-15 fixed missing shortcuts in tooltips, bug #696058
    RJ Ryan 2012-05-15 Fix Windows build.
    RJ Ryan 2012-05-15 Set shoutcast stream public based on stream_public preference. Fixe...
    Daniel Schürmann 2012-05-15 fix *.kbd.cfg location
    RJ Ryan 2012-05-14 Forgot return value.
    RJ Ryan 2012-05-14 If QLocale::uiLanguages() has English as the first language then do...
    RJ Ryan 2012-05-14 [merge] Merge from lp:mixxx/1.10
    RJ Ryan 2012-05-14 Typo
    Daniel Schürmann 2012-05-14 additional keyboard layouts added
    Daniel Schürmann 2012-05-14 Load keyboard mappings based on actual keyboard layout, fi...
    RJ Ryan 2012-05-14 Delete AnalyserGainVamp and ReplayGain from libmixxxminimal.
    RJ Ryan 2012-05-14 Disable AnalyserGainVamp and use the built-in RG analyser for all a...
    RJ Ryan 2012-05-14 [merge] Merging from lp:mixxx/1.10.
    RJ Ryan 2012-05-14 Add vittorio's C++ and class-ified conversion of ReplayGain analyse...
    Daniel Schürmann 2012-05-14 removed absolute path when loading lame, fix bug #920191
    Daniel Schürmann 2012-05-14 hide smb songs from Rhythmbox library
    Bill Good 2012-05-13 Fixed SoundManager from filtering input devices with only 1 channel
    Bill Good 2012-05-13 Fixed DlgPrefSoundItem to only show devices with sufficient channels
    Bill Good 2012-05-13 Added unistd.h include for sleep(3) on non-Windows
    Daniel Schürmann 2012-05-14 removed absolute path when loading lame, fix bug #920191
    RJ Ryan 2012-05-14 Update translation templates.:
    RJ Ryan 2012-05-14 Fix spelling of coarse in MIDI learning.
    Daniel Schürmann 2012-05-14 hide smb songs from Rhythmbox library
    jus 2012-05-14 Update translation template
    Daniel Schürmann 2012-05-13 eject played track on end of Auto-DJ playlist, fix bug #99...
    RJ Ryan 2012-05-12 Rework ErrorDialogHandler to be a little cleaner and not Q_ASSERT.
    RJ Ryan 2012-05-12 [merge] Merging from lp:mixxx/1.10
    RJ Ryan 2012-05-12 Do not use display strings to store/communicate shoutcast preferenc...
    RJ Ryan 2012-05-11 Fix deadlock in BrowseThread. Fixes Bug #955179
    Daniel Schürmann 2012-05-12 fixed outline skin kill buttons
    Sean M. Pappalardo 2012-05-12 Prevent HIDAPI from bailing out on non-critical libusb e...
    RJ Ryan 2012-05-12 Add patch from mutil to allow customization of Browse section Quick...
    Owen Williams 2012-05-11 Make sure analyzers are cleaned up before we requeue a track
    RJ Ryan 2012-05-11 Fix deadlock in BrowseThread. Fixes Bug #955179
    RJ Ryan 2012-05-11 Add /usr/lib/mixxx to install directories in Debian packaging scripts.
    Owen Williams 2012-05-11 Make track analysis interruptable so loaded tracks always get...
    RJ Ryan 2012-05-11 Use SoundSource samplerate instead of TrackInfoObject samplerate in...
    RJ Ryan 2012-05-11 Add daschuer's patch to allow enabling/disabling of iTunes/Traktor/...
    RJ Ryan 2012-05-11 Add daschuer's patch to allow importing external-library playlists ...
    RJ Ryan 2012-05-10 Add Tom Gascoigne's patch to add a locale preference option, allowi...
    RJ Ryan 2012-05-10 Change WStatusLight behavior so that PathBack is not drawn on every...
    RJ Ryan 2012-05-10 Use a CO instead of COTM in SoundManager.
    Daniel Schürmann 2012-05-10 fix bug #900255 losing keyboard release events
    RJ Ryan 2012-05-10 Add path from mutil to show help text when clicking the main browse...
    RJ Ryan 2012-05-09 Set SoundManager status to disconnected if we fail to open a device...
    RJ Ryan 2012-05-09 Forgot to create CO for SoundManager.
    RJ Ryan 2012-05-09 Add patch from Maxime Bochon to suggest a filename based on the pla...
    RJ Ryan 2012-05-09 Add [SoundManager],status [Recording],status and [Shoutcast],status...
    jus <https://launchpa... 2012-05-09 Update translation template
    jus <https://launchpa... 2012-05-09 Small tooltips fixes (Typo, Double space, Capitali...
    RJ Ryan 2012-05-08 Remove Q_ASSERT on query failure and another Q_ASSERT on rollback.
    RJ Ryan 2012-05-08 Fix iTunes scanner so it doesn't run with the main thread database ...
    RJ Ryan 2012-05-08 Close DB connection on shutdown in AnalyserWaveform.
    RJ Ryan 2012-05-08 Add connectionName to debug output.
    RJ Ryan 2012-05-08 Don't clone the QSqlDatabase in AnalysisDao.
    RJ Ryan 2012-05-08 Convert all transactions to use ScopedTransaction so should never b...
    RJ Ryan 2012-05-08 Add missing rollback and delete unused SQL statement.
    RJ Ryan 2012-05-08 Fix typo.
    RJ Ryan 2012-05-08 Prioritize tracks that are loaded when choosing the next track to a...
    RJ Ryan 2012-05-08 Fix typo.
    RJ Ryan 2012-05-08 Update translation templates so LP translators can start work on to...
    RJ Ryan 2012-05-08 Wordsmith and de-duplicate tooltips.
    jus 2012-05-08 Adds a selectable Tracks File Path display in the now less high track e...
    RJ Ryan 2012-05-08 [merge] Merging from lp:~mixxxdevelopers/mixxx/1.11-skins
    jus 2012-05-08 [merge] Merge from trunk
    jus 2012-05-08 [merge] Merge from trunk
    jus 2012-05-08 Oops, fix copypasta error
    jus 2012-05-08 [merge] Merge from trunk
    jus 2012-05-08 Make "orientation" TooltipID more unambiguous
    jus 2012-05-08 Removed individual Tooltip text in all skin.xml. Tooltip now use a Tool...
    jus 2012-05-08 Add bpm_tap_visual_bpm TooltipId to tooltips.cpp . This is a special ca...
    jus 2012-05-08 Unify heading word capitalization for displayed tooltips in tooltips.cpp
    jus 2012-05-08 Add track_duration, track_album, text , TooltipId`s to tooltips.cpp
    jus 2012-05-08 Fix spelling in tooltips.cpp
    jus 2012-05-08 [merge] Merge from trunk
    jus 2012-05-06 Revert last commit, cause the crossfaders ALT+H shortcut is already tak...
    jus 2012-05-06 Added shortcuts to switch the crossfader from left to right channel in ...
    jus 2012-05-06 [merge] Merge from trunk
    jus 2012-05-05 Add tooltips for all buttons in dlgprepare.ui
    jus 2012-05-05 Add tooltips for ramping pitchbend in dlgprefcontrolsdlg.ui
    jus 2012-05-04 Align the call to action button to the right like in all other preferen...
    jus 2012-05-04 Unify wording, use "Reset to Defaults" accross all preferences panes ( ...
    jus 2012-05-04 Clean up Preferences->Interface widget, fix lp:992144
    jus 2012-05-04 [merge] Merge from trunk
    jus 2012-05-04 Apply styles to spinbox in AutoDJ tab in all skin.xml
    jus 2012-05-04 Made QSpinbox in dlgautodj.ui frameless and remove its fixed size. Need...
    jus 2012-05-04 Added QSpinbox to the existing workaround to support legacy color styli...
    jus 2012-05-04 Fix mini tooltips typo in all skin.xml
    jus 2012-05-03 [merge] Merge from trunk
    jus 2012-05-03 Fix typo in recordings preferences
    jus 2012-05-03 Update icons for the renamed History feature (was Set Log)
    jus 2012-05-02 [merge] Merge from trunk
    jus 2012-05-01 Update tooltips & use of EmitOnPressAndRelease for bpm_tab in Phoney(Da...
    jus 2012-05-01 Fix spacing in some skin.xml
    jus 2012-05-01 Added element missed in the previous copypasta fest in Deere1440x900-WX...
    jus 2012-05-01 Update tooltips & use of EmitOnPressAndRelease for bpm_tab with Outline...
    jus 2012-05-01 Bump target Mixxx version to 1.11 in skin.xml & CHANGELOG.txt
    jus 2012-05-01 Deere skin family: Move changelog from skin.xml to separate CHANGELOG.t...
    jus 2012-05-01 Shade skin family: Move changelog from skin.xml to separate CHANGELOG.t...
    jus 2012-05-01 PhoneyDark skin family: Move changelog from skin.xml to separate CHANGE...
    jus 2012-05-01 Phoney skin family: Move changelog from skin.xml to separate CHANGELOG....
    jus 2012-05-01 Outline skin family: Move changelog from skin.xml to separate CHANGELOG...
    jus 2012-05-01 LateNightBlues skin family: Move changelog from skin.xml to separate CH...
    jus 2012-05-01 LateNight skin family: Move changelog from skin.xml to separate CHANGEL...
    jus 2012-05-01 Deere skin family: Move changelog from skin.xml to separate CHANGELOG.t...
    jus 2012-05-01 Support <Mark> (Hot)Cue and <MarkRange> Loop marker in waveform <Overvi...
    RJ Ryan 2012-05-08 Add patch from mutil to add right-click 'Open in file browser' cont...
    RJ Ryan 2012-05-08 Don't short-circuit Analyser::initialise calls.
    RJ Ryan 2012-05-08 Revert r3103.
    Sean M. Pappalardo 2012-05-08 Write beat detection defaults to config file on startup ...
    Sean M. Pappalardo 2012-05-08 Fixed waveforms again after r3101
    RJ Ryan 2012-05-08 Add waveform analyser to prepare-analyser-queue so that waveforms w...
    RJ Ryan 2012-05-08 Don't run the analyser-queue on tracks for which no analyser wants ...
    RJ Ryan 2012-05-08 [merge] Merging from lp:mixxx/1.10
    RJ Ryan 2012-05-08 Fix integer overflow when using 4GB recording splits. Fixes Bug #95...
    RJ Ryan 2012-05-07 Fix deletion order in DlgAutoDJ to fix header-state saving for the ...
    RJ Ryan 2012-05-07 Move tooltips out of skins and into src/skin/tooltips.cpp. Add Tool...
    RJ Ryan 2012-05-07 Re-work Beats::findBeats to not append to a QList<double>. Instead,...
    Owen Williams 2012-05-06 Add vinylcontrol_enabled to midi learning (lp:#995658)
    RJ Ryan 2012-05-06 [merge] Merging from lp:mixxx/1.10
    RJ Ryan 2012-05-06 Remove Q_ASSERT on angle in WSpinny and gracefully handle the error...

3014. By globalkeith on 2012-05-06

merge with trunk

3013. By globalkeith on 2012-05-06

update from trunk

3012. By globalkeith on 2012-04-21

extensive refactoring to clean up code and added a row count UI so you can see how many tracks are matched by the filters

=== modified file 'mixxx/build/depends.py'
--- mixxx/build/depends.py	2012-06-25 00:02:38 +0000
+++ mixxx/build/depends.py	2012-06-27 11:06:21 +0000
@@ -324,6 +324,7 @@
                    "dlgprefcrossfader.cpp",
                    "dlgtrackinfo.cpp",
                    "dlgprepare.cpp",
+                   "dlgselector.cpp",
                    "dlgautodj.cpp",
 
                    "engine/engineworker.cpp",
@@ -424,6 +425,7 @@
                    "widget/wlibrary.cpp",
                    "widget/wlibrarytableview.cpp",
                    "widget/wpreparelibrarytableview.cpp",
+                   "widget/wselectorlibrarytableview.cpp",
                    "widget/wpreparecratestableview.cpp",
                    "widget/wlibrarytextbrowser.cpp",
                    "library/preparecratedelegate.cpp",
@@ -455,6 +457,9 @@
                    "dlgrecording.cpp",
                    "recording/recordingmanager.cpp",
 
+                   "library/selector/selectorfeature.cpp",
+                   "library/selector/selectorlibrarytablemodel.cpp",
+
                    # External Library Features
                    "library/baseexternallibraryfeature.cpp",
                    "library/rhythmbox/rhythmboxfeature.cpp",
@@ -629,6 +634,7 @@
         build.env.Uic4('dlgaboutdlg.ui')
         build.env.Uic4('dlgtrackinfo.ui')
         build.env.Uic4('dlgprepare.ui')
+        build.env.Uic4('dlgselector.ui')
         build.env.Uic4('dlgautodj.ui')
         build.env.Uic4('dlgprefsounditem.ui')
         build.env.Uic4('dlgrecording.ui')

=== added file 'mixxx/lib/replaygain/replaygain_analysis.h'
--- mixxx/lib/replaygain/replaygain_analysis.h	1970-01-01 00:00:00 +0000
+++ mixxx/lib/replaygain/replaygain_analysis.h	2012-06-27 11:06:21 +0000
@@ -0,0 +1,58 @@
+/*
+ *  ReplayGainAnalysis - analyzes input samples and give the recommended dB change
+ *  Copyright (C) 2001 David Robinson and Glen Sawyer
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  concept and filter values by David Robinson ([e-mail])
+ *    -- blame him if you think the idea is flawed
+ *  coding by Glen Sawyer ([e-mail]) 442 N 700 E, Provo, UT 84606 USA
+ *    -- blame him if you think this runs too slowly, or the coding is otherwise flawed
+ *  minor cosmetic tweaks to integrate with FLAC by Josh Coalson
+ *
+ *  For an explanation of the concepts and the basic algorithms involved, go to:
+ *    http://www.replaygain.org/
+ */
+
+#ifndef GAIN_ANALYSIS_H
+#define GAIN_ANALYSIS_H
+
+#include <stddef.h>
+
+#define GAIN_NOT_ENOUGH_SAMPLES  -24601
+#define GAIN_ANALYSIS_ERROR           0
+#define GAIN_ANALYSIS_OK              1
+#define INIT_GAIN_ANALYSIS_ERROR      0
+#define INIT_GAIN_ANALYSIS_OK         1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef float   Float_t;         /* Type used for filtering */
+
+extern Float_t ReplayGainReferenceLoudness; /* in dB SPL, currently == 89.0 */
+
+int     InitGainAnalysis ( long samplefreq );
+int     AnalyzeSamples   ( const Float_t* left_samples, const Float_t* right_samples, size_t num_samples, int num_channels );
+int		ResetSampleFrequency ( long samplefreq );
+Float_t GetTitleGain     ( void );
+/*Float_t GetAlbumGain     ( void );*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GAIN_ANALYSIS_H */

=== added file 'mixxx/res/images/library/ic_library_selector.png'
Binary files mixxx/res/images/library/ic_library_selector.png	1970-01-01 00:00:00 +0000 and mixxx/res/images/library/ic_library_selector.png	2012-06-27 11:06:21 +0000 differ
=== added file 'mixxx/res/keyboard/Standard.kbd.cfg'
--- mixxx/res/keyboard/Standard.kbd.cfg	1970-01-01 00:00:00 +0000
+++ mixxx/res/keyboard/Standard.kbd.cfg	2012-06-27 11:06:21 +0000
@@ -0,0 +1,101 @@
+[Master]
+crossfader_up h
+crossfader_down g
+crossfader_up_small Shift+h
+crossfader_down_small Shift+g
+
+[Microphone]
+talkover `
+
+[Channel1]
+play d
+cue_set Shift+d
+cue_default f
+cue_gotoandstop Shift+f
+
+back a
+reverse Shift+a
+fwd s
+
+beatsync 1
+bpm_tap Shift+!
+
+rate_perm_down F1
+rate_perm_up F2
+rate_temp_down F3
+rate_temp_up F4
+rate_perm_down_small Shift+F1
+rate_perm_up_small Shift+F2
+rate_temp_down_small Shift+F3
+rate_temp_up_small Shift+F4
+
+pfl t
+filterLowKill b
+flanger 5
+
+hotcue_1_activate z
+hotcue_2_activate x
+hotcue_3_activate c
+hotcue_4_activate v
+hotcue_1_clear Shift+z
+hotcue_2_clear Shift+x
+hotcue_3_clear Shift+c
+hotcue_4_clear Shift+v
+
+LoadSelectedTrack Shift+Left
+eject Alt+Shift+Left
+
+loop_in 2
+loop_out 3
+reloop_exit 4
+
+beatloop_4_toggle q
+loop_halve w
+loop_double e
+
+
+[Channel2]
+play l
+cue_set Shift+l
+cue_default ;
+cue_gotoandstop Shift+:
+
+back j
+reverse Shift+j
+fwd k
+
+beatsync 6
+bpm_tap Shift+^
+
+rate_perm_down F5
+rate_perm_up F6
+rate_temp_down F7
+rate_temp_up F8
+rate_perm_down_small Shift+F5
+rate_perm_up_small Shift+F6
+rate_temp_down_small Shift+F7
+rate_temp_up_small Shift+F8
+
+pfl y
+filterLowKill n
+flanger 0
+
+hotcue_1_activate m
+hotcue_2_activate ,
+hotcue_3_activate .
+hotcue_4_activate /
+hotcue_1_clear Shift+M
+hotcue_2_clear Shift+<
+hotcue_3_clear Shift+>
+hotcue_4_clear Shift+?
+
+LoadSelectedTrack Shift+Right
+eject Alt+Shift+Right
+
+loop_in 7
+loop_out 8
+reloop_exit 9
+
+beatloop_4_toggle u
+loop_halve i
+loop_double o

=== modified file 'mixxx/res/keyboard/en_US.kbd.cfg'
--- mixxx/res/keyboard/en_US.kbd.cfg	2012-05-14 21:39:03 +0000
+++ mixxx/res/keyboard/en_US.kbd.cfg	2012-06-27 11:06:21 +0000
@@ -1,8 +1,8 @@
 [Master]
 crossfader_up h
 crossfader_down g
-crossfader_up_small Shift+h
-crossfader_down_small Shift+g
+crossfader_maximum Shift+h
+crossfader_minimum Shift+g
 
 [Microphone]
 talkover `

=== modified file 'mixxx/res/mixxx.qrc'
--- mixxx/res/mixxx.qrc	2012-06-25 00:02:38 +0000
+++ mixxx/res/mixxx.qrc	2012-06-27 11:06:21 +0000
@@ -30,6 +30,7 @@
         <file>images/library/ic_library_locked.png</file>
         <file>images/library/ic_library_playlist.png</file>
         <file>images/library/ic_library_prepare.png</file>
+        <file>images/library/ic_library_selector.png</file>
         <file>images/library/ic_library_promotracks.png</file>
         <file>images/library/ic_library_recordings.png</file>
         <file>images/library/ic_library_rhythmbox.png</file>

=== added file 'mixxx/src/analyserwavesummary.cpp'
--- mixxx/src/analyserwavesummary.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/analyserwavesummary.cpp	2012-06-27 11:06:21 +0000
@@ -0,0 +1,81 @@
+#include <QtDebug>
+
+#include "trackinfoobject.h"
+#include "analyserwavesummary.h"
+
+// Taken from the old wavesummary.cpp code
+#ifndef WAVESUMMARYCONSTANTS
+const int kiBlockSize = 2048;
+const int kiBeatBlockNo = 1000;
+const int kiBeatBins = 100;
+const int kiSummaryBufferSize = 2100;
+const float kfFeatureStepSize = 0.01f;
+#define WAVESUMMARYCONSTANTS
+#endif
+
+AnalyserWavesummary::AnalyserWavesummary() {
+    m_pData = NULL;
+}
+
+void AnalyserWavesummary::initialise(TrackPointer tio, int sampleRate, int totalSamples) {
+    Q_UNUSED(sampleRate);
+    // Check if the preview has already been generated
+    const QByteArray* p = tio->getWaveSummary();
+    if(p != NULL && p->size() > 0) {
+        return;
+    }
+
+    // Initialize kiSummaryBufferSize bytes to 0
+    m_pData = new QByteArray(kiSummaryBufferSize, 0);
+
+    // The stride length is the number of samples that correspond
+    // to one "line" (3 entries) in the data buffer.
+    m_iStrideLength = (int)ceilf((float)totalSamples/((float)kiSummaryBufferSize/3.));
+    if(m_iStrideLength%2 != 0)
+        m_iStrideLength--;
+
+    m_iCurPos = 0;
+    m_iBufferPos = 0;
+    m_fMax = -1.0f;
+    m_fMin = 1.0f;
+}
+
+void AnalyserWavesummary::process(const CSAMPLE *pIn, const int iLen) {
+    // Check if processing is disabled.
+    if(m_pData == NULL)
+        return;
+
+    //qDebug() << "AnalyserWavesummary::process() processing " << iLen << " samples";
+
+    for(int i=0; i<iLen && m_iCurPos+2 < m_pData->size() ; i++) {
+        if(m_iBufferPos >= m_iStrideLength) {
+            (*m_pData)[m_iCurPos] = (char)(m_fMin*127);
+            (*m_pData)[m_iCurPos+1] = (char)(m_fMax*127);
+            (*m_pData)[m_iCurPos+2] = 0;
+            m_iCurPos += 3;
+
+            m_iBufferPos = 0;
+            m_fMax = -1.0f;
+            m_fMin = 1.0f;
+        }
+
+        if(m_iBufferPos <= kiBlockSize) {
+            if(pIn[i] > m_fMax)
+                m_fMax = pIn[i];
+            if(pIn[i] < m_fMin)
+                m_fMin = pIn[i];
+        }
+        m_iBufferPos++;
+    }
+}
+
+void AnalyserWavesummary::finalise(TrackPointer tio) {
+    if(m_pData == NULL)
+        return;
+    tio->setWaveSummary(m_pData, true);
+    //setWaveSummary copies the waveform from the pointer we pass it, so it's safe
+    //to delete the pointer.
+    delete m_pData;
+    m_pData = NULL;
+    //qDebug() << "AnalyserWavesummary generation successful for " << tio->getFilename();
+}

=== added file 'mixxx/src/analyserwavesummary.h'
--- mixxx/src/analyserwavesummary.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/analyserwavesummary.h	2012-06-27 11:06:21 +0000
@@ -0,0 +1,25 @@
+#ifndef ANALYSER_WAVESUMMARY_H
+#define ANALYSER_WAVESUMMARY_H
+
+#include <QByteArray>
+
+#include "analyser.h"
+
+class AnalyserWavesummary : public Analyser {
+
+  public:
+    AnalyserWavesummary();
+    void initialise(TrackPointer tio, int sampleRate, int totalSamples);
+    void process(const CSAMPLE *pIn, const int iLen);
+    void finalise(TrackPointer tio);
+
+  private:
+    QByteArray *m_pData;
+    int m_iCurPos;
+    int m_iBufferPos;
+    int m_iStrideLength;
+    float m_fMax;
+    float m_fMin;
+};
+
+#endif

=== modified file 'mixxx/src/dlgautodj.cpp'
--- mixxx/src/dlgautodj.cpp	2012-06-25 00:02:38 +0000
+++ mixxx/src/dlgautodj.cpp	2012-06-27 11:06:21 +0000
@@ -129,6 +129,9 @@
     m_pAutoDJTableModel->select();
 }
 
+void DlgAutoDJ::onHide() {
+}
+
 void DlgAutoDJ::setup(QDomNode node) {
     QPalette pal = palette();
 

=== modified file 'mixxx/src/dlgautodj.h'
--- mixxx/src/dlgautodj.h	2012-06-25 00:02:38 +0000
+++ mixxx/src/dlgautodj.h	2012-06-27 11:06:21 +0000
@@ -28,6 +28,7 @@
     virtual void onSearchCleared();
     virtual void onSearch(const QString& text);
     virtual void onShow();
+    virtual void onHide();
     virtual void loadSelectedTrack();
     virtual void loadSelectedTrackToGroup(QString group);
     virtual void moveSelection(int delta);

=== added file 'mixxx/src/dlgmidilearning.cpp'
--- mixxx/src/dlgmidilearning.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgmidilearning.cpp	2012-06-27 11:06:21 +0000
@@ -0,0 +1,210 @@
+/***************************************************************************
+                          dlgmidilearning.cpp  -  description
+                             -------------------
+    begin                : Mon March 2 2009
+    copyright            : (C) 2009 by Albert Santoni
+    email                : alberts at mixxx dot org
+ ***************************************************************************/
+
+/***************************************************************************
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+***************************************************************************/
+
+#include "dlgmidilearning.h"
+#include "mixxxcontrol.h"
+#include "midi/midimessage.h"
+#include "midi/midimapping.h"
+
+DlgMidiLearning::DlgMidiLearning(QWidget * parent, MidiMapping* mapping) :  QDialog(parent), Ui::DlgMidiLearning()
+{
+    setupUi(this);
+    m_pMidiMapping = mapping;
+    labelMappedTo->setText("");
+    iCurrentControl = 0;
+    stackedWidget->setCurrentIndex(0); //Ensure the first page is always shown regardless
+                                       //of the last page shown when the .ui file was saved.
+
+    //Delete this dialog when its closed. We don't want any persistence.
+    QWidget::setAttribute(Qt::WA_DeleteOnClose);
+
+    m_pSkipShortcut = new QShortcut(QKeySequence(Qt::Key_Space), this);
+    connect(m_pSkipShortcut, SIGNAL(triggered()), pushButtonSkip, SLOT(click()));
+    //pushButtonSkip->setShortcut(QKeySequence(Qt::Key_Space));
+
+    connect(pushButtonBegin, SIGNAL(clicked()), this, SLOT(begin()));
+    connect(pushButtonSkip, SIGNAL(clicked()), this, SLOT(next()));
+    connect(pushButtonPrevious, SIGNAL(clicked()), this, SLOT(prev()));
+    connect(m_pMidiMapping, SIGNAL(midiLearningFinished(MidiMessage)), this, SLOT(controlMapped(MidiMessage)));
+    connect(pushButtonFinish, SIGNAL(clicked()), this, SLOT(close()));
+
+
+    // Master Controls
+    setupControl("[Master]", "crossfader", tr("Crossfader"));
+    setupControl("[Master]", "volume", tr("Master volume"));
+    setupControl("[Master]", "balance", tr("Master balance"));
+    setupControl("[Master]", "headVolume", tr("Headphones volume"));
+    setupControl("[Master]", "headMix", tr("Headphones mix (pre/main)"));
+
+    // Deck Controls
+    setupDeckControl("cue_default", tr("Cue button for Player %1"));
+    setupDeckControl("play", tr("Play button for Player %1"));
+    setupDeckControl("back", tr("Fast rewind button for Player %1"));
+    setupDeckControl("fwd", tr("Fast forward button for Player %1"));
+    setupDeckControl("reverse", tr("Play reverse button for Player %1"));
+    setupDeckControl("pfl", tr("Headphone listen button for Player %1"));
+    setupDeckControl("beatsync", tr("Beat sync button for Player %1"));
+    setupDeckControl("bpm", tr("BPM tap button for Player %1"));
+    setupDeckControl("keylock", tr("Keylock button for Player %1"));
+    setupDeckControl("rate", tr("Pitch control slider for Player %1"));
+    setupDeckControl("flanger", tr("Flanger effect button for Player %1"));
+    setupDeckControl("volume", tr("Channel %1 volume fader"));
+    setupDeckControl("pregain", tr("Gain knob for Channel %1"));
+    setupDeckControl("filterHigh", tr("High EQ knob for Channel %1"));
+    setupDeckControl("filterMid", tr("Mid EQ knob for Channel %1"));
+    setupDeckControl("filterLow", tr("Low EQ knob for Channel %1"));
+    setupDeckControl("loop_in", tr("Loop In button for Player %1"));
+    setupDeckControl("loop_out", tr("Loop Out button for Player %1"));
+    setupDeckControl("reloop_exit", tr("Reloop / Exit button for Player %1"));
+    setupDeckControl("beatloop_4", tr("Setup a loop over 4 beats for Player %1"));
+    setupDeckControl("loop_halve", tr("Halves the current loop's length for Player %1"));
+    setupDeckControl("loop_double", tr("Doubles the current loop's length for Player %1"));
+    setupDeckControl("hotcue_1_activate", tr("Hotcue 1 button for Player %1"));
+    setupDeckControl("hotcue_2_activate", tr("Hotcue 2 button for Player %1"));
+    setupDeckControl("hotcue_3_activate", tr("Hotcue 3 button for Player %1"));
+    setupDeckControl("hotcue_4_activate", tr("Hotcue 4 button for Player %1"));
+    setupDeckControl("hotcue_1_clear", tr("Hotcue 1 delete button for Player %1"));
+    setupDeckControl("hotcue_2_clear", tr("Hotcue 2 delete button for Player %1"));
+    setupDeckControl("hotcue_3_clear", tr("Hotcue 3 delete button for Player %1"));
+    setupDeckControl("hotcue_4_clear", tr("Hotcue 4 delete button for Player %1"));
+
+    setupSamplerControl("play", tr("Play button for Sampler %1"));
+    setupSamplerControl("pregain", tr("Gain knob for Sampler %1"));
+    setupSamplerControl("pfl", tr("Headphone listen button for Sampler %1"));
+    setupSamplerControl("bpm", tr("BPM tap button for Sampler %1"));
+    setupSamplerControl("keylock", tr("Keylock button for Sampler %1"));
+    setupSamplerControl("rate", tr("Pitch control slider for Sampler %1"));
+    setupSamplerControl("hotcue_1_activate", tr("Hotcue 1 button for Sampler %1"));
+    setupSamplerControl("hotcue_2_activate", tr("Hotcue 2 button for Sampler %1"));
+    setupSamplerControl("hotcue_3_activate", tr("Hotcue 3 button for Sampler %1"));
+    setupSamplerControl("hotcue_4_activate", tr("Hotcue 4 button for Sampler %1"));
+    setupSamplerControl("hotcue_1_clear", tr("Hotcue 1 delete button for Sampler %1"));
+    setupSamplerControl("hotcue_2_clear", tr("Hotcue 2 delete button for Sampler %1"));
+    setupSamplerControl("hotcue_3_clear", tr("Hotcue 3 delete button for Sampler %1"));
+    setupSamplerControl("hotcue_4_clear", tr("Hotcue 4 delete button for Sampler %1"));
+
+    // Library Controls
+    setupControl("[Playlist]", "SelectNextPlaylist", tr("Switch to the next view (library, playlist..)"));
+    setupControl("[Playlist]", "SelectPrevPlaylist", tr("Switch to the previous view (library, playlist..)"));
+    setupControl("[Playlist]", "SelectNextTrack", tr("Scroll to next track in library/playlist"));
+    setupControl("[Playlist]", "SelectPrevTrack", tr("Scroll to previous track in library/playlist"));
+    setupControl("[Playlist]", "LoadSelectedIntoFirstStopped", tr("Load selected track into first stopped player"));
+    setupDeckControl("LoadSelectedTrack", tr("Load selected track into Player %1"));
+
+    // Flanger Controls
+    setupControl("[Flanger]", "lfoPeriod", tr("Adjusts the wavelength of the flange effect"));
+    setupControl("[Flanger]", "lfoDepth", tr("Adjusts the intensity of the flange effect"));
+    setupControl("[Flanger]", "lfoDelay", tr("Adjusts the phase delay of the flange effect"));
+
+    // Microphone Controls
+    setupControl("[Microphone]", "talkover", tr("Microphone on/off"));
+    setupControl("[Microphone]", "volume", tr("Microphone volume"));
+}
+
+void DlgMidiLearning::setupControl(QString group, QString control, QString description) {
+    m_controlsToBind.append(qMakePair(MixxxControl(group, control), description));
+}
+
+void DlgMidiLearning::setupDeckControl(QString control, QString description) {
+    // TODO(rryan) get this from the PlayerManager
+    const int iNumDecks = 2;
+    for (int i = 1; i <= iNumDecks; ++i) {
+        QString group = QString("[Channel%1]").arg(i);
+        m_controlsToBind.append(qMakePair(MixxxControl(group, control), description.arg(i)));
+    }
+}
+
+void DlgMidiLearning::setupSamplerControl(QString control, QString description) {
+    // TODO(rryan) get this from the PlayerManager
+    const int iNumSamplers = 4;
+    for (int i = 1; i <= iNumSamplers; ++i) {
+        QString group = QString("[Sampler%1]").arg(i);
+        m_controlsToBind.append(qMakePair(MixxxControl(group, control), description.arg(i)));
+    }
+}
+
+DlgMidiLearning::~DlgMidiLearning()
+{
+    //If there was any ongoing learning, cancel it (benign if there wasn't).
+    m_pMidiMapping->cancelMidiLearn();
+
+    delete m_pSkipShortcut;
+}
+
+void DlgMidiLearning::begin()
+{
+    //Switch pages in the stacked widget so that we show the mapping stuff.
+    stackedWidget->setCurrentIndex(1);
+
+    //Tell the MIDI mapping to start learning the first control.
+    iCurrentControl = 0;
+    QPair<MixxxControl, QString>& control = m_controlsToBind[iCurrentControl];
+    m_pMidiMapping->beginMidiLearn(control.first);
+    labelMixxxControl->setText(control.second);
+}
+
+void DlgMidiLearning::next()
+{
+    iCurrentControl++;
+    if (iCurrentControl < m_controlsToBind.size())
+    {
+
+        QPair<MixxxControl, QString>& control = m_controlsToBind[iCurrentControl];
+        m_pMidiMapping->beginMidiLearn(control.first);
+        labelMixxxControl->setText(control.second);
+        pushButtonSkip->setText(tr("Skip"));
+
+        labelMappedTo->setText("");
+        pushButtonPrevious->setEnabled(true);
+    }
+    else
+    {
+        //We've hit the end, show the congrats pane
+        stackedWidget->setCurrentIndex(2);
+    }
+}
+
+void DlgMidiLearning::prev()
+{
+    iCurrentControl--;
+    if (iCurrentControl >= 0)
+    {
+        QPair<MixxxControl, QString>& control = m_controlsToBind[iCurrentControl];
+        m_pMidiMapping->beginMidiLearn(control.first);
+        labelMixxxControl->setText(control.second);
+        pushButtonSkip->setText(tr("Skip"));
+        labelMappedTo->setText("");
+
+        //We've hit the start, don't let the user go back anymore.
+        if (iCurrentControl == 0)
+            pushButtonPrevious->setEnabled(false);
+    }
+
+}
+
+/** Gets called when a control has just been mapped successfully */
+void DlgMidiLearning::controlMapped(MidiMessage message)
+{
+    //QThread::sleep(1);
+
+    labelMappedTo->setText(tr("Successfully mapped to: ") + message.toString());
+
+    //Set the label on the "Skip" button to "Next" because we're proceeding
+    //instead of "skipping" now. Makes more sense, I think...
+    pushButtonSkip->setText(tr("Next"));
+    //next();
+}

=== added file 'mixxx/src/dlgmidilearning.h'
--- mixxx/src/dlgmidilearning.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgmidilearning.h	2012-06-27 11:06:21 +0000
@@ -0,0 +1,56 @@
+/***************************************************************************
+                          dlgmidilearning.cpp  -  description
+                             -------------------
+    begin                : Mon March 2 2009
+    copyright            : (C) 2009 by Albert Santoni
+    email                : alberts at mixxx dot org
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef DLGMIDILEARNING_H
+#define DLGMIDILEARNING_H
+
+#include <QtCore>
+#include <QtGui>
+#include <QPair>
+
+#include "ui_dlgmidilearning.h"
+#include "configobject.h"
+#include "mixxxcontrol.h"
+#include "midi/midimessage.h"
+
+class MidiMapping;
+
+/**
+  *@author Albert Santoni
+  */
+
+class DlgMidiLearning : public QDialog, public Ui::DlgMidiLearning {
+    Q_OBJECT
+  public:
+    DlgMidiLearning(QWidget *parent, MidiMapping* mapping);
+    ~DlgMidiLearning();
+  public slots:
+    void begin();   /** Begin the MIDI learning phase */
+    void next();    /** Ask to map the next control */
+    void prev();    /** Ask to map the previous control */
+    void controlMapped(MidiMessage); /** Gets called when a control has just been mapped successfully */
+  private:
+    void setupControl(QString group, QString control, QString helpText);
+    void setupDeckControl(QString control, QString helpText);
+    void setupSamplerControl(QString control, QString helpText);
+    MidiMapping* m_pMidiMapping;
+    QList<QPair<MixxxControl, QString> > m_controlsToBind;
+    int iCurrentControl; /** Used to iterate through the controls list */
+    QShortcut* m_pSkipShortcut;
+};
+
+#endif

=== added file 'mixxx/src/dlgmidilearning.ui'
--- mixxx/src/dlgmidilearning.ui	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgmidilearning.ui	2012-06-27 11:06:21 +0000
@@ -0,0 +1,241 @@
+<ui version="4.0" >
+ <class>DlgMidiLearning</class>
+ <widget class="QDialog" name="DlgMidiLearning" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>366</width>
+    <height>271</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>MIDI Learning Wizard</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" >
+    <widget class="QStackedWidget" name="stackedWidget" >
+     <property name="currentIndex" >
+      <number>2</number>
+     </property>
+     <widget class="QWidget" name="page" >
+      <layout class="QGridLayout" name="gridLayout_2" >
+       <item row="0" column="0" colspan="3" >
+        <widget class="QLabel" name="label_2" >
+         <property name="font" >
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text" >
+          <string>Welcome to the MIDI Learning Wizard</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" colspan="3" >
+        <widget class="QLabel" name="label_3" >
+         <property name="text" >
+          <string>This wizard allows you to easily map the controls on your MIDI controller to Mixxx's controls.</string>
+         </property>
+         <property name="wordWrap" >
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" >
+        <spacer name="horizontalSpacer" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>116</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="2" column="1" >
+        <widget class="QPushButton" name="pushButtonBegin" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text" >
+          <string>Begin</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="2" >
+        <spacer name="horizontalSpacer_2" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>116</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="page_2" >
+      <layout class="QGridLayout" name="gridLayout_3" >
+       <item row="0" column="0" colspan="2" >
+        <widget class="QLabel" name="label" >
+         <property name="text" >
+          <string>Please tweak the control for:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" colspan="2" >
+        <widget class="QLabel" name="labelMixxxControl" >
+         <property name="font" >
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text" >
+          <string>Mixxx Control</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="2" >
+        <widget class="QLabel" name="labelMappedTo" >
+         <property name="text" >
+          <string>Successfully mapped to: </string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0" >
+        <widget class="QPushButton" name="pushButtonPrevious" >
+         <property name="enabled" >
+          <bool>false</bool>
+         </property>
+         <property name="text" >
+          <string>Previous</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="1" >
+        <widget class="QPushButton" name="pushButtonSkip" >
+         <property name="text" >
+          <string>Skip</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0" colspan="2" >
+        <widget class="QLabel" name="label_6" >
+         <property name="text" >
+          <string>Press spacebar to proceed or skip.</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0" >
+        <spacer name="verticalSpacer" >
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="page_3" >
+      <layout class="QGridLayout" name="gridLayout_4" >
+       <item row="0" column="0" colspan="3" >
+        <widget class="QLabel" name="label_4" >
+         <property name="font" >
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text" >
+          <string>MIDI learning complete!</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" colspan="3" >
+        <widget class="QLabel" name="label_8" >
+         <property name="text" >
+          <string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;">
+&lt;p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This wizard can be re-run at any time.&lt;/p>
+&lt;p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;br />Now go spin some beats!&lt;/p>&lt;/body>&lt;/html></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" >
+        <spacer name="horizontalSpacer_3" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>109</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="2" column="1" >
+        <widget class="QPushButton" name="pushButtonFinish" >
+         <property name="text" >
+          <string>Finito!</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="2" >
+        <spacer name="horizontalSpacer_4" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>109</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

=== added file 'mixxx/src/dlgprefmidibindings.cpp'
--- mixxx/src/dlgprefmidibindings.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgprefmidibindings.cpp	2012-06-27 11:06:21 +0000
@@ -0,0 +1,510 @@
+/***************************************************************************
+                          dlgprefmidibindings.cpp  -  description
+                             -------------------
+    begin                : Sat Jun 21 2008
+    copyright            : (C) 2008 by Tom Care
+    email                : [e-mail]
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include <QtGui>
+#include <QDebug>
+#include "midi/midiinputmappingtablemodel.h"
+#include "midi/midioutputmappingtablemodel.h"
+#include "midi/midichanneldelegate.h"
+#include "midi/midistatusdelegate.h"
+#include "midi/midinodelegate.h"
+#include "midi/midioptiondelegate.h"
+#include "controlgroupdelegate.h"
+#include "controlvaluedelegate.h"
+#include "dlgprefmidibindings.h"
+#include "midi/mididevice.h"
+#include "midi/mididevicemanager.h"
+#include "configobject.h"
+#include "midi/midimapping.h"
+
+#ifdef __MIDISCRIPT__
+#include "midi/midiscriptengine.h"
+#endif
+
+
+DlgPrefMidiBindings::DlgPrefMidiBindings(QWidget *parent, MidiDevice* midiDevice,
+                                         MidiDeviceManager* midiDeviceManager,
+                                         ConfigObject<ConfigValue> *pConfig)
+    : QWidget(parent), Ui::DlgPrefMidiBindingsDlg()
+{
+    setupUi(this);
+    m_pConfig = pConfig;
+    m_pMidiDevice = midiDevice;
+    m_pMidiDeviceManager = midiDeviceManager;
+
+    m_pDlgMidiLearning = NULL;
+
+    m_bDirty = false;
+
+    labelDeviceName->setText(m_pMidiDevice->getName());
+
+    //Tell the input mapping table widget which data model it should be viewing
+    //(note that m_pInputMappingTableView is defined in the .ui file!)
+    m_pInputMappingTableView->setModel((QAbstractItemModel*)m_pMidiDevice->getMidiMapping()->getMidiInputMappingTableModel());
+
+    m_pInputMappingTableView->setSelectionBehavior(QAbstractItemView::SelectRows);
+    m_pInputMappingTableView->setSelectionMode(QAbstractItemView::ContiguousSelection); //The model won't like ExtendedSelection, probably.
+    m_pInputMappingTableView->verticalHeader()->hide();
+
+    //Set up "delete" as a shortcut key to remove a row for the MIDI input table.
+    m_deleteMIDIInputRowAction = new QAction(m_pInputMappingTableView);
+    /*m_deleteMIDIInputRowAction->setShortcut(QKeySequence::Delete);
+    m_deleteMIDIInputRowAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    connect(m_deleteMIDIInputRowAction, SIGNAL(triggered()), this, SLOT(slotRemoveInputBinding()));
+    */
+    //The above shortcut doesn't work yet, not quite sure why. -- Albert Feb 1 / 2009
+
+    //Set up the cool item delegates for the input mapping table
+    m_pMidiChannelDelegate = new MidiChannelDelegate(m_pInputMappingTableView);
+    m_pMidiStatusDelegate = new MidiStatusDelegate(m_pInputMappingTableView);
+    m_pMidiNoDelegate = new MidiNoDelegate(m_pInputMappingTableView);
+    m_pMidiOptionDelegate = new MidiOptionDelegate(m_pInputMappingTableView);
+    m_pControlGroupDelegate = new ControlGroupDelegate(m_pInputMappingTableView);
+    m_pControlValueDelegate = new ControlValueDelegate(m_pInputMappingTableView);
+    m_pInputMappingTableView->setItemDelegateForColumn(MIDIINPUTTABLEINDEX_MIDISTATUS, m_pMidiStatusDelegate);
+    m_pInputMappingTableView->setItemDelegateForColumn(MIDIINPUTTABLEINDEX_MIDICHANNEL, m_pMidiChannelDelegate);
+    m_pInputMappingTableView->setItemDelegateForColumn(MIDIINPUTTABLEINDEX_MIDINO, m_pMidiNoDelegate);
+    m_pInputMappingTableView->setItemDelegateForColumn(MIDIINPUTTABLEINDEX_CONTROLOBJECTGROUP, m_pControlGroupDelegate);
+    m_pInputMappingTableView->setItemDelegateForColumn(MIDIINPUTTABLEINDEX_CONTROLOBJECTVALUE, m_pControlValueDelegate);
+    m_pInputMappingTableView->setItemDelegateForColumn(MIDIINPUTTABLEINDEX_MIDIOPTION, m_pMidiOptionDelegate);
+
+    //Tell the output mapping table widget which data model it should be viewing
+    //(note that m_pOutputMappingTableView is defined in the .ui file!)
+    m_pOutputMappingTableView->setModel((QAbstractItemModel*)m_pMidiDevice->getMidiMapping()->getMidiOutputMappingTableModel());
+    m_pOutputMappingTableView->setSelectionBehavior(QAbstractItemView::SelectRows);
+    m_pOutputMappingTableView->setSelectionMode(QAbstractItemView::ContiguousSelection);
+    m_pOutputMappingTableView->verticalHeader()->hide();
+
+    //Set up the cool item delegates for the output mapping table
+    m_pOutputMappingTableView->setItemDelegateForColumn(MIDIOUTPUTTABLEINDEX_MIDISTATUS, m_pMidiStatusDelegate);
+    m_pOutputMappingTableView->setItemDelegateForColumn(MIDIOUTPUTTABLEINDEX_MIDICHANNEL, m_pMidiChannelDelegate);
+    m_pOutputMappingTableView->setItemDelegateForColumn(MIDIOUTPUTTABLEINDEX_MIDINO, m_pMidiNoDelegate);
+    //TODO: We need different delegates for the output table's CO group/value columns because we only list real input
+    //      controls, and for output we'd want to list a different set with stuff like "VUMeter" and other output controls.
+    //m_pOutputMappingTableView->setItemDelegateForColumn(MIDIOUTPUTTABLEINDEX_CONTROLOBJECTGROUP, m_pControlGroupDelegate);
+    //m_pOutputMappingTableView->setItemDelegateForColumn(MIDIOUTPUTTABLEINDEX_CONTROLOBJECTVALUE, m_pControlValueDelegate);
+
+    // Connect buttons to slots
+    connect(btnExportXML, SIGNAL(clicked()), this, SLOT(slotExportXML()));
+
+    //Input bindings
+    connect(btnMidiLearnWizard, SIGNAL(clicked()), this, SLOT(slotShowMidiLearnDialog()));
+    connect(btnMidiLearnWizard, SIGNAL(clicked()), this, SLOT(slotDirty()));
+    connect(btnClearAllInputBindings, SIGNAL(clicked()), this, SLOT(slotClearAllInputBindings()));
+    connect(btnClearAllInputBindings, SIGNAL(clicked()), this, SLOT(slotDirty()));
+    connect(btnRemoveInputBinding, SIGNAL(clicked()), this, SLOT(slotRemoveInputBinding()));
+    connect(btnRemoveInputBinding, SIGNAL(clicked()), this, SLOT(slotDirty()));
+    connect(btnAddInputBinding, SIGNAL(clicked()), this, SLOT(slotAddInputBinding()));
+    connect(btnAddInputBinding, SIGNAL(clicked()), this, SLOT(slotDirty()));
+
+    //Output bindings
+    connect(btnClearAllOutputBindings, SIGNAL(clicked()), this, SLOT(slotClearAllOutputBindings()));
+    connect(btnClearAllOutputBindings, SIGNAL(clicked()), this, SLOT(slotDirty()));
+    connect(btnRemoveOutputBinding, SIGNAL(clicked()), this, SLOT(slotRemoveOutputBinding()));
+    connect(btnRemoveOutputBinding, SIGNAL(clicked()), this, SLOT(slotDirty()));
+    connect(btnAddOutputBinding, SIGNAL(clicked()), this, SLOT(slotAddOutputBinding()));
+    connect(btnAddOutputBinding, SIGNAL(clicked()), this, SLOT(slotDirty()));
+
+    connect(comboBoxPreset, SIGNAL(activated(const QString&)), this, SLOT(slotLoadMidiMapping(const QString&)));
+    connect(comboBoxPreset, SIGNAL(activated(const QString&)), this, SLOT(slotDirty()));
+
+    connect(m_pInputMappingTableView, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(slotDirty()));
+    connect(m_pOutputMappingTableView, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(slotDirty()));
+
+    //Load the list of presets into the presets combobox.
+    enumeratePresets();
+
+    //Initialize the output device combobox
+    enumerateOutputDevices();
+
+}
+
+DlgPrefMidiBindings::~DlgPrefMidiBindings() {
+    delete m_deleteMIDIInputRowAction;
+}
+
+void DlgPrefMidiBindings::slotDirty ()
+{
+    m_bDirty = true;
+}
+
+void DlgPrefMidiBindings::enumerateOutputDevices()
+{
+    comboBoxOutputDevice->clear();
+
+    comboBoxOutputDevice->addItem(tr("None"));
+
+    //For each MIDI output device, insert an item into the output device combobox.
+    QList<MidiDevice*> deviceList = m_pMidiDeviceManager->getDeviceList(true, false);
+    QListIterator<MidiDevice*> it(deviceList);
+
+    while (it.hasNext())
+      {
+        MidiDevice* currentDevice = it.next();
+        QString curDeviceName = currentDevice->getName();
+        //qDebug() << "curDeviceName: " << curDeviceName;
+        comboBoxOutputDevice->addItem(curDeviceName);
+      }
+
+    //Assume autopairing was done and let's just show the output device combobox with the name
+    //of the input device selected for now...
+    QString currentOutputMidiDeviceName = m_pMidiDevice->getName();
+    comboBoxOutputDevice->setCurrentIndex(comboBoxOutputDevice->findText(currentOutputMidiDeviceName));
+
+}
+
+void DlgPrefMidiBindings::enumeratePresets()
+{
+    QList<QString> presetsList;
+    comboBoxPreset->clear();
+
+    //Insert a dummy "..." item at the top to try to make it less confusing.
+    //(For example, we don't want "Akai MPD24" showing up as the default item
+    // when a user has their controller plugged in)
+    comboBoxPreset->addItem("...");
+
+    // paths to search for midi presets
+    QList<QString> midiDirPaths;
+    midiDirPaths.append(LPRESETS_PATH);
+    midiDirPaths.append(m_pConfig->getConfigPath().append("midi/"));
+
+    QListIterator<QString> itpth(midiDirPaths);
+    while (itpth.hasNext()) {
+        QDirIterator it(itpth.next());
+        while (it.hasNext())
+        {
+            it.next(); //Advance iterator. We get the filename from the next line. (It's a bit weird.)
+            QString curMapping = it.fileName();
+            if (curMapping.endsWith(MIDI_MAPPING_EXTENSION)) //blah, thanks for nothing Qt
+            {
+                curMapping.chop(QString(MIDI_MAPPING_EXTENSION).length()); //chop off the .midi.xml
+                presetsList.append(curMapping);
+            }
+        }
+    }
+    //Sort in alphabetical order
+    qSort(presetsList);
+    comboBoxPreset->addItems(presetsList);
+}
+
+
+
+/* slotUpdate()
+ * Called when the dialog is displayed.
+ */
+void DlgPrefMidiBindings::slotUpdate() {
+
+    //Check if the device that this dialog is for is already enabled...
+    if (m_pMidiDevice->isOpen())
+    {
+        chkEnabledDevice->setCheckState(Qt::Checked); //Check the "Enabled" box
+        toolBox->setEnabled(true); //Enable MIDI in/out toolbox.
+        groupBoxPresets->setEnabled(true); //Enable presets group box.
+    }
+    else {
+        chkEnabledDevice->setCheckState(Qt::Unchecked); //Uncheck the "Enabled" box
+        toolBox->setEnabled(false); //Disable MIDI in/out toolbox.
+        groupBoxPresets->setEnabled(false); //Disable presets group box.
+    }
+
+    //Connect the "Enabled" checkbox after the checkbox state is set
+    connect(chkEnabledDevice, SIGNAL(stateChanged(int)), this, SLOT(slotDeviceState(int)));
+    connect(chkEnabledDevice, SIGNAL(stateChanged(int)), this, SLOT(slotDirty()));
+}
+
+/* slotApply()
+ * Called when the OK button is pressed.
+ */
+void DlgPrefMidiBindings::slotApply() {
+    /* User has pressed OK, so enable or disable the device, write the
+     * controls to the DOM, and reload the MIDI bindings.  FIXED: only
+     * do this if the user has changed the preferences.
+     */
+    if (m_bDirty)
+    {
+        m_pMidiDevice->disableMidiLearn();
+        if (chkEnabledDevice->isChecked()) {
+            //Enable the device.
+            enableDevice();
+
+            //Disable processing of MIDI messages received from the device in order to
+            //prevent a race condition while we modify the MIDI mapping.
+            m_pMidiDevice->setReceiveInhibit(true);
+            m_pMidiDevice->getMidiMapping()->applyPreset();
+            m_pMidiDevice->setReceiveInhibit(false);
+
+            //FIXME: We need some logic like this to make changing the output device work.
+            //       See MidiDeviceManager::associateInputAndOutputDevices() for more info...
+            /*
+              if (comboBoxOutputDevice->currentText() != tr("None"))
+              m_pMidiDeviceManager->associateInputAndOutputDevices(m_pMidiDevice, comboBoxOutputDevice->currentText());
+            */
+        }
+        else disableDevice();
+    }
+    m_bDirty = false;
+}
+
+void DlgPrefMidiBindings::slotShowMidiLearnDialog() {
+
+    //If the user has checked the "Enabled" checkbox but they haven't
+    //hit OK to apply it yet, prompt them to apply the settings before we open
+    //the MIDI learning dialog. If we don't apply the settings first and open the device,
+    //MIDI learn won't react to MIDI messages.
+    if (chkEnabledDevice->isChecked() && !m_pMidiDevice->isOpen())
+    {
+        QMessageBox::StandardButton result = QMessageBox::question(this,
+                    tr("Apply MIDI device settings?"),
+                    tr("Your settings must be applied before starting the MIDI learning wizard.\n"
+                        "Apply settings and continue?"));
+        if (result == QMessageBox::Cancel)
+        {
+            return;
+        }
+        else
+        {
+            slotApply();
+        }
+    }
+
+    //Note that DlgMidiLearning is set to delete itself on
+    //close using the Qt::WA_DeleteOnClose attribute (so this "new" doesn't leak memory)
+    m_pDlgMidiLearning = new DlgMidiLearning(this, m_pMidiDevice->getMidiMapping());
+    m_pDlgMidiLearning->show();
+}
+
+/* slotImportXML()
+ * Prompts the user for an XML preset and loads it.
+ */
+void DlgPrefMidiBindings::slotLoadMidiMapping(const QString &name) {
+
+    if (name == "...")
+        return;
+
+    //Ask for confirmation if the MIDI tables aren't empty...
+    MidiMapping* mapping = m_pMidiDevice->getMidiMapping();
+    if (mapping->numInputMidiMessages() > 0 ||
+        mapping->numOutputMixxxControls() > 0)
+    {
+         QMessageBox::StandardButton result = QMessageBox::question(
+             this,
+             tr("Overwrite existing mapping?"),
+             tr("Are you sure you'd like to load the %1 mapping?\n"
+                "This will overwrite your existing MIDI mapping.").arg(name),
+                   QMessageBox::Yes | QMessageBox::No);
+
+         if (result == QMessageBox::No) {
+            //Select the "..." item again in the combobox.
+            comboBoxPreset->setCurrentIndex(0);
+            return;
+         }
+    }
+
+    QString filename = LPRESETS_PATH + name + MIDI_MAPPING_EXTENSION;
+    QFile ftest(filename);
+    if ( !ftest.exists() ) filename = m_pConfig->getConfigPath().append("midi/") + name + MIDI_MAPPING_EXTENSION;
+
+    if (!filename.isNull()) m_pMidiDevice->getMidiMapping()->loadPreset(filename, true);    // It's applied on prefs close
+    m_pInputMappingTableView->update();
+
+    //Select the "..." item again in the combobox.
+    comboBoxPreset->setCurrentIndex(0);
+}
+
+/* slotExportXML()
+ * Prompts the user for an XML preset and saves it.
+ */
+void DlgPrefMidiBindings::slotExportXML() {
+    QString fileName = QFileDialog::getSaveFileName(this,
+            tr("Export Mixxx MIDI Bindings"), m_pConfig->getConfigPath().append("midi/"),
+            tr("Preset Files (*.midi.xml)"));
+    if (!fileName.isNull()) m_pMidiDevice->getMidiMapping()->savePreset(fileName);
+}
+
+void DlgPrefMidiBindings::slotDeviceState(int state) {
+  if (state == Qt::Checked) {
+      toolBox->setEnabled(true);    //Enable MIDI in/out toolbox.
+      groupBoxPresets->setEnabled(true);    //Enable presets group box.
+      emit deviceStateChanged(this,true);  // Set tree item text to bold
+  }
+  else {
+      toolBox->setEnabled(false);   //Disable MIDI in/out toolbox.
+      groupBoxPresets->setEnabled(false);   //Disable presets group box.
+      emit deviceStateChanged(this,false);  // Set tree item text to not bold
+  }
+}
+
+void DlgPrefMidiBindings::enableDevice()
+{
+    if (m_pMidiDevice->isOpen()) {
+        m_pMidiDevice->close();
+    }
+    m_pMidiDevice->open();
+    m_pConfig->set(ConfigKey("[Midi]", m_pMidiDevice->getName().replace(" ", "_")), 1);
+
+    //TODO: Should probably check if open() actually succeeded.
+}
+
+void DlgPrefMidiBindings::disableDevice()
+{
+    m_pMidiDevice->close();
+    m_pConfig->set(ConfigKey("[Midi]", m_pMidiDevice->getName().replace(" ", "_")), 0);
+
+    //TODO: Should probably check if close() actually succeeded.
+}
+
+void DlgPrefMidiBindings::slotAddInputBinding()
+{
+    bool ok = true;
+    QString controlGroup = QInputDialog::getItem(this, tr("Select Control Group"), tr("Select Control Group"),
+                                                ControlGroupDelegate::getControlGroups(), 0, false,  &ok);
+    if (!ok) return;
+
+    QStringList controlValues;
+    if (controlGroup == CONTROLGROUP_CHANNEL1_STRING ||
+        controlGroup == CONTROLGROUP_CHANNEL2_STRING ||
+        controlGroup == CONTROLGROUP_SAMPLER1_STRING ||
+        controlGroup == CONTROLGROUP_SAMPLER2_STRING ||
+        controlGroup == CONTROLGROUP_SAMPLER3_STRING ||
+        controlGroup == CONTROLGROUP_SAMPLER4_STRING) {
+        controlValues = ControlValueDelegate::getChannelControlValues();
+    }
+    else if (controlGroup == CONTROLGROUP_MASTER_STRING)
+    {
+        controlValues = ControlValueDelegate::getMasterControlValues();
+    }
+    else if (controlGroup == CONTROLGROUP_PLAYLIST_STRING)
+    {
+        controlValues = ControlValueDelegate::getPlaylistControlValues();
+    }
+    else if (controlGroup == CONTROLGROUP_FLANGER_STRING)
+    {
+        controlValues = ControlValueDelegate::getFlangerControlValues();
+    }
+    else if (controlGroup == CONTROLGROUP_MICROPHONE_STRING)
+    {
+        controlValues = ControlValueDelegate::getMicrophoneControlValues();
+    }
+    else
+    {
+        qDebug() << "Unhandled ControlGroup in " << __FILE__;
+    }
+
+
+    QString controlValue = QInputDialog::getItem(this, tr("Select Control"), tr("Select Control"),
+                                                 controlValues, 0, false,  &ok);
+    if (!ok) return;
+
+
+    MixxxControl mixxxControl(controlGroup, controlValue);
+    MidiMessage message;
+
+    while (m_pMidiDevice->getMidiMapping()->isMidiMessageMapped(message))
+    {
+        message.setMidiNo(message.getMidiNo() + 1);
+        if (message.getMidiNo() >= 127) //If the table is full, then overwrite something...
+            break;
+    }
+    m_pMidiDevice->getMidiMapping()->setInputMidiMapping(message, mixxxControl);
+}
+
+void DlgPrefMidiBindings::slotRemoveInputBinding()
+{
+    QModelIndexList selectedIndices = m_pInputMappingTableView->selectionModel()->selectedRows();
+    if (selectedIndices.size() > 0)
+    {
+        MidiInputMappingTableModel* tableModel = dynamic_cast<MidiInputMappingTableModel*>(m_pInputMappingTableView->model());
+        if (tableModel) {
+
+            QModelIndex curIndex;
+            //The model indices are sorted so that we remove the rows from the table
+            //in ascending order. This is necessary because if row A is above row B in
+            //the table, and you remove row A, the model index for row B will change.
+            //Sorting the indices first means we don't have to worry about this.
+            qSort(selectedIndices);
+
+            //Going through the model indices in descending order (see above comment for explanation).
+            QListIterator<QModelIndex> it(selectedIndices);
+            it.toBack();
+            while (it.hasPrevious())
+            {
+                curIndex = it.previous();
+                tableModel->removeRow(curIndex.row());
+            }
+        }
+    }
+}
+
+void DlgPrefMidiBindings::slotClearAllInputBindings() {
+    if (QMessageBox::warning(this, tr("Clear Input Bindings"),
+            tr("Are you sure you want to clear all bindings?"),
+            QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Cancel) != QMessageBox::Ok)
+        return;
+
+    //Remove all the rows from the data model (ie. the MIDI mapping).
+    MidiInputMappingTableModel* tableModel = dynamic_cast<MidiInputMappingTableModel*>(m_pInputMappingTableView->model());
+    if (tableModel) {
+        tableModel->removeRows(0, tableModel->rowCount());
+    }
+}
+
+
+void DlgPrefMidiBindings::slotAddOutputBinding() {
+    qDebug() << "STUB: DlgPrefMidiBindings::slotAddOutputBinding()";
+
+    m_pMidiDevice->getMidiMapping()->setOutputMidiMapping(MixxxControl(), MidiMessage());
+}
+
+void DlgPrefMidiBindings::slotRemoveOutputBinding()
+{
+    QModelIndexList selectedIndices = m_pOutputMappingTableView->selectionModel()->selectedRows();
+    if (selectedIndices.size() > 0)
+    {
+        MidiOutputMappingTableModel* tableModel =
+                            dynamic_cast<MidiOutputMappingTableModel*>(m_pOutputMappingTableView->model());
+        if (tableModel) {
+            QModelIndex curIndex;
+            //The model indices are sorted so that we remove the rows from the table
+            //in ascending order. This is necessary because if row A is above row B in
+            //the table, and you remove row A, the model index for row B will change.
+            //Sorting the indices first means we don't have to worry about this.
+            //qSort(selectedIndices);
+
+            //Going through the model indices in descending order (see above comment for explanation).
+            QListIterator<QModelIndex> it(selectedIndices);
+            it.toBack();
+            while (it.hasPrevious())
+            {
+                curIndex = it.previous();
+                qDebug() << "Dlg: removing row" << curIndex.row();
+                tableModel->removeRow(curIndex.row());
+            }
+        }
+    }
+}
+
+void DlgPrefMidiBindings::slotClearAllOutputBindings() {
+    if (QMessageBox::warning(this, tr("Clear Output Bindings"),
+            tr("Are you sure you want to clear all output bindings?"),
+            QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Cancel) != QMessageBox::Ok)
+        return;
+
+    //Remove all the rows from the data model (ie. the MIDI mapping).
+    MidiOutputMappingTableModel* tableModel = dynamic_cast<MidiOutputMappingTableModel*>(m_pOutputMappingTableView->model());
+    if (tableModel) {
+        tableModel->removeRows(0, tableModel->rowCount());
+    }
+}

=== added file 'mixxx/src/dlgprefmidibindings.h'
--- mixxx/src/dlgprefmidibindings.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgprefmidibindings.h	2012-06-27 11:06:21 +0000
@@ -0,0 +1,92 @@
+/***************************************************************************
+                          dlgprefmidibindings.h  -  description
+                             -------------------
+    begin                : Sat Jun 21 2008
+    copyright            : (C) 2008 by Tom Care
+    email                : [e-mail]
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#ifndef DLGPREFMIDIBINDINGS_H_
+#define DLGPREFMIDIBINDINGS_H_
+
+#include <QtGui>
+#include "ui_dlgprefmidibindingsdlg.h"
+#include "dlgmidilearning.h"
+#include "configobject.h"
+
+//Forward declarations
+class MidiChannelDelegate;
+class MidiStatusDelegate;
+class MidiNoDelegate;
+class MidiOptionDelegate;
+class ControlGroupDelegate;
+class ControlValueDelegate;
+class MidiDevice;
+class MidiDeviceManager;
+
+class DlgPrefMidiBindings : public QWidget, public Ui::DlgPrefMidiBindingsDlg  {
+    Q_OBJECT
+public:
+    DlgPrefMidiBindings(QWidget *parent, MidiDevice* midiDevice,
+                        MidiDeviceManager* midiDeviceManager,
+    					ConfigObject<ConfigValue> *pConfig);
+    ~DlgPrefMidiBindings();
+
+
+public slots:
+    void slotUpdate();
+    void slotApply();
+    void slotShowMidiLearnDialog();
+    void slotLoadMidiMapping(const QString &name);
+    void slotExportXML();
+    void slotDeviceState(int state);
+
+    //Input bindings
+    void slotClearAllInputBindings();
+    void slotRemoveInputBinding();
+    void slotAddInputBinding();
+
+    //Output bindings
+    void slotAddOutputBinding();
+    void slotClearAllOutputBindings();
+    void slotRemoveOutputBinding();
+
+    //Mark that we need to apply the settings.
+    void slotDirty ();
+    
+signals:
+    void deviceStateChanged(DlgPrefMidiBindings*, bool);
+
+private:
+    void setRowBackground(int row, QColor color);
+    void savePreset(QString path);
+    void enumeratePresets();
+    void enumerateOutputDevices();
+
+    void enableDevice();
+    void disableDevice();
+    
+    bool m_bDirty;
+    int currentGroupRow;
+    MidiChannelDelegate* m_pMidiChannelDelegate;
+    MidiStatusDelegate* m_pMidiStatusDelegate;
+    MidiNoDelegate* m_pMidiNoDelegate;
+    MidiOptionDelegate* m_pMidiOptionDelegate;
+    ControlGroupDelegate* m_pControlGroupDelegate;
+    ControlValueDelegate* m_pControlValueDelegate;
+    QAction* m_deleteMIDIInputRowAction; /** Used for setting up the shortcut for delete button */
+    ConfigObject<ConfigValue> *m_pConfig;
+    MidiDevice* m_pMidiDevice;
+    MidiDeviceManager* m_pMidiDeviceManager;
+    DlgMidiLearning* m_pDlgMidiLearning;
+};
+
+#endif /*DLGPREFMIDIBINDINGS_H_*/

=== added file 'mixxx/src/dlgprefmidibindingsdlg.ui'
--- mixxx/src/dlgprefmidibindingsdlg.ui	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgprefmidibindingsdlg.ui	2012-06-27 11:06:21 +0000
@@ -0,0 +1,324 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DlgPrefMidiBindingsDlg</class>
+ <widget class="QWidget" name="DlgPrefMidiBindingsDlg">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>598</width>
+    <height>436</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_4">
+   <item row="0" column="3" rowspan="3">
+    <widget class="QGroupBox" name="groupBoxPresets">
+     <property name="title">
+      <string/>
+     </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
+     <property name="checkable">
+      <bool>false</bool>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <property name="margin">
+       <number>0</number>
+      </property>
+      <item row="1" column="1">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Load Preset:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="buddy" >
+         <cstring>comboBoxPreset</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QComboBox" name="comboBoxPreset">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>250</width>
+          <height>16777215</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QPushButton" name="btnExportXML">
+        <property name="styleSheet">
+         <string notr="true"/>
+        </property>
+        <property name="text">
+         <string>Export</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QComboBox" name="comboBoxOutputDevice">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>250</width>
+          <height>16777215</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Output:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>comboBoxOutputDevice</cstring>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="4">
+    <widget class="QToolBox" name="toolBox">
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <property name="tabSpacing">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="page">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>580</width>
+        <height>301</height>
+       </rect>
+      </property>
+      <attribute name="label">
+       <string>MIDI Input</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_2">
+       <item row="1" column="0" colspan="2">
+        <widget class="QTableView" name="m_pInputMappingTableView"/>
+       </item>
+       <item row="2" column="0" colspan="2">
+        <widget class="QGroupBox" name="groupBoxInputManagement">
+         <property name="minimumSize">
+          <size>
+           <width>300</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="title">
+          <string>Controls</string>
+         </property>
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <item>
+           <widget class="QPushButton" name="btnAddInputBinding">
+            <property name="styleSheet">
+             <string notr="true"/>
+            </property>
+            <property name="text">
+             <string>Add</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="btnRemoveInputBinding">
+            <property name="styleSheet">
+             <string notr="true"/>
+            </property>
+            <property name="text">
+             <string>Remove</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="btnMidiLearnWizard">
+            <property name="styleSheet">
+             <string notr="true"/>
+            </property>
+            <property name="text">
+             <string>MIDI Learning Wizard</string>
+            </property>
+            <property name="checkable">
+             <bool>false</bool>
+            </property>
+            <property name="checked">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_3">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>219</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QPushButton" name="btnClearAllInputBindings">
+            <property name="autoFillBackground">
+             <bool>false</bool>
+            </property>
+            <property name="styleSheet">
+             <string notr="true"/>
+            </property>
+            <property name="text">
+             <string>Clear All</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="page_2">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>234</width>
+        <height>137</height>
+       </rect>
+      </property>
+      <attribute name="label">
+       <string>MIDI Output</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_3">
+       <item row="0" column="0">
+        <widget class="QTableView" name="m_pOutputMappingTableView">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QGroupBox" name="groupBoxOutputs">
+         <property name="title">
+          <string>Outputs</string>
+         </property>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <item>
+           <widget class="QPushButton" name="btnAddOutputBinding">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>Add</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="btnRemoveOutputBinding">
+            <property name="text">
+             <string>Remove</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_2">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>219</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QPushButton" name="btnClearAllOutputBindings">
+            <property name="text">
+             <string>Clear All</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item row="0" column="2" rowspan="3">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>24</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="labelDeviceName">
+     <property name="font">
+      <font>
+       <pointsize>14</pointsize>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Your Device Name</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QCheckBox" name="chkEnabledDevice">
+     <property name="text">
+      <string>Enabled</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>&lt;a href=&quot;http://mixxx.org/wiki/doku.php/midi_controller_mapping_file_format&quot;&gt;Troubleshooting&lt;/a&gt;</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+     </property>
+     <property name="openExternalLinks">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

=== added file 'mixxx/src/dlgprefnomidi.cpp'
--- mixxx/src/dlgprefnomidi.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgprefnomidi.cpp	2012-06-27 11:06:21 +0000
@@ -0,0 +1,25 @@
+/***************************************************************************
+                          dlgprefnomidi.cpp  -  
+***************************************************************************/
+
+/***************************************************************************
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+***************************************************************************/
+
+#include "dlgprefnomidi.h"
+#include <QtCore>
+#include <QtGui>
+
+DlgPrefNoMidi::DlgPrefNoMidi(QWidget * parent, ConfigObject<ConfigValue> * _config) :  QWidget(parent), Ui::DlgPrefNoMidiDlg()
+{
+    setupUi(this);
+}
+
+DlgPrefNoMidi::~DlgPrefNoMidi()
+{
+}
\ No newline at end of file

=== added file 'mixxx/src/dlgprefnomidi.h'
--- mixxx/src/dlgprefnomidi.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgprefnomidi.h	2012-06-27 11:06:21 +0000
@@ -0,0 +1,33 @@
+/***************************************************************************
+                          dlgprefnomidi.h  -  "No MIDI devices available"
+                             -------------------
+    begin                : Thu Apr 17 2003
+    copyright            : (C) 2003 by Tue & Ken Haste Andersen
+    email                : [e-mail]
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef DLGPREFNOMIDI_H
+#define DLGPREFNOMIDI_H
+
+#include "ui_dlgprefnomididlg.h"
+#include "configobject.h"
+
+//class QWidget;
+
+class DlgPrefNoMidi : public QWidget, public Ui::DlgPrefNoMidiDlg  {
+    Q_OBJECT
+public:
+    DlgPrefNoMidi(QWidget *parent, ConfigObject<ConfigValue> *_config);
+    ~DlgPrefNoMidi();
+};
+
+#endif

=== added file 'mixxx/src/dlgprefnomididlg.ui'
--- mixxx/src/dlgprefnomididlg.ui	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgprefnomididlg.ui	2012-06-27 11:06:21 +0000
@@ -0,0 +1,46 @@
+<ui version="4.0" >
+ <class>DlgPrefNoMidiDlg</class>
+ <widget class="QWidget" name="DlgPrefNoMidiDlg" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>462</width>
+    <height>87</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form3</string>
+  </property>
+  <layout class="QVBoxLayout" >
+     <property name="alignment" >
+       <enum>Qt::AlignTop</enum>
+     </property>
+  <item>
+    <widget class="QLabel" name="TextLabel3_2" >
+     <property name="enabled" >
+      <bool>true</bool>
+     </property>
+     <property name="font" >
+      <font/>
+     </property>
+            <property name="minimumSize" >
+             <size>
+              <width>100</width>
+              <height>10</height>
+             </size>
+            </property>
+     <property name="text" >
+      <string>No MIDI devices available</string>
+     </property>
+     <property name="wordWrap" >
+      <bool>false</bool>
+     </property>
+    </widget>
+
+   </item>
+
+
+  </layout>
+ </widget>
+</ui>

=== modified file 'mixxx/src/dlgprepare.cpp'
--- mixxx/src/dlgprepare.cpp	2012-04-29 05:43:31 +0000
+++ mixxx/src/dlgprepare.cpp	2012-06-27 11:06:21 +0000
@@ -92,6 +92,10 @@
     //m_pCratesTableModel->select();
 }
 
+void DlgPrepare::onHide()
+{
+}
+
 void DlgPrepare::setup(QDomNode node)
 {
 

=== modified file 'mixxx/src/dlgprepare.h'
--- mixxx/src/dlgprepare.h	2012-06-25 00:02:38 +0000
+++ mixxx/src/dlgprepare.h	2012-06-27 11:06:21 +0000
@@ -27,6 +27,7 @@
     virtual void onSearchCleared();
     virtual void onSearch(const QString& text);
     virtual void onShow();
+    virtual void onHide();
     virtual void loadSelectedTrack();
     virtual void loadSelectedTrackToGroup(QString group);
     virtual void moveSelection(int delta);

=== modified file 'mixxx/src/dlgrecording.cpp'
--- mixxx/src/dlgrecording.cpp	2012-06-25 00:02:38 +0000
+++ mixxx/src/dlgrecording.cpp	2012-06-27 11:06:21 +0000
@@ -70,6 +70,10 @@
     m_browseModel.setPath(m_recordingDir);
 }
 
+void DlgRecording::onHide()
+{
+}
+
 void DlgRecording::setup(QDomNode node)
 {
 

=== modified file 'mixxx/src/dlgrecording.h'
--- mixxx/src/dlgrecording.h	2012-06-25 00:02:38 +0000
+++ mixxx/src/dlgrecording.h	2012-06-27 11:06:21 +0000
@@ -31,6 +31,7 @@
     virtual void onSearchCleared();
     virtual void onSearch(const QString& text);
     virtual void onShow();
+    virtual void onHide();
     virtual void loadSelectedTrack();
     virtual void loadSelectedTrackToGroup(QString group);
     virtual void moveSelection(int delta);

=== added file 'mixxx/src/dlgselector.cpp'
--- mixxx/src/dlgselector.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgselector.cpp	2012-06-27 11:06:21 +0000
@@ -0,0 +1,196 @@
+#include <QSqlTableModel>
+#include "widget/wwidget.h"
+#include "widget/wskincolor.h"
+#include "library/selector/selectorlibrarytablemodel.h"
+#include "transposeproxymodel.h"
+#include "widget/wselectorlibrarytableview.h"
+#include "library/trackcollection.h"
+#include "dlgselector.h"
+
+
+DlgSelector::DlgSelector(QWidget* parent,
+                       ConfigObject<ConfigValue>* pConfig,
+                       TrackCollection* pTrackCollection)
+        : QWidget(parent), Ui::DlgSelector(),
+          m_pConfig(pConfig),
+          m_pTrackCollection(pTrackCollection) {
+    setupUi(this);
+
+    m_pSelectorLibraryTableView = new WSelectorLibraryTableView(this, pConfig, pTrackCollection,
+                                                              ConfigKey(), ConfigKey());
+    connect(m_pSelectorLibraryTableView, SIGNAL(loadTrack(TrackPointer)),
+            this, SIGNAL(loadTrack(TrackPointer)));
+    connect(m_pSelectorLibraryTableView, SIGNAL(loadTrackToPlayer(TrackPointer, QString)),
+            this, SIGNAL(loadTrackToPlayer(TrackPointer, QString)));
+
+    QBoxLayout* box = dynamic_cast<QBoxLayout*>(layout());
+    Q_ASSERT(box); //Assumes the form layout is a QVBox/QHBoxLayout!
+    box->removeWidget(m_pTrackTablePlaceholder);
+    m_pTrackTablePlaceholder->hide();
+    box->insertWidget(1, m_pSelectorLibraryTableView);
+
+    m_pSelectorLibraryTableModel =  new SelectorLibraryTableModel(this, pTrackCollection);
+    m_pSelectorLibraryTableView->loadTrackModel(m_pSelectorLibraryTableModel);
+
+    connect(checkBoxGenre, SIGNAL(clicked()),
+            this, SLOT(filterByGenre()));
+    connect(checkBoxBpm, SIGNAL(clicked()),
+            this, SLOT(filterByBpm()));
+    connect(checkBoxYear, SIGNAL(clicked()),
+            this, SLOT(filterByYear()));
+    connect(checkBoxRating, SIGNAL(clicked()),
+            this, SLOT(filterByRating()));
+    connect(checkBoxKey, SIGNAL(clicked()),
+            this, SLOT(filterByKey()));
+    connect(checkBoxKey4th, SIGNAL(clicked()),
+            this, SLOT(filterByKey4th()));
+    connect(checkBoxKey5th, SIGNAL(clicked()),
+            this, SLOT(filterByKey5th()));
+    connect(checkBoxKeyRelative, SIGNAL(clicked()),
+            this, SLOT(filterByKeyRelative()));
+    connect(horizontalSliderBpmRange, SIGNAL(valueChanged(int)),
+            this, SLOT(spinBoxBpmRangeChanged(int)));
+    connect(m_pSelectorLibraryTableView->selectionModel(),
+            SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection&)),
+            this, SLOT(tableSelectionChanged(const QItemSelection &, const QItemSelection&)));
+
+    connect(m_pSelectorLibraryTableModel,
+            SIGNAL(doSearch(const QItemSelection &, const QItemSelection&)),
+            this,
+            SLOT(tableSelectionChanged(const QItemSelection &, const QItemSelection&)));
+
+    connect(m_pSelectorLibraryTableModel, SIGNAL(filtersChanged()),
+            this, SLOT(slotFiltersChanged()));
+    // Getting info on current decks playing etc
+    connect(m_pSelectorLibraryTableModel, SIGNAL(currentTrackInfoChanged()),
+           this, SLOT(slotCurrentTrackInfoChanged()));
+            
+
+}
+
+DlgSelector::~DlgSelector() {
+}
+
+void DlgSelector::onShow()
+{
+    qDebug() << "DlgSelector::onShow()";
+    m_pSelectorLibraryTableModel->active(true);
+    slotCurrentTrackInfoChanged();
+}
+
+void DlgSelector::onHide()
+{
+    qDebug() << "DlgSelector::onHide()";
+    m_pSelectorLibraryTableModel->active(false);
+}
+
+void DlgSelector::setup(QDomNode node)
+{
+    qDebug() << "DlgSelector::setup()";
+}
+
+void DlgSelector::onSearchStarting()
+{
+}
+
+void DlgSelector::onSearchCleared()
+{
+}
+
+void DlgSelector::slotFiltersChanged() {
+    int count = m_pSelectorLibraryTableModel->rowCount();
+    QString pluralize = ((count > 1) ? QString("s") : QString(""));
+    QString labelMatchText = QString(tr("%1 Track%2 Found ")).arg(count).arg(pluralize);
+    labelMatchCount->setText(labelMatchText);
+}
+
+void DlgSelector::slotCurrentTrackInfoChanged() {
+    // check which filters to activate
+    checkBoxGenre->setEnabled(m_pSelectorLibraryTableModel->currentTrackGenreExists());
+    checkBoxBpm->setEnabled(m_pSelectorLibraryTableModel->currentTrackBpmExists());
+    horizontalSliderBpmRange->setEnabled(m_pSelectorLibraryTableModel->currentTrackBpmExists());
+    checkBoxYear->setEnabled(m_pSelectorLibraryTableModel->currentTrackYearExists());
+    checkBoxRating->setEnabled(m_pSelectorLibraryTableModel->currentTrackRatingExists());
+    checkBoxKey->setEnabled(m_pSelectorLibraryTableModel->currentTrackKeyExists());
+    checkBoxKey4th->setEnabled(m_pSelectorLibraryTableModel->currentTrackKeyExists());
+    checkBoxKey5th->setEnabled(m_pSelectorLibraryTableModel->currentTrackKeyExists());
+    checkBoxKeyRelative->setEnabled(m_pSelectorLibraryTableModel->currentTrackKeyExists());
+}
+
+void DlgSelector::onSearch(const QString& text)
+{
+    m_pSelectorLibraryTableModel->search(text);
+}
+
+void DlgSelector::loadSelectedTrack() {
+    m_pSelectorLibraryTableView->loadSelectedTrack();
+}
+
+void DlgSelector::loadSelectedTrackToGroup(QString group) {
+    m_pSelectorLibraryTableView->loadSelectedTrackToGroup(group);
+}
+
+void DlgSelector::moveSelection(int delta) {
+    m_pSelectorLibraryTableView->moveSelection(delta);
+}
+
+void DlgSelector::tableSelectionChanged(const QItemSelection& selected, 
+	const QItemSelection& deselected)
+{
+}
+
+void DlgSelector::selectAll() {
+    m_pSelectorLibraryTableView->selectAll();
+}
+
+void DlgSelector::filterByGenre()
+{
+    m_pSelectorLibraryTableModel->filterByGenre(checkBoxGenre->isChecked());
+}
+
+void DlgSelector::filterByBpm()
+{
+    bool bpm = checkBoxBpm->isChecked();
+    int range = horizontalSliderBpmRange->value();
+    m_pSelectorLibraryTableModel->filterByBpm(bpm, range);
+}
+
+void DlgSelector::spinBoxBpmRangeChanged(int value)
+{
+    filterByBpm();
+}
+
+void DlgSelector::filterByYear()
+{
+    m_pSelectorLibraryTableModel->filterByYear(checkBoxYear->isChecked());
+}
+
+void DlgSelector::filterByRating()
+{
+    m_pSelectorLibraryTableModel->filterByRating(checkBoxRating->isChecked());
+}
+
+void DlgSelector::filterByKey()
+{
+    m_pSelectorLibraryTableModel->filterByKey(checkBoxKey->isChecked());
+}
+
+void DlgSelector::filterByKey4th()
+{
+    m_pSelectorLibraryTableModel->filterByKey4th(checkBoxKey4th->isChecked());
+}
+
+void DlgSelector::filterByKey5th()
+{
+    m_pSelectorLibraryTableModel->filterByKey5th(checkBoxKey5th->isChecked());
+}
+
+void DlgSelector::filterByKeyRelative()
+{
+    m_pSelectorLibraryTableModel->filterByKeyRelative(checkBoxKeyRelative->isChecked());
+}
+
+void DlgSelector::installEventFilter(QObject* pFilter) {
+    QWidget::installEventFilter(pFilter);
+    m_pSelectorLibraryTableView->installEventFilter(pFilter);
+}

=== added file 'mixxx/src/dlgselector.h'
--- mixxx/src/dlgselector.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgselector.h	2012-06-27 11:06:21 +0000
@@ -0,0 +1,67 @@
+#ifndef DLGSELECTOR_H
+#define DLGSELECTOR_H
+
+#include <QItemSelection>
+#include "ui_dlgselector.h"
+#include "configobject.h"
+#include "library/libraryview.h"
+#include "library/trackcollection.h"
+
+class SelectorLibraryTableModel;
+class WSelectorCratesTableView;
+class WSelectorLibraryTableView;
+class QSqlTableModel;
+class CrateView;
+
+class DlgSelector : public QWidget, public Ui::DlgSelector, public virtual LibraryView {
+    Q_OBJECT
+  public:
+    DlgSelector(QWidget *parent,
+               ConfigObject<ConfigValue>* pConfig,
+               TrackCollection* pTrackCollection);
+    virtual ~DlgSelector();
+
+    virtual void setup(QDomNode node);
+    virtual void onSearchStarting();
+    virtual void onSearchCleared();
+    virtual void onSearch(const QString& text);
+    virtual void onShow();
+    virtual void onHide();
+    virtual void loadSelectedTrack();
+    virtual void loadSelectedTrackToGroup(QString group);
+    virtual void moveSelection(int delta);
+
+  public slots:
+    void tableSelectionChanged(const QItemSelection& selected,
+                               const QItemSelection& deselected);
+    void selectAll();
+    void filterByGenre();
+    void filterByBpm();
+    void spinBoxBpmRangeChanged(int value);
+    void filterByYear();
+    void filterByRating();
+    void filterByKey();
+    void filterByKey4th();
+    void filterByKey5th();
+    void filterByKeyRelative();
+    void installEventFilter(QObject* pFilter);
+    void slotFiltersChanged();
+    void slotCurrentTrackInfoChanged();
+
+  signals:
+    void loadTrack(TrackPointer pTrack);
+    void loadTrackToPlayer(TrackPointer pTrack, QString player);
+
+  private:
+    //Note m_pTrackTablePlaceholder is defined in the .ui file
+    ConfigObject<ConfigValue>* m_pConfig;
+    TrackCollection* m_pTrackCollection;
+    //QButtonGroup m_songsButtonGroup;
+    WSelectorLibraryTableView* m_pSelectorLibraryTableView;
+    SelectorLibraryTableModel* m_pSelectorLibraryTableModel;
+    WSelectorCratesTableView* m_pSelectorCratesTableView;
+    CrateView* m_pCrateView;
+    QSqlTableModel* m_pCratesTableModel;
+};
+
+#endif //DLGSELECTOR_H

=== added file 'mixxx/src/dlgselector.ui'
--- mixxx/src/dlgselector.ui	1970-01-01 00:00:00 +0000
+++ mixxx/src/dlgselector.ui	2012-06-27 11:06:21 +0000
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DlgSelector</class>
+ <widget class="QWidget" name="DlgSelector">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>619</width>
+    <height>399</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Manage</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>12</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="checkBoxGenre">
+       <property name="text">
+        <string>Genre</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="checkBoxBpm">
+       <property name="text">
+        <string>BPM</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QSlider" name="horizontalSliderBpmRange">
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bpm filter range&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="maximum">
+        <number>8</number>
+       </property>
+       <property name="pageStep">
+        <number>1</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="tickPosition">
+        <enum>QSlider::TicksBelow</enum>
+       </property>
+       <property name="tickInterval">
+        <number>1</number>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="checkBoxYear">
+       <property name="text">
+        <string>Year</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="checkBoxRating">
+       <property name="text">
+        <string>Rating</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="checkBoxKey">
+       <property name="text">
+        <string>Key</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="checkBoxKey4th">
+       <property name="text">
+        <string>Perfect 4th</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="checkBoxKey5th">
+       <property name="text">
+        <string>Perfect 5th</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="checkBoxKeyRelative">
+       <property name="text">
+        <string>Relative Key</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelMatchCount">
+       <property name="text">
+        <string>Tracks</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QTableView" name="m_pTrackTablePlaceholder">
+     <property name="showGrid">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

=== modified file 'mixxx/src/library/bundledsongswebview.cpp'
--- mixxx/src/library/bundledsongswebview.cpp	2011-03-22 16:24:04 +0000
+++ mixxx/src/library/bundledsongswebview.cpp	2012-06-27 11:06:21 +0000
@@ -96,6 +96,10 @@
     //    page()->mainFrame()->evaluateJavaScript("showMainStuff(0, 0);");
 }
 
+void BundledSongsWebView::onHide()
+{
+}
+
 /* Google Analytics doesn't like our crappy malformed "Mixxx 1.8" string
    as a user agent. Let Qt construct it for us instead by leaving this commented out.
 QString PromoTracksWebView::userAgentForUrl (const QUrl & url) const

=== modified file 'mixxx/src/library/bundledsongswebview.h'
--- mixxx/src/library/bundledsongswebview.h	2011-03-22 16:24:04 +0000
+++ mixxx/src/library/bundledsongswebview.h	2012-06-27 11:06:21 +0000
@@ -45,6 +45,7 @@
     virtual void onSearchCleared()  {};
     virtual void onSearch(const QString&) {};
     virtual void onShow();
+    virtual void onHide();
     virtual void keyPressEvent(QKeyEvent* event);
     virtual void loadSelectedTrack();
     virtual void loadSelectedTrackToGroup(QString group);

=== modified file 'mixxx/src/library/featuredartistswebview.h'
--- mixxx/src/library/featuredartistswebview.h	2010-10-24 09:50:11 +0000
+++ mixxx/src/library/featuredartistswebview.h	2012-06-27 11:06:21 +0000
@@ -37,6 +37,7 @@
         virtual void onSearchCleared()  {};
         virtual void onSearch(const QString&) {};
         virtual void onShow() {};
+        virtual void onHide() {};
         virtual QWidget* getWidgetForMIDIControl() { return this; };
         virtual void keyPressEvent(QKeyEvent* event);
 

=== modified file 'mixxx/src/library/library.cpp'
--- mixxx/src/library/library.cpp	2012-05-11 05:42:47 +0000
+++ mixxx/src/library/library.cpp	2012-06-27 11:06:21 +0000
@@ -18,6 +18,7 @@
 #include "library/autodjfeature.h"
 #include "library/playlistfeature.h"
 #include "library/preparefeature.h"
+#include "library/selector/selectorfeature.h"
 #include "library/promotracksfeature.h"
 #include "library/traktor/traktorfeature.h"
 #include "library/librarycontrol.h"
@@ -63,6 +64,7 @@
     addFeature(new RecordingFeature(this, pConfig, m_pTrackCollection, m_pRecordingManager));
     addFeature(new SetlogFeature(this, pConfig, m_pTrackCollection));
     addFeature(new PrepareFeature(this, pConfig, m_pTrackCollection));
+    addFeature(new SelectorFeature(this, pConfig, m_pTrackCollection));
     //iTunes and Rhythmbox should be last until we no longer have an obnoxious
     //messagebox popup when you select them. (This forces you to reach for your
     //mouse or keyboard if you're using MIDI control and you scroll through them...)

=== modified file 'mixxx/src/library/libraryview.h'
--- mixxx/src/library/libraryview.h	2011-03-22 16:24:04 +0000
+++ mixxx/src/library/libraryview.h	2012-06-27 11:06:21 +0000
@@ -17,6 +17,7 @@
     virtual void onSearchCleared() = 0;
     virtual void onSearch(const QString& text) = 0;
     virtual void onShow() = 0;
+    virtual void onHide() = 0;
 
     // If applicable, requests that the LibraryView load the selected
     // track. Does nothing otherwise.

=== added directory 'mixxx/src/library/selector'
=== added file 'mixxx/src/library/selector/selectorfeature.cpp'
--- mixxx/src/library/selector/selectorfeature.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/selector/selectorfeature.cpp	2012-06-27 11:06:21 +0000
@@ -0,0 +1,92 @@
+// selectorfeature.cpp
+// Created 3/17/2012 by Keith Salisbury ([e-mail])
+
+#include <QtDebug>
+
+#include "library/selector/selectorfeature.h"
+#include "library/librarytablemodel.h"
+#include "library/trackcollection.h"
+#include "dlgselector.h"
+#include "widget/wlibrary.h"
+#include "widget/wlibrarysidebar.h"
+#include "mixxxkeyboard.h"
+
+const QString SelectorFeature::m_sSelectorViewName = QString("Selector");
+
+SelectorFeature::SelectorFeature(QObject* parent,
+                               ConfigObject<ConfigValue>* pConfig,
+                               TrackCollection* pTrackCollection)
+        : LibraryFeature(parent),
+          m_pConfig(pConfig),
+          m_pTrackCollection(pTrackCollection) {
+}
+
+SelectorFeature::~SelectorFeature() {
+    // TODO(XXX) delete these
+    //delete m_pLibraryTableModel;
+}
+
+QVariant SelectorFeature::title() {
+    return tr("Selector");
+}
+
+QIcon SelectorFeature::getIcon() {
+    return QIcon(":/images/library/ic_library_selector.png");
+}
+
+void SelectorFeature::bindWidget(WLibrarySidebar* sidebarWidget,
+                                WLibrary* libraryWidget,
+                                MixxxKeyboard* keyboard) {
+    DlgSelector* pSelectorView = new DlgSelector(libraryWidget,
+                                              m_pConfig,
+                                              m_pTrackCollection);
+    connect(pSelectorView, SIGNAL(loadTrack(TrackPointer)),
+            this, SIGNAL(loadTrack(TrackPointer)));
+    connect(pSelectorView, SIGNAL(loadTrackToPlayer(TrackPointer, QString)),
+            this, SIGNAL(loadTrackToPlayer(TrackPointer, QString)));
+
+    pSelectorView->installEventFilter(keyboard);
+
+    libraryWidget->registerView(m_sSelectorViewName, pSelectorView);
+}
+
+TreeItemModel* SelectorFeature::getChildModel() {
+    return &m_childModel;
+}
+
+void SelectorFeature::activate() {
+    //qDebug() << "SelectorFeature::activate()";
+    emit(switchToView(m_sSelectorViewName));
+}
+
+void SelectorFeature::activateChild(const QModelIndex& index) {
+}
+
+void SelectorFeature::onRightClick(const QPoint& globalPos) {
+}
+
+void SelectorFeature::onRightClickChild(const QPoint& globalPos,
+                                            QModelIndex index) {
+}
+
+bool SelectorFeature::dropAccept(QUrl url) {
+    return false;
+}
+
+bool SelectorFeature::dropAcceptChild(const QModelIndex& index, QUrl url) {
+    return false;
+}
+
+bool SelectorFeature::dragMoveAccept(QUrl url) {
+    return false;
+}
+
+bool SelectorFeature::dragMoveAcceptChild(const QModelIndex& index,
+                                              QUrl url) {
+    return false;
+}
+
+void SelectorFeature::onLazyChildExpandation(const QModelIndex &index){
+    //Nothing to do because the childmodel is not of lazy nature.
+}
+

=== added file 'mixxx/src/library/selector/selectorfeature.h'
--- mixxx/src/library/selector/selectorfeature.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/selector/selectorfeature.h	2012-06-27 11:06:21 +0000
@@ -0,0 +1,58 @@
+// selectorfeature.h
+// Created 8/23/2012 by Keith Salisbury ([e-mail])
+
+#ifndef SELECTORFEATURE_H
+#define SELECTORFEATURE_H
+
+#include <QStringListModel>
+#include "library/libraryfeature.h"
+#include "library/treeitemmodel.h"
+#include "configobject.h"
+
+class LibraryTableModel;
+class TrackCollection;
+
+class SelectorFeature : public LibraryFeature {
+    Q_OBJECT
+  public:
+    SelectorFeature(QObject* parent,
+                   ConfigObject<ConfigValue>* pConfig,
+                   TrackCollection* pTrackCollection);
+    virtual ~SelectorFeature();
+
+    QVariant title();
+    QIcon getIcon();
+
+    bool dropAccept(QUrl url);
+    bool dropAcceptChild(const QModelIndex& index, QUrl url);
+    bool dragMoveAccept(QUrl url);
+    bool dragMoveAcceptChild(const QModelIndex& index, QUrl url);
+
+    void bindWidget(WLibrarySidebar* sidebarWidget,
+                    WLibrary* libraryWidget,
+                    MixxxKeyboard* keyboard);
+
+    TreeItemModel* getChildModel();
+
+  signals:
+
+  public slots:
+    void activate();
+    void activateChild(const QModelIndex& index);
+    void onRightClick(const QPoint& globalPos);
+    void onRightClickChild(const QPoint& globalPos, QModelIndex index);
+    void onLazyChildExpandation(const QModelIndex& index);
+
+  private slots:
+
+  private:
+    ConfigObject<ConfigValue>* m_pConfig;
+    TrackCollection* m_pTrackCollection;
+    // Used to temporarily enable BPM detection in the prefs before we analyse
+    int m_iOldBpmEnabled;
+    TreeItemModel m_childModel;
+    const static QString m_sSelectorViewName;
+};
+
+
+#endif /* SELECTORFEATURE_H */

=== added file 'mixxx/src/library/selector/selectorlibrarytablemodel.cpp'
--- mixxx/src/library/selector/selectorlibrarytablemodel.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/selector/selectorlibrarytablemodel.cpp	2012-06-27 11:06:21 +0000
@@ -0,0 +1,390 @@
+// Created 3/17/2012 by Keith Salisbury ([e-mail])
+
+#include <QObject>
+
+#include "selectorlibrarytablemodel.h"
+#include "library/trackcollection.h"
+#include "basetrackplayer.h"
+#include "playerinfo.h"
+
+#include "controlobjectthreadmain.h"
+#include "controlobject.h"
+#include "trackinfoobject.h"
+
+const bool sDebug = true;
+
+SelectorLibraryTableModel::SelectorLibraryTableModel(QObject* parent,
+                                                   TrackCollection* pTrackCollection)
+        : LibraryTableModel(parent, pTrackCollection,
+                            "mixxx.db.model.selector") {
+
+    connect(this, SIGNAL(doSearch(const QString&)),
+            this, SLOT(slotSearch(const QString&)));
+
+    // Getting info on current decks playing etc
+    connect(&PlayerInfo::Instance(), SIGNAL(currentPlayingDeckChanged(int)),
+           this, SLOT(slotPlayingDeckChanged(int)));
+
+    connect(this, SIGNAL(filtersChanged()),
+            this, SLOT(slotFiltersChanged()));
+
+    m_bFilterGenre = false;
+    m_bFilterBpm = false;
+    m_iFilterBpmRange = 0;
+    m_bFilterYear = false;
+    m_bFilterRating = false;
+    m_bFilterKey = false;
+    m_bFilterKey4th = false;
+    m_bFilterKey5th = false;
+    m_bFilterKeyRelative = false;
+    m_filterString = "";
+    m_channelBpm = NULL;
+    m_bActive = false;
+    m_rate = 0;
+    
+    m_sCurrentTrackGenre = "";
+    m_fCurrentTrackBpm = 0;
+    m_sCurrentTrackYear = "";
+    m_iCurrentTrackRating = 0;
+    m_sCurrentTrackKey = "";
+
+    initializeHarmonicsData();
+
+}
+
+SelectorLibraryTableModel::~SelectorLibraryTableModel() {
+}
+
+bool SelectorLibraryTableModel::isColumnInternal(int column) {
+    return LibraryTableModel::isColumnInternal(column);
+}
+
+int SelectorLibraryTableModel::rowCount() {
+    return BaseSqlTableModel::rowCount();
+}
+
+void SelectorLibraryTableModel::active(bool value) {
+    m_bActive = value;
+}
+
+bool SelectorLibraryTableModel::currentTrackGenreExists() {
+    return m_sCurrentTrackGenre != QString();
+}
+
+bool SelectorLibraryTableModel::currentTrackBpmExists() {
+    return m_fCurrentTrackBpm > 0;
+}
+
+bool SelectorLibraryTableModel::currentTrackYearExists() {
+    return m_sCurrentTrackYear != QString();
+}
+
+bool SelectorLibraryTableModel::currentTrackRatingExists() {
+    return m_iCurrentTrackRating > 0;
+}
+
+bool SelectorLibraryTableModel::currentTrackKeyExists() {
+    return m_sCurrentTrackKey != QString();
+}
+
+void SelectorLibraryTableModel::filterByGenre(bool value) {
+    m_bFilterGenre = value;
+    updateFilterText();
+}
+
+void SelectorLibraryTableModel::filterByBpm(bool value, int range) {
+    m_bFilterBpm = value;
+    m_iFilterBpmRange = range;
+    updateFilterText();
+}
+
+void SelectorLibraryTableModel::filterByYear(bool value) {
+    m_bFilterYear = value;
+    updateFilterText();
+}
+
+void SelectorLibraryTableModel::filterByRating(bool value) {
+    m_bFilterRating = value;
+    updateFilterText();
+}
+
+void SelectorLibraryTableModel::filterByKey(bool value) {
+    m_bFilterKey = value;
+    updateFilterText();
+}
+
+void SelectorLibraryTableModel::filterByKey4th(bool value) {
+    m_bFilterKey4th = value;
+    updateFilterText();
+}
+
+void SelectorLibraryTableModel::filterByKey5th(bool value) {
+    m_bFilterKey5th = value;
+    updateFilterText();
+}
+
+void SelectorLibraryTableModel::filterByKeyRelative(bool value) {
+    m_bFilterKeyRelative = value;
+    updateFilterText();
+}
+
+// PRIVATE SLOTS
+
+void SelectorLibraryTableModel::slotPlayingDeckChanged(int deck) {
+    m_pChannel = QString("[Channel%1]").arg(deck);
+
+    // disconnect the old pitch slider
+    if (m_channelBpm) {
+        m_channelBpm->disconnect(this);
+    }
+    // get the new pitch slider object
+    m_channelBpm = new ControlObjectThreadMain(
+        ControlObject::getControl(ConfigKey(m_pChannel, "bpm")));
+    // listen for slider change events
+    connect(m_channelBpm, SIGNAL(valueChanged(double)), this, 
+        SLOT(slotChannel1BpmChanged(double)));
+
+    m_pLoadedTrack = PlayerInfo::Instance().getTrackInfo(m_pChannel);
+
+    m_sCurrentTrackGenre = m_pLoadedTrack->getGenre();
+    m_fCurrentTrackBpm = m_pLoadedTrack->getBpm();
+    m_sCurrentTrackYear = m_pLoadedTrack->getYear();
+    m_iCurrentTrackRating = m_pLoadedTrack->getRating();
+    m_sCurrentTrackKey = m_pLoadedTrack->getKey();
+
+    emit(currentTrackInfoChanged());
+
+    setRate();
+    updateFilterText();
+}
+
+
+void SelectorLibraryTableModel::slotChannel1BpmChanged(double value) {
+    #define DISCARD_PARAMETER(p) (void)p
+    (void)value;
+    setRate();
+    updateFilterText();
+}
+
+void SelectorLibraryTableModel::slotFiltersChanged() {
+	if (!m_bActive) return;
+    slotSearch(QString());
+}
+
+void SelectorLibraryTableModel::slotSearch(const QString& searchText) {
+    BaseSqlTableModel::search(searchText, m_filterString);
+}
+
+// PRIVATE METHODS
+
+void SelectorLibraryTableModel::updateFilterText() {
+	if (!m_bActive) return;
+    if (m_pLoadedTrack) {
+		QStringList filters;
+
+        // Genre
+        if (m_bFilterGenre) {
+            QString TrackGenre = m_sCurrentTrackGenre;
+            if (TrackGenre != "")
+                filters << QString("Genre == '%1'").arg(TrackGenre);
+        }
+
+        // Year
+        if (m_bFilterYear) {
+            QString TrackYear = m_sCurrentTrackYear;
+            if (TrackYear!="")
+                filters << QString("Year == '%1'").arg(TrackYear);
+        }
+
+        // Rating
+        if (m_bFilterRating) {
+            int TrackRating = m_iCurrentTrackRating;
+            if (TrackRating > 0)
+                filters << QString("Rating >= %1").arg(TrackRating);
+        }
+
+        // calculate the current BPM
+        float trackBpm = m_fCurrentTrackBpm;
+        float currentBpm = trackBpm * m_rate;
+
+        // Bpm
+        if (m_bFilterBpm) {
+            //float trackBpm = pChannel1Bpm->get();
+            if (currentBpm > 0) 
+                filters << QString("(Bpm > %1 AND Bpm < %2)").arg(
+                    floor(currentBpm - m_iFilterBpmRange)).arg(
+                    ceil(currentBpm + m_iFilterBpmRange));
+        } 
+
+        // Keys
+
+        // calculate the new pitch
+        const int semitonesPerOctave = 12;
+        float frequencyRatio = currentBpm / trackBpm;
+        float semitoneOffset = semitonesPerOctave * log(frequencyRatio) / log(2);
+        QString trackKey = adjustPitchBy(m_sCurrentTrackKey, semitoneOffset);
+
+		QString hKeys = getHarmonicKeys(trackKey);
+		if (hKeys!="")
+            filters << QString("Key in (%1)").arg(hKeys);
+                    
+        QString filterString = filters.join(" AND ");
+        if (m_filterString != filterString) {
+            m_filterString = filterString;
+            emit(filtersChanged());
+        }
+
+    }
+
+}
+
+void SelectorLibraryTableModel::setRate() {
+        // get pitch slider value (deck rate)
+    ControlObjectThreadMain* rateSlider = new ControlObjectThreadMain(
+        ControlObject::getControl(ConfigKey(m_pChannel, "rate")));
+    ControlObjectThreadMain* rateRange = new ControlObjectThreadMain(
+        ControlObject::getControl(ConfigKey(m_pChannel, "rateRange")));
+    ControlObjectThreadMain* rateDirection = new ControlObjectThreadMain(
+        ControlObject::getControl(ConfigKey(m_pChannel, "rate_dir")));
+
+    if (rateSlider != NULL && rateRange != NULL && rateDirection != NULL) {
+        m_rate = (1 + rateSlider->get() * rateRange->get() * rateDirection->get());        
+    }
+}
+
+void SelectorLibraryTableModel::search(const QString& searchText) {
+    emit(doSearch(searchText));
+}
+
+QString SelectorLibraryTableModel::getHarmonicKeys(QString trackKey) const {
+	// determine major or minor key "m"
+	bool isMinor = trackKey.contains("m", Qt::CaseInsensitive);
+
+	QStringList keys1 = (isMinor ? m_minors : m_majors);
+	QStringList keys2 = (isMinor ? m_majors : m_minors);
+	
+    int index = keys1.indexOf(trackKey);
+    int len = keys1.count();
+    if (index < 0) return QString("");
+    int lower = index-1;
+    if (lower < 0) lower += len; 
+    int upper = index+1;
+    if (upper >= len) upper -= len; 
+
+	QStringList keyfilters;
+	// Tonic Key
+	if (m_bFilterKey)
+		keyfilters << QString("'%1'").arg(trackKey);
+	// Perfect Fourth (Sub Dominant)
+	if (m_bFilterKey4th)
+		keyfilters << QString("'%1'").arg(keys1[lower]);
+	// Perfect Fifth (Dominant)
+	if (m_bFilterKey5th)
+		keyfilters << QString("'%1'").arg(keys1[upper]);
+	// Relative Minor/Major
+    if (m_bFilterKeyRelative)
+		keyfilters << QString("'%1'").arg(keys2[index]);
+    
+    return keyfilters.join(",");
+}
+
+QString SelectorLibraryTableModel::adjustPitchBy(QString pitch, int change) {
+    if (pitch == "") return pitch;
+
+    int position = m_semitoneList.indexOf(pitch);
+    if (position<0)
+        return pitch;
+
+    int newpos = position + (change * 2);
+    if (newpos >= 24)
+        newpos = newpos - 24;
+
+    QString newpitch = m_semitoneList.at(newpos);
+    return newpitch;
+}
+
+void SelectorLibraryTableModel::initializeHarmonicsData() {
+    /*
+    m_enharmonic_preference = "b" // # or b
+    "A# = Bb"
+    "C# = Db"
+    "D# = Eb"
+    "F# = Gb"
+    "G# = Ab"
+
+    m_enharmonic_preference = "#" // # or b
+    "Ab = G#"
+    "Bb = A#"
+    "Db = C#"
+    "Eb = D#"
+    "Gb = F#"
+
+    m_majors = QString("C,G,D,A,E,B,F#,Db,Ab,Eb,Bb,F").split(",");
+    m_minors = QString("Am,Em,Bm,F#m,Dbm,Abm,Ebm,Bbm,Fm,Cm,Gm,Dm").split(",");
+    m_semitoneList = QString("C,Cm,C#,C#m,D,Dm,Eb,Ebm,E,Em,F,Fm,F#,F#m,G,Gm,G#,G#m,A,Am,Bb,Bbm,B,Bm").split(",");
+    */
+    //  if (m_enharmonic_preference == "#") {
+            // prefer #'s
+            m_majors = QString("C,G,D,A,E,B,F#,C#,G#,D#,A#,F").split(",");
+            m_minors = QString("Am,Em,Bm,F#m,C#m,G#m,D#m,A#m,Fm,Cm,Gm,Dm").split(",");
+            m_semitoneList = QString("C,Cm,C#,C#m,D,Dm,D#,D#m,E,Em,F,Fm,F#,F#m,G,Gm,G#,G#m,A,Am,A#,A#m,B,Bm").split(",");
+    /*  } else {
+            // prefer b's
+            m_majors = QString("C,G,D,A,E,B,Gb,Db,Ab,Eb,Bb,F").split(",");
+            m_minors = QString("Am,Em,Bm,Gbm,Dbm,Abm,Ebm,Bbm,Fm,Cm,Gm,Dm").split(",");
+            m_semitoneList = QString("C,Cm,Db,Dbm,D,Dm,Eb,Ebm,E,Em,F,Fm,Gb,Gbm,G,Gm,Ab,Abm,A,Am,Bb,Bbm,B,Bm").split(",");
+        }
+    */
+	/*
+		// OK notation
+		m_majors = QString("1,2,3,4,5,6,7,8,9,10,11,12").split("d,");
+		m_minors = QString("1,2,3,4,5,6,7,8,9,10,11,12").split("m,");
+		m_semitoneList = QString("1d,10m,8d,5m,3d,12m,10d,7m,5d,2m,12d,9m,7d,4m,2d,11m,9d,6m,4d,1m,11d,8m,6d,Bm").split(",");
+	*/
+
+	/*
+	QHash<QString, QStringList> hash;
+
+	hash["1d"] = "C";
+	hash["2d"] = "G";
+	hash["3d"] = "D";
+	hash["4d"] = "A";
+	hash["5d"] = "E";
+	hash["6d"] = "B";
+	hash["7d"] = "F#,Gb";
+	hash["8d"] = "C#,Db";
+	hash["9d"] = "G#,Ab";
+	hash["10d"] = "D#,Eb";
+	hash["11d"] = "A#,Bb";
+	hash["12d"] = "F";
+
+	hash["1m"] = "Am";
+	hash["2m"] = "Em";
+	hash["3m"] = "Bm";
+	hash["4m"] = "F#m,Gbm";
+	hash["5m"] = "C#m,Dbm";
+	hash["6m"] = "G#m,Abm";
+	hash["7m"] = "D#m,Ebm";
+	hash["8m"] = "A#m,Bbm";
+	hash["9m"] = "Fm";
+	hash["10m"] = "Cm";
+	hash["11m"] = "Gm";
+	hash["12m"] = "Dm";
+
+	//                majors    minors
+	hash["1"] =     { "C",      "Am"        };
+	hash["2"] =     { "G",      "Em"        };
+	hash["3"] =     { "D",      "Bm"        };
+	hash["4"] =     { "A",      "F#m,Gbm"   };
+	hash["5"] =     { "E",      "C#m,Dbm"   };
+	hash["6"] =     { "B",      "G#m,Abm"   };
+	hash["7"] =     { "F#,Gb",  "D#m,Ebm"   };
+	hash["8"] =     { "C#,Db",  "A#m,Bbm"   };
+	hash["9"] =     { "G#,Ab",  "Fm"        };
+	hash["10"] =    { "D#,Eb",  "Cm"        };
+	hash["11"] =    { "A#,Bb",  "Gm"        };
+	hash["12"] =    { "F",      "Dm"        };
+
+	*/
+
+}

=== added file 'mixxx/src/library/selector/selectorlibrarytablemodel.h'
--- mixxx/src/library/selector/selectorlibrarytablemodel.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/selector/selectorlibrarytablemodel.h	2012-06-27 11:06:21 +0000
@@ -0,0 +1,103 @@
+// Created 3/17/2012 by Keith Salisbury ([e-mail])
+
+#ifndef SELECTORLIBRARYTABLEMODEL_H_
+#define SELECTORLIBRARYTABLEMODEL_H_
+
+#include <QModelIndexList>
+#include "library/librarytablemodel.h"
+#include "controlobjectthreadmain.h"
+
+
+class ControlObjectThreadMain;
+
+class SelectorLibraryTableModel : public LibraryTableModel
+{
+    Q_OBJECT
+  public:
+    SelectorLibraryTableModel(QObject* parent, TrackCollection* pTrackCollection);
+    virtual ~SelectorLibraryTableModel();
+
+    virtual void search(const QString& searchText);
+    virtual bool isColumnInternal(int column);
+    virtual int rowCount();
+	void active(bool value);
+
+    bool currentTrackGenreExists();
+    bool currentTrackBpmExists();
+    bool currentTrackYearExists();
+    bool currentTrackRatingExists();
+    bool currentTrackKeyExists();
+
+  public slots:
+    void filterByGenre(bool value);
+    void filterByBpm(bool value, int range);
+    void filterByYear(bool value);
+    void filterByRating(bool value);
+	void filterByKey(bool value);
+	void filterByKey4th(bool value);
+	void filterByKey5th(bool value);
+	void filterByKeyRelative(bool value);
+
+    /*
+    void updateFilter(
+        bool filterByGenre, 
+        bool filterByBpm,
+        bool filterByYear,
+        bool filterByRating,
+        bool filterByKey,
+        bool filterByHarmonicKey
+        );
+        */
+  private slots:
+    void slotSearch(const QString& searchText);
+    void slotPlayingDeckChanged(int deck);
+    void slotChannel1BpmChanged(double value);
+    void slotFiltersChanged();
+  signals:
+    void filtersChanged();
+    void currentTrackInfoChanged();
+    void doSearch(const QString& searchText);
+  private:
+
+    bool m_bActive;
+    void updateFilterText();
+    QString adjustPitchBy(QString pitch, int change);
+    void setRate();
+    float m_rate;
+    bool m_bFilterGenre;
+    bool m_bFilterBpm;
+    int m_iFilterBpmRange;
+    bool m_bFilterYear;
+    bool m_bFilterRating;
+    bool m_bFilterKey;
+    bool m_bFilterKey4th;
+    bool m_bFilterKey5th;
+    bool m_bFilterKeyRelative;
+
+    // Current Track Properties
+    QString m_sCurrentTrackGenre;
+    float m_fCurrentTrackBpm;
+    QString m_sCurrentTrackYear;
+    int m_iCurrentTrackRating;
+    QString m_sCurrentTrackKey;
+
+    QStringList m_semitoneList;
+    QStringList m_majors;
+    QStringList m_minors;
+
+    QString m_pChannel;
+    QString m_filterString;
+    TrackPointer m_pLoadedTrack;
+    ControlObjectThreadMain* m_channelBpm;
+    void initializeHarmonicsData();
+    QString getHarmonicKeys(QString key) const;
+
+};
+
+
+
+
+#endif
+
+
+

=== added file 'mixxx/src/mixxxcontrol.cpp'
--- mixxx/src/mixxxcontrol.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/mixxxcontrol.cpp	2012-06-27 11:06:21 +0000
@@ -0,0 +1,183 @@
+#include <QtCore>
+#include <QtXml>
+#include "mixxxcontrol.h"
+
+/** MixxxControl constructor */
+MixxxControl::MixxxControl(QString controlobject_group, QString controlobject_value, 
+                         QString controlobject_description, MidiOption midioption)
+{
+    m_strCOGroup = controlobject_group;
+    m_strCOValue = controlobject_value;
+    m_strCODescription = controlobject_description;
+    m_midiOption = midioption;
+    
+    m_thresholdMinimum = 0.0f;
+    m_thresholdMaximum = 1.0f;
+}
+
+/** Constructor that unserializes a MixxxControl object from a <control> or <output>
+    node block in our MIDI mapping XML file.
+*/
+MixxxControl::MixxxControl(QDomElement& parentNode, bool isOutputNode)
+{
+    QDomElement groupNode = parentNode.firstChildElement("group");
+    QDomElement keyNode = parentNode.firstChildElement("key");
+    QDomElement descriptionNode = parentNode.firstChildElement("description");
+
+    m_strCOGroup = groupNode.text();
+    m_strCOValue = keyNode.text();
+    m_strCODescription = descriptionNode.text();
+
+    QDomElement optionsNode = parentNode.firstChildElement("options");
+
+    // At the moment, use one element, in future iterate through options
+    QString strMidiOption;
+    if (optionsNode.hasChildNodes()) {
+        strMidiOption = optionsNode.firstChild().nodeName().toLower();
+    } else {
+        strMidiOption = "normal";
+    }
+
+    if (strMidiOption == "normal")  // can't switch() on a string
+        m_midiOption = MIDI_OPT_NORMAL;
+    else if (strMidiOption == "invert")
+        m_midiOption = MIDI_OPT_INVERT;
+    else if (strMidiOption == "rot64")
+        m_midiOption = MIDI_OPT_ROT64;
+    else if (strMidiOption == "rot64inv")
+        m_midiOption = MIDI_OPT_ROT64_INV;
+    else if (strMidiOption == "rot64fast")
+        m_midiOption = MIDI_OPT_ROT64_FAST;
+    else if (strMidiOption == "diff")
+        m_midiOption = MIDI_OPT_DIFF;
+    else if (strMidiOption == "button")
+        m_midiOption = MIDI_OPT_BUTTON;
+    else if (strMidiOption == "switch")
+        m_midiOption = MIDI_OPT_SWITCH;
+    else if (strMidiOption == "hercjog")
+        m_midiOption = MIDI_OPT_HERC_JOG;
+    else if (strMidiOption == "spread64")
+        m_midiOption = MIDI_OPT_SPREAD64;
+    else if (strMidiOption == "selectknob")
+        m_midiOption = MIDI_OPT_SELECTKNOB;
+    else if (strMidiOption == "soft-takeover")
+        m_midiOption = MIDI_OPT_SOFT_TAKEOVER;
+    else if (strMidiOption == "script-binding")
+        m_midiOption = MIDI_OPT_SCRIPT;
+    else {
+        m_midiOption = MIDI_OPT_NORMAL;
+        qWarning() << "Unknown midioption" << strMidiOption << "in" << __FILE__;
+    }
+    
+    //Parse threshold stuff, only used for output.
+    if (isOutputNode) {
+        
+        //TODO: Parse threshold stuff
+        QDomElement minNode = parentNode.firstChildElement("minimum");
+        QDomElement maxNode = parentNode.firstChildElement("maximum");
+        
+        bool ok = false;
+        if (!minNode.isNull()) {
+            m_thresholdMinimum = minNode.text().toFloat(&ok);
+        } else {
+            ok = false;
+        }
+
+        if (!ok) //If not a float, or node wasn't defined
+            m_thresholdMinimum = 0.0f;
+            
+        if (!maxNode.isNull()) {
+            m_thresholdMaximum = maxNode.text().toFloat(&ok);
+        } else {
+            ok = false;
+        }
+
+        if (!ok) //If not a float, or node wasn't defined
+            m_thresholdMaximum = 1.0f;
+    }
+}
+
+void MixxxControl::serializeToXML(QDomElement& parentNode, bool isOutputNode) const
+{
+    QDomText text;
+    QDomDocument nodeMaker;
+    QDomElement tagNode;
+
+    //Control object group
+    tagNode = nodeMaker.createElement("group");
+    text = nodeMaker.createTextNode(this->getControlObjectGroup());
+    tagNode.appendChild(text);
+    parentNode.appendChild(tagNode);
+
+    //Control object value
+    tagNode = nodeMaker.createElement("key"); //WTF worst name ever
+    text = nodeMaker.createTextNode(this->getControlObjectValue());
+    tagNode.appendChild(text);
+    parentNode.appendChild(tagNode);
+
+    //Control object description
+    tagNode = nodeMaker.createElement("description");
+    text = nodeMaker.createTextNode(this->getControlObjectDescription());
+    tagNode.appendChild(text);
+    parentNode.appendChild(tagNode);
+
+    //Midi option (slightly different format)
+    QDomElement optionsNode = nodeMaker.createElement("options");
+    QString strMidiOption;
+    int iMidiOption = this->getMidiOption();
+    if (iMidiOption == MIDI_OPT_NORMAL) // can't switch() on a string
+        strMidiOption = "normal";
+    else if (iMidiOption == MIDI_OPT_INVERT)
+        strMidiOption = "invert";
+    else if (iMidiOption == MIDI_OPT_ROT64)
+        strMidiOption = "rot64";
+    else if (iMidiOption == MIDI_OPT_ROT64_INV)
+        strMidiOption = "rot64inv";
+    else if (iMidiOption == MIDI_OPT_ROT64_FAST)
+        strMidiOption = "rot64fast";
+    else if (iMidiOption == MIDI_OPT_DIFF)
+        strMidiOption = "diff";
+    else if (iMidiOption == MIDI_OPT_BUTTON)
+        strMidiOption = "button";
+    else if (iMidiOption == MIDI_OPT_SWITCH)
+        strMidiOption = "switch";
+    else if (iMidiOption == MIDI_OPT_HERC_JOG)
+        strMidiOption = "hercjog";
+    else if (iMidiOption == MIDI_OPT_SPREAD64)
+        strMidiOption = "spread64";
+    else if (iMidiOption == MIDI_OPT_SELECTKNOB)
+        strMidiOption = "selectknob";
+    else if (iMidiOption == MIDI_OPT_SOFT_TAKEOVER)
+        strMidiOption = "soft-takeover";
+    else if (iMidiOption == MIDI_OPT_SCRIPT)
+        strMidiOption = "script-binding";
+    else {
+        strMidiOption = "Unknown";
+        qWarning() << "Unknown midioption in" << __FILE__;
+    }
+
+    QDomElement singleOption = nodeMaker.createElement(strMidiOption);
+    optionsNode.appendChild(singleOption);
+    parentNode.appendChild(optionsNode);
+
+    //If we're writing to an <output> block, write our threshold params
+    if (isOutputNode)
+    {
+        //TODO: Write threshold blocks
+        tagNode = nodeMaker.createElement("minimum");
+        text = nodeMaker.createTextNode(QString("%1").arg(this->getThresholdMinimum()));
+        tagNode.appendChild(text);
+        parentNode.appendChild(tagNode);
+
+        tagNode = nodeMaker.createElement("maximum");
+        text = nodeMaker.createTextNode(QString("%1").arg(this->getThresholdMaximum()));
+        tagNode.appendChild(text);
+        parentNode.appendChild(tagNode);
+    }
+}
+
+
+uint qHash(const MixxxControl& key)
+{
+    return (qHash(key.getControlObjectGroup() + key.getControlObjectValue()));
+}

=== added file 'mixxx/src/mixxxcontrol.h'
--- mixxx/src/mixxxcontrol.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/mixxxcontrol.h	2012-06-27 11:06:21 +0000
@@ -0,0 +1,88 @@
+#ifndef _MIXXXCONTROL_H_
+#define _MIXXXCONTROL_H_
+
+#include <QDebug>
+#include "configobject.h"
+
+typedef enum {
+    MIDI_OPT_NORMAL           = 0,
+    MIDI_OPT_INVERT           = 1,
+    MIDI_OPT_ROT64            = 2,
+    MIDI_OPT_ROT64_INV        = 3,
+    MIDI_OPT_ROT64_FAST       = 4,
+    MIDI_OPT_DIFF             = 5,
+    MIDI_OPT_BUTTON           = 6, // Button Down (!=00) and Button Up (00) events happen together
+    MIDI_OPT_SWITCH           = 7, // Button Down (!=00) and Button Up (00) events happen seperately
+    MIDI_OPT_HERC_JOG         = 8, // Generic hercules wierd range correction
+    MIDI_OPT_SPREAD64         = 9, // Accelerated difference from 64
+    MIDI_OPT_SELECTKNOB       = 10,// Relative knob which can be turned forever and outputs a signed value.
+
+    MIDI_OPT_SOFT_TAKEOVER    = 40,// Prevents sudden changes when hardware position differs from software value
+    
+    MIDI_OPT_SCRIPT           = 50,// Maps a MIDI control to a custom MixxxScript function
+} MidiOption;
+
+/** Note: The hash table in the MIDI mapping class maps MidiCommands onto MixxxControls! */
+
+class MixxxControl
+{
+    public:
+        MixxxControl(QString controlobject_group="", QString controlobject_value="",
+                         QString controlobject_description="",
+                         MidiOption midioption=MIDI_OPT_NORMAL);
+        MixxxControl(QDomElement& controlNode, bool isOutputNode=false);
+        ~MixxxControl() {};
+        void setControlObjectGroup(QString controlobject_group) { m_strCOGroup = controlobject_group; };
+        void setControlObjectValue(QString controlobject_value) { m_strCOValue = controlobject_value; };
+        void setControlObjectDescription(QString controlobject_description) { m_strCODescription = controlobject_description; };
+        void setMidiOption(MidiOption midioption) { m_midiOption = midioption; };
+        void setThresholdMinimum(float min) { m_thresholdMinimum = min; };
+        void setThresholdMaximum(float max) { m_thresholdMaximum = max; };
+        QString getControlObjectGroup() const { return m_strCOGroup; };
+        QString getControlObjectValue() const { return m_strCOValue; };
+        QString getControlObjectDescription() const { return m_strCODescription; };
+        MidiOption getMidiOption() const { return m_midiOption; };
+        float getThresholdMinimum() const { return m_thresholdMinimum; };
+        float getThresholdMaximum() const { return m_thresholdMaximum; };
+        void serializeToXML(QDomElement& parentNode, bool isOutputNode=false) const;
+        bool operator==(const MixxxControl& other) const {
+            return ((m_strCOGroup == other.getControlObjectGroup()) &&
+                    (m_strCOValue == other.getControlObjectValue()) &&
+                    (m_strCODescription == other.getControlObjectDescription()) &&
+                    (m_midiOption == other.getMidiOption()));
+        };
+        bool isNull() { return (m_strCOGroup == "" && m_strCOValue == ""); };
+    private:
+        QString m_strCOGroup;
+        QString m_strCOValue;
+        QString m_strCODescription;
+        MidiOption m_midiOption;
+        
+        /** These next parameters are used for MIDI output, when we're monitoring
+            the value of some control and sending output when it hits some threshold
+            (and stuff like that). */
+        float m_thresholdMinimum;
+        float m_thresholdMaximum; 
+};
+
+inline bool operator<(const MixxxControl &first, const MixxxControl &second)
+{
+   return ((first.getControlObjectGroup() + first.getControlObjectValue()) < 
+            (second.getControlObjectGroup() + second.getControlObjectValue()));
+}
+  
+/** Hash function needed so we can use MixxxControl in a QHash table */
+uint qHash(const MixxxControl& key);
+
+/*
+QDebug operator<<(QDebug dbg, MixxxControl& control)
+{
+    dbg.space() << control.getControlObjectGroup();
+    dbg.space() << control.getControlObjectValue();
+    dbg.space() << control.getMidiOption();
+
+    return dbg.space();
+}*/
+
+#endif
+

=== added file 'mixxx/src/softtakeover.cpp'
--- mixxx/src/softtakeover.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/softtakeover.cpp	2012-06-27 11:06:21 +0000
@@ -0,0 +1,115 @@
+/***************************************************************************
+                          softtakeover.cpp  -  description
+                          ----------------
+    begin                : Sat Mar 26 2011
+    copyright            : (C) 2011 by Sean M. Pappalardo
+    email                : [e-mail]
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "softtakeover.h"
+#include <math.h>  // for fabs()
+#include <qdatetime.h>
+
+// HACK: remove this after Control 2.0 is here
+#include "controlpotmeter.h"
+
+// qint64 currentTimeMsecs() {
+uint SoftTakeover::currentTimeMsecs() {
+    QDateTime currDT = QDateTime::currentDateTime();
+
+    // toMSecsSinceEpoch() is preferred since it's only one QDateTime call but
+    //  it requires Qt 4.7. Use it instead when something more substantial
+    //  elsewhere in Mixxx also requires Qt 4.7.
+    //qint64 t = dt.toMSecsSinceEpoch();  // Requires Qt 4.7
+    uint t = currDT.toTime_t()*1000+currDT.toString("zzz").toUInt();
+    return t;
+}
+
+// For legacy Controls
+void SoftTakeover::enable(QString group, QString name) {
+    MixxxControl mixxxControl = MixxxControl(group,name);
+    enable(mixxxControl);
+}
+
+void SoftTakeover::enable(MixxxControl control) {
+    if (!m_times.contains(control)) m_times.insert(control,currentTimeMsecs());
+}
+
+// For legacy Controls
+void SoftTakeover::disable(QString group, QString name) {
+    MixxxControl mixxxControl = MixxxControl(group,name);
+    disable(mixxxControl);
+}
+
+void SoftTakeover::disable(MixxxControl control) {
+    m_times.remove(control);
+}
+
+// For legacy Controls
+bool SoftTakeover::ignore(QString group, QString name, float newValue) {
+    MixxxControl mixxxControl = MixxxControl(group,name);
+    return ignore(mixxxControl,newValue);
+}
+
+bool SoftTakeover::ignore(MixxxControl mc, float newValue, bool midiVal) {
+    bool ignore = false;
+    QString message;
+    if (m_times.contains(mc)) {
+        // We only want to ignore the MIDI controller when all of the following are true:
+        //  - its new value is far away from the MixxxControl
+        //  - it's been awhile since the last MIDI message for this control affected it
+        
+        // 3/128 units away from the current is enough to catch fast non-sequential moves
+        //  but not cause an audially noticeable jump.
+        float threshold = 3;
+        
+        ControlObject* temp = ControlObject::getControl(
+            ConfigKey(mc.getControlObjectGroup(), mc.getControlObjectValue()));
+
+        if (temp == NULL) return ignore;
+        
+        if (!midiVal) {
+            // These defaults will effectively disable soft-takeover for this pass
+            //  (causing the control to jump to the new value regardless)
+            //  if there's a problem with the below CO being NULL
+            double maxValue=10000000;   // Anything, just higher than any CO can go
+            double minValue=0;
+            
+            // HACK until we have Control 2.0. It can't come soon enough...
+            ControlPotmeter* cpo = dynamic_cast<ControlPotmeter*>(temp);    // for getMax/getMin
+            if (cpo != NULL) {
+                maxValue = cpo->getMax();
+                minValue = cpo->getMin();
+            }
+            // End hack
+            
+            double scaleFactor = maxValue-minValue;
+            threshold = scaleFactor*(threshold/128);
+        }
+        
+        double oldValue;
+        if (midiVal) oldValue = temp->GetMidiValue();
+        else oldValue = temp->get();
+        double difference = oldValue - newValue;
+        
+        uint currentTime = currentTimeMsecs();
+        if (fabs(difference)>threshold
+            && (currentTime - m_times.value(mc)) > SUBSEQUENT_VALUE_OVERRIDE_TIME) {
+            ignore = true;
+        }
+        if (!ignore) {
+            //  Update the time only if the value is not ignored
+            m_times.insert(mc,currentTime); // Replaces any previous value for this MixxxControl
+        }
+    }
+    return ignore;
+}

=== added file 'mixxx/src/softtakeover.h'
--- mixxx/src/softtakeover.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/softtakeover.h	2012-06-27 11:06:21 +0000
@@ -0,0 +1,50 @@
+/***************************************************************************
+                           softtakeover.h  -  description
+                           --------------
+    begin                : Thu Mar 17 2011
+    copyright            : (C) 2011 by Sean M. Pappalardo
+    email                : [e-mail]
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#ifndef SOFTTAKEOVER_H
+#define SOFTTAKEOVER_H
+
+#include "mixxxcontrol.h"
+
+class SoftTakeover {
+
+    public:
+        /** Enable soft-takeover for the given Control
+            It's okay to call this on a Control that's already enabled. */
+        void enable(MixxxControl control);
+        void enable(QString group, QString name);
+        /** Disable soft-takeover for the given Control */
+        void disable(MixxxControl control);
+        void disable(QString group, QString name);
+        /** Check to see if the new value for the Control should be ignored */
+        bool ignore(MixxxControl control, float newValue, bool midiVal = false);
+        /** For legacy Controls */
+        bool ignore(QString group, QString name, float newValue);
+    
+    private:
+        /** If a new value is received within this amount of time,
+            jump to it regardless. This allows quickly whipping controls to work
+            while retaining the benefits of soft-takeover for slower movements.
+            
+            Setting this too high will defeat the purpose of soft-takeover.*/        
+        static const uint SUBSEQUENT_VALUE_OVERRIDE_TIME = 50;   // Milliseconds
+        //qint64 currentTimeMsecs();
+        //QHash<MixxxControl,qint64> m_times;
+        uint currentTimeMsecs();
+        QHash<MixxxControl,uint> m_times;
+};
+
+#endif
\ No newline at end of file

=== added file 'mixxx/src/test/analyserwavesummarytest.cpp'
--- mixxx/src/test/analyserwavesummarytest.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/test/analyserwavesummarytest.cpp	2012-06-27 11:06:21 +0000
@@ -0,0 +1,102 @@
+#include <gtest/gtest.h>
+#include <QDebug>
+
+#include "trackinfoobject.h"
+#include "analyserwavesummary.h"
+
+#define BIGBUF_SIZE (1024 * 1024)  //Megabyte
+#define CANARY_SIZE (1024*4)
+#define MAGIC_FLOAT 1234.567890f
+#define CANARY_FLOAT 0.0f
+
+namespace {
+
+class AnalyserWavesummaryTest: public testing::Test {
+  protected:
+    virtual void SetUp() {
+        qDebug() << "SetUp";
+        aw = new AnalyserWavesummary();
+        tio = TrackPointer(new TrackInfoObject("foo"));
+        //Subpixels per second, from waveformrenderer.cpp:247
+        tio->setVisualResampleRate(200);
+
+        bigbuf = new CSAMPLE[BIGBUF_SIZE];
+        for (int i = 0; i < BIGBUF_SIZE; i++)
+            bigbuf[i] = MAGIC_FLOAT;
+
+        //Memory layout for canaryBigBuf looks like
+        //  [ canary | big buf | canary ]
+        //
+
+        canaryBigBuf = new CSAMPLE[BIGBUF_SIZE + 2*CANARY_SIZE];
+        for (int i = 0; i < CANARY_SIZE; i++)
+            canaryBigBuf[i] = CANARY_FLOAT;
+        for (int i = CANARY_SIZE; i < CANARY_SIZE+BIGBUF_SIZE; i++)
+            canaryBigBuf[i] = MAGIC_FLOAT;
+        for (int i = CANARY_SIZE+BIGBUF_SIZE; i < 2*CANARY_SIZE+BIGBUF_SIZE; i++)
+            canaryBigBuf[i] = CANARY_FLOAT;
+    }
+
+    virtual void TearDown() {
+        qDebug() << "TearDown";
+        qDebug() << "delete aw";
+        delete aw;
+        delete [] bigbuf;
+        delete [] canaryBigBuf;
+    }
+
+    AnalyserWavesummary* aw;
+    TrackPointer tio;
+    CSAMPLE* bigbuf;
+    CSAMPLE* canaryBigBuf;
+};
+
+//Test to make sure we don't modify the source buffer.
+TEST_F(AnalyserWavesummaryTest, simpleAnalyze) {
+    aw->initialise(tio, 44100, BIGBUF_SIZE);
+    aw->process(bigbuf, BIGBUF_SIZE);
+    aw->finalise(tio);
+    for (int i = 0; i < BIGBUF_SIZE; i++) {
+        EXPECT_FLOAT_EQ(bigbuf[i], MAGIC_FLOAT);
+    }
+}
+
+//Basic test to make sure we don't step out of bounds.
+TEST_F(AnalyserWavesummaryTest, canary) {
+    aw->initialise(tio, 44100, BIGBUF_SIZE);
+    aw->process(&canaryBigBuf[CANARY_SIZE], BIGBUF_SIZE);
+    aw->finalise(tio);
+    for (int i = 0; i < CANARY_SIZE; i++) {
+        EXPECT_FLOAT_EQ(canaryBigBuf[i], CANARY_FLOAT);
+    }
+    for (int i = CANARY_SIZE+BIGBUF_SIZE; i < 2*CANARY_SIZE+BIGBUF_SIZE; i++) {
+        EXPECT_FLOAT_EQ(canaryBigBuf[i], CANARY_FLOAT);
+    }
+}
+
+//Test to make sure that if an incorrect totalSamples is passed to
+//initialise(..) and process(..) is told to process more samples than that,
+//that we don't step out of bounds.
+TEST_F(AnalyserWavesummaryTest, wrongTotalSamples) {
+    aw->initialise(tio, 44100, BIGBUF_SIZE);
+    //Process in a loop
+    int wrongTotalSamples = BIGBUF_SIZE+1; //Too big by 1 sample...
+    //Note that the correct totalSamples would just be BIGBUF_SIZE. :)
+    int blockSize = 2*32768;
+    for (int i = CANARY_SIZE; i < CANARY_SIZE+wrongTotalSamples; i += blockSize) {
+        aw->process(&canaryBigBuf[i], blockSize);
+    }
+    aw->finalise(tio);
+    //Ensure the source buffer is intact
+    for (int i = CANARY_SIZE; i < BIGBUF_SIZE; i++) {
+        EXPECT_FLOAT_EQ(canaryBigBuf[i], MAGIC_FLOAT);
+    }
+    //Make sure our canaries are still OK
+    for (int i = 0; i < CANARY_SIZE; i++) {
+        EXPECT_FLOAT_EQ(canaryBigBuf[i], CANARY_FLOAT);
+    }
+    for (int i = CANARY_SIZE+BIGBUF_SIZE; i < 2*CANARY_SIZE+BIGBUF_SIZE; i++) {
+        EXPECT_FLOAT_EQ(canaryBigBuf[i], CANARY_FLOAT);
+    }
+}
+}

=== added file 'mixxx/src/test/midiscriptenginetest.cpp'
--- mixxx/src/test/midiscriptenginetest.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/test/midiscriptenginetest.cpp	2012-06-27 11:06:21 +0000
@@ -0,0 +1,95 @@
+
+#include <gtest/gtest.h>
+#include <QDebug>
+#include <QApplication>
+#include <QObject>
+#include <QFile>
+
+#include "controlobject.h"
+#include "configobject.h"
+#include "midi/midiscriptengine.h"
+
+namespace {
+
+class MidiScriptEngineTest : public testing::Test {
+  protected:
+    virtual void SetUp() {
+        qDebug() << "SetUp";
+        static int argc = 1;
+        static char** argv = NULL;
+        app = new QApplication(argc, argv);
+        MidiDevice* pDevice = NULL;
+        scriptEngine = new MidiScriptEngine(pDevice);
+        scriptEngine->setMidiDebug(false);
+        scriptEngine->setMidiPopups(false);
+        scriptEngine->moveToThread(scriptEngine);
+        scriptEngine->start();
+        while(!scriptEngine->isReady()) { }
+    }
+
+    virtual void TearDown() {
+        qDebug() << "TearDown";
+        scriptEngine->gracefulShutdown(QList<QString>());
+        scriptEngine->wait();
+        delete scriptEngine;
+        delete app;
+    }
+
+    QApplication *app;
+    MidiScriptEngine *scriptEngine;
+};
+
+TEST_F(MidiScriptEngineTest, commonScriptHasNoErrors) {
+    // ConfigObject<ConfigValue> config("~/.mixxx/mixxx.cfg");
+    // QString commonScript = config.getConfigPath() + "/" +
+    //         "/midi/midi-mappings-scripts.js";
+    QString commonScript = "./res/midi/midi-mappings-scripts.js";
+    scriptEngine->evaluate(commonScript);
+    EXPECT_FALSE(scriptEngine->hasErrors(commonScript));
+}
+
+TEST_F(MidiScriptEngineTest, scriptSetValue) {
+    QString script = "test.js";
+    QFile f(script);
+    f.open(QIODevice::ReadWrite | QIODevice::Truncate);
+    f.write("setValue = function() { engine.setValue('[Channel1]', 'co', 1.0); }\n");
+    f.close();
+
+    scriptEngine->evaluate(script);;
+    EXPECT_FALSE(scriptEngine->hasErrors(script));
+
+    ControlObject *co = new ControlObject(ConfigKey("[Channel1]", "co"));
+    co->set(0.0);
+    scriptEngine->execute("setValue");
+    ControlObject::sync();
+    EXPECT_DOUBLE_EQ(co->get(), 1.0f);
+
+    delete co;
+    co = NULL;
+
+    f.remove();
+}
+
+TEST_F(MidiScriptEngineTest, scriptGetSetValue) {
+    QString script = "test.js";
+    QFile f(script);
+    f.open(QIODevice::ReadWrite | QIODevice::Truncate);
+    f.write("getSetValue = function() { var val = engine.getValue('[Channel1]', 'co'); engine.setValue('[Channel1]', 'co', val + 1); }\n");
+    f.close();
+
+    scriptEngine->evaluate(script);;
+    EXPECT_FALSE(scriptEngine->hasErrors(script));
+
+    ControlObject *co = new ControlObject(ConfigKey("[Channel1]", "co"));
+    co->set(0.0);
+    scriptEngine->execute("getSetValue");
+    ControlObject::sync();
+    EXPECT_DOUBLE_EQ(co->get(), 1.0f);
+
+    delete co;
+    co = NULL;
+
+    f.remove();
+}
+
+}

=== added file 'mixxx/src/track/beatmatrix.cpp'
--- mixxx/src/track/beatmatrix.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/track/beatmatrix.cpp	2012-06-27 11:06:21 +0000
@@ -0,0 +1,275 @@
+#include <QtDebug>
+#include <QMutexLocker>
+
+#include "track/beatmatrix.h"
+
+BeatMatrix::BeatMatrix(TrackPointer pTrack, const QByteArray* pByteArray)
+        : QObject(),
+          m_mutex(QMutex::Recursive),
+          m_iSampleRate(pTrack->getSampleRate()) {
+    if (pByteArray != NULL) {
+        readByteArray(pByteArray);
+    }
+}
+
+BeatMatrix::~BeatMatrix() {
+}
+
+unsigned int BeatMatrix::numBeats() const {
+    return m_beatList.size();
+}
+
+QByteArray* BeatMatrix::toByteArray() const {
+    QMutexLocker locker(&m_mutex);
+    // No guarantees BeatLists are made of a data type which located adjacent
+    // items in adjacent memory locations.
+    double* pBuffer = new double[m_beatList.size()];
+    for (int i = 0; i < m_beatList.size(); ++i) {
+        pBuffer[i] = m_beatList[i];
+    }
+    QByteArray* pByteArray = new QByteArray((char*)pBuffer, sizeof(pBuffer[0]) * m_beatList.size());
+    delete [] pBuffer;
+    return pByteArray;
+}
+
+void BeatMatrix::readByteArray(const QByteArray* pByteArray) {
+    if (pByteArray->size() % sizeof(double) != 0) {
+        qDebug() << "ERROR: Could not parse BeatMatrix from QByteArray of size" << pByteArray->size();
+        return;
+    }
+
+    int numBeats = pByteArray->size() / sizeof(double);
+    double* pBuffer = (double*)pByteArray->data();
+    for (int i = 0; i < numBeats; ++i) {
+        m_beatList.append(pBuffer[i]);
+    }
+}
+
+
+QString BeatMatrix::getVersion() const {
+    QMutexLocker locker(&m_mutex);
+    return "BeatMatrix-1.0";
+}
+
+// internal use only
+bool BeatMatrix::isValid() const {
+    return m_iSampleRate > 0 && m_beatList.size() > 0;
+}
+
+double BeatMatrix::findNextBeat(double dSamples) const {
+    return findNthBeat(dSamples, 1);
+}
+
+double BeatMatrix::findPrevBeat(double dSamples) const {
+    return findNthBeat(dSamples, -1);
+}
+
+double BeatMatrix::findClosestBeat(double dSamples) const {
+    QMutexLocker locker(&m_mutex);
+    if (!isValid()) {
+        return -1;
+    }
+    double nextBeat = findNextBeat(dSamples);
+    double prevBeat = findPrevBeat(dSamples);
+    return (nextBeat - dSamples > dSamples - prevBeat) ? prevBeat : nextBeat;
+}
+
+double BeatMatrix::findNthBeat(double dSamples, int n) const {
+    QMutexLocker locker(&m_mutex);
+    // Reduce the Sample Offset to a frame offset.
+    dSamples = floorf(dSamples/2);
+    BeatList::const_iterator it;
+    int i;
+
+    if (!isValid() || n == 0) {
+        return -1;
+    }
+
+    if (n > 0) {
+        it = qLowerBound(m_beatList.begin(), m_beatList.end(), dSamples);
+
+        // Count down until n=1
+        while (it != m_beatList.end()) {
+            if (n == 1) {
+                // Return a Sample Offset
+                return (*it * 2);
+            }
+            it++; n--;
+        }
+    }
+    else if (n < 0) {
+        it = qUpperBound(m_beatList.begin(), m_beatList.end(), dSamples);
+
+        // Count up until n=-1
+        while (it != m_beatList.begin()) {
+            // qUpperBound starts us off at the position just-one-past the last
+            // occurence of dSamples-or-smaller in the list. In order to get the
+            // last instance of dSamples-or-smaller, we decrement it by 1 before
+            // touching it. The guard of this while loop guarantees this does
+            // not put us before the start of the loop.
+            it--;
+            if (n == -1) {
+                // Return a Sample Offset
+                return (*it * 2);
+            }
+            n++;
+        }
+    }
+
+    return -1;
+}
+
+void BeatMatrix::findBeats(double startSample, double stopSample, QList<double>* pBeatsList) const {
+    QMutexLocker locker(&m_mutex);
+    if (!isValid() || startSample > stopSample) {
+        return;
+    }
+    BeatList::const_iterator curBeat = qLowerBound(m_beatList.begin(),
+                                                   m_beatList.end(),
+                                                   startSample);
+    BeatList::const_iterator stopBeat = qUpperBound(m_beatList.begin(),
+                                                    m_beatList.end(),
+                                                    stopSample);
+
+    for (; curBeat != stopBeat; curBeat++) {
+        pBeatsList->append(*curBeat);
+    }
+}
+
+bool BeatMatrix::hasBeatInRange(double startSample, double stopSample) const {
+    QMutexLocker locker(&m_mutex);
+    if (!isValid() || startSample > stopSample) {
+        return false;
+    }
+    BeatList::const_iterator startBeat = qLowerBound(m_beatList.begin(),
+                                                     m_beatList.end(),
+                                                     startSample);
+    BeatList::const_iterator stopBeat = qUpperBound(m_beatList.begin(),
+                                                    m_beatList.end(),
+                                                    stopSample);
+
+    if (startBeat != stopBeat)
+        return true;
+    return false;
+}
+
+double BeatMatrix::getBpm() const {
+    QMutexLocker locker(&m_mutex);
+    if (!isValid()) {
+        return -1;
+    }
+
+    // TODO(XXX) not actually correct. We need the true song length.
+    double startSample = *m_beatList.begin();
+    double stopSample = *(m_beatList.end()-1);
+    double songDurationMinutes =
+            (stopSample - startSample) / (60.0f * m_iSampleRate);
+    return m_beatList.size() / songDurationMinutes;
+}
+
+double BeatMatrix::getBpmRange(double startSample, double stopSample) const {
+    QMutexLocker locker(&m_mutex);
+    if (!isValid() || startSample > stopSample) {
+        return -1;
+    }
+
+    BeatList::const_iterator startBeat = qLowerBound(m_beatList.begin(),
+                                               m_beatList.end(),
+                                               startSample);
+    BeatList::const_iterator stopBeat = qUpperBound(m_beatList.begin(),
+                                                    m_beatList.end(),
+                                                    stopSample);
+    double rangeDurationMinutes =
+            (stopSample - startSample) / (60.0f * m_iSampleRate);
+    // Subtracting returns the number of beats between the samples referred to
+    // by the start and end.
+    double beatsInRange = stopBeat - startBeat;
+
+    return beatsInRange / rangeDurationMinutes;
+}
+
+void BeatMatrix::addBeat(double dBeatSample) {
+    QMutexLocker locker(&m_mutex);
+
+    BeatList::iterator it = qLowerBound(m_beatList.begin(),
+                                        m_beatList.end(),
+                                        dBeatSample);
+    // Don't insert a duplicate beat. TODO(XXX) determine what epsilon to
+    // consider a beat identical to another.
+    if (*it == dBeatSample)
+        return;
+
+    m_beatList.insert(it, dBeatSample);
+    locker.unlock();
+    emit(updated());
+}
+
+void BeatMatrix::removeBeat(double dBeatSample) {
+    QMutexLocker locker(&m_mutex);
+    BeatList::iterator it = qLowerBound(m_beatList.begin(),
+                                        m_beatList.end(), dBeatSample);
+
+    // In case there are duplicates, remove every instance of dBeatSample
+    // TODO(XXX) add invariant checks against this
+    // TODO(XXX) determine what epsilon to consider a beat identical to another
+    while (*it == dBeatSample) {
+        it = m_beatList.erase(it);
+    }
+    locker.unlock();
+    emit(updated());
+}
+
+void BeatMatrix::moveBeat(double dBeatSample, double dNewBeatSample) {
+    QMutexLocker locker(&m_mutex);
+
+    BeatList::iterator it = qLowerBound(m_beatList.begin(),
+                                        m_beatList.end(), dBeatSample);
+
+    // Remove all beats from dBeatSample
+    while (*it == dBeatSample) {
+        it = m_beatList.erase(it);
+    }
+
+    // Now add a beat to dNewBeatSample
+    it = qLowerBound(m_beatList.begin(),
+                     m_beatList.end(), dNewBeatSample);
+
+    // TODO(XXX) beat epsilon
+    if (*it != dNewBeatSample) {
+        m_beatList.insert(it, dNewBeatSample);
+    }
+    locker.unlock();
+    emit(updated());
+}
+
+void BeatMatrix::translate(double dNumSamples) {
+    QMutexLocker locker(&m_mutex);
+    if (!isValid()) {
+        return;
+    }
+
+    for (BeatList::iterator it = m_beatList.begin();
+         it != m_beatList.end(); ++it) {
+        *it += dNumSamples;
+    }
+    locker.unlock();
+    emit(updated());
+}
+
+void BeatMatrix::scale(double dScalePercentage) {
+    QMutexLocker locker(&m_mutex);
+    if (!isValid()) {
+        return;
+    }
+    for (BeatList::iterator it = m_beatList.begin();
+         it != m_beatList.end(); ++it) {
+        *it *= dScalePercentage;
+    }
+    locker.unlock();
+    emit(updated());
+}
+
+void BeatMatrix::slotTrackBpmUpdated(double dBpm) {
+    //QMutexLocker locker(&m_mutex);
+    // TODO(XXX) How do we handle this?
+}

=== added file 'mixxx/src/track/beatmatrix.h'
--- mixxx/src/track/beatmatrix.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/track/beatmatrix.h	2012-06-27 11:06:21 +0000
@@ -0,0 +1,67 @@
+#ifndef BEATMATRIX_H
+#define BEATMATRIX_H
+
+#include <QObject>
+#include <QMutex>
+
+#include "trackinfoobject.h"
+#include "track/beats.h"
+
+// BeatMatrix is an implementation of the Beats interface that implements a list
+// of finite beats that have been extracted or otherwise annotated for a track.
+class BeatMatrix : public QObject, public Beats {
+    Q_OBJECT
+  public:
+    BeatMatrix(TrackPointer pTrack, const QByteArray* pByteArray=NULL);
+    virtual ~BeatMatrix();
+
+    // See method comments in beats.h
+
+    virtual Beats::CapabilitiesFlags getCapabilities() const {
+        return BEATSCAP_TRANSLATE | BEATSCAP_SCALE | BEATSCAP_ADDREMOVE | BEATSCAP_MOVEBEAT;
+    }
+
+    virtual QByteArray* toByteArray() const;
+    virtual QString getVersion() const;
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Beat calculations
+    ////////////////////////////////////////////////////////////////////////////
+
+    virtual double findNextBeat(double dSamples) const;
+    virtual double findPrevBeat(double dSamples) const;
+    virtual double findClosestBeat(double dSamples) const;
+    virtual double findNthBeat(double dSamples, int n) const;
+    virtual void findBeats(double startSample, double stopSample, QList<double>* pBeatsList) const;
+    virtual bool hasBeatInRange(double startSample, double stopSample) const;
+    virtual double getBpm() const;
+    virtual double getBpmRange(double startSample, double stopSample) const;
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Beat mutations
+    ////////////////////////////////////////////////////////////////////////////
+
+    virtual void addBeat(double dBeatSample);
+    virtual void removeBeat(double dBeatSample);
+    virtual void moveBeat(double dBeatSample, double dNewBeatSample);
+    virtual void translate(double dNumSamples);
+    virtual void scale(double dScalePercentage);
+
+  signals:
+    void updated();
+
+  private slots:
+    void slotTrackBpmUpdated(double bpm);
+
+  private:
+    void readByteArray(const QByteArray* pByteArray);
+    // For internal use only.
+    bool isValid() const;
+    unsigned int numBeats() const;
+
+    mutable QMutex m_mutex;
+    int m_iSampleRate;
+    BeatList m_beatList;
+};
+
+#endif /* BEATMATRIX_H */

=== added file 'mixxx/src/waveform/glwaveformrenderer.cpp'
--- mixxx/src/waveform/glwaveformrenderer.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/waveform/glwaveformrenderer.cpp	2012-06-27 11:06:21 +0000
@@ -0,0 +1,334 @@
+/**
+
+  A license and other info goes here!
+
+ */
+
+#include <QDebug>
+#include <QDomNode>
+#include <QImage>
+#include <QObject>
+#include <qgl.h>
+
+#include "glwaveformrenderer.h"
+#include "waveformrenderbeat.h"
+#include "trackinfoobject.h"
+#include "soundsourceproxy.h"
+#include "controlobjectthreadmain.h"
+#include "controlobject.h"
+#include "widget/wwidget.h"
+#include "widget/wskincolor.h"
+
+#define DEFAULT_SECONDS_TO_DISPLAY 4
+#define SCALE_TEST 4
+
+GLWaveformRenderer::GLWaveformRenderer(const char* group) :
+m_iWidth(0),
+m_iHeight(0),
+m_iMax(0),
+m_iMin(0),
+m_iNumSamples(0),
+bgColor(0,0,0),
+signalColor(255,255,255),
+colorMarker(255,255,255),
+colorBeat(255,255,255),
+colorCue(255,255,255),
+m_iDesiredSecondsToDisplay(DEFAULT_SECONDS_TO_DISPLAY),
+m_pSampleBuffer(NULL),
+m_pInternalBuffer(NULL),
+m_iInternalBufferSize(0)
+{
+    m_pPlayPos = new ControlObjectThreadMain(ControlObject::getControl(ConfigKey(group,"playposition")));
+    connect(m_pPlayPos, SIGNAL(valueChanged(double)), this, SLOT(slotUpdatePlayPos(double)));
+
+    m_pCOVisualResample = new ControlObject(ConfigKey(group,"VisualResample"));
+    m_pCOVerticalScale = new ControlObject(ConfigKey(group, "VisualVerticalScale"));
+}
+
+
+GLWaveformRenderer::~GLWaveformRenderer() {
+    if(m_pCOVisualResample)
+        delete m_pCOVisualResample;
+    m_pCOVisualResample = NULL;
+
+    if(m_pCOVerticalScale)
+        delete m_pCOVerticalScale;
+    m_pCOVerticalScale = NULL;
+
+    if(m_pPlayPos)
+        delete m_pPlayPos;
+    m_pPlayPos = NULL;
+
+}
+
+void GLWaveformRenderer::slotUpdatePlayPos(double v) {
+    m_dPlayPos = v;
+}
+
+
+void GLWaveformRenderer::resize(int w, int h) {
+    m_iWidth = w;
+    m_iHeight = h;
+
+    m_pInternalBuffer = new GLfloat[w*3*5];
+    m_iInternalBufferSize = w*5;
+
+    for(int i=0; i<w*5; i++) {
+        m_pInternalBuffer[i*3+0] = i-10;
+        m_pInternalBuffer[i*3+1] = 0.5;
+        m_pInternalBuffer[i*3+2] = 1.0;
+
+
+    }
+
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    gluPerspective(60.0, 1.0, 1.0, 1000.0);
+    glViewport(0,0,w,h);
+
+    gluLookAt(0,0,15.0, // look along z-axis
+              0,0,0,  // from the origin
+              0,1.0,0); // with y being 'up'
+
+    setupControlObjects();
+}
+
+void GLWaveformRenderer::setupControlObjects() {
+
+    // the max positive value of a sample is 32767, (2**15-1)
+    // we want the waveforms normalized so that 0-32767 maps to 0-m_iHeight/2
+    // (m_iHeight/2) = (32767) / x  =>  x = 32767/(m_iHeight/2)
+    int verticalScale = ((1<<15)-1)*2/ m_iHeight;
+    m_pCOVerticalScale->set(verticalScale);
+
+
+    // the resample rate is the number of seconds that correspond to one pixel
+    // on the visual waveform display.
+
+    // the reason for using seconds is that we do not know the
+    // sample rate of the song that will be loaded.
+
+    // we calculate this as follows:
+
+    // secondsPerPixel = desiredSecondsToDisplay / m_iWidth
+
+    // for now just send the width.. meh
+    double secondsPerPixel = double(m_iDesiredSecondsToDisplay)/m_iWidth;
+    //m_pCOVisualResample->set(secondsPerPixel);
+
+    m_pCOVisualResample->set(m_iWidth);
+
+    qDebug() << "GLWaveformRenderer::setupControlObjects - VisualResample: " << secondsPerPixel << " VerticalScale: " << verticalScale;
+
+}
+
+void GLWaveformRenderer::setup(QDomNode node) {
+
+    bgColor.setNamedColor(WWidget::selectNodeQString(node, "BgColor"));
+    bgColor = WSkinColor::getCorrectColor(bgColor);
+
+    qDebug() << "Got bgColor " << bgColor;
+
+    signalColor.setNamedColor(WWidget::selectNodeQString(node, "SignalColor"));
+    signalColor = WSkinColor::getCorrectColor(signalColor);
+
+    qDebug() << "Got signalColor " << signalColor;
+
+    colorMarker.setNamedColor(WWidget::selectNodeQString(node, "MarkerColor"));
+    colorMarker = WSkinColor::getCorrectColor(colorMarker);
+
+    colorBeat.setNamedColor(WWidget::selectNodeQString(node, "BeatColor"));
+    colorBeat = WSkinColor::getCorrectColor(colorBeat);
+
+    colorCue.setNamedColor(WWidget::selectNodeQString(node, "CueColor"));
+    colorCue = WSkinColor::getCorrectColor(colorCue);
+
+}
+
+
+void GLWaveformRenderer::precomputePixmap() {
+
+}
+
+bool GLWaveformRenderer::fetchWaveformFromTrack() {
+
+    if(!m_pTrack)
+        return false;
+
+    QVector<float> *buffer = m_pTrack->getVisualWaveform();
+
+    if(buffer == NULL)
+        return false;
+
+    m_pSampleBuffer = buffer;
+    m_iNumSamples = buffer->size();
+
+    return true;
+}
+
+
+
+void GLWaveformRenderer::drawSignalLines() {
+
+    if(m_pSampleBuffer == NULL) {
+            return;
+    }
+
+    int iCurPos = 0;
+    if(m_dPlayPos != -1) {
+        iCurPos = (int)(m_dPlayPos*m_iNumSamples);
+    }
+
+    if((iCurPos % 2) != 0)
+        iCurPos--;
+
+
+    int halfw = m_iInternalBufferSize/2;
+
+    for(int i=0;i<m_iInternalBufferSize;i++) {
+        int thisIndex = iCurPos+2*(i-halfw);
+        if(thisIndex >= 0 && (thisIndex+1) < m_iNumSamples) {
+            float sampl = (*m_pSampleBuffer)[thisIndex];
+            float sampr = (*m_pSampleBuffer)[thisIndex+1];
+
+            m_pInternalBuffer[i*3+1] = sampl;
+        }
+
+
+    }
+
+    /*
+    pPainter->scale(1.0/float(SCALE_TEST),m_iHeight*0.40);
+    int halfw = m_iWidth*SCALE_TEST/2;
+    for(int i=0;i<m_iWidth*SCALE_TEST;i++) {
+        //pPainter->drawLine(QPoint(i,0), QPoint(i, i/sca));
+        int thisIndex = iCurPos+2*(i-halfw);
+        if(thisIndex >= 0 && (thisIndex+1) < m_iNumSamples) {
+            float sampl = (*m_pSampleBuffer)[thisIndex];
+            float sampr = (*m_pSampleBuffer)[thisIndex+1];
+
+            // Old cruft
+            //pPainter->drawLine(QPoint(i,m_iHeight/4), QPoint(i,m_iHeight/4+sampl/scaley2));
+            //pPainter->drawLine(QPoint(i,-m_iHeight/4), QPoint(i,-m_iHeight/4+sampr/scaley2));
+
+            // These are decent
+            //pPainter->drawLine(QPoint(i,0), QPoint(i, sampl/scaley));
+            //pPainter->drawLine(QPoint(i,0), QPoint(i, -sampr/scaley));
+
+            //m_lines[i] = QLineF(i,-sampr,i,sampl);
+        } else {
+            //m_lines[i] = QLineF(0,0,0,0);
+        }
+    }
+
+    //pPainter->drawLines(m_lines);
+
+    pPainter->restore();
+    */
+}
+
+void GLWaveformRenderer::drawSignalPixmap(QPainter *pPainter) {
+
+}
+
+void GLWaveformRenderer::glDraw() {
+
+    if(m_iWidth == 0 || m_iHeight == 0)
+        return;
+
+    if(m_pSampleBuffer == NULL) {
+        fetchWaveformFromTrack();
+        if(m_pSampleBuffer != NULL)
+            qDebug() << "Received waveform from track";
+    }
+
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    glMatrixMode(GL_MODELVIEW);
+    glLoadIdentity();
+
+    gluLookAt(0,0,15,
+              0,0,0,
+              0,1,0);
+
+    glDrawBuffer(GL_BACK);
+
+
+    glPushMatrix();
+
+    glScalef(1.0/5.0,m_iHeight/2, 1.0);
+
+    drawSignalLines();
+
+    glBegin(GL_LINES);
+
+    glVertex3f(0,0,1.0);
+    glVertex3f(0,1.0,1.0);
+
+
+    glEnd();
+
+    glEnableClientState(GL_VERTEX_ARRAY);
+    glVertexPointer(3, GL_FLOAT, 0, m_pInternalBuffer);
+    glDrawArrays(GL_LINE_LOOP,0,m_iInternalBufferSize);
+
+    glPopMatrix();
+
+
+
+    glFlush();
+}
+
+void GLWaveformRenderer::draw(QPainter* pPainter, QPaintEvent *pEvent) {
+    pPainter->fillRect(pEvent->rect(), QBrush(bgColor));
+    pPainter->setPen(signalColor);
+
+    if(m_iWidth == 0 || m_iHeight == 0)
+        return;
+
+    //int scaley = 32767*2/ m_iHeight;
+    //int scaley2 = 32767*4/ m_iHeight;
+    //int sca = m_iWidth*2/ m_iHeight;
+
+
+    if(m_pSampleBuffer == NULL) {
+        fetchWaveformFromTrack();
+        if(m_pSampleBuffer != NULL)
+            qDebug() << "Received waveform from track";
+    }
+
+
+
+    //drawSignalPixmap(pPainter);
+
+
+
+    pPainter->translate(0,m_iHeight/2);
+    pPainter->scale(1.0,-1.0);
+    //drawSignalLines(pPainter);
+
+
+    // Draw various markers.
+    pPainter->setPen(colorMarker);
+
+    pPainter->drawLine(QLine(0,0,m_iWidth,0));
+    pPainter->drawLine(QLine(m_iWidth/2,m_iHeight/2,m_iWidth/2,-m_iHeight/2));
+    //pPainter->drawLine(QPoint(-h,0), QPoint(h,0));
+    //pPainter->drawLine(QPoint(h,m_iHeight/2), QPoint(h,-m_iHeight/2));
+
+
+}
+
+void GLWaveformRenderer::newTrack(TrackPointer pTrack) {
+    m_pTrack = pTrack;
+    m_pSampleBuffer = 0;
+    m_iNumSamples = 0;
+
+}
+
+int GLWaveformRenderer::getDesiredSecondsToDisplay() {
+    return m_iDesiredSecondsToDisplay;
+}
+
+void GLWaveformRenderer::setDesiredSecondsToDisplay(int secondsToDisplay) {
+    m_iDesiredSecondsToDisplay = secondsToDisplay;
+}

=== added file 'mixxx/src/waveform/glwaveformrenderer.h'
--- mixxx/src/waveform/glwaveformrenderer.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/waveform/glwaveformrenderer.h	2012-06-27 11:06:21 +0000
@@ -0,0 +1,59 @@
+
+#ifndef GLWAVEFORMRENDERER_H
+#define GLWAVEFORMRENDERER_H
+
+#include <QColor>
+#include <QPainter>
+#include <QPaintEvent>
+#include <QVector>
+#include <qgl.h>
+
+#include "defs.h"
+#include "trackinfoobject.h"
+
+class ControlObjectThreadMain;
+class QDomNode;
+class WaveformRenderBeat;
+class ControlObject;
+
+class GLWaveformRenderer : public QObject {
+    Q_OBJECT
+public:
+    GLWaveformRenderer(const char* group);
+    ~GLWaveformRenderer();
+
+    void resize(int w, int h);
+    void draw(QPainter* pPainter, QPaintEvent *pEvent);
+    void glDraw();
+    void drawSignalLines();
+    void drawSignalPixmap(QPainter* p);
+    void newTrack(TrackPointer pTrack);
+    void setup(QDomNode node);
+    void precomputePixmap();
+    void setDesiredSecondsToDisplay(int seconds);
+    int getDesiredSecondsToDisplay();
+
+public slots:
+    void slotUpdatePlayPos(double playpos);
+
+private:
+    void setupControlObjects();
+    bool fetchWaveformFromTrack();
+    int m_iWidth, m_iHeight;
+    QColor bgColor, signalColor, colorMarker, colorBeat, colorCue;
+    int m_iNumSamples, m_iMax, m_iMin;
+    double m_dPlayPos;
+    QVector<float> *m_pSampleBuffer;
+
+    ControlObjectThreadMain *m_pPlayPos;
+    ControlObject *m_pCOVerticalScale;
+    ControlObject *m_pCOVisualResample;
+
+    int m_iDesiredSecondsToDisplay;
+    TrackPointer m_pTrack;
+
+    GLfloat *m_pInternalBuffer;
+    int m_iInternalBufferSize;
+};
+
+#endif

=== added file 'mixxx/src/waveform/renderobject.cpp'
--- mixxx/src/waveform/renderobject.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/waveform/renderobject.cpp	2012-06-27 11:06:21 +0000
@@ -0,0 +1,12 @@
+
+#include <QDomNode>
+
+#include "renderobject.h"
+
+RenderObject::RenderObject() : QObject() {
+
+}
+
+RenderObject::~RenderObject() {
+
+}

=== added file 'mixxx/src/waveform/renderobject.h'
--- mixxx/src/waveform/renderobject.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/waveform/renderobject.h	2012-06-27 11:06:21 +0000
@@ -0,0 +1,27 @@
+#ifndef RENDEROBJECT_H
+#define RENDEROBJECT_H
+
+#include <QObject>
+#include <QDomNode>
+#include <QVector>
+
+#include "trackinfoobject.h"
+
+class QDomNode;
+class QPainter;
+class QPaintEvent;
+
+class RenderObject : public QObject {
+    Q_OBJECT
+    public:
+    explicit RenderObject();
+    virtual ~RenderObject();
+    virtual void resize(int w, int h) = 0;
+    virtual void setup(QDomNode node) = 0;
+    virtual void draw(QPainter *pPainter, QPaintEvent *pEvent,
+                      QVector<float> *buffer, double playpos,
+                      double rateAdjust) = 0;
+    virtual void newTrack(TrackPointer pTrack) = 0;
+};
+
+#endif

=== added file 'mixxx/src/waveform/waveformrenderbackground.cpp'
--- mixxx/src/waveform/waveformrenderbackground.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/waveform/waveformrenderbackground.cpp	2012-06-27 11:06:21 +0000
@@ -0,0 +1,70 @@
+
+#include <QDebug>
+#include <QColor>
+#include <QDomNode>
+#include <QPaintEvent>
+#include <QPainter>
+#include <QObject>
+#include <QVector>
+#include <QLine>
+#include <QPixmap>
+
+#include "waveformrenderbackground.h"
+#include "waveformrenderer.h"
+#include "controlobjectthreadmain.h"
+#include "controlobject.h"
+#include "widget/wskincolor.h"
+#include "widget/wwidget.h"
+#include "trackinfoobject.h"
+
+WaveformRenderBackground::WaveformRenderBackground(const char* group, WaveformRenderer *parent)
+        : m_iWidth(0),
+          m_iHeight(0),
+          m_backgroundPixmap(),
+          m_bRepaintBackground(true),
+          bgColor(0,0,0) {
+}
+
+WaveformRenderBackground::~WaveformRenderBackground() {
+    qDebug() << this << "~WaveformRenderBackground()";
+}
+
+void WaveformRenderBackground::resize(int w, int h) {
+    m_iWidth = w;
+    m_iHeight = h;
+    // Need to repaint the background if we've been resized.
+    m_bRepaintBackground = true;
+}
+
+void WaveformRenderBackground::newTrack(TrackPointer pTrack) {
+}
+
+void WaveformRenderBackground::setup(QDomNode node) {
+    bgColor.setNamedColor(WWidget::selectNodeQString(node, "BgColor"));
+    bgColor = WSkinColor::getCorrectColor(bgColor);
+    m_backgroundPixmapPath = WWidget::selectNodeQString(node, "BgPixmap");
+    m_bRepaintBackground = true;
+}
+
+void WaveformRenderBackground::draw(QPainter *pPainter, QPaintEvent *pEvent,
+                                    QVector<float> *buffer, double dPlayPos, double rateAdjust) {
+    if(m_bRepaintBackground) {
+        generatePixmap();
+    }
+
+    pPainter->fillRect(pEvent->rect(), bgColor);
+
+    // Paint the background pixmap if it exists.
+    if (!m_backgroundPixmap.isNull()) {
+        pPainter->drawTiledPixmap(pEvent->rect(), m_backgroundPixmap, QPoint(0,0));
+    }
+}
+
+void WaveformRenderBackground::generatePixmap() {
+    if (m_backgroundPixmapPath != "") {
+        m_backgroundPixmap = QPixmap(WWidget::getPath(m_backgroundPixmapPath));
+    } else {
+        m_backgroundPixmap = QPixmap();
+    }
+    m_bRepaintBackground = false;
+}

=== added file 'mixxx/src/waveform/waveformrenderbackground.h'
--- mixxx/src/waveform/waveformrenderbackground.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/waveform/waveformrenderbackground.h	2012-06-27 11:06:21 +0000
@@ -0,0 +1,38 @@
+
+#ifndef WAVEFORMRENDERBACKGROUND_H
+#define WAVEFORMRENDERBACKGROUND_H
+
+#include <QObject>
+#include <QColor>
+#include <QVector>
+#include <QPixmap>
+
+#include "renderobject.h"
+
+class QDomNode;
+class QPainter;
+class QPaintEvent;
+
+class WaveformRenderer;
+
+class WaveformRenderBackground : public RenderObject {
+    Q_OBJECT
+  public:
+    WaveformRenderBackground(const char *group, WaveformRenderer *parent);
+    virtual ~WaveformRenderBackground();
+
+    void resize(int w, int h);
+    void setup(QDomNode node);
+    void draw(QPainter *pPainter, QPaintEvent *event, QVector<float> *buffer, double playPos, double rateAdjust);
+    void newTrack(TrackPointer pTrack);
+
+  private:
+    void generatePixmap();
+    int m_iWidth, m_iHeight;
+    QColor bgColor;
+    QPixmap m_backgroundPixmap;
+    QString m_backgroundPixmapPath;
+    bool m_bRepaintBackground;
+};
+
+#endif

=== added file 'mixxx/src/waveform/waveformrenderbeat.cpp'
--- mixxx/src/waveform/waveformrenderbeat.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/waveform/waveformrenderbeat.cpp	2012-06-27 11:06:21 +0000
@@ -0,0 +1,183 @@
+
+#include <QDebug>
+#include <QColor>
+#include <QDomNode>
+#include <QPaintEvent>
+#include <QPainter>
+#include <QObject>
+#include <QVector>
+
+#include "waveformrenderbeat.h"
+#include "waveformrenderer.h"
+#include "controlobjectthreadmain.h"
+#include "controlobject.h"
+#include "widget/wskincolor.h"
+#include "widget/wwidget.h"
+#include "trackinfoobject.h"
+#include "track/beats.h"
+
+
+WaveformRenderBeat::WaveformRenderBeat(const char* group, WaveformRenderer *parent)
+        : m_pParent(parent),
+          m_pTrackSamples(NULL),
+          m_pTrack(),
+          m_iWidth(0),
+          m_iHeight(0),
+          m_dSamplesPerPixel(-1),
+          m_dSamplesPerDownsample(-1),
+          m_iNumSamples(0),
+          m_iSampleRate(0),
+          m_bBeatActive(false) {
+    m_pTrackSamples = new ControlObjectThreadMain(
+        ControlObject::getControl(ConfigKey(group,"track_samples")));
+    slotUpdateTrackSamples(m_pTrackSamples->get());
+    connect(m_pTrackSamples, SIGNAL(valueChanged(double)),
+            this, SLOT(slotUpdateTrackSamples(double)));
+
+    m_pTrackSampleRate = new ControlObjectThreadMain(
+        ControlObject::getControl(ConfigKey(group,"track_samplerate")));
+    slotUpdateTrackSampleRate(m_pTrackSampleRate->get());
+    connect(m_pTrackSampleRate, SIGNAL(valueChanged(double)),
+            this, SLOT(slotUpdateTrackSampleRate(double)));
+
+    m_pBeatActive = new ControlObjectThreadMain(
+        ControlObject::getControl(ConfigKey(group,"beat_active")));
+    slotUpdateBeatActive(m_pBeatActive->get());
+    connect(m_pBeatActive, SIGNAL(valueChanged(double)),
+            this, SLOT(slotUpdateBeatActive(double)));
+}
+
+WaveformRenderBeat::~WaveformRenderBeat() {
+   delete m_pTrackSamples;
+   delete m_pBeatActive;
+    qDebug() << this << "~WaveformRenderBeat()";
+}
+
+void WaveformRenderBeat::slotUpdateTrackSamples(double samples) {
+    //qDebug() << "WaveformRenderBeat :: samples = " << int(samples);
+    m_iNumSamples = static_cast<int>(samples);
+}
+
+void WaveformRenderBeat::slotUpdateTrackSampleRate(double sampleRate) {
+
+
+    // f = z * m * n
+    double m = m_pParent->getSubpixelsPerPixel();
+    double f = sampleRate;
+    double z = m_pParent->getPixelsPerSecond();
+    double n = f / (m*z);
+
+    m_iSampleRate = static_cast<int>(sampleRate);
+    m_dSamplesPerDownsample = n;
+    m_dSamplesPerPixel = f/z;
+
+    //qDebug() << "WaveformRenderBeat :: sampleRate = " << int(sampleRate)
+    //         << "samplesPerDownsample" << m_dSamplesPerDownsample
+    //         << "samplesPerPixel" << m_dSamplesPerPixel;
+}
+
+void WaveformRenderBeat::slotUpdateBeatActive(double beatActive) {
+    m_bBeatActive = beatActive > 0;
+}
+
+void WaveformRenderBeat::resize(int w, int h) {
+    m_iWidth = w;
+    m_iHeight = h;
+}
+
+void WaveformRenderBeat::newTrack(TrackPointer pTrack) {
+    m_pTrack = pTrack;
+}
+
+void WaveformRenderBeat::setup(QDomNode node) {
+    colorMarks.setNamedColor(WWidget::selectNodeQString(node, "BeatColor"));
+    colorMarks = WSkinColor::getCorrectColor(colorMarks);
+
+    colorHighlight = Qt::black;
+    QString highlight = WWidget::selectNodeQString(node, "BeatHighlightColor");
+    if (highlight != "") {
+        colorHighlight.setNamedColor(highlight);
+    }
+    colorHighlight = WSkinColor::getCorrectColor(colorHighlight);
+}
+
+void WaveformRenderBeat::draw(QPainter *pPainter, QPaintEvent *event,
+                              QVector<float> *buffer, double dPlayPos, double rateAdjust) {
+    slotUpdateTrackSamples(m_pTrackSamples->get());
+
+    if(m_iSampleRate <= 0 || m_iNumSamples == 0)
+        return;
+
+    if(buffer == NULL)
+        return;
+
+    BeatsPointer pBeats = m_pTrack->getBeats();
+    if (!pBeats)
+        return;
+
+    int iCurPos = (int)(dPlayPos * m_iNumSamples);
+    if(iCurPos % 2 != 0)
+        iCurPos--;
+
+    // iCurPos is the current sample being processed the current pixel
+    // p, with respect to iCurPos is in the screen if it is less than
+    // halfw from iCurPos. A sample is a beat if it satisifes the following:
+
+    // for b beats per minute, that means b/60 beats per seconds, or 60/b seconds per beat.
+    // with a sample rate of f (generally 44khz),
+    //   60f/b = samples per beat
+
+    // Therefore, sample s is a beat if it satisfies  s % 60f/b == 0.
+    // where s is a /mono/ sample
+
+    double subpixelsPerPixel = m_pParent->getSubpixelsPerPixel()*(1.0+rateAdjust);
+
+    QPen marksPen(colorMarks);
+    marksPen.setWidth(subpixelsPerPixel*1.5);
+    QPen highlightPen(colorHighlight);
+    highlightPen.setWidth(subpixelsPerPixel*1.5);
+
+    pPainter->save();
+    pPainter->scale(1.0/subpixelsPerPixel,1.0);
+
+    pPainter->setPen(marksPen);
+
+    double subpixelWidth = m_iWidth * subpixelsPerPixel;
+    double subpixelHalfWidth = subpixelWidth / 2.0;
+    double halfh = m_iHeight/2;
+
+    // basePos and endPos are in samples
+    double basePos = iCurPos - m_dSamplesPerPixel * m_iWidth * (1.0+rateAdjust);
+    double endPos = basePos + (2 * m_iWidth) * m_dSamplesPerPixel * (1.0+rateAdjust);
+
+
+    m_beatList.clear();
+    pBeats->findBeats(basePos, endPos, &m_beatList);
+
+    bool reset = false;
+    foreach (double curPos, m_beatList) {
+        if (curPos < 0)
+            continue;
+
+        // i relative to the current play position in subpixels
+        double i = (((curPos) - iCurPos)/2)/m_dSamplesPerDownsample;
+
+        // If a beat is active, highlight the marker.
+        if(m_bBeatActive && abs(i) < 20) {
+            pPainter->setPen(highlightPen);
+            reset = true;
+        }
+
+        // Translate from -subpixelHalfWidth..subpixelHalfwidth to 0..subpixelWidth
+        i += subpixelHalfWidth;
+
+        pPainter->drawLine(QLineF(i,halfh,i,-halfh));
+
+        if(reset) {
+            pPainter->setPen(marksPen);
+            reset = false;
+        }
+    }
+
+    pPainter->restore();
+}

=== added file 'mixxx/src/waveform/waveformrenderbeat.h'
--- mixxx/src/waveform/waveformrenderbeat.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/waveform/waveformrenderbeat.h	2012-06-27 11:06:21 +0000
@@ -0,0 +1,53 @@
+
+#ifndef WAVEFORMRENDERBEAT_H
+#define WAVEFORMRENDERBEAT_H
+
+#include <QObject>
+#include <QColor>
+#include <QVector>
+
+#include "renderobject.h"
+
+class QDomNode;
+class QPainter;
+class QPaintEvent;
+
+class ControlObjectThreadMain;
+class WaveformRenderer;
+class SoundSourceProxy;
+
+class WaveformRenderBeat : public RenderObject {
+    Q_OBJECT
+  public:
+    WaveformRenderBeat(const char *group, WaveformRenderer *parent);
+    virtual ~WaveformRenderBeat();
+
+    void resize(int w, int h);
+    void setup(QDomNode node);
+    void draw(QPainter *pPainter, QPaintEvent *event, QVector<float> *buffer,
+              double playPos, double rateAdjust);
+    void newTrack(TrackPointer pTrack);
+
+  private slots:
+    void slotUpdateTrackSamples(double samples);
+    void slotUpdateBeatActive(double beatActive);
+    void slotUpdateTrackSampleRate(double sampleRate);
+
+  private:
+    WaveformRenderer *m_pParent;
+    ControlObjectThreadMain* m_pTrackSamples;
+    ControlObjectThreadMain *m_pTrackSampleRate;