diff options
author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-09-25 14:27:25 +0200 |
---|---|---|
committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-09-25 14:27:25 +0200 |
commit | 323563df6a0d2f59107ae423f3cd62a915e78f13 (patch) | |
tree | 833adf36ae794c114fcdb28ae1ba8008aae0ae13 /src/mixer/playermanager.cpp | |
parent | 92573b8263c2468df6eefa5cdb8126a33150fa64 (diff) | |
parent | e433d42d51d6961f46c7341163b4038c16bd58b3 (diff) |
Merge branch '2.3' of github.com:mixxxdj/mixxx into master
Diffstat (limited to 'src/mixer/playermanager.cpp')
-rw-r--r-- | src/mixer/playermanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp index d8968e762c..0f2b5b2938 100644 --- a/src/mixer/playermanager.cpp +++ b/src/mixer/playermanager.cpp @@ -219,7 +219,7 @@ unsigned int PlayerManager::numDecks() { } } // m_pCOPNumDecks->get() fails on MacOs - return pCOPNumDecks ? pCOPNumDecks->get() : 0; + return pCOPNumDecks ? static_cast<int>(pCOPNumDecks->get()) : 0; } // static @@ -237,7 +237,7 @@ unsigned int PlayerManager::numSamplers() { } } // m_pCOPNumSamplers->get() fails on MacOs - return pCOPNumSamplers ? pCOPNumSamplers->get() : 0; + return pCOPNumSamplers ? static_cast<int>(pCOPNumSamplers->get()) : 0; } // static @@ -256,7 +256,7 @@ unsigned int PlayerManager::numPreviewDecks() { } } // m_pCOPNumPreviewDecks->get() fails on MacOs - return pCOPNumPreviewDecks ? pCOPNumPreviewDecks->get() : 0; + return pCOPNumPreviewDecks ? static_cast<int>(pCOPNumPreviewDecks->get()) : 0; } void PlayerManager::slotChangeNumDecks(double v) { |