summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2018-12-25 09:56:20 +0100
committerDaniel Schürmann <daschuer@mixxx.org>2018-12-25 09:56:20 +0100
commit29f8d741b04f7fd63002e29edaa944d1d50c4a9a (patch)
treef798ba951ab12f5391c35e0f526abe5bb389c3e0 /src/engine
parent5f5e1f93beb1ae9d30dc37b68b03024959b6dcb0 (diff)
Move end_of_track control into the engine
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/enginebuffer.cpp1
-rw-r--r--src/engine/enginebuffer.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/engine/enginebuffer.cpp b/src/engine/enginebuffer.cpp
index b7104ad3ae..e321b7f3bb 100644
--- a/src/engine/enginebuffer.cpp
+++ b/src/engine/enginebuffer.cpp
@@ -151,6 +151,7 @@ EngineBuffer::EngineBuffer(QString group, UserSettingsPointer pConfig,
m_timeElapsed = new ControlObject(ConfigKey(m_group, "time_elapsed"));
m_timeRemaining = new ControlObject(ConfigKey(m_group, "time_remaining"));
+ m_pEndOfTrack = std::make_unique<ControlObject>(ConfigKey(group, "end_of_track"));
m_playposSlider = new ControlLinPotmeter(
ConfigKey(m_group, "playposition"), 0.0, 1.0, 0, 0, true);
diff --git a/src/engine/enginebuffer.h b/src/engine/enginebuffer.h
index 2580ccba4f..ecd17e38fc 100644
--- a/src/engine/enginebuffer.h
+++ b/src/engine/enginebuffer.h
@@ -343,6 +343,8 @@ class EngineBuffer : public EngineObject {
ControlProxy* m_pKeylockEngine;
ControlPushButton* m_pKeylock;
+ std::unique_ptr<ControlObject> m_pEndOfTrack;
+
// This ControlProxys is created as parent to this and deleted by
// the Qt object tree. This helps that they are deleted by the creating
// thread, which is required to avoid segfaults.