diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-04-16 15:29:59 +0200 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-04-16 15:29:59 +0200 |
| commit | 1621e19cbb666b215e3489ef7b450c6b0be12e44 (patch) | |
| tree | 9335e10de5fec0ea02164414dc573622ba7c3c03 /src/widget/wtracktableview.cpp | |
| parent | 2e75d8e71a4d791e0d86342ef225e5b06da9a968 (diff) | |
| parent | 36276a301a453f5558f406f9d24771eb0c51e8e2 (diff) | |
Merge branch 'master' of github.com:mixxxdj/mixxx into track-colors-from-controller
Diffstat (limited to 'src/widget/wtracktableview.cpp')
| -rw-r--r-- | src/widget/wtracktableview.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp index 951c8417a0..ed00db02ff 100644 --- a/src/widget/wtracktableview.cpp +++ b/src/widget/wtracktableview.cpp @@ -47,15 +47,18 @@ const ConfigKey kConfigKeyAllowTrackLoadToPlayingDeck("[Controls]", "AllowTrackL } -WTrackTableView::WTrackTableView(QWidget * parent, - UserSettingsPointer pConfig, - TrackCollectionManager* pTrackCollectionManager, - bool sorting) - : WLibraryTableView(parent, pConfig, - ConfigKey(LIBRARY_CONFIGVALUE, - WTRACKTABLEVIEW_VSCROLLBARPOS_KEY)), +WTrackTableView::WTrackTableView(QWidget* parent, + UserSettingsPointer pConfig, + TrackCollectionManager* pTrackCollectionManager, + double backgroundColorOpacity, + bool sorting) + : WLibraryTableView(parent, + pConfig, + ConfigKey(LIBRARY_CONFIGVALUE, + WTRACKTABLEVIEW_VSCROLLBARPOS_KEY)), m_pConfig(pConfig), m_pTrackCollectionManager(pTrackCollectionManager), + m_backgroundColorOpacity(backgroundColorOpacity), m_sorting(sorting), m_iCoverSourceColumn(-1), m_iCoverTypeColumn(-1), @@ -66,7 +69,6 @@ WTrackTableView::WTrackTableView(QWidget * parent, m_loadCachedOnly(false), m_bPlaylistMenuLoaded(false), m_bCrateMenuLoaded(false) { - m_pNumSamplers = new ControlProxy( "[Master]", "num_samplers", this); m_pNumDecks = new ControlProxy( |