summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/qml/qmlplayermanagerproxy.cpp11
-rw-r--r--src/qml/qmlplayermanagerproxy.h5
2 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/qmlplayermanagerproxy.cpp b/src/qml/qmlplayermanagerproxy.cpp
index 7b7e2ca4a6..35c480d963 100644
--- a/src/qml/qmlplayermanagerproxy.cpp
+++ b/src/qml/qmlplayermanagerproxy.cpp
@@ -11,10 +11,6 @@ namespace qml {
QmlPlayerManagerProxy::QmlPlayerManagerProxy(
std::shared_ptr<PlayerManager> pPlayerManager, QObject* parent)
: QObject(parent), m_pPlayerManager(pPlayerManager) {
- connect(this,
- &QmlPlayerManagerProxy::loadLocationToPlayer,
- m_pPlayerManager.get(),
- &PlayerManager::loadLocationToPlayer);
}
QObject* QmlPlayerManagerProxy::getPlayer(const QString& group) {
@@ -32,7 +28,7 @@ QObject* QmlPlayerManagerProxy::getPlayer(const QString& group) {
&QmlPlayerProxy::loadTrackFromLocationRequested,
this,
[this, group](const QString& trackLocation, bool play) {
- emit loadLocationToPlayer(trackLocation, group, play);
+ loadLocationToPlayer(trackLocation, group, play);
});
connect(pPlayerProxy,
&QmlPlayerProxy::cloneFromGroup,
@@ -43,5 +39,10 @@ QObject* QmlPlayerManagerProxy::getPlayer(const QString& group) {
return pPlayerProxy;
}
+void QmlPlayerManagerProxy::loadLocationToPlayer(
+ const QString& location, const QString& group, bool play) {
+ m_pPlayerManager->slotLoadLocationToPlayer(location, group, play);
+}
+
} // namespace qml
} // namespace mixxx
diff --git a/src/qml/qmlplayermanagerproxy.h b/src/qml/qmlplayermanagerproxy.h
index d566c34dea..9b9b27ee36 100644
--- a/src/qml/qmlplayermanagerproxy.h
+++ b/src/qml/qmlplayermanagerproxy.h
@@ -15,9 +15,8 @@ class QmlPlayerManagerProxy : public QObject {
QObject* parent = nullptr);
Q_INVOKABLE QObject* getPlayer(const QString& deck);
-
- signals:
- void loadLocationToPlayer(const QString& location, const QString& group, bool play = false);
+ Q_INVOKABLE void loadLocationToPlayer(
+ const QString& location, const QString& group, bool play = false);
private:
const std::shared_ptr<PlayerManager> m_pPlayerManager;