diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2016-01-13 19:08:54 +0100 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2016-01-13 19:56:47 +0100 |
| commit | f702895ca9e6789f646a3965154dfdf30410bc76 (patch) | |
| tree | 0ef2ff4086a6bf3f75a4e2da957f3f8e0c61e918 /src/vinylcontrol/vinylcontrolxwax.cpp | |
| parent | d4a8b545d59310a072bda1dd70934a9f399db505 (diff) | |
remove ControlObjectThread completely
Conflicts:
src/basetrackplayer.cpp
src/cachingreader.cpp
src/test/looping_control_test.cpp
src/test/mixxxtest.h
Conflicts:
src/vinylcontrol/vinylcontrolmanager.cpp
Diffstat (limited to 'src/vinylcontrol/vinylcontrolxwax.cpp')
| -rw-r--r-- | src/vinylcontrol/vinylcontrolxwax.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/vinylcontrol/vinylcontrolxwax.cpp b/src/vinylcontrol/vinylcontrolxwax.cpp index 11e132d222..c37cb0d3b9 100644 --- a/src/vinylcontrol/vinylcontrolxwax.cpp +++ b/src/vinylcontrol/vinylcontrolxwax.cpp @@ -24,7 +24,6 @@ #include "vinylcontrol/vinylcontrolxwax.h" #include "util/timer.h" -#include "controlobjectthread.h" #include "controlobjectslave.h" #include "controlobject.h" #include "util/math.h" |