Move as many headers as possible out of the include folder

Headers are moved to src/core/include or src/gui/include where appropriate. This is the first change towards a separation between gui and core. No code changes are present in this commit. The output binaries should be equivalent to the previous commit.
LMMS · Jun 26, 2024 · 776c66b · 776c66b
1 parent 6634cec
commit 776c66b
Show file tree

Hide file tree

Showing 306 changed files with 23 additions and 20 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -720,7 +720,7 @@ endif()
 # people simply updating git will still have this and mess up build with it
 FILE(REMOVE include/lmmsconfig.h)
 
-FILE(GLOB LMMS_INCLUDES "${CMAKE_SOURCE_DIR}/include/*.h")
+FILE(GLOB LMMS_INCLUDES "${CMAKE_SOURCE_DIR}/include/*.h" "${CMAKE_SOURCE_DIR}/src/core/include/*.h" "${CMAKE_SOURCE_DIR}/src/gui/include/*.h")
 LIST(SORT LMMS_INCLUDES)
 
 # Get list of all committers from git history, ordered by number of commits.

diff --git a/cmake/modules/BuildPlugin.cmake b/cmake/modules/BuildPlugin.cmake
@@ -9,7 +9,7 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME)
 	CMAKE_PARSE_ARGUMENTS(PLUGIN "" "LINK;EXPORT_BASE_NAME" "MOCFILES;EMBEDDED_RESOURCES" ${ARGN})
 	SET(PLUGIN_SOURCES ${PLUGIN_UNPARSED_ARGUMENTS})
 
-	INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_SOURCE_DIR}/include")
+	INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_SOURCE_DIR}/include" "${CMAKE_SOURCE_DIR}/src/core/include" "${CMAKE_SOURCE_DIR}/src/gui/include")
 
 	ADD_DEFINITIONS(-DPLUGIN_NAME=${PLUGIN_NAME})
 

diff --git a/src/3rdparty/jack2 b/src/3rdparty/jack2
diff --git a/src/3rdparty/mingw-std-threads b/src/3rdparty/mingw-std-threads
diff --git a/src/3rdparty/qt5-x11embed b/src/3rdparty/qt5-x11embed
diff --git a/src/3rdparty/ringbuffer b/src/3rdparty/ringbuffer
diff --git a/src/3rdparty/weakjack/weakjack b/src/3rdparty/weakjack/weakjack
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -19,7 +19,6 @@ ENDIF()
 ADD_SUBDIRECTORY(common)
 ADD_SUBDIRECTORY(core)
 ADD_SUBDIRECTORY(gui)
-ADD_SUBDIRECTORY(tracks)
 
 LIST(APPEND LMMS_SRCS ${LMMS_COMMON_SRCS})
 
