diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2016-06-24 16:33:27 +0200 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2016-06-24 16:33:27 +0200 |
| commit | 42683a172bebca2584e66b4537048512f5005f1c (patch) | |
| tree | fd998b961a4f4f1caccde5f51f4e2da1577ae37b /src/waveform/visualplayposition.cpp | |
| parent | b52560c76491e0ff5536ef0d9a417e281fa8f111 (diff) | |
| parent | ddb0fcde609e131efdc61e79a363ff9e63aaea94 (diff) | |
Merge branch 'master' into networkclockref
Conflicts:
src/soundio/sounddeviceportaudio.cpp
src/soundio/sounddeviceportaudio.h
src/soundio/soundmanager.cpp
Diffstat (limited to 'src/waveform/visualplayposition.cpp')
| -rw-r--r-- | src/waveform/visualplayposition.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/waveform/visualplayposition.cpp b/src/waveform/visualplayposition.cpp index 8ccd8c4957..1fa7794dbb 100644 --- a/src/waveform/visualplayposition.cpp +++ b/src/waveform/visualplayposition.cpp @@ -2,8 +2,8 @@ #include <QtDebug> -#include "controlobjectslave.h" -#include "controlobject.h" +#include "control/controlproxy.h" +#include "control/controlobject.h" #include "util/math.h" #include "waveform/vsyncthread.h" @@ -15,7 +15,7 @@ double VisualPlayPosition::m_dCallbackEntryToDacSecs = 0; VisualPlayPosition::VisualPlayPosition(const QString& key) : m_valid(false), m_key(key) { - m_audioBufferSize = new ControlObjectSlave( + m_audioBufferSize = new ControlProxy( "[Master]", "audio_buffer_size", this); m_audioBufferSize->connectValueChanged( SLOT(slotAudioBufferSizeChanged(double))); @@ -107,4 +107,3 @@ void VisualPlayPosition::setCallbackEntryToDacSecs(double secs, const Performanc m_timeInfoTime = time; m_dCallbackEntryToDacSecs = secs; } - |