summaryrefslogtreecommitdiffstats
path: root/src/mixer/playermanager.cpp
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2019-01-11 22:18:50 +0100
committerDaniel Schürmann <daschuer@mixxx.org>2019-01-11 22:18:50 +0100
commit7c3fb1dc3826e761b68c85fdd3de54fc542e685c (patch)
tree0abda4c87f440108124cbdcb89da5dfa45d1ccdf /src/mixer/playermanager.cpp
parent833a2a150558e49d6ed08b8653ffd53afed854a2 (diff)
remove QT4 compatibility layer from util/compatibility.h
Diffstat (limited to 'src/mixer/playermanager.cpp')
-rw-r--r--src/mixer/playermanager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp
index c58bc23beb..aa05ba3341 100644
--- a/src/mixer/playermanager.cpp
+++ b/src/mixer/playermanager.cpp
@@ -209,7 +209,7 @@ bool PlayerManager::isPreviewDeckGroup(const QString& group, int* number) {
unsigned int PlayerManager::numDecks() {
// We do this to cache the control once it is created so callers don't incur
// a hashtable lookup every time they call this.
- ControlProxy* pCOPNumDecks = load_atomic_pointer(m_pCOPNumDecks);
+ ControlProxy* pCOPNumDecks = m_pCOPNumDecks.load();
if (pCOPNumDecks == nullptr) {
pCOPNumDecks = new ControlProxy(ConfigKey("[Master]", "num_decks"));
if (!pCOPNumDecks->valid()) {
@@ -227,7 +227,7 @@ unsigned int PlayerManager::numDecks() {
unsigned int PlayerManager::numSamplers() {
// We do this to cache the control once it is created so callers don't incur
// a hashtable lookup every time they call this.
- ControlProxy* pCOPNumSamplers = load_atomic_pointer(m_pCOPNumSamplers);
+ ControlProxy* pCOPNumSamplers = m_pCOPNumSamplers.load();
if (pCOPNumSamplers == nullptr) {
pCOPNumSamplers = new ControlProxy(ConfigKey("[Master]", "num_samplers"));
if (!pCOPNumSamplers->valid()) {
@@ -245,7 +245,7 @@ unsigned int PlayerManager::numSamplers() {
unsigned int PlayerManager::numPreviewDecks() {
// We do this to cache the control once it is created so callers don't incur
// a hashtable lookup every time they call this.
- ControlProxy* pCOPNumPreviewDecks = load_atomic_pointer(m_pCOPNumPreviewDecks);
+ ControlProxy* pCOPNumPreviewDecks = m_pCOPNumPreviewDecks.load();
if (pCOPNumPreviewDecks == nullptr) {
pCOPNumPreviewDecks = new ControlProxy(
ConfigKey("[Master]", "num_preview_decks"));