Merge pull request #3767 from daschuer/synceject

Remove unused eject from SyncControl

2 files changed, 0 insertions, 16 deletions

diff --git a/src/engine/sync/synccontrol.cpp b/src/engine/sync/synccontrol.cpp
index 0921421653..657e42deaa 100644
--- a/src/engine/sync/synccontrol.cpp
+++ b/src/engine/sync/synccontrol.cpp
@@ -71,10 +71,6 @@ SyncControl::SyncControl(const QString& group, UserSettingsPointer pConfig,
     m_pPassthroughEnabled->connectValueChanged(this,
             &SyncControl::slotPassthroughChanged, Qt::DirectConnection);
 
-    m_pEjectButton = new ControlProxy(group, "eject", this);
-    m_pEjectButton->connectValueChanged(this,
-            &SyncControl::slotEjectPushed, Qt::DirectConnection);
-
     m_pQuantize = new ControlProxy(group, "quantize", this);
 
     // Adopt an invalid to not ignore the first call setLocalBpm()
@@ -374,14 +370,6 @@ void SyncControl::slotPassthroughChanged(double enabled) {
     }
 }
 
-void SyncControl::slotEjectPushed(double enabled) {
-    Q_UNUSED(enabled);
-    // We can't eject tracks if the decks is playing back, so if we are master
-    // and eject was pushed the deck must be stopped.  Handing off in this case
-    // actually causes the other decks to start playing, so not doing anything
-    // is preferred.
-}
-
 void SyncControl::slotSyncModeChangeRequest(double state) {
     if (kLogger.traceEnabled()) {
         kLogger.trace() << getGroup() << "SyncControl::slotSyncModeChangeRequest";
diff --git a/src/engine/sync/synccontrol.h b/src/engine/sync/synccontrol.h
index 66e797d734..918a6dd892 100644
--- a/src/engine/sync/synccontrol.h
+++ b/src/engine/sync/synccontrol.h
@@ -72,9 +72,6 @@ class SyncControl : public EngineControl, public Syncable {
     // Fired when passthrough mode is enabled or disabled.
     void slotPassthroughChanged(double v);
 
-    // Fired when a track is ejected.
-    void slotEjectPushed(double v);
-
     // Fired by changes in rate, rate_dir, rateRange.
     void slotRateChanged();
 
@@ -127,7 +124,6 @@ class SyncControl : public EngineControl, public Syncable {
     ControlProxy* m_pRateRatio;
     ControlProxy* m_pVCEnabled;
     ControlProxy* m_pPassthroughEnabled;
-    ControlProxy* m_pEjectButton;
     ControlProxy* m_pSyncPhaseButton;
     ControlProxy* m_pQuantize;