diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2018-05-01 23:44:38 +0200 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2018-05-01 23:44:38 +0200 |
| commit | 2e543cd8e6069c47002ee9b28ae35cfe4e39cd59 (patch) | |
| tree | 058e2df591f5a193de4d43dd41ecdbacc55af312 /src/widget/effectwidgetutils.h | |
| parent | cf70247a1e344534f9ff258a1eca8295ddf567f7 (diff) | |
| parent | 947694bc2ab3f65ac7452e09128dbbb7c60cdb1b (diff) | |
Merge remote-tracking branch 'upstream/master' into lv2_support2
Conflicts:
.travis.yml
src/effects/effect.cpp
src/effects/effect.h
src/effects/effectchainmanager.h
src/effects/effectinstantiator.h
src/effects/effectmanifest.h
src/effects/effectrack.cpp
src/effects/native/autopaneffect.cpp
src/effects/native/balanceeffect.cpp
src/effects/native/biquadfullkilleqeffect.h
src/effects/native/bitcrushereffect.cpp
src/effects/native/echoeffect.cpp
src/effects/native/echoeffect.h
src/effects/native/filtereffect.cpp
src/effects/native/flangereffect.cpp
src/effects/native/loudnesscontoureffect.cpp
src/effects/native/phasereffect.cpp
src/effects/native/reverbeffect.cpp
src/effects/native/threebandbiquadeqeffect.h
src/engine/effects/engineeffect.cpp
src/engine/effects/engineeffect.h
src/mixxx.cpp
src/preferences/dialog/dlgpreferences.cpp
src/preferences/dialog/dlgpreferences.h
src/test/metaknob_link_test.cpp
src/test/nativeeffects_test.cpp
Diffstat (limited to 'src/widget/effectwidgetutils.h')
| -rw-r--r-- | src/widget/effectwidgetutils.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/widget/effectwidgetutils.h b/src/widget/effectwidgetutils.h index d0feb467fd..f2fd08c1c7 100644 --- a/src/widget/effectwidgetutils.h +++ b/src/widget/effectwidgetutils.h @@ -4,6 +4,9 @@ #include <QDomNode> #include "effects/effectsmanager.h" +#include "effects/defs.h" +#include "effects/effectrack.h" +#include "effects/effectslot.h" #include "skin/skincontext.h" class EffectWidgetUtils { |