@@ -29,6 +28,8 @@ INCLUDE_DIRECTORIES(
 	"${CMAKE_BINARY_DIR}/include"
 	"${CMAKE_SOURCE_DIR}"
 	"${CMAKE_SOURCE_DIR}/include"
+	"${CMAKE_SOURCE_DIR}/src/core/include"
+	"${CMAKE_SOURCE_DIR}/src/gui/include"
 )
 
 IF(WIN32 AND MSVC)

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
@@ -4,6 +4,8 @@ set(COMMON_SRCS
 	SystemSemaphore.cpp
 )
 
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
+
 foreach(SRC ${COMMON_SRCS})
 	list(APPEND LMMS_COMMON_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${SRC}")
 endforeach()

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -131,5 +131,12 @@ set(LMMS_SRCS
 	core/midi/MidiPort.cpp
 	core/midi/MidiWinMM.cpp
 
+	core/tracks/AutomationTrack.cpp
+	core/tracks/InstrumentTrack.cpp
+	core/tracks/MidiClip.cpp
+	core/tracks/PatternTrack.cpp
+	core/tracks/SampleTrack.cpp
+
+
 	PARENT_SCOPE
 )
diff --git a/include/ArrayVector.h → src/core/include/ArrayVector.h b/include/ArrayVector.h → src/core/include/ArrayVector.h
diff --git a/include/AudioAlsa.h → src/core/include/AudioAlsa.h b/include/AudioAlsa.h → src/core/include/AudioAlsa.h
diff --git a/include/AudioDevice.h → src/core/include/AudioDevice.h b/include/AudioDevice.h → src/core/include/AudioDevice.h
diff --git a/include/AudioDummy.h → src/core/include/AudioDummy.h b/include/AudioDummy.h → src/core/include/AudioDummy.h
diff --git a/include/AudioEngine.h → src/core/include/AudioEngine.h b/include/AudioEngine.h → src/core/include/AudioEngine.h
diff --git a/include/AudioEngineProfiler.h → src/core/include/AudioEngineProfiler.h b/include/AudioEngineProfiler.h → src/core/include/AudioEngineProfiler.h
diff --git a/include/AudioEngineWorkerThread.h → src/core/include/AudioEngineWorkerThread.h b/include/AudioEngineWorkerThread.h → src/core/include/AudioEngineWorkerThread.h
diff --git a/include/AudioFileDevice.h → src/core/include/AudioFileDevice.h b/include/AudioFileDevice.h → src/core/include/AudioFileDevice.h
diff --git a/include/AudioFileFlac.h → src/core/include/AudioFileFlac.h b/include/AudioFileFlac.h → src/core/include/AudioFileFlac.h
diff --git a/include/AudioFileMP3.h → src/core/include/AudioFileMP3.h b/include/AudioFileMP3.h → src/core/include/AudioFileMP3.h
diff --git a/include/AudioFileOgg.h → src/core/include/AudioFileOgg.h b/include/AudioFileOgg.h → src/core/include/AudioFileOgg.h
diff --git a/include/AudioFileWave.h → src/core/include/AudioFileWave.h b/include/AudioFileWave.h → src/core/include/AudioFileWave.h
diff --git a/include/AudioJack.h → src/core/include/AudioJack.h b/include/AudioJack.h → src/core/include/AudioJack.h
diff --git a/include/AudioOss.h → src/core/include/AudioOss.h b/include/AudioOss.h → src/core/include/AudioOss.h
diff --git a/include/AudioPort.h → src/core/include/AudioPort.h b/include/AudioPort.h → src/core/include/AudioPort.h
diff --git a/include/AudioPortAudio.h → src/core/include/AudioPortAudio.h b/include/AudioPortAudio.h → src/core/include/AudioPortAudio.h
diff --git a/include/AudioPulseAudio.h → src/core/include/AudioPulseAudio.h b/include/AudioPulseAudio.h → src/core/include/AudioPulseAudio.h
diff --git a/include/AudioResampler.h → src/core/include/AudioResampler.h b/include/AudioResampler.h → src/core/include/AudioResampler.h
diff --git a/include/AudioSampleRecorder.h → src/core/include/AudioSampleRecorder.h b/include/AudioSampleRecorder.h → src/core/include/AudioSampleRecorder.h
diff --git a/include/AudioSdl.h → src/core/include/AudioSdl.h b/include/AudioSdl.h → src/core/include/AudioSdl.h
diff --git a/include/AudioSndio.h → src/core/include/AudioSndio.h b/include/AudioSndio.h → src/core/include/AudioSndio.h
diff --git a/include/AudioSoundIo.h → src/core/include/AudioSoundIo.h b/include/AudioSoundIo.h → src/core/include/AudioSoundIo.h
diff --git a/include/AutomatableModel.h → src/core/include/AutomatableModel.h b/include/AutomatableModel.h → src/core/include/AutomatableModel.h
diff --git a/include/AutomationClip.h → src/core/include/AutomationClip.h b/include/AutomationClip.h → src/core/include/AutomationClip.h
diff --git a/include/AutomationNode.h → src/core/include/AutomationNode.h b/include/AutomationNode.h → src/core/include/AutomationNode.h
diff --git a/include/AutomationTrack.h → src/core/include/AutomationTrack.h b/include/AutomationTrack.h → src/core/include/AutomationTrack.h
diff --git a/include/BandLimitedWave.h → src/core/include/BandLimitedWave.h b/include/BandLimitedWave.h → src/core/include/BandLimitedWave.h
diff --git a/include/BasicFilters.h → src/core/include/BasicFilters.h b/include/BasicFilters.h → src/core/include/BasicFilters.h
diff --git a/include/BufferManager.h → src/core/include/BufferManager.h b/include/BufferManager.h → src/core/include/BufferManager.h
diff --git a/include/Clip.h → src/core/include/Clip.h b/include/Clip.h → src/core/include/Clip.h
diff --git a/include/Clipboard.h → src/core/include/Clipboard.h b/include/Clipboard.h → src/core/include/Clipboard.h
diff --git a/include/ComboBoxModel.h → src/core/include/ComboBoxModel.h b/include/ComboBoxModel.h → src/core/include/ComboBoxModel.h
diff --git a/include/ConfigManager.h → src/core/include/ConfigManager.h b/include/ConfigManager.h → src/core/include/ConfigManager.h
diff --git a/include/Controller.h → src/core/include/Controller.h b/include/Controller.h → src/core/include/Controller.h
diff --git a/include/ControllerConnection.h → src/core/include/ControllerConnection.h b/include/ControllerConnection.h → src/core/include/ControllerConnection.h
diff --git a/include/DataFile.h → src/core/include/DataFile.h b/include/DataFile.h → src/core/include/DataFile.h
diff --git a/include/Delay.h → src/core/include/Delay.h b/include/Delay.h → src/core/include/Delay.h
diff --git a/include/DetuningHelper.h → src/core/include/DetuningHelper.h b/include/DetuningHelper.h → src/core/include/DetuningHelper.h
diff --git a/include/DrumSynth.h → src/core/include/DrumSynth.h b/include/DrumSynth.h → src/core/include/DrumSynth.h
diff --git a/include/DspEffectLibrary.h → src/core/include/DspEffectLibrary.h b/include/DspEffectLibrary.h → src/core/include/DspEffectLibrary.h
diff --git a/include/DummyEffect.h → src/core/include/DummyEffect.h b/include/DummyEffect.h → src/core/include/DummyEffect.h
diff --git a/include/DummyInstrument.h → src/core/include/DummyInstrument.h b/include/DummyInstrument.h → src/core/include/DummyInstrument.h
diff --git a/include/DummyPlugin.h → src/core/include/DummyPlugin.h b/include/DummyPlugin.h → src/core/include/DummyPlugin.h
diff --git a/include/Effect.h → src/core/include/Effect.h b/include/Effect.h → src/core/include/Effect.h
diff --git a/include/EffectChain.h → src/core/include/EffectChain.h b/include/EffectChain.h → src/core/include/EffectChain.h
diff --git a/include/EffectControls.h → src/core/include/EffectControls.h b/include/EffectControls.h → src/core/include/EffectControls.h
diff --git a/include/Engine.h → src/core/include/Engine.h b/include/Engine.h → src/core/include/Engine.h
diff --git a/include/EnvelopeAndLfoParameters.h → src/core/include/EnvelopeAndLfoParameters.h b/include/EnvelopeAndLfoParameters.h → src/core/include/EnvelopeAndLfoParameters.h
diff --git a/include/ExportFilter.h → src/core/include/ExportFilter.h b/include/ExportFilter.h → src/core/include/ExportFilter.h
diff --git a/include/FifoBuffer.h → src/core/include/FifoBuffer.h b/include/FifoBuffer.h → src/core/include/FifoBuffer.h
diff --git a/include/FileSearch.h → src/core/include/FileSearch.h b/include/FileSearch.h → src/core/include/FileSearch.h
diff --git a/include/Flags.h → src/core/include/Flags.h b/include/Flags.h → src/core/include/Flags.h
diff --git a/include/ImportFilter.h → src/core/include/ImportFilter.h b/include/ImportFilter.h → src/core/include/ImportFilter.h
diff --git a/include/InlineAutomation.h → src/core/include/InlineAutomation.h b/include/InlineAutomation.h → src/core/include/InlineAutomation.h
diff --git a/include/Instrument.h → src/core/include/Instrument.h b/include/Instrument.h → src/core/include/Instrument.h
diff --git a/include/InstrumentFunctions.h → src/core/include/InstrumentFunctions.h b/include/InstrumentFunctions.h → src/core/include/InstrumentFunctions.h
diff --git a/include/InstrumentPlayHandle.h → src/core/include/InstrumentPlayHandle.h b/include/InstrumentPlayHandle.h → src/core/include/InstrumentPlayHandle.h
diff --git a/include/InstrumentSoundShaping.h → src/core/include/InstrumentSoundShaping.h b/include/InstrumentSoundShaping.h → src/core/include/InstrumentSoundShaping.h
diff --git a/include/InstrumentTrack.h → src/core/include/InstrumentTrack.h b/include/InstrumentTrack.h → src/core/include/InstrumentTrack.h
diff --git a/include/InstrumentView.h → src/core/include/InstrumentView.h b/include/InstrumentView.h → src/core/include/InstrumentView.h
diff --git a/include/JournallingObject.h → src/core/include/JournallingObject.h b/include/JournallingObject.h → src/core/include/JournallingObject.h
diff --git a/include/Keymap.h → src/core/include/Keymap.h b/include/Keymap.h → src/core/include/Keymap.h
diff --git a/include/Ladspa2LMMS.h → src/core/include/Ladspa2LMMS.h b/include/Ladspa2LMMS.h → src/core/include/Ladspa2LMMS.h
diff --git a/include/LadspaBase.h → src/core/include/LadspaBase.h b/include/LadspaBase.h → src/core/include/LadspaBase.h
diff --git a/include/LadspaControl.h → src/core/include/LadspaControl.h b/include/LadspaControl.h → src/core/include/LadspaControl.h
diff --git a/include/LadspaManager.h → src/core/include/LadspaManager.h b/include/LadspaManager.h → src/core/include/LadspaManager.h
diff --git a/include/LfoController.h → src/core/include/LfoController.h b/include/LfoController.h → src/core/include/LfoController.h
diff --git a/include/LinkedModelGroups.h → src/core/include/LinkedModelGroups.h b/include/LinkedModelGroups.h → src/core/include/LinkedModelGroups.h
diff --git a/include/LmmsSemaphore.h → src/core/include/LmmsSemaphore.h b/include/LmmsSemaphore.h → src/core/include/LmmsSemaphore.h
diff --git a/include/LocaleHelper.h → src/core/include/LocaleHelper.h b/include/LocaleHelper.h → src/core/include/LocaleHelper.h
diff --git a/include/LocklessAllocator.h → src/core/include/LocklessAllocator.h b/include/LocklessAllocator.h → src/core/include/LocklessAllocator.h
diff --git a/include/LocklessList.h → src/core/include/LocklessList.h b/include/LocklessList.h → src/core/include/LocklessList.h
diff --git a/include/LocklessRingBuffer.h → src/core/include/LocklessRingBuffer.h b/include/LocklessRingBuffer.h → src/core/include/LocklessRingBuffer.h
diff --git a/include/Lv2Basics.h → src/core/include/Lv2Basics.h b/include/Lv2Basics.h → src/core/include/Lv2Basics.h
diff --git a/include/Lv2ControlBase.h → src/core/include/Lv2ControlBase.h b/include/Lv2ControlBase.h → src/core/include/Lv2ControlBase.h
diff --git a/include/Lv2Evbuf.h → src/core/include/Lv2Evbuf.h b/include/Lv2Evbuf.h → src/core/include/Lv2Evbuf.h
diff --git a/include/Lv2Features.h → src/core/include/Lv2Features.h b/include/Lv2Features.h → src/core/include/Lv2Features.h
diff --git a/include/Lv2Manager.h → src/core/include/Lv2Manager.h b/include/Lv2Manager.h → src/core/include/Lv2Manager.h
diff --git a/include/Lv2Options.h → src/core/include/Lv2Options.h b/include/Lv2Options.h → src/core/include/Lv2Options.h
diff --git a/include/Lv2Ports.h → src/core/include/Lv2Ports.h b/include/Lv2Ports.h → src/core/include/Lv2Ports.h
diff --git a/include/Lv2Proc.h → src/core/include/Lv2Proc.h b/include/Lv2Proc.h → src/core/include/Lv2Proc.h
diff --git a/include/Lv2SubPluginFeatures.h → src/core/include/Lv2SubPluginFeatures.h b/include/Lv2SubPluginFeatures.h → src/core/include/Lv2SubPluginFeatures.h
diff --git a/include/Lv2UridCache.h → src/core/include/Lv2UridCache.h b/include/Lv2UridCache.h → src/core/include/Lv2UridCache.h
diff --git a/include/Lv2UridMap.h → src/core/include/Lv2UridMap.h b/include/Lv2UridMap.h → src/core/include/Lv2UridMap.h
diff --git a/include/Lv2Worker.h → src/core/include/Lv2Worker.h b/include/Lv2Worker.h → src/core/include/Lv2Worker.h
diff --git a/include/MeterModel.h → src/core/include/MeterModel.h b/include/MeterModel.h → src/core/include/MeterModel.h
diff --git a/include/MicroTimer.h → src/core/include/MicroTimer.h b/include/MicroTimer.h → src/core/include/MicroTimer.h
diff --git a/include/Microtuner.h → src/core/include/Microtuner.h b/include/Microtuner.h → src/core/include/Microtuner.h
diff --git a/include/MidiAlsaRaw.h → src/core/include/MidiAlsaRaw.h b/include/MidiAlsaRaw.h → src/core/include/MidiAlsaRaw.h
diff --git a/include/MidiAlsaSeq.h → src/core/include/MidiAlsaSeq.h b/include/MidiAlsaSeq.h → src/core/include/MidiAlsaSeq.h
diff --git a/include/MidiApple.h → src/core/include/MidiApple.h b/include/MidiApple.h → src/core/include/MidiApple.h
diff --git a/include/MidiClient.h → src/core/include/MidiClient.h b/include/MidiClient.h → src/core/include/MidiClient.h
diff --git a/include/MidiClip.h → src/core/include/MidiClip.h b/include/MidiClip.h → src/core/include/MidiClip.h
diff --git a/include/MidiController.h → src/core/include/MidiController.h b/include/MidiController.h → src/core/include/MidiController.h
diff --git a/include/MidiDummy.h → src/core/include/MidiDummy.h b/include/MidiDummy.h → src/core/include/MidiDummy.h
diff --git a/include/MidiEventProcessor.h → src/core/include/MidiEventProcessor.h b/include/MidiEventProcessor.h → src/core/include/MidiEventProcessor.h
diff --git a/include/MidiEventToByteSeq.h → src/core/include/MidiEventToByteSeq.h b/include/MidiEventToByteSeq.h → src/core/include/MidiEventToByteSeq.h
diff --git a/include/MidiJack.h → src/core/include/MidiJack.h b/include/MidiJack.h → src/core/include/MidiJack.h
diff --git a/include/MidiOss.h → src/core/include/MidiOss.h b/include/MidiOss.h → src/core/include/MidiOss.h
diff --git a/include/MidiPort.h → src/core/include/MidiPort.h b/include/MidiPort.h → src/core/include/MidiPort.h
diff --git a/include/MidiSndio.h → src/core/include/MidiSndio.h b/include/MidiSndio.h → src/core/include/MidiSndio.h
diff --git a/include/MidiWinMM.h → src/core/include/MidiWinMM.h b/include/MidiWinMM.h → src/core/include/MidiWinMM.h
diff --git a/include/MixHelpers.h → src/core/include/MixHelpers.h b/include/MixHelpers.h → src/core/include/MixHelpers.h
diff --git a/include/Mixer.h → src/core/include/Mixer.h b/include/Mixer.h → src/core/include/Mixer.h
diff --git a/include/Model.h → src/core/include/Model.h b/include/Model.h → src/core/include/Model.h
diff --git a/include/ModelVisitor.h → src/core/include/ModelVisitor.h b/include/ModelVisitor.h → src/core/include/ModelVisitor.h
diff --git a/include/NoCopyNoMove.h → src/core/include/NoCopyNoMove.h b/include/NoCopyNoMove.h → src/core/include/NoCopyNoMove.h
diff --git a/include/Note.h → src/core/include/Note.h b/include/Note.h → src/core/include/Note.h
diff --git a/include/NotePlayHandle.h → src/core/include/NotePlayHandle.h b/include/NotePlayHandle.h → src/core/include/NotePlayHandle.h
diff --git a/include/Oscillator.h → src/core/include/Oscillator.h b/include/Oscillator.h → src/core/include/Oscillator.h
diff --git a/include/OscillatorConstants.h → src/core/include/OscillatorConstants.h b/include/OscillatorConstants.h → src/core/include/OscillatorConstants.h
diff --git a/include/OutputSettings.h → src/core/include/OutputSettings.h b/include/OutputSettings.h → src/core/include/OutputSettings.h
diff --git a/include/PathUtil.h → src/core/include/PathUtil.h b/include/PathUtil.h → src/core/include/PathUtil.h
diff --git a/include/PatternClip.h → src/core/include/PatternClip.h b/include/PatternClip.h → src/core/include/PatternClip.h
diff --git a/include/PatternStore.h → src/core/include/PatternStore.h b/include/PatternStore.h → src/core/include/PatternStore.h
diff --git a/include/PatternTrack.h → src/core/include/PatternTrack.h b/include/PatternTrack.h → src/core/include/PatternTrack.h
diff --git a/include/PeakController.h → src/core/include/PeakController.h b/include/PeakController.h → src/core/include/PeakController.h
diff --git a/include/PerfLog.h → src/core/include/PerfLog.h b/include/PerfLog.h → src/core/include/PerfLog.h
diff --git a/include/Piano.h → src/core/include/Piano.h b/include/Piano.h → src/core/include/Piano.h
diff --git a/include/Pitch.h → src/core/include/Pitch.h b/include/Pitch.h → src/core/include/Pitch.h
diff --git a/include/PlayHandle.h → src/core/include/PlayHandle.h b/include/PlayHandle.h → src/core/include/PlayHandle.h
diff --git a/include/Plugin.h → src/core/include/Plugin.h b/include/Plugin.h → src/core/include/Plugin.h
diff --git a/include/PluginFactory.h → src/core/include/PluginFactory.h b/include/PluginFactory.h → src/core/include/PluginFactory.h
@@ -42,8 +42,9 @@ class QLibrary;
 namespace lmms
 {
 
-class LMMS_EXPORT PluginFactory
+class LMMS_EXPORT PluginFactory : public QObject
 {
+	Q_OBJECT
 public:
 	struct PluginInfo
 	{

diff --git a/include/PluginIssue.h → src/core/include/PluginIssue.h b/include/PluginIssue.h → src/core/include/PluginIssue.h
diff --git a/include/PluginView.h → src/core/include/PluginView.h b/include/PluginView.h → src/core/include/PluginView.h
diff --git a/include/PresetPreviewPlayHandle.h → src/core/include/PresetPreviewPlayHandle.h b/include/PresetPreviewPlayHandle.h → src/core/include/PresetPreviewPlayHandle.h
diff --git a/include/ProjectJournal.h → src/core/include/ProjectJournal.h b/include/ProjectJournal.h → src/core/include/ProjectJournal.h
diff --git a/include/ProjectRenderer.h → src/core/include/ProjectRenderer.h b/include/ProjectRenderer.h → src/core/include/ProjectRenderer.h
diff --git a/include/ProjectVersion.h → src/core/include/ProjectVersion.h b/include/ProjectVersion.h → src/core/include/ProjectVersion.h
diff --git a/include/QuadratureLfo.h → src/core/include/QuadratureLfo.h b/include/QuadratureLfo.h → src/core/include/QuadratureLfo.h
diff --git a/include/RemotePlugin.h → src/core/include/RemotePlugin.h b/include/RemotePlugin.h → src/core/include/RemotePlugin.h
diff --git a/include/RenderManager.h → src/core/include/RenderManager.h b/include/RenderManager.h → src/core/include/RenderManager.h
diff --git a/include/RingBuffer.h → src/core/include/RingBuffer.h b/include/RingBuffer.h → src/core/include/RingBuffer.h
diff --git a/include/RmsHelper.h → src/core/include/RmsHelper.h b/include/RmsHelper.h → src/core/include/RmsHelper.h
diff --git a/include/Sample.h → src/core/include/Sample.h b/include/Sample.h → src/core/include/Sample.h
diff --git a/include/SampleBuffer.h → src/core/include/SampleBuffer.h b/include/SampleBuffer.h → src/core/include/SampleBuffer.h
diff --git a/include/SampleClip.h → src/core/include/SampleClip.h b/include/SampleClip.h → src/core/include/SampleClip.h
diff --git a/include/SampleDecoder.h → src/core/include/SampleDecoder.h b/include/SampleDecoder.h → src/core/include/SampleDecoder.h
diff --git a/include/SamplePlayHandle.h → src/core/include/SamplePlayHandle.h b/include/SamplePlayHandle.h → src/core/include/SamplePlayHandle.h
diff --git a/include/SampleRecordHandle.h → src/core/include/SampleRecordHandle.h b/include/SampleRecordHandle.h → src/core/include/SampleRecordHandle.h
diff --git a/include/SampleTrack.h → src/core/include/SampleTrack.h b/include/SampleTrack.h → src/core/include/SampleTrack.h
diff --git a/include/Scale.h → src/core/include/Scale.h b/include/Scale.h → src/core/include/Scale.h
diff --git a/include/SerializingObject.h → src/core/include/SerializingObject.h b/include/SerializingObject.h → src/core/include/SerializingObject.h
diff --git a/include/Song.h → src/core/include/Song.h b/include/Song.h → src/core/include/Song.h
diff --git a/include/StepRecorder.h → src/core/include/StepRecorder.h b/include/StepRecorder.h → src/core/include/StepRecorder.h
diff --git a/include/SweepOscillator.h → src/core/include/SweepOscillator.h b/include/SweepOscillator.h → src/core/include/SweepOscillator.h
diff --git a/include/TempoSyncKnobModel.h → src/core/include/TempoSyncKnobModel.h b/include/TempoSyncKnobModel.h → src/core/include/TempoSyncKnobModel.h
diff --git a/include/ThreadPool.h → src/core/include/ThreadPool.h b/include/ThreadPool.h → src/core/include/ThreadPool.h
diff --git a/include/ThreadableJob.h → src/core/include/ThreadableJob.h b/include/ThreadableJob.h → src/core/include/ThreadableJob.h
diff --git a/include/TimePos.h → src/core/include/TimePos.h b/include/TimePos.h → src/core/include/TimePos.h
diff --git a/include/Timeline.h → src/core/include/Timeline.h b/include/Timeline.h → src/core/include/Timeline.h
diff --git a/include/ToolPlugin.h → src/core/include/ToolPlugin.h b/include/ToolPlugin.h → src/core/include/ToolPlugin.h
diff --git a/include/Track.h → src/core/include/Track.h b/include/Track.h → src/core/include/Track.h
diff --git a/include/TrackContainer.h → src/core/include/TrackContainer.h b/include/TrackContainer.h → src/core/include/TrackContainer.h
diff --git a/include/ValueBuffer.h → src/core/include/ValueBuffer.h b/include/ValueBuffer.h → src/core/include/ValueBuffer.h
diff --git a/include/VstSyncController.h → src/core/include/VstSyncController.h b/include/VstSyncController.h → src/core/include/VstSyncController.h
diff --git a/include/base64.h → src/core/include/base64.h b/include/base64.h → src/core/include/base64.h
diff --git a/include/debug.h → src/core/include/debug.h b/include/debug.h → src/core/include/debug.h
diff --git a/include/denormals.h → src/core/include/denormals.h b/include/denormals.h → src/core/include/denormals.h
diff --git a/include/endian_handling.h → src/core/include/endian_handling.h b/include/endian_handling.h → src/core/include/endian_handling.h
diff --git a/include/fenv.h → src/core/include/fenv.h b/include/fenv.h → src/core/include/fenv.h
diff --git a/include/fft_helpers.h → src/core/include/fft_helpers.h b/include/fft_helpers.h → src/core/include/fft_helpers.h
diff --git a/include/interpolation.h → src/core/include/interpolation.h b/include/interpolation.h → src/core/include/interpolation.h
diff --git a/include/ladspa.h → src/core/include/ladspa.h b/include/ladspa.h → src/core/include/ladspa.h
diff --git a/include/lmms_constants.h → src/core/include/lmms_constants.h b/include/lmms_constants.h → src/core/include/lmms_constants.h
diff --git a/include/lmms_math.h → src/core/include/lmms_math.h b/include/lmms_math.h → src/core/include/lmms_math.h
diff --git a/include/panning.h → src/core/include/panning.h b/include/panning.h → src/core/include/panning.h
diff --git a/include/shared_object.h → src/core/include/shared_object.h b/include/shared_object.h → src/core/include/shared_object.h
diff --git a/include/versioninfo.h → src/core/include/versioninfo.h b/include/versioninfo.h → src/core/include/versioninfo.h
diff --git a/src/tracks/AutomationTrack.cpp → src/core/tracks/AutomationTrack.cpp b/src/tracks/AutomationTrack.cpp → src/core/tracks/AutomationTrack.cpp
diff --git a/src/tracks/InstrumentTrack.cpp → src/core/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp → src/core/tracks/InstrumentTrack.cpp
diff --git a/src/tracks/MidiClip.cpp → src/core/tracks/MidiClip.cpp b/src/tracks/MidiClip.cpp → src/core/tracks/MidiClip.cpp
diff --git a/src/tracks/PatternTrack.cpp → src/core/tracks/PatternTrack.cpp b/src/tracks/PatternTrack.cpp → src/core/tracks/PatternTrack.cpp
diff --git a/src/tracks/SampleTrack.cpp → src/core/tracks/SampleTrack.cpp b/src/tracks/SampleTrack.cpp → src/core/tracks/SampleTrack.cpp
diff --git a/include/AboutDialog.h → src/gui/include/AboutDialog.h b/include/AboutDialog.h → src/gui/include/AboutDialog.h
diff --git a/include/ActionGroup.h → src/gui/include/ActionGroup.h b/include/ActionGroup.h → src/gui/include/ActionGroup.h
diff --git a/include/AudioAlsaSetupWidget.h → src/gui/include/AudioAlsaSetupWidget.h b/include/AudioAlsaSetupWidget.h → src/gui/include/AudioAlsaSetupWidget.h
diff --git a/include/AudioDeviceSetupWidget.h → src/gui/include/AudioDeviceSetupWidget.h b/include/AudioDeviceSetupWidget.h → src/gui/include/AudioDeviceSetupWidget.h
diff --git a/include/AutomatableButton.h → src/gui/include/AutomatableButton.h b/include/AutomatableButton.h → src/gui/include/AutomatableButton.h
diff --git a/include/AutomatableModelView.h → src/gui/include/AutomatableModelView.h b/include/AutomatableModelView.h → src/gui/include/AutomatableModelView.h
diff --git a/include/AutomatableSlider.h → src/gui/include/AutomatableSlider.h b/include/AutomatableSlider.h → src/gui/include/AutomatableSlider.h
diff --git a/include/AutomationClipView.h → src/gui/include/AutomationClipView.h b/include/AutomationClipView.h → src/gui/include/AutomationClipView.h
diff --git a/include/AutomationEditor.h → src/gui/include/AutomationEditor.h b/include/AutomationEditor.h → src/gui/include/AutomationEditor.h
diff --git a/include/AutomationTrackView.h → src/gui/include/AutomationTrackView.h b/include/AutomationTrackView.h → src/gui/include/AutomationTrackView.h
diff --git a/include/BarModelEditor.h → src/gui/include/BarModelEditor.h b/include/BarModelEditor.h → src/gui/include/BarModelEditor.h
diff --git a/include/CPULoadWidget.h → src/gui/include/CPULoadWidget.h b/include/CPULoadWidget.h → src/gui/include/CPULoadWidget.h
diff --git a/include/CaptionMenu.h → src/gui/include/CaptionMenu.h b/include/CaptionMenu.h → src/gui/include/CaptionMenu.h
diff --git a/include/ClipView.h → src/gui/include/ClipView.h b/include/ClipView.h → src/gui/include/ClipView.h
diff --git a/include/ColorChooser.h → src/gui/include/ColorChooser.h b/include/ColorChooser.h → src/gui/include/ColorChooser.h
diff --git a/include/ColorHelper.h → src/gui/include/ColorHelper.h b/include/ColorHelper.h → src/gui/include/ColorHelper.h
diff --git a/include/ComboBox.h → src/gui/include/ComboBox.h b/include/ComboBox.h → src/gui/include/ComboBox.h
diff --git a/include/ControlLayout.h → src/gui/include/ControlLayout.h b/include/ControlLayout.h → src/gui/include/ControlLayout.h
diff --git a/include/ControllerConnectionDialog.h → src/gui/include/ControllerConnectionDialog.h b/include/ControllerConnectionDialog.h → src/gui/include/ControllerConnectionDialog.h
diff --git a/include/ControllerDialog.h → src/gui/include/ControllerDialog.h b/include/ControllerDialog.h → src/gui/include/ControllerDialog.h
diff --git a/include/ControllerRackView.h → src/gui/include/ControllerRackView.h b/include/ControllerRackView.h → src/gui/include/ControllerRackView.h
diff --git a/include/ControllerView.h → src/gui/include/ControllerView.h b/include/ControllerView.h → src/gui/include/ControllerView.h
diff --git a/include/Controls.h → src/gui/include/Controls.h b/include/Controls.h → src/gui/include/Controls.h
diff --git a/include/CustomTextKnob.h → src/gui/include/CustomTextKnob.h b/include/CustomTextKnob.h → src/gui/include/CustomTextKnob.h
diff --git a/include/DeprecationHelper.h → src/gui/include/DeprecationHelper.h b/include/DeprecationHelper.h → src/gui/include/DeprecationHelper.h
diff --git a/include/Editor.h → src/gui/include/Editor.h b/include/Editor.h → src/gui/include/Editor.h
diff --git a/include/EffectControlDialog.h → src/gui/include/EffectControlDialog.h b/include/EffectControlDialog.h → src/gui/include/EffectControlDialog.h
diff --git a/include/EffectRackView.h → src/gui/include/EffectRackView.h b/include/EffectRackView.h → src/gui/include/EffectRackView.h
diff --git a/include/EffectSelectDialog.h → src/gui/include/EffectSelectDialog.h b/include/EffectSelectDialog.h → src/gui/include/EffectSelectDialog.h
diff --git a/include/EffectView.h → src/gui/include/EffectView.h b/include/EffectView.h → src/gui/include/EffectView.h
diff --git a/include/EnvelopeAndLfoView.h → src/gui/include/EnvelopeAndLfoView.h b/include/EnvelopeAndLfoView.h → src/gui/include/EnvelopeAndLfoView.h
diff --git a/include/EnvelopeGraph.h → src/gui/include/EnvelopeGraph.h b/include/EnvelopeGraph.h → src/gui/include/EnvelopeGraph.h
diff --git a/include/ExportProjectDialog.h → src/gui/include/ExportProjectDialog.h b/include/ExportProjectDialog.h → src/gui/include/ExportProjectDialog.h
diff --git a/include/FadeButton.h → src/gui/include/FadeButton.h b/include/FadeButton.h → src/gui/include/FadeButton.h
diff --git a/include/Fader.h → src/gui/include/Fader.h b/include/Fader.h → src/gui/include/Fader.h
diff --git a/include/FileBrowser.h → src/gui/include/FileBrowser.h b/include/FileBrowser.h → src/gui/include/FileBrowser.h
diff --git a/include/FileDialog.h → src/gui/include/FileDialog.h b/include/FileDialog.h → src/gui/include/FileDialog.h
diff --git a/include/FloatModelEditorBase.h → src/gui/include/FloatModelEditorBase.h b/include/FloatModelEditorBase.h → src/gui/include/FloatModelEditorBase.h
diff --git a/include/Graph.h → src/gui/include/Graph.h b/include/Graph.h → src/gui/include/Graph.h
diff --git a/include/GroupBox.h → src/gui/include/GroupBox.h b/include/GroupBox.h → src/gui/include/GroupBox.h
diff --git a/include/GuiApplication.h → src/gui/include/GuiApplication.h b/include/GuiApplication.h → src/gui/include/GuiApplication.h
diff --git a/include/InstrumentFunctionViews.h → src/gui/include/InstrumentFunctionViews.h b/include/InstrumentFunctionViews.h → src/gui/include/InstrumentFunctionViews.h
diff --git a/include/InstrumentMidiIOView.h → src/gui/include/InstrumentMidiIOView.h b/include/InstrumentMidiIOView.h → src/gui/include/InstrumentMidiIOView.h
diff --git a/include/InstrumentSoundShapingView.h → src/gui/include/InstrumentSoundShapingView.h b/include/InstrumentSoundShapingView.h → src/gui/include/InstrumentSoundShapingView.h
diff --git a/include/InstrumentTrackView.h → src/gui/include/InstrumentTrackView.h b/include/InstrumentTrackView.h → src/gui/include/InstrumentTrackView.h
diff --git a/include/InstrumentTrackWindow.h → src/gui/include/InstrumentTrackWindow.h b/include/InstrumentTrackWindow.h → src/gui/include/InstrumentTrackWindow.h
@@ -29,6 +29,7 @@
 
 #include "ModelView.h"
 #include "SerializingObject.h"
+#include "InstrumentTrack.h"
 
 class QLabel;
 class QLineEdit;

diff --git a/include/InstrumentTuningView.h → src/gui/include/InstrumentTuningView.h b/include/InstrumentTuningView.h → src/gui/include/InstrumentTuningView.h
diff --git a/include/Knob.h → src/gui/include/Knob.h b/include/Knob.h → src/gui/include/Knob.h
diff --git a/include/LadspaControlView.h → src/gui/include/LadspaControlView.h b/include/LadspaControlView.h → src/gui/include/LadspaControlView.h
diff --git a/include/LcdFloatSpinBox.h → src/gui/include/LcdFloatSpinBox.h b/include/LcdFloatSpinBox.h → src/gui/include/LcdFloatSpinBox.h
diff --git a/include/LcdSpinBox.h → src/gui/include/LcdSpinBox.h b/include/LcdSpinBox.h → src/gui/include/LcdSpinBox.h
diff --git a/include/LcdWidget.h → src/gui/include/LcdWidget.h b/include/LcdWidget.h → src/gui/include/LcdWidget.h
diff --git a/include/LedCheckBox.h → src/gui/include/LedCheckBox.h b/include/LedCheckBox.h → src/gui/include/LedCheckBox.h
diff --git a/include/LeftRightNav.h → src/gui/include/LeftRightNav.h b/include/LeftRightNav.h → src/gui/include/LeftRightNav.h
@@ -26,7 +26,7 @@
 #define LMMS_GUI_LEFT_RIGHT_NAV_H
 
 #include "PixmapButton.h"
-
+#include <QHBoxLayout>
 
 namespace lmms::gui
 {

diff --git a/include/LfoGraph.h → src/gui/include/LfoGraph.h b/include/LfoGraph.h → src/gui/include/LfoGraph.h
diff --git a/include/LinkedModelGroupViews.h → src/gui/include/LinkedModelGroupViews.h b/include/LinkedModelGroupViews.h → src/gui/include/LinkedModelGroupViews.h
diff --git a/include/LmmsPalette.h → src/gui/include/LmmsPalette.h b/include/LmmsPalette.h → src/gui/include/LmmsPalette.h
diff --git a/include/LmmsStyle.h → src/gui/include/LmmsStyle.h b/include/LmmsStyle.h → src/gui/include/LmmsStyle.h
diff --git a/include/Lv2ViewBase.h → src/gui/include/Lv2ViewBase.h b/include/Lv2ViewBase.h → src/gui/include/Lv2ViewBase.h
diff --git a/include/MainApplication.h → src/gui/include/MainApplication.h b/include/MainApplication.h → src/gui/include/MainApplication.h
diff --git a/include/MainWindow.h → src/gui/include/MainWindow.h b/include/MainWindow.h → src/gui/include/MainWindow.h
diff --git a/include/MeterDialog.h → src/gui/include/MeterDialog.h b/include/MeterDialog.h → src/gui/include/MeterDialog.h
diff --git a/include/MicrotunerConfig.h → src/gui/include/MicrotunerConfig.h b/include/MicrotunerConfig.h → src/gui/include/MicrotunerConfig.h
diff --git a/include/MidiCCRackView.h → src/gui/include/MidiCCRackView.h b/include/MidiCCRackView.h → src/gui/include/MidiCCRackView.h
diff --git a/include/MidiClipView.h → src/gui/include/MidiClipView.h b/include/MidiClipView.h → src/gui/include/MidiClipView.h
diff --git a/include/MidiPortMenu.h → src/gui/include/MidiPortMenu.h b/include/MidiPortMenu.h → src/gui/include/MidiPortMenu.h
diff --git a/include/MidiSetupWidget.h → src/gui/include/MidiSetupWidget.h b/include/MidiSetupWidget.h → src/gui/include/MidiSetupWidget.h
diff --git a/include/MixerChannelLcdSpinBox.h → src/gui/include/MixerChannelLcdSpinBox.h b/include/MixerChannelLcdSpinBox.h → src/gui/include/MixerChannelLcdSpinBox.h
diff --git a/include/MixerChannelView.h → src/gui/include/MixerChannelView.h b/include/MixerChannelView.h → src/gui/include/MixerChannelView.h
diff --git a/include/MixerView.h → src/gui/include/MixerView.h b/include/MixerView.h → src/gui/include/MixerView.h
diff --git a/include/ModelView.h → src/gui/include/ModelView.h b/include/ModelView.h → src/gui/include/ModelView.h
diff --git a/include/NStateButton.h → src/gui/include/NStateButton.h b/include/NStateButton.h → src/gui/include/NStateButton.h
diff --git a/include/Oscilloscope.h → src/gui/include/Oscilloscope.h b/include/Oscilloscope.h → src/gui/include/Oscilloscope.h
diff --git a/include/PatternClipView.h → src/gui/include/PatternClipView.h b/include/PatternClipView.h → src/gui/include/PatternClipView.h
diff --git a/include/PatternEditor.h → src/gui/include/PatternEditor.h b/include/PatternEditor.h → src/gui/include/PatternEditor.h
diff --git a/include/PatternTrackView.h → src/gui/include/PatternTrackView.h b/include/PatternTrackView.h → src/gui/include/PatternTrackView.h
diff --git a/include/PeakIndicator.h → src/gui/include/PeakIndicator.h b/include/PeakIndicator.h → src/gui/include/PeakIndicator.h
diff --git a/include/PianoRoll.h → src/gui/include/PianoRoll.h b/include/PianoRoll.h → src/gui/include/PianoRoll.h
diff --git a/include/PianoView.h → src/gui/include/PianoView.h b/include/PianoView.h → src/gui/include/PianoView.h
diff --git a/include/PixmapButton.h → src/gui/include/PixmapButton.h b/include/PixmapButton.h → src/gui/include/PixmapButton.h
diff --git a/include/PluginBrowser.h → src/gui/include/PluginBrowser.h b/include/PluginBrowser.h → src/gui/include/PluginBrowser.h
diff --git a/include/PositionLine.h → src/gui/include/PositionLine.h b/include/PositionLine.h → src/gui/include/PositionLine.h
diff --git a/include/ProjectNotes.h → src/gui/include/ProjectNotes.h b/include/ProjectNotes.h → src/gui/include/ProjectNotes.h
diff --git a/include/RecentProjectsMenu.h → src/gui/include/RecentProjectsMenu.h b/include/RecentProjectsMenu.h → src/gui/include/RecentProjectsMenu.h
diff --git a/include/RenameDialog.h → src/gui/include/RenameDialog.h b/include/RenameDialog.h → src/gui/include/RenameDialog.h
diff --git a/include/RowTableView.h → src/gui/include/RowTableView.h b/include/RowTableView.h → src/gui/include/RowTableView.h
diff --git a/include/Rubberband.h → src/gui/include/Rubberband.h b/include/Rubberband.h → src/gui/include/Rubberband.h
diff --git a/include/SampleClipView.h → src/gui/include/SampleClipView.h b/include/SampleClipView.h → src/gui/include/SampleClipView.h
diff --git a/include/SampleLoader.h → src/gui/include/SampleLoader.h b/include/SampleLoader.h → src/gui/include/SampleLoader.h
diff --git a/include/SampleTrackView.h → src/gui/include/SampleTrackView.h b/include/SampleTrackView.h → src/gui/include/SampleTrackView.h
@@ -28,6 +28,7 @@
 
 #include "MixerChannelLcdSpinBox.h"
 #include "TrackView.h"
+#include "SampleTrack.h"
 
 namespace lmms
 {

diff --git a/include/SampleTrackWindow.h → src/gui/include/SampleTrackWindow.h b/include/SampleTrackWindow.h → src/gui/include/SampleTrackWindow.h
diff --git a/include/SampleWaveform.h → src/gui/include/SampleWaveform.h b/include/SampleWaveform.h → src/gui/include/SampleWaveform.h
diff --git a/include/SendButtonIndicator.h → src/gui/include/SendButtonIndicator.h b/include/SendButtonIndicator.h → src/gui/include/SendButtonIndicator.h
diff --git a/include/SetupDialog.h → src/gui/include/SetupDialog.h b/include/SetupDialog.h → src/gui/include/SetupDialog.h
diff --git a/include/SideBar.h → src/gui/include/SideBar.h b/include/SideBar.h → src/gui/include/SideBar.h
diff --git a/include/SideBarWidget.h → src/gui/include/SideBarWidget.h b/include/SideBarWidget.h → src/gui/include/SideBarWidget.h
diff --git a/include/SimpleTextFloat.h → src/gui/include/SimpleTextFloat.h b/include/SimpleTextFloat.h → src/gui/include/SimpleTextFloat.h
diff --git a/include/SongEditor.h → src/gui/include/SongEditor.h b/include/SongEditor.h → src/gui/include/SongEditor.h
diff --git a/include/StepRecorderWidget.h → src/gui/include/StepRecorderWidget.h b/include/StepRecorderWidget.h → src/gui/include/StepRecorderWidget.h
diff --git a/include/StringPairDrag.h → src/gui/include/StringPairDrag.h b/include/StringPairDrag.h → src/gui/include/StringPairDrag.h
diff --git a/include/SubWindow.h → src/gui/include/SubWindow.h b/include/SubWindow.h → src/gui/include/SubWindow.h
diff --git a/include/TabBar.h → src/gui/include/TabBar.h b/include/TabBar.h → src/gui/include/TabBar.h
diff --git a/include/TabButton.h → src/gui/include/TabButton.h b/include/TabButton.h → src/gui/include/TabButton.h
diff --git a/include/TabWidget.h → src/gui/include/TabWidget.h b/include/TabWidget.h → src/gui/include/TabWidget.h
diff --git a/include/TemplatesMenu.h → src/gui/include/TemplatesMenu.h b/include/TemplatesMenu.h → src/gui/include/TemplatesMenu.h
diff --git a/include/TempoSyncBarModelEditor.h → src/gui/include/TempoSyncBarModelEditor.h b/include/TempoSyncBarModelEditor.h → src/gui/include/TempoSyncBarModelEditor.h
diff --git a/include/TempoSyncKnob.h → src/gui/include/TempoSyncKnob.h b/include/TempoSyncKnob.h → src/gui/include/TempoSyncKnob.h
diff --git a/include/TextFloat.h → src/gui/include/TextFloat.h b/include/TextFloat.h → src/gui/include/TextFloat.h
diff --git a/include/TimeDisplayWidget.h → src/gui/include/TimeDisplayWidget.h b/include/TimeDisplayWidget.h → src/gui/include/TimeDisplayWidget.h
diff --git a/include/TimeLineWidget.h → src/gui/include/TimeLineWidget.h b/include/TimeLineWidget.h → src/gui/include/TimeLineWidget.h
diff --git a/include/ToolButton.h → src/gui/include/ToolButton.h b/include/ToolButton.h → src/gui/include/ToolButton.h
diff --git a/include/ToolPluginView.h → src/gui/include/ToolPluginView.h b/include/ToolPluginView.h → src/gui/include/ToolPluginView.h
diff --git a/include/TrackContainerView.h → src/gui/include/TrackContainerView.h b/include/TrackContainerView.h → src/gui/include/TrackContainerView.h
diff --git a/include/TrackContentWidget.h → src/gui/include/TrackContentWidget.h b/include/TrackContentWidget.h → src/gui/include/TrackContentWidget.h
diff --git a/include/TrackLabelButton.h → src/gui/include/TrackLabelButton.h b/include/TrackLabelButton.h → src/gui/include/TrackLabelButton.h
diff --git a/include/TrackOperationsWidget.h → src/gui/include/TrackOperationsWidget.h b/include/TrackOperationsWidget.h → src/gui/include/TrackOperationsWidget.h