From 776c66bbc2f875c0a9165ced41d861b89a070500 Mon Sep 17 00:00:00 2001 From: jsmtux Date: Sun, 23 Jun 2024 13:04:11 +0200 Subject: [PATCH] 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. --- CMakeLists.txt | 2 +- cmake/modules/BuildPlugin.cmake | 2 +- src/3rdparty/jack2 | 2 +- src/3rdparty/mingw-std-threads | 2 +- src/3rdparty/qt5-x11embed | 2 +- src/3rdparty/ringbuffer | 2 +- src/3rdparty/weakjack/weakjack | 2 +- src/CMakeLists.txt | 3 ++- src/common/CMakeLists.txt | 2 ++ src/core/CMakeLists.txt | 7 +++++++ {include => src/core/include}/ArrayVector.h | 0 {include => src/core/include}/AudioAlsa.h | 0 {include => src/core/include}/AudioDevice.h | 0 {include => src/core/include}/AudioDummy.h | 0 {include => src/core/include}/AudioEngine.h | 0 {include => src/core/include}/AudioEngineProfiler.h | 0 .../core/include}/AudioEngineWorkerThread.h | 0 {include => src/core/include}/AudioFileDevice.h | 0 {include => src/core/include}/AudioFileFlac.h | 0 {include => src/core/include}/AudioFileMP3.h | 0 {include => src/core/include}/AudioFileOgg.h | 0 {include => src/core/include}/AudioFileWave.h | 0 {include => src/core/include}/AudioJack.h | 0 {include => src/core/include}/AudioOss.h | 0 {include => src/core/include}/AudioPort.h | 0 {include => src/core/include}/AudioPortAudio.h | 0 {include => src/core/include}/AudioPulseAudio.h | 0 {include => src/core/include}/AudioResampler.h | 0 {include => src/core/include}/AudioSampleRecorder.h | 0 {include => src/core/include}/AudioSdl.h | 0 {include => src/core/include}/AudioSndio.h | 0 {include => src/core/include}/AudioSoundIo.h | 0 {include => src/core/include}/AutomatableModel.h | 0 {include => src/core/include}/AutomationClip.h | 0 {include => src/core/include}/AutomationNode.h | 0 {include => src/core/include}/AutomationTrack.h | 0 {include => src/core/include}/BandLimitedWave.h | 0 {include => src/core/include}/BasicFilters.h | 0 {include => src/core/include}/BufferManager.h | 0 {include => src/core/include}/Clip.h | 0 {include => src/core/include}/Clipboard.h | 0 {include => src/core/include}/ComboBoxModel.h | 0 {include => src/core/include}/ConfigManager.h | 0 {include => src/core/include}/Controller.h | 0 {include => src/core/include}/ControllerConnection.h | 0 {include => src/core/include}/DataFile.h | 0 {include => src/core/include}/Delay.h | 0 {include => src/core/include}/DetuningHelper.h | 0 {include => src/core/include}/DrumSynth.h | 0 {include => src/core/include}/DspEffectLibrary.h | 0 {include => src/core/include}/DummyEffect.h | 0 {include => src/core/include}/DummyInstrument.h | 0 {include => src/core/include}/DummyPlugin.h | 0 {include => src/core/include}/Effect.h | 0 {include => src/core/include}/EffectChain.h | 0 {include => src/core/include}/EffectControls.h | 0 {include => src/core/include}/Engine.h | 0 .../core/include}/EnvelopeAndLfoParameters.h | 0 {include => src/core/include}/ExportFilter.h | 0 {include => src/core/include}/FifoBuffer.h | 0 {include => src/core/include}/FileSearch.h | 0 {include => src/core/include}/Flags.h | 0 {include => src/core/include}/ImportFilter.h | 0 {include => src/core/include}/InlineAutomation.h | 0 {include => src/core/include}/Instrument.h | 0 {include => src/core/include}/InstrumentFunctions.h | 0 {include => src/core/include}/InstrumentPlayHandle.h | 0 {include => src/core/include}/InstrumentSoundShaping.h | 0 {include => src/core/include}/InstrumentTrack.h | 0 {include => src/core/include}/InstrumentView.h | 0 {include => src/core/include}/JournallingObject.h | 0 {include => src/core/include}/Keymap.h | 0 {include => src/core/include}/Ladspa2LMMS.h | 0 {include => src/core/include}/LadspaBase.h | 0 {include => src/core/include}/LadspaControl.h | 0 {include => src/core/include}/LadspaManager.h | 0 {include => src/core/include}/LfoController.h | 0 {include => src/core/include}/LinkedModelGroups.h | 0 {include => src/core/include}/LmmsSemaphore.h | 0 {include => src/core/include}/LocaleHelper.h | 0 {include => src/core/include}/LocklessAllocator.h | 0 {include => src/core/include}/LocklessList.h | 0 {include => src/core/include}/LocklessRingBuffer.h | 0 {include => src/core/include}/Lv2Basics.h | 0 {include => src/core/include}/Lv2ControlBase.h | 0 {include => src/core/include}/Lv2Evbuf.h | 0 {include => src/core/include}/Lv2Features.h | 0 {include => src/core/include}/Lv2Manager.h | 0 {include => src/core/include}/Lv2Options.h | 0 {include => src/core/include}/Lv2Ports.h | 0 {include => src/core/include}/Lv2Proc.h | 0 {include => src/core/include}/Lv2SubPluginFeatures.h | 0 {include => src/core/include}/Lv2UridCache.h | 0 {include => src/core/include}/Lv2UridMap.h | 0 {include => src/core/include}/Lv2Worker.h | 0 {include => src/core/include}/MeterModel.h | 0 {include => src/core/include}/MicroTimer.h | 0 {include => src/core/include}/Microtuner.h | 0 {include => src/core/include}/MidiAlsaRaw.h | 0 {include => src/core/include}/MidiAlsaSeq.h | 0 {include => src/core/include}/MidiApple.h | 0 {include => src/core/include}/MidiClient.h | 0 {include => src/core/include}/MidiClip.h | 0 {include => src/core/include}/MidiController.h | 0 {include => src/core/include}/MidiDummy.h | 0 {include => src/core/include}/MidiEventProcessor.h | 0 {include => src/core/include}/MidiEventToByteSeq.h | 0 {include => src/core/include}/MidiJack.h | 0 {include => src/core/include}/MidiOss.h | 0 {include => src/core/include}/MidiPort.h | 0 {include => src/core/include}/MidiSndio.h | 0 {include => src/core/include}/MidiWinMM.h | 0 {include => src/core/include}/MixHelpers.h | 0 {include => src/core/include}/Mixer.h | 0 {include => src/core/include}/Model.h | 0 {include => src/core/include}/ModelVisitor.h | 0 {include => src/core/include}/NoCopyNoMove.h | 0 {include => src/core/include}/Note.h | 0 {include => src/core/include}/NotePlayHandle.h | 0 {include => src/core/include}/Oscillator.h | 0 {include => src/core/include}/OscillatorConstants.h | 0 {include => src/core/include}/OutputSettings.h | 0 {include => src/core/include}/PathUtil.h | 0 {include => src/core/include}/PatternClip.h | 0 {include => src/core/include}/PatternStore.h | 0 {include => src/core/include}/PatternTrack.h | 0 {include => src/core/include}/PeakController.h | 0 {include => src/core/include}/PerfLog.h | 0 {include => src/core/include}/Piano.h | 0 {include => src/core/include}/Pitch.h | 0 {include => src/core/include}/PlayHandle.h | 0 {include => src/core/include}/Plugin.h | 0 {include => src/core/include}/PluginFactory.h | 3 ++- {include => src/core/include}/PluginIssue.h | 0 {include => src/core/include}/PluginView.h | 0 .../core/include}/PresetPreviewPlayHandle.h | 0 {include => src/core/include}/ProjectJournal.h | 0 {include => src/core/include}/ProjectRenderer.h | 0 {include => src/core/include}/ProjectVersion.h | 0 {include => src/core/include}/QuadratureLfo.h | 0 {include => src/core/include}/RemotePlugin.h | 0 {include => src/core/include}/RenderManager.h | 0 {include => src/core/include}/RingBuffer.h | 0 {include => src/core/include}/RmsHelper.h | 0 {include => src/core/include}/Sample.h | 0 {include => src/core/include}/SampleBuffer.h | 0 {include => src/core/include}/SampleClip.h | 0 {include => src/core/include}/SampleDecoder.h | 0 {include => src/core/include}/SamplePlayHandle.h | 0 {include => src/core/include}/SampleRecordHandle.h | 0 {include => src/core/include}/SampleTrack.h | 0 {include => src/core/include}/Scale.h | 0 {include => src/core/include}/SerializingObject.h | 0 {include => src/core/include}/Song.h | 0 {include => src/core/include}/StepRecorder.h | 0 {include => src/core/include}/SweepOscillator.h | 0 {include => src/core/include}/TempoSyncKnobModel.h | 0 {include => src/core/include}/ThreadPool.h | 0 {include => src/core/include}/ThreadableJob.h | 0 {include => src/core/include}/TimePos.h | 0 {include => src/core/include}/Timeline.h | 0 {include => src/core/include}/ToolPlugin.h | 0 {include => src/core/include}/Track.h | 0 {include => src/core/include}/TrackContainer.h | 0 {include => src/core/include}/ValueBuffer.h | 0 {include => src/core/include}/VstSyncController.h | 0 {include => src/core/include}/base64.h | 0 {include => src/core/include}/debug.h | 0 {include => src/core/include}/denormals.h | 0 {include => src/core/include}/endian_handling.h | 0 {include => src/core/include}/fenv.h | 0 {include => src/core/include}/fft_helpers.h | 0 {include => src/core/include}/interpolation.h | 0 {include => src/core/include}/ladspa.h | 0 {include => src/core/include}/lmms_constants.h | 0 {include => src/core/include}/lmms_math.h | 0 {include => src/core/include}/panning.h | 0 {include => src/core/include}/shared_object.h | 0 {include => src/core/include}/versioninfo.h | 0 src/{ => core}/tracks/AutomationTrack.cpp | 0 src/{ => core}/tracks/InstrumentTrack.cpp | 0 src/{ => core}/tracks/MidiClip.cpp | 0 src/{ => core}/tracks/PatternTrack.cpp | 0 src/{ => core}/tracks/SampleTrack.cpp | 0 {include => src/gui/include}/AboutDialog.h | 0 {include => src/gui/include}/ActionGroup.h | 0 {include => src/gui/include}/AudioAlsaSetupWidget.h | 0 {include => src/gui/include}/AudioDeviceSetupWidget.h | 0 {include => src/gui/include}/AutomatableButton.h | 0 {include => src/gui/include}/AutomatableModelView.h | 0 {include => src/gui/include}/AutomatableSlider.h | 0 {include => src/gui/include}/AutomationClipView.h | 0 {include => src/gui/include}/AutomationEditor.h | 0 {include => src/gui/include}/AutomationTrackView.h | 0 {include => src/gui/include}/BarModelEditor.h | 0 {include => src/gui/include}/CPULoadWidget.h | 0 {include => src/gui/include}/CaptionMenu.h | 0 {include => src/gui/include}/ClipView.h | 0 {include => src/gui/include}/ColorChooser.h | 0 {include => src/gui/include}/ColorHelper.h | 0 {include => src/gui/include}/ComboBox.h | 0 {include => src/gui/include}/ControlLayout.h | 0 .../gui/include}/ControllerConnectionDialog.h | 0 {include => src/gui/include}/ControllerDialog.h | 0 {include => src/gui/include}/ControllerRackView.h | 0 {include => src/gui/include}/ControllerView.h | 0 {include => src/gui/include}/Controls.h | 0 {include => src/gui/include}/CustomTextKnob.h | 0 {include => src/gui/include}/DeprecationHelper.h | 0 {include => src/gui/include}/Editor.h | 0 {include => src/gui/include}/EffectControlDialog.h | 0 {include => src/gui/include}/EffectRackView.h | 0 {include => src/gui/include}/EffectSelectDialog.h | 0 {include => src/gui/include}/EffectView.h | 0 {include => src/gui/include}/EnvelopeAndLfoView.h | 0 {include => src/gui/include}/EnvelopeGraph.h | 0 {include => src/gui/include}/ExportProjectDialog.h | 0 {include => src/gui/include}/FadeButton.h | 0 {include => src/gui/include}/Fader.h | 0 {include => src/gui/include}/FileBrowser.h | 0 {include => src/gui/include}/FileDialog.h | 0 {include => src/gui/include}/FloatModelEditorBase.h | 0 {include => src/gui/include}/Graph.h | 0 {include => src/gui/include}/GroupBox.h | 0 {include => src/gui/include}/GuiApplication.h | 0 {include => src/gui/include}/InstrumentFunctionViews.h | 0 {include => src/gui/include}/InstrumentMidiIOView.h | 0 .../gui/include}/InstrumentSoundShapingView.h | 0 {include => src/gui/include}/InstrumentTrackView.h | 0 {include => src/gui/include}/InstrumentTrackWindow.h | 1 + {include => src/gui/include}/InstrumentTuningView.h | 0 {include => src/gui/include}/Knob.h | 0 {include => src/gui/include}/LadspaControlView.h | 0 {include => src/gui/include}/LcdFloatSpinBox.h | 0 {include => src/gui/include}/LcdSpinBox.h | 0 {include => src/gui/include}/LcdWidget.h | 0 {include => src/gui/include}/LedCheckBox.h | 0 {include => src/gui/include}/LeftRightNav.h | 2 +- {include => src/gui/include}/LfoGraph.h | 0 {include => src/gui/include}/LinkedModelGroupViews.h | 0 {include => src/gui/include}/LmmsPalette.h | 0 {include => src/gui/include}/LmmsStyle.h | 0 {include => src/gui/include}/Lv2ViewBase.h | 0 {include => src/gui/include}/MainApplication.h | 0 {include => src/gui/include}/MainWindow.h | 0 {include => src/gui/include}/MeterDialog.h | 0 {include => src/gui/include}/MicrotunerConfig.h | 0 {include => src/gui/include}/MidiCCRackView.h | 0 {include => src/gui/include}/MidiClipView.h | 0 {include => src/gui/include}/MidiPortMenu.h | 0 {include => src/gui/include}/MidiSetupWidget.h | 0 {include => src/gui/include}/MixerChannelLcdSpinBox.h | 0 {include => src/gui/include}/MixerChannelView.h | 0 {include => src/gui/include}/MixerView.h | 0 {include => src/gui/include}/ModelView.h | 0 {include => src/gui/include}/NStateButton.h | 0 {include => src/gui/include}/Oscilloscope.h | 0 {include => src/gui/include}/PatternClipView.h | 0 {include => src/gui/include}/PatternEditor.h | 0 {include => src/gui/include}/PatternTrackView.h | 0 {include => src/gui/include}/PeakIndicator.h | 0 {include => src/gui/include}/PianoRoll.h | 0 {include => src/gui/include}/PianoView.h | 0 {include => src/gui/include}/PixmapButton.h | 0 {include => src/gui/include}/PluginBrowser.h | 0 {include => src/gui/include}/PositionLine.h | 0 {include => src/gui/include}/ProjectNotes.h | 0 {include => src/gui/include}/RecentProjectsMenu.h | 0 {include => src/gui/include}/RenameDialog.h | 0 {include => src/gui/include}/RowTableView.h | 0 {include => src/gui/include}/Rubberband.h | 0 {include => src/gui/include}/SampleClipView.h | 0 {include => src/gui/include}/SampleLoader.h | 0 {include => src/gui/include}/SampleTrackView.h | 1 + {include => src/gui/include}/SampleTrackWindow.h | 0 {include => src/gui/include}/SampleWaveform.h | 0 {include => src/gui/include}/SendButtonIndicator.h | 0 {include => src/gui/include}/SetupDialog.h | 0 {include => src/gui/include}/SideBar.h | 0 {include => src/gui/include}/SideBarWidget.h | 0 {include => src/gui/include}/SimpleTextFloat.h | 0 {include => src/gui/include}/SongEditor.h | 0 {include => src/gui/include}/StepRecorderWidget.h | 0 {include => src/gui/include}/StringPairDrag.h | 0 {include => src/gui/include}/SubWindow.h | 0 {include => src/gui/include}/TabBar.h | 0 {include => src/gui/include}/TabButton.h | 0 {include => src/gui/include}/TabWidget.h | 0 {include => src/gui/include}/TemplatesMenu.h | 0 {include => src/gui/include}/TempoSyncBarModelEditor.h | 0 {include => src/gui/include}/TempoSyncKnob.h | 0 {include => src/gui/include}/TextFloat.h | 0 {include => src/gui/include}/TimeDisplayWidget.h | 0 {include => src/gui/include}/TimeLineWidget.h | 0 {include => src/gui/include}/ToolButton.h | 0 {include => src/gui/include}/ToolPluginView.h | 0 {include => src/gui/include}/TrackContainerView.h | 0 {include => src/gui/include}/TrackContentWidget.h | 0 {include => src/gui/include}/TrackLabelButton.h | 0 {include => src/gui/include}/TrackOperationsWidget.h | 0 {include => src/gui/include}/TrackRenameLineEdit.h | 0 {include => src/gui/include}/TrackView.h | 0 {include => src/gui/include}/VersionedSaveDialog.h | 0 {include => src/gui/include}/embed.h | 0 {include => src/gui/include}/gui_templates.h | 0 src/tracks/CMakeLists.txt | 10 ---------- 306 files changed, 23 insertions(+), 20 deletions(-) rename {include => src/core/include}/ArrayVector.h (100%) rename {include => src/core/include}/AudioAlsa.h (100%) rename {include => src/core/include}/AudioDevice.h (100%) rename {include => src/core/include}/AudioDummy.h (100%) rename {include => src/core/include}/AudioEngine.h (100%) rename {include => src/core/include}/AudioEngineProfiler.h (100%) rename {include => src/core/include}/AudioEngineWorkerThread.h (100%) rename {include => src/core/include}/AudioFileDevice.h (100%) rename {include => src/core/include}/AudioFileFlac.h (100%) rename {include => src/core/include}/AudioFileMP3.h (100%) rename {include => src/core/include}/AudioFileOgg.h (100%) rename {include => src/core/include}/AudioFileWave.h (100%) rename {include => src/core/include}/AudioJack.h (100%) rename {include => src/core/include}/AudioOss.h (100%) rename {include => src/core/include}/AudioPort.h (100%) rename {include => src/core/include}/AudioPortAudio.h (100%) rename {include => src/core/include}/AudioPulseAudio.h (100%) rename {include => src/core/include}/AudioResampler.h (100%) rename {include => src/core/include}/AudioSampleRecorder.h (100%) rename {include => src/core/include}/AudioSdl.h (100%) rename {include => src/core/include}/AudioSndio.h (100%) rename {include => src/core/include}/AudioSoundIo.h (100%) rename {include => src/core/include}/AutomatableModel.h (100%) rename {include => src/core/include}/AutomationClip.h (100%) rename {include => src/core/include}/AutomationNode.h (100%) rename {include => src/core/include}/AutomationTrack.h (100%) rename {include => src/core/include}/BandLimitedWave.h (100%) rename {include => src/core/include}/BasicFilters.h (100%) rename {include => src/core/include}/BufferManager.h (100%) rename {include => src/core/include}/Clip.h (100%) rename {include => src/core/include}/Clipboard.h (100%) rename {include => src/core/include}/ComboBoxModel.h (100%) rename {include => src/core/include}/ConfigManager.h (100%) rename {include => src/core/include}/Controller.h (100%) rename {include => src/core/include}/ControllerConnection.h (100%) rename {include => src/core/include}/DataFile.h (100%) rename {include => src/core/include}/Delay.h (100%) rename {include => src/core/include}/DetuningHelper.h (100%) rename {include => src/core/include}/DrumSynth.h (100%) rename {include => src/core/include}/DspEffectLibrary.h (100%) rename {include => src/core/include}/DummyEffect.h (100%) rename {include => src/core/include}/DummyInstrument.h (100%) rename {include => src/core/include}/DummyPlugin.h (100%) rename {include => src/core/include}/Effect.h (100%) rename {include => src/core/include}/EffectChain.h (100%) rename {include => src/core/include}/EffectControls.h (100%) rename {include => src/core/include}/Engine.h (100%) rename {include => src/core/include}/EnvelopeAndLfoParameters.h (100%) rename {include => src/core/include}/ExportFilter.h (100%) rename {include => src/core/include}/FifoBuffer.h (100%) rename {include => src/core/include}/FileSearch.h (100%) rename {include => src/core/include}/Flags.h (100%) rename {include => src/core/include}/ImportFilter.h (100%) rename {include => src/core/include}/InlineAutomation.h (100%) rename {include => src/core/include}/Instrument.h (100%) rename {include => src/core/include}/InstrumentFunctions.h (100%) rename {include => src/core/include}/InstrumentPlayHandle.h (100%) rename {include => src/core/include}/InstrumentSoundShaping.h (100%) rename {include => src/core/include}/InstrumentTrack.h (100%) rename {include => src/core/include}/InstrumentView.h (100%) rename {include => src/core/include}/JournallingObject.h (100%) rename {include => src/core/include}/Keymap.h (100%) rename {include => src/core/include}/Ladspa2LMMS.h (100%) rename {include => src/core/include}/LadspaBase.h (100%) rename {include => src/core/include}/LadspaControl.h (100%) rename {include => src/core/include}/LadspaManager.h (100%) rename {include => src/core/include}/LfoController.h (100%) rename {include => src/core/include}/LinkedModelGroups.h (100%) rename {include => src/core/include}/LmmsSemaphore.h (100%) rename {include => src/core/include}/LocaleHelper.h (100%) rename {include => src/core/include}/LocklessAllocator.h (100%) rename {include => src/core/include}/LocklessList.h (100%) rename {include => src/core/include}/LocklessRingBuffer.h (100%) rename {include => src/core/include}/Lv2Basics.h (100%) rename {include => src/core/include}/Lv2ControlBase.h (100%) rename {include => src/core/include}/Lv2Evbuf.h (100%) rename {include => src/core/include}/Lv2Features.h (100%) rename {include => src/core/include}/Lv2Manager.h (100%) rename {include => src/core/include}/Lv2Options.h (100%) rename {include => src/core/include}/Lv2Ports.h (100%) rename {include => src/core/include}/Lv2Proc.h (100%) rename {include => src/core/include}/Lv2SubPluginFeatures.h (100%) rename {include => src/core/include}/Lv2UridCache.h (100%) rename {include => src/core/include}/Lv2UridMap.h (100%) rename {include => src/core/include}/Lv2Worker.h (100%) rename {include => src/core/include}/MeterModel.h (100%) rename {include => src/core/include}/MicroTimer.h (100%) rename {include => src/core/include}/Microtuner.h (100%) rename {include => src/core/include}/MidiAlsaRaw.h (100%) rename {include => src/core/include}/MidiAlsaSeq.h (100%) rename {include => src/core/include}/MidiApple.h (100%) rename {include => src/core/include}/MidiClient.h (100%) rename {include => src/core/include}/MidiClip.h (100%) rename {include => src/core/include}/MidiController.h (100%) rename {include => src/core/include}/MidiDummy.h (100%) rename {include => src/core/include}/MidiEventProcessor.h (100%) rename {include => src/core/include}/MidiEventToByteSeq.h (100%) rename {include => src/core/include}/MidiJack.h (100%) rename {include => src/core/include}/MidiOss.h (100%) rename {include => src/core/include}/MidiPort.h (100%) rename {include => src/core/include}/MidiSndio.h (100%) rename {include => src/core/include}/MidiWinMM.h (100%) rename {include => src/core/include}/MixHelpers.h (100%) rename {include => src/core/include}/Mixer.h (100%) rename {include => src/core/include}/Model.h (100%) rename {include => src/core/include}/ModelVisitor.h (100%) rename {include => src/core/include}/NoCopyNoMove.h (100%) rename {include => src/core/include}/Note.h (100%) rename {include => src/core/include}/NotePlayHandle.h (100%) rename {include => src/core/include}/Oscillator.h (100%) rename {include => src/core/include}/OscillatorConstants.h (100%) rename {include => src/core/include}/OutputSettings.h (100%) rename {include => src/core/include}/PathUtil.h (100%) rename {include => src/core/include}/PatternClip.h (100%) rename {include => src/core/include}/PatternStore.h (100%) rename {include => src/core/include}/PatternTrack.h (100%) rename {include => src/core/include}/PeakController.h (100%) rename {include => src/core/include}/PerfLog.h (100%) rename {include => src/core/include}/Piano.h (100%) rename {include => src/core/include}/Pitch.h (100%) rename {include => src/core/include}/PlayHandle.h (100%) rename {include => src/core/include}/Plugin.h (100%) rename {include => src/core/include}/PluginFactory.h (98%) rename {include => src/core/include}/PluginIssue.h (100%) rename {include => src/core/include}/PluginView.h (100%) rename {include => src/core/include}/PresetPreviewPlayHandle.h (100%) rename {include => src/core/include}/ProjectJournal.h (100%) rename {include => src/core/include}/ProjectRenderer.h (100%) rename {include => src/core/include}/ProjectVersion.h (100%) rename {include => src/core/include}/QuadratureLfo.h (100%) rename {include => src/core/include}/RemotePlugin.h (100%) rename {include => src/core/include}/RenderManager.h (100%) rename {include => src/core/include}/RingBuffer.h (100%) rename {include => src/core/include}/RmsHelper.h (100%) rename {include => src/core/include}/Sample.h (100%) rename {include => src/core/include}/SampleBuffer.h (100%) rename {include => src/core/include}/SampleClip.h (100%) rename {include => src/core/include}/SampleDecoder.h (100%) rename {include => src/core/include}/SamplePlayHandle.h (100%) rename {include => src/core/include}/SampleRecordHandle.h (100%) rename {include => src/core/include}/SampleTrack.h (100%) rename {include => src/core/include}/Scale.h (100%) rename {include => src/core/include}/SerializingObject.h (100%) rename {include => src/core/include}/Song.h (100%) rename {include => src/core/include}/StepRecorder.h (100%) rename {include => src/core/include}/SweepOscillator.h (100%) rename {include => src/core/include}/TempoSyncKnobModel.h (100%) rename {include => src/core/include}/ThreadPool.h (100%) rename {include => src/core/include}/ThreadableJob.h (100%) rename {include => src/core/include}/TimePos.h (100%) rename {include => src/core/include}/Timeline.h (100%) rename {include => src/core/include}/ToolPlugin.h (100%) rename {include => src/core/include}/Track.h (100%) rename {include => src/core/include}/TrackContainer.h (100%) rename {include => src/core/include}/ValueBuffer.h (100%) rename {include => src/core/include}/VstSyncController.h (100%) rename {include => src/core/include}/base64.h (100%) rename {include => src/core/include}/debug.h (100%) rename {include => src/core/include}/denormals.h (100%) rename {include => src/core/include}/endian_handling.h (100%) rename {include => src/core/include}/fenv.h (100%) rename {include => src/core/include}/fft_helpers.h (100%) rename {include => src/core/include}/interpolation.h (100%) rename {include => src/core/include}/ladspa.h (100%) rename {include => src/core/include}/lmms_constants.h (100%) rename {include => src/core/include}/lmms_math.h (100%) rename {include => src/core/include}/panning.h (100%) rename {include => src/core/include}/shared_object.h (100%) rename {include => src/core/include}/versioninfo.h (100%) rename src/{ => core}/tracks/AutomationTrack.cpp (100%) rename src/{ => core}/tracks/InstrumentTrack.cpp (100%) rename src/{ => core}/tracks/MidiClip.cpp (100%) rename src/{ => core}/tracks/PatternTrack.cpp (100%) rename src/{ => core}/tracks/SampleTrack.cpp (100%) rename {include => src/gui/include}/AboutDialog.h (100%) rename {include => src/gui/include}/ActionGroup.h (100%) rename {include => src/gui/include}/AudioAlsaSetupWidget.h (100%) rename {include => src/gui/include}/AudioDeviceSetupWidget.h (100%) rename {include => src/gui/include}/AutomatableButton.h (100%) rename {include => src/gui/include}/AutomatableModelView.h (100%) rename {include => src/gui/include}/AutomatableSlider.h (100%) rename {include => src/gui/include}/AutomationClipView.h (100%) rename {include => src/gui/include}/AutomationEditor.h (100%) rename {include => src/gui/include}/AutomationTrackView.h (100%) rename {include => src/gui/include}/BarModelEditor.h (100%) rename {include => src/gui/include}/CPULoadWidget.h (100%) rename {include => src/gui/include}/CaptionMenu.h (100%) rename {include => src/gui/include}/ClipView.h (100%) rename {include => src/gui/include}/ColorChooser.h (100%) rename {include => src/gui/include}/ColorHelper.h (100%) rename {include => src/gui/include}/ComboBox.h (100%) rename {include => src/gui/include}/ControlLayout.h (100%) rename {include => src/gui/include}/ControllerConnectionDialog.h (100%) rename {include => src/gui/include}/ControllerDialog.h (100%) rename {include => src/gui/include}/ControllerRackView.h (100%) rename {include => src/gui/include}/ControllerView.h (100%) rename {include => src/gui/include}/Controls.h (100%) rename {include => src/gui/include}/CustomTextKnob.h (100%) rename {include => src/gui/include}/DeprecationHelper.h (100%) rename {include => src/gui/include}/Editor.h (100%) rename {include => src/gui/include}/EffectControlDialog.h (100%) rename {include => src/gui/include}/EffectRackView.h (100%) rename {include => src/gui/include}/EffectSelectDialog.h (100%) rename {include => src/gui/include}/EffectView.h (100%) rename {include => src/gui/include}/EnvelopeAndLfoView.h (100%) rename {include => src/gui/include}/EnvelopeGraph.h (100%) rename {include => src/gui/include}/ExportProjectDialog.h (100%) rename {include => src/gui/include}/FadeButton.h (100%) rename {include => src/gui/include}/Fader.h (100%) rename {include => src/gui/include}/FileBrowser.h (100%) rename {include => src/gui/include}/FileDialog.h (100%) rename {include => src/gui/include}/FloatModelEditorBase.h (100%) rename {include => src/gui/include}/Graph.h (100%) rename {include => src/gui/include}/GroupBox.h (100%) rename {include => src/gui/include}/GuiApplication.h (100%) rename {include => src/gui/include}/InstrumentFunctionViews.h (100%) rename {include => src/gui/include}/InstrumentMidiIOView.h (100%) rename {include => src/gui/include}/InstrumentSoundShapingView.h (100%) rename {include => src/gui/include}/InstrumentTrackView.h (100%) rename {include => src/gui/include}/InstrumentTrackWindow.h (99%) rename {include => src/gui/include}/InstrumentTuningView.h (100%) rename {include => src/gui/include}/Knob.h (100%) rename {include => src/gui/include}/LadspaControlView.h (100%) rename {include => src/gui/include}/LcdFloatSpinBox.h (100%) rename {include => src/gui/include}/LcdSpinBox.h (100%) rename {include => src/gui/include}/LcdWidget.h (100%) rename {include => src/gui/include}/LedCheckBox.h (100%) rename {include => src/gui/include}/LeftRightNav.h (98%) rename {include => src/gui/include}/LfoGraph.h (100%) rename {include => src/gui/include}/LinkedModelGroupViews.h (100%) rename {include => src/gui/include}/LmmsPalette.h (100%) rename {include => src/gui/include}/LmmsStyle.h (100%) rename {include => src/gui/include}/Lv2ViewBase.h (100%) rename {include => src/gui/include}/MainApplication.h (100%) rename {include => src/gui/include}/MainWindow.h (100%) rename {include => src/gui/include}/MeterDialog.h (100%) rename {include => src/gui/include}/MicrotunerConfig.h (100%) rename {include => src/gui/include}/MidiCCRackView.h (100%) rename {include => src/gui/include}/MidiClipView.h (100%) rename {include => src/gui/include}/MidiPortMenu.h (100%) rename {include => src/gui/include}/MidiSetupWidget.h (100%) rename {include => src/gui/include}/MixerChannelLcdSpinBox.h (100%) rename {include => src/gui/include}/MixerChannelView.h (100%) rename {include => src/gui/include}/MixerView.h (100%) rename {include => src/gui/include}/ModelView.h (100%) rename {include => src/gui/include}/NStateButton.h (100%) rename {include => src/gui/include}/Oscilloscope.h (100%) rename {include => src/gui/include}/PatternClipView.h (100%) rename {include => src/gui/include}/PatternEditor.h (100%) rename {include => src/gui/include}/PatternTrackView.h (100%) rename {include => src/gui/include}/PeakIndicator.h (100%) rename {include => src/gui/include}/PianoRoll.h (100%) rename {include => src/gui/include}/PianoView.h (100%) rename {include => src/gui/include}/PixmapButton.h (100%) rename {include => src/gui/include}/PluginBrowser.h (100%) rename {include => src/gui/include}/PositionLine.h (100%) rename {include => src/gui/include}/ProjectNotes.h (100%) rename {include => src/gui/include}/RecentProjectsMenu.h (100%) rename {include => src/gui/include}/RenameDialog.h (100%) rename {include => src/gui/include}/RowTableView.h (100%) rename {include => src/gui/include}/Rubberband.h (100%) rename {include => src/gui/include}/SampleClipView.h (100%) rename {include => src/gui/include}/SampleLoader.h (100%) rename {include => src/gui/include}/SampleTrackView.h (98%) rename {include => src/gui/include}/SampleTrackWindow.h (100%) rename {include => src/gui/include}/SampleWaveform.h (100%) rename {include => src/gui/include}/SendButtonIndicator.h (100%) rename {include => src/gui/include}/SetupDialog.h (100%) rename {include => src/gui/include}/SideBar.h (100%) rename {include => src/gui/include}/SideBarWidget.h (100%) rename {include => src/gui/include}/SimpleTextFloat.h (100%) rename {include => src/gui/include}/SongEditor.h (100%) rename {include => src/gui/include}/StepRecorderWidget.h (100%) rename {include => src/gui/include}/StringPairDrag.h (100%) rename {include => src/gui/include}/SubWindow.h (100%) rename {include => src/gui/include}/TabBar.h (100%) rename {include => src/gui/include}/TabButton.h (100%) rename {include => src/gui/include}/TabWidget.h (100%) rename {include => src/gui/include}/TemplatesMenu.h (100%) rename {include => src/gui/include}/TempoSyncBarModelEditor.h (100%) rename {include => src/gui/include}/TempoSyncKnob.h (100%) rename {include => src/gui/include}/TextFloat.h (100%) rename {include => src/gui/include}/TimeDisplayWidget.h (100%) rename {include => src/gui/include}/TimeLineWidget.h (100%) rename {include => src/gui/include}/ToolButton.h (100%) rename {include => src/gui/include}/ToolPluginView.h (100%) rename {include => src/gui/include}/TrackContainerView.h (100%) rename {include => src/gui/include}/TrackContentWidget.h (100%) rename {include => src/gui/include}/TrackLabelButton.h (100%) rename {include => src/gui/include}/TrackOperationsWidget.h (100%) rename {include => src/gui/include}/TrackRenameLineEdit.h (100%) rename {include => src/gui/include}/TrackView.h (100%) rename {include => src/gui/include}/VersionedSaveDialog.h (100%) rename {include => src/gui/include}/embed.h (100%) rename {include => src/gui/include}/gui_templates.h (100%) delete mode 100644 src/tracks/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index a9dbda4ccbd..992e94e450a 100644 --- 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 index 69af41ecb12..05a18f42fa6 100644 --- 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 index ac334fabfb5..c46c1b16e0e 160000 --- a/src/3rdparty/jack2 +++ b/src/3rdparty/jack2 @@ -1 +1 @@ -Subproject commit ac334fabfb56989e9115ee6e2a77c1f6162d14fb +Subproject commit c46c1b16e0eabbcf55ef69b0ffb96dfe16521cfa diff --git a/src/3rdparty/mingw-std-threads b/src/3rdparty/mingw-std-threads index 6c2061b7da4..c931bac289d 160000 --- a/src/3rdparty/mingw-std-threads +++ b/src/3rdparty/mingw-std-threads @@ -1 +1 @@ -Subproject commit 6c2061b7da41d6aa1b2162ff4383ec3ece864bc6 +Subproject commit c931bac289dd431f1dd30fc4a5d1a7be36668073 diff --git a/src/3rdparty/qt5-x11embed b/src/3rdparty/qt5-x11embed index 022b39a1d49..5337eefc06f 160000 --- a/src/3rdparty/qt5-x11embed +++ b/src/3rdparty/qt5-x11embed @@ -1 +1 @@ -Subproject commit 022b39a1d496d72eb3e5b5188e5559f66afca957 +Subproject commit 5337eefc06feaa0558ea40c43db0b749fdc8ee64 diff --git a/src/3rdparty/ringbuffer b/src/3rdparty/ringbuffer index 1c46ef34a28..ea4141f3997 160000 --- a/src/3rdparty/ringbuffer +++ b/src/3rdparty/ringbuffer @@ -1 +1 @@ -Subproject commit 1c46ef34a28d4637b43fb6d5ebb31d38c05f4bd8 +Subproject commit ea4141f39972a245a3a053ff41549637ce6d9410 diff --git a/src/3rdparty/weakjack/weakjack b/src/3rdparty/weakjack/weakjack index fd11655be3b..61389602c52 160000 --- a/src/3rdparty/weakjack/weakjack +++ b/src/3rdparty/weakjack/weakjack @@ -1 +1 @@ -Subproject commit fd11655be3b2efd6082968ecfe53f9cfe88bda2b +Subproject commit 61389602c52109fd074e691e589699f4ae62d443 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 940d485f966..a9812351c95 100644 --- 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 index 9f349f09103..fe71547dc48 100644 --- 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 index 3608d28486a..ce294f46b6e 100644 --- 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 b/src/core/include/ArrayVector.h similarity index 100% rename from include/ArrayVector.h rename to src/core/include/ArrayVector.h diff --git a/include/AudioAlsa.h b/src/core/include/AudioAlsa.h similarity index 100% rename from include/AudioAlsa.h rename to src/core/include/AudioAlsa.h diff --git a/include/AudioDevice.h b/src/core/include/AudioDevice.h similarity index 100% rename from include/AudioDevice.h rename to src/core/include/AudioDevice.h diff --git a/include/AudioDummy.h b/src/core/include/AudioDummy.h similarity index 100% rename from include/AudioDummy.h rename to src/core/include/AudioDummy.h diff --git a/include/AudioEngine.h b/src/core/include/AudioEngine.h similarity index 100% rename from include/AudioEngine.h rename to src/core/include/AudioEngine.h diff --git a/include/AudioEngineProfiler.h b/src/core/include/AudioEngineProfiler.h similarity index 100% rename from include/AudioEngineProfiler.h rename to src/core/include/AudioEngineProfiler.h diff --git a/include/AudioEngineWorkerThread.h b/src/core/include/AudioEngineWorkerThread.h similarity index 100% rename from include/AudioEngineWorkerThread.h rename to src/core/include/AudioEngineWorkerThread.h diff --git a/include/AudioFileDevice.h b/src/core/include/AudioFileDevice.h similarity index 100% rename from include/AudioFileDevice.h rename to src/core/include/AudioFileDevice.h diff --git a/include/AudioFileFlac.h b/src/core/include/AudioFileFlac.h similarity index 100% rename from include/AudioFileFlac.h rename to src/core/include/AudioFileFlac.h diff --git a/include/AudioFileMP3.h b/src/core/include/AudioFileMP3.h similarity index 100% rename from include/AudioFileMP3.h rename to src/core/include/AudioFileMP3.h diff --git a/include/AudioFileOgg.h b/src/core/include/AudioFileOgg.h similarity index 100% rename from include/AudioFileOgg.h rename to src/core/include/AudioFileOgg.h diff --git a/include/AudioFileWave.h b/src/core/include/AudioFileWave.h similarity index 100% rename from include/AudioFileWave.h rename to src/core/include/AudioFileWave.h diff --git a/include/AudioJack.h b/src/core/include/AudioJack.h similarity index 100% rename from include/AudioJack.h rename to src/core/include/AudioJack.h diff --git a/include/AudioOss.h b/src/core/include/AudioOss.h similarity index 100% rename from include/AudioOss.h rename to src/core/include/AudioOss.h diff --git a/include/AudioPort.h b/src/core/include/AudioPort.h similarity index 100% rename from include/AudioPort.h rename to src/core/include/AudioPort.h diff --git a/include/AudioPortAudio.h b/src/core/include/AudioPortAudio.h similarity index 100% rename from include/AudioPortAudio.h rename to src/core/include/AudioPortAudio.h diff --git a/include/AudioPulseAudio.h b/src/core/include/AudioPulseAudio.h similarity index 100% rename from include/AudioPulseAudio.h rename to src/core/include/AudioPulseAudio.h diff --git a/include/AudioResampler.h b/src/core/include/AudioResampler.h similarity index 100% rename from include/AudioResampler.h rename to src/core/include/AudioResampler.h diff --git a/include/AudioSampleRecorder.h b/src/core/include/AudioSampleRecorder.h similarity index 100% rename from include/AudioSampleRecorder.h rename to src/core/include/AudioSampleRecorder.h diff --git a/include/AudioSdl.h b/src/core/include/AudioSdl.h similarity index 100% rename from include/AudioSdl.h rename to src/core/include/AudioSdl.h diff --git a/include/AudioSndio.h b/src/core/include/AudioSndio.h similarity index 100% rename from include/AudioSndio.h rename to src/core/include/AudioSndio.h diff --git a/include/AudioSoundIo.h b/src/core/include/AudioSoundIo.h similarity index 100% rename from include/AudioSoundIo.h rename to src/core/include/AudioSoundIo.h diff --git a/include/AutomatableModel.h b/src/core/include/AutomatableModel.h similarity index 100% rename from include/AutomatableModel.h rename to src/core/include/AutomatableModel.h diff --git a/include/AutomationClip.h b/src/core/include/AutomationClip.h similarity index 100% rename from include/AutomationClip.h rename to src/core/include/AutomationClip.h diff --git a/include/AutomationNode.h b/src/core/include/AutomationNode.h similarity index 100% rename from include/AutomationNode.h rename to src/core/include/AutomationNode.h diff --git a/include/AutomationTrack.h b/src/core/include/AutomationTrack.h similarity index 100% rename from include/AutomationTrack.h rename to src/core/include/AutomationTrack.h diff --git a/include/BandLimitedWave.h b/src/core/include/BandLimitedWave.h similarity index 100% rename from include/BandLimitedWave.h rename to src/core/include/BandLimitedWave.h diff --git a/include/BasicFilters.h b/src/core/include/BasicFilters.h similarity index 100% rename from include/BasicFilters.h rename to src/core/include/BasicFilters.h diff --git a/include/BufferManager.h b/src/core/include/BufferManager.h similarity index 100% rename from include/BufferManager.h rename to src/core/include/BufferManager.h diff --git a/include/Clip.h b/src/core/include/Clip.h similarity index 100% rename from include/Clip.h rename to src/core/include/Clip.h diff --git a/include/Clipboard.h b/src/core/include/Clipboard.h similarity index 100% rename from include/Clipboard.h rename to src/core/include/Clipboard.h diff --git a/include/ComboBoxModel.h b/src/core/include/ComboBoxModel.h similarity index 100% rename from include/ComboBoxModel.h rename to src/core/include/ComboBoxModel.h diff --git a/include/ConfigManager.h b/src/core/include/ConfigManager.h similarity index 100% rename from include/ConfigManager.h rename to src/core/include/ConfigManager.h diff --git a/include/Controller.h b/src/core/include/Controller.h similarity index 100% rename from include/Controller.h rename to src/core/include/Controller.h diff --git a/include/ControllerConnection.h b/src/core/include/ControllerConnection.h similarity index 100% rename from include/ControllerConnection.h rename to src/core/include/ControllerConnection.h diff --git a/include/DataFile.h b/src/core/include/DataFile.h similarity index 100% rename from include/DataFile.h rename to src/core/include/DataFile.h diff --git a/include/Delay.h b/src/core/include/Delay.h similarity index 100% rename from include/Delay.h rename to src/core/include/Delay.h diff --git a/include/DetuningHelper.h b/src/core/include/DetuningHelper.h similarity index 100% rename from include/DetuningHelper.h rename to src/core/include/DetuningHelper.h diff --git a/include/DrumSynth.h b/src/core/include/DrumSynth.h similarity index 100% rename from include/DrumSynth.h rename to src/core/include/DrumSynth.h diff --git a/include/DspEffectLibrary.h b/src/core/include/DspEffectLibrary.h similarity index 100% rename from include/DspEffectLibrary.h rename to src/core/include/DspEffectLibrary.h diff --git a/include/DummyEffect.h b/src/core/include/DummyEffect.h similarity index 100% rename from include/DummyEffect.h rename to src/core/include/DummyEffect.h diff --git a/include/DummyInstrument.h b/src/core/include/DummyInstrument.h similarity index 100% rename from include/DummyInstrument.h rename to src/core/include/DummyInstrument.h diff --git a/include/DummyPlugin.h b/src/core/include/DummyPlugin.h similarity index 100% rename from include/DummyPlugin.h rename to src/core/include/DummyPlugin.h diff --git a/include/Effect.h b/src/core/include/Effect.h similarity index 100% rename from include/Effect.h rename to src/core/include/Effect.h diff --git a/include/EffectChain.h b/src/core/include/EffectChain.h similarity index 100% rename from include/EffectChain.h rename to src/core/include/EffectChain.h diff --git a/include/EffectControls.h b/src/core/include/EffectControls.h similarity index 100% rename from include/EffectControls.h rename to src/core/include/EffectControls.h diff --git a/include/Engine.h b/src/core/include/Engine.h similarity index 100% rename from include/Engine.h rename to src/core/include/Engine.h diff --git a/include/EnvelopeAndLfoParameters.h b/src/core/include/EnvelopeAndLfoParameters.h similarity index 100% rename from include/EnvelopeAndLfoParameters.h rename to src/core/include/EnvelopeAndLfoParameters.h diff --git a/include/ExportFilter.h b/src/core/include/ExportFilter.h similarity index 100% rename from include/ExportFilter.h rename to src/core/include/ExportFilter.h diff --git a/include/FifoBuffer.h b/src/core/include/FifoBuffer.h similarity index 100% rename from include/FifoBuffer.h rename to src/core/include/FifoBuffer.h diff --git a/include/FileSearch.h b/src/core/include/FileSearch.h similarity index 100% rename from include/FileSearch.h rename to src/core/include/FileSearch.h diff --git a/include/Flags.h b/src/core/include/Flags.h similarity index 100% rename from include/Flags.h rename to src/core/include/Flags.h diff --git a/include/ImportFilter.h b/src/core/include/ImportFilter.h similarity index 100% rename from include/ImportFilter.h rename to src/core/include/ImportFilter.h diff --git a/include/InlineAutomation.h b/src/core/include/InlineAutomation.h similarity index 100% rename from include/InlineAutomation.h rename to src/core/include/InlineAutomation.h diff --git a/include/Instrument.h b/src/core/include/Instrument.h similarity index 100% rename from include/Instrument.h rename to src/core/include/Instrument.h diff --git a/include/InstrumentFunctions.h b/src/core/include/InstrumentFunctions.h similarity index 100% rename from include/InstrumentFunctions.h rename to src/core/include/InstrumentFunctions.h diff --git a/include/InstrumentPlayHandle.h b/src/core/include/InstrumentPlayHandle.h similarity index 100% rename from include/InstrumentPlayHandle.h rename to src/core/include/InstrumentPlayHandle.h diff --git a/include/InstrumentSoundShaping.h b/src/core/include/InstrumentSoundShaping.h similarity index 100% rename from include/InstrumentSoundShaping.h rename to src/core/include/InstrumentSoundShaping.h diff --git a/include/InstrumentTrack.h b/src/core/include/InstrumentTrack.h similarity index 100% rename from include/InstrumentTrack.h rename to src/core/include/InstrumentTrack.h diff --git a/include/InstrumentView.h b/src/core/include/InstrumentView.h similarity index 100% rename from include/InstrumentView.h rename to src/core/include/InstrumentView.h diff --git a/include/JournallingObject.h b/src/core/include/JournallingObject.h similarity index 100% rename from include/JournallingObject.h rename to src/core/include/JournallingObject.h diff --git a/include/Keymap.h b/src/core/include/Keymap.h similarity index 100% rename from include/Keymap.h rename to src/core/include/Keymap.h diff --git a/include/Ladspa2LMMS.h b/src/core/include/Ladspa2LMMS.h similarity index 100% rename from include/Ladspa2LMMS.h rename to src/core/include/Ladspa2LMMS.h diff --git a/include/LadspaBase.h b/src/core/include/LadspaBase.h similarity index 100% rename from include/LadspaBase.h rename to src/core/include/LadspaBase.h diff --git a/include/LadspaControl.h b/src/core/include/LadspaControl.h similarity index 100% rename from include/LadspaControl.h rename to src/core/include/LadspaControl.h diff --git a/include/LadspaManager.h b/src/core/include/LadspaManager.h similarity index 100% rename from include/LadspaManager.h rename to src/core/include/LadspaManager.h diff --git a/include/LfoController.h b/src/core/include/LfoController.h similarity index 100% rename from include/LfoController.h rename to src/core/include/LfoController.h diff --git a/include/LinkedModelGroups.h b/src/core/include/LinkedModelGroups.h similarity index 100% rename from include/LinkedModelGroups.h rename to src/core/include/LinkedModelGroups.h diff --git a/include/LmmsSemaphore.h b/src/core/include/LmmsSemaphore.h similarity index 100% rename from include/LmmsSemaphore.h rename to src/core/include/LmmsSemaphore.h diff --git a/include/LocaleHelper.h b/src/core/include/LocaleHelper.h similarity index 100% rename from include/LocaleHelper.h rename to src/core/include/LocaleHelper.h diff --git a/include/LocklessAllocator.h b/src/core/include/LocklessAllocator.h similarity index 100% rename from include/LocklessAllocator.h rename to src/core/include/LocklessAllocator.h diff --git a/include/LocklessList.h b/src/core/include/LocklessList.h similarity index 100% rename from include/LocklessList.h rename to src/core/include/LocklessList.h diff --git a/include/LocklessRingBuffer.h b/src/core/include/LocklessRingBuffer.h similarity index 100% rename from include/LocklessRingBuffer.h rename to src/core/include/LocklessRingBuffer.h diff --git a/include/Lv2Basics.h b/src/core/include/Lv2Basics.h similarity index 100% rename from include/Lv2Basics.h rename to src/core/include/Lv2Basics.h diff --git a/include/Lv2ControlBase.h b/src/core/include/Lv2ControlBase.h similarity index 100% rename from include/Lv2ControlBase.h rename to src/core/include/Lv2ControlBase.h diff --git a/include/Lv2Evbuf.h b/src/core/include/Lv2Evbuf.h similarity index 100% rename from include/Lv2Evbuf.h rename to src/core/include/Lv2Evbuf.h diff --git a/include/Lv2Features.h b/src/core/include/Lv2Features.h similarity index 100% rename from include/Lv2Features.h rename to src/core/include/Lv2Features.h diff --git a/include/Lv2Manager.h b/src/core/include/Lv2Manager.h similarity index 100% rename from include/Lv2Manager.h rename to src/core/include/Lv2Manager.h diff --git a/include/Lv2Options.h b/src/core/include/Lv2Options.h similarity index 100% rename from include/Lv2Options.h rename to src/core/include/Lv2Options.h diff --git a/include/Lv2Ports.h b/src/core/include/Lv2Ports.h similarity index 100% rename from include/Lv2Ports.h rename to src/core/include/Lv2Ports.h diff --git a/include/Lv2Proc.h b/src/core/include/Lv2Proc.h similarity index 100% rename from include/Lv2Proc.h rename to src/core/include/Lv2Proc.h diff --git a/include/Lv2SubPluginFeatures.h b/src/core/include/Lv2SubPluginFeatures.h similarity index 100% rename from include/Lv2SubPluginFeatures.h rename to src/core/include/Lv2SubPluginFeatures.h diff --git a/include/Lv2UridCache.h b/src/core/include/Lv2UridCache.h similarity index 100% rename from include/Lv2UridCache.h rename to src/core/include/Lv2UridCache.h diff --git a/include/Lv2UridMap.h b/src/core/include/Lv2UridMap.h similarity index 100% rename from include/Lv2UridMap.h rename to src/core/include/Lv2UridMap.h diff --git a/include/Lv2Worker.h b/src/core/include/Lv2Worker.h similarity index 100% rename from include/Lv2Worker.h rename to src/core/include/Lv2Worker.h diff --git a/include/MeterModel.h b/src/core/include/MeterModel.h similarity index 100% rename from include/MeterModel.h rename to src/core/include/MeterModel.h diff --git a/include/MicroTimer.h b/src/core/include/MicroTimer.h similarity index 100% rename from include/MicroTimer.h rename to src/core/include/MicroTimer.h diff --git a/include/Microtuner.h b/src/core/include/Microtuner.h similarity index 100% rename from include/Microtuner.h rename to src/core/include/Microtuner.h diff --git a/include/MidiAlsaRaw.h b/src/core/include/MidiAlsaRaw.h similarity index 100% rename from include/MidiAlsaRaw.h rename to src/core/include/MidiAlsaRaw.h diff --git a/include/MidiAlsaSeq.h b/src/core/include/MidiAlsaSeq.h similarity index 100% rename from include/MidiAlsaSeq.h rename to src/core/include/MidiAlsaSeq.h diff --git a/include/MidiApple.h b/src/core/include/MidiApple.h similarity index 100% rename from include/MidiApple.h rename to src/core/include/MidiApple.h diff --git a/include/MidiClient.h b/src/core/include/MidiClient.h similarity index 100% rename from include/MidiClient.h rename to src/core/include/MidiClient.h diff --git a/include/MidiClip.h b/src/core/include/MidiClip.h similarity index 100% rename from include/MidiClip.h rename to src/core/include/MidiClip.h diff --git a/include/MidiController.h b/src/core/include/MidiController.h similarity index 100% rename from include/MidiController.h rename to src/core/include/MidiController.h diff --git a/include/MidiDummy.h b/src/core/include/MidiDummy.h similarity index 100% rename from include/MidiDummy.h rename to src/core/include/MidiDummy.h diff --git a/include/MidiEventProcessor.h b/src/core/include/MidiEventProcessor.h similarity index 100% rename from include/MidiEventProcessor.h rename to src/core/include/MidiEventProcessor.h diff --git a/include/MidiEventToByteSeq.h b/src/core/include/MidiEventToByteSeq.h similarity index 100% rename from include/MidiEventToByteSeq.h rename to src/core/include/MidiEventToByteSeq.h diff --git a/include/MidiJack.h b/src/core/include/MidiJack.h similarity index 100% rename from include/MidiJack.h rename to src/core/include/MidiJack.h diff --git a/include/MidiOss.h b/src/core/include/MidiOss.h similarity index 100% rename from include/MidiOss.h rename to src/core/include/MidiOss.h diff --git a/include/MidiPort.h b/src/core/include/MidiPort.h similarity index 100% rename from include/MidiPort.h rename to src/core/include/MidiPort.h diff --git a/include/MidiSndio.h b/src/core/include/MidiSndio.h similarity index 100% rename from include/MidiSndio.h rename to src/core/include/MidiSndio.h diff --git a/include/MidiWinMM.h b/src/core/include/MidiWinMM.h similarity index 100% rename from include/MidiWinMM.h rename to src/core/include/MidiWinMM.h diff --git a/include/MixHelpers.h b/src/core/include/MixHelpers.h similarity index 100% rename from include/MixHelpers.h rename to src/core/include/MixHelpers.h diff --git a/include/Mixer.h b/src/core/include/Mixer.h similarity index 100% rename from include/Mixer.h rename to src/core/include/Mixer.h diff --git a/include/Model.h b/src/core/include/Model.h similarity index 100% rename from include/Model.h rename to src/core/include/Model.h diff --git a/include/ModelVisitor.h b/src/core/include/ModelVisitor.h similarity index 100% rename from include/ModelVisitor.h rename to src/core/include/ModelVisitor.h diff --git a/include/NoCopyNoMove.h b/src/core/include/NoCopyNoMove.h similarity index 100% rename from include/NoCopyNoMove.h rename to src/core/include/NoCopyNoMove.h diff --git a/include/Note.h b/src/core/include/Note.h similarity index 100% rename from include/Note.h rename to src/core/include/Note.h diff --git a/include/NotePlayHandle.h b/src/core/include/NotePlayHandle.h similarity index 100% rename from include/NotePlayHandle.h rename to src/core/include/NotePlayHandle.h diff --git a/include/Oscillator.h b/src/core/include/Oscillator.h similarity index 100% rename from include/Oscillator.h rename to src/core/include/Oscillator.h diff --git a/include/OscillatorConstants.h b/src/core/include/OscillatorConstants.h similarity index 100% rename from include/OscillatorConstants.h rename to src/core/include/OscillatorConstants.h diff --git a/include/OutputSettings.h b/src/core/include/OutputSettings.h similarity index 100% rename from include/OutputSettings.h rename to src/core/include/OutputSettings.h diff --git a/include/PathUtil.h b/src/core/include/PathUtil.h similarity index 100% rename from include/PathUtil.h rename to src/core/include/PathUtil.h diff --git a/include/PatternClip.h b/src/core/include/PatternClip.h similarity index 100% rename from include/PatternClip.h rename to src/core/include/PatternClip.h diff --git a/include/PatternStore.h b/src/core/include/PatternStore.h similarity index 100% rename from include/PatternStore.h rename to src/core/include/PatternStore.h diff --git a/include/PatternTrack.h b/src/core/include/PatternTrack.h similarity index 100% rename from include/PatternTrack.h rename to src/core/include/PatternTrack.h diff --git a/include/PeakController.h b/src/core/include/PeakController.h similarity index 100% rename from include/PeakController.h rename to src/core/include/PeakController.h diff --git a/include/PerfLog.h b/src/core/include/PerfLog.h similarity index 100% rename from include/PerfLog.h rename to src/core/include/PerfLog.h diff --git a/include/Piano.h b/src/core/include/Piano.h similarity index 100% rename from include/Piano.h rename to src/core/include/Piano.h diff --git a/include/Pitch.h b/src/core/include/Pitch.h similarity index 100% rename from include/Pitch.h rename to src/core/include/Pitch.h diff --git a/include/PlayHandle.h b/src/core/include/PlayHandle.h similarity index 100% rename from include/PlayHandle.h rename to src/core/include/PlayHandle.h diff --git a/include/Plugin.h b/src/core/include/Plugin.h similarity index 100% rename from include/Plugin.h rename to src/core/include/Plugin.h diff --git a/include/PluginFactory.h b/src/core/include/PluginFactory.h similarity index 98% rename from include/PluginFactory.h rename to src/core/include/PluginFactory.h index 7221f2b097b..f52f23f9a68 100644 --- a/include/PluginFactory.h +++ b/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 b/src/core/include/PluginIssue.h similarity index 100% rename from include/PluginIssue.h rename to src/core/include/PluginIssue.h diff --git a/include/PluginView.h b/src/core/include/PluginView.h similarity index 100% rename from include/PluginView.h rename to src/core/include/PluginView.h diff --git a/include/PresetPreviewPlayHandle.h b/src/core/include/PresetPreviewPlayHandle.h similarity index 100% rename from include/PresetPreviewPlayHandle.h rename to src/core/include/PresetPreviewPlayHandle.h diff --git a/include/ProjectJournal.h b/src/core/include/ProjectJournal.h similarity index 100% rename from include/ProjectJournal.h rename to src/core/include/ProjectJournal.h diff --git a/include/ProjectRenderer.h b/src/core/include/ProjectRenderer.h similarity index 100% rename from include/ProjectRenderer.h rename to src/core/include/ProjectRenderer.h diff --git a/include/ProjectVersion.h b/src/core/include/ProjectVersion.h similarity index 100% rename from include/ProjectVersion.h rename to src/core/include/ProjectVersion.h diff --git a/include/QuadratureLfo.h b/src/core/include/QuadratureLfo.h similarity index 100% rename from include/QuadratureLfo.h rename to src/core/include/QuadratureLfo.h diff --git a/include/RemotePlugin.h b/src/core/include/RemotePlugin.h similarity index 100% rename from include/RemotePlugin.h rename to src/core/include/RemotePlugin.h diff --git a/include/RenderManager.h b/src/core/include/RenderManager.h similarity index 100% rename from include/RenderManager.h rename to src/core/include/RenderManager.h diff --git a/include/RingBuffer.h b/src/core/include/RingBuffer.h similarity index 100% rename from include/RingBuffer.h rename to src/core/include/RingBuffer.h diff --git a/include/RmsHelper.h b/src/core/include/RmsHelper.h similarity index 100% rename from include/RmsHelper.h rename to src/core/include/RmsHelper.h diff --git a/include/Sample.h b/src/core/include/Sample.h similarity index 100% rename from include/Sample.h rename to src/core/include/Sample.h diff --git a/include/SampleBuffer.h b/src/core/include/SampleBuffer.h similarity index 100% rename from include/SampleBuffer.h rename to src/core/include/SampleBuffer.h diff --git a/include/SampleClip.h b/src/core/include/SampleClip.h similarity index 100% rename from include/SampleClip.h rename to src/core/include/SampleClip.h diff --git a/include/SampleDecoder.h b/src/core/include/SampleDecoder.h similarity index 100% rename from include/SampleDecoder.h rename to src/core/include/SampleDecoder.h diff --git a/include/SamplePlayHandle.h b/src/core/include/SamplePlayHandle.h similarity index 100% rename from include/SamplePlayHandle.h rename to src/core/include/SamplePlayHandle.h diff --git a/include/SampleRecordHandle.h b/src/core/include/SampleRecordHandle.h similarity index 100% rename from include/SampleRecordHandle.h rename to src/core/include/SampleRecordHandle.h diff --git a/include/SampleTrack.h b/src/core/include/SampleTrack.h similarity index 100% rename from include/SampleTrack.h rename to src/core/include/SampleTrack.h diff --git a/include/Scale.h b/src/core/include/Scale.h similarity index 100% rename from include/Scale.h rename to src/core/include/Scale.h diff --git a/include/SerializingObject.h b/src/core/include/SerializingObject.h similarity index 100% rename from include/SerializingObject.h rename to src/core/include/SerializingObject.h diff --git a/include/Song.h b/src/core/include/Song.h similarity index 100% rename from include/Song.h rename to src/core/include/Song.h diff --git a/include/StepRecorder.h b/src/core/include/StepRecorder.h similarity index 100% rename from include/StepRecorder.h rename to src/core/include/StepRecorder.h diff --git a/include/SweepOscillator.h b/src/core/include/SweepOscillator.h similarity index 100% rename from include/SweepOscillator.h rename to src/core/include/SweepOscillator.h diff --git a/include/TempoSyncKnobModel.h b/src/core/include/TempoSyncKnobModel.h similarity index 100% rename from include/TempoSyncKnobModel.h rename to src/core/include/TempoSyncKnobModel.h diff --git a/include/ThreadPool.h b/src/core/include/ThreadPool.h similarity index 100% rename from include/ThreadPool.h rename to src/core/include/ThreadPool.h diff --git a/include/ThreadableJob.h b/src/core/include/ThreadableJob.h similarity index 100% rename from include/ThreadableJob.h rename to src/core/include/ThreadableJob.h diff --git a/include/TimePos.h b/src/core/include/TimePos.h similarity index 100% rename from include/TimePos.h rename to src/core/include/TimePos.h diff --git a/include/Timeline.h b/src/core/include/Timeline.h similarity index 100% rename from include/Timeline.h rename to src/core/include/Timeline.h diff --git a/include/ToolPlugin.h b/src/core/include/ToolPlugin.h similarity index 100% rename from include/ToolPlugin.h rename to src/core/include/ToolPlugin.h diff --git a/include/Track.h b/src/core/include/Track.h similarity index 100% rename from include/Track.h rename to src/core/include/Track.h diff --git a/include/TrackContainer.h b/src/core/include/TrackContainer.h similarity index 100% rename from include/TrackContainer.h rename to src/core/include/TrackContainer.h diff --git a/include/ValueBuffer.h b/src/core/include/ValueBuffer.h similarity index 100% rename from include/ValueBuffer.h rename to src/core/include/ValueBuffer.h diff --git a/include/VstSyncController.h b/src/core/include/VstSyncController.h similarity index 100% rename from include/VstSyncController.h rename to src/core/include/VstSyncController.h diff --git a/include/base64.h b/src/core/include/base64.h similarity index 100% rename from include/base64.h rename to src/core/include/base64.h diff --git a/include/debug.h b/src/core/include/debug.h similarity index 100% rename from include/debug.h rename to src/core/include/debug.h diff --git a/include/denormals.h b/src/core/include/denormals.h similarity index 100% rename from include/denormals.h rename to src/core/include/denormals.h diff --git a/include/endian_handling.h b/src/core/include/endian_handling.h similarity index 100% rename from include/endian_handling.h rename to src/core/include/endian_handling.h diff --git a/include/fenv.h b/src/core/include/fenv.h similarity index 100% rename from include/fenv.h rename to src/core/include/fenv.h diff --git a/include/fft_helpers.h b/src/core/include/fft_helpers.h similarity index 100% rename from include/fft_helpers.h rename to src/core/include/fft_helpers.h diff --git a/include/interpolation.h b/src/core/include/interpolation.h similarity index 100% rename from include/interpolation.h rename to src/core/include/interpolation.h diff --git a/include/ladspa.h b/src/core/include/ladspa.h similarity index 100% rename from include/ladspa.h rename to src/core/include/ladspa.h diff --git a/include/lmms_constants.h b/src/core/include/lmms_constants.h similarity index 100% rename from include/lmms_constants.h rename to src/core/include/lmms_constants.h diff --git a/include/lmms_math.h b/src/core/include/lmms_math.h similarity index 100% rename from include/lmms_math.h rename to src/core/include/lmms_math.h diff --git a/include/panning.h b/src/core/include/panning.h similarity index 100% rename from include/panning.h rename to src/core/include/panning.h diff --git a/include/shared_object.h b/src/core/include/shared_object.h similarity index 100% rename from include/shared_object.h rename to src/core/include/shared_object.h diff --git a/include/versioninfo.h b/src/core/include/versioninfo.h similarity index 100% rename from include/versioninfo.h rename to src/core/include/versioninfo.h diff --git a/src/tracks/AutomationTrack.cpp b/src/core/tracks/AutomationTrack.cpp similarity index 100% rename from src/tracks/AutomationTrack.cpp rename to src/core/tracks/AutomationTrack.cpp diff --git a/src/tracks/InstrumentTrack.cpp b/src/core/tracks/InstrumentTrack.cpp similarity index 100% rename from src/tracks/InstrumentTrack.cpp rename to src/core/tracks/InstrumentTrack.cpp diff --git a/src/tracks/MidiClip.cpp b/src/core/tracks/MidiClip.cpp similarity index 100% rename from src/tracks/MidiClip.cpp rename to src/core/tracks/MidiClip.cpp diff --git a/src/tracks/PatternTrack.cpp b/src/core/tracks/PatternTrack.cpp similarity index 100% rename from src/tracks/PatternTrack.cpp rename to src/core/tracks/PatternTrack.cpp diff --git a/src/tracks/SampleTrack.cpp b/src/core/tracks/SampleTrack.cpp similarity index 100% rename from src/tracks/SampleTrack.cpp rename to src/core/tracks/SampleTrack.cpp diff --git a/include/AboutDialog.h b/src/gui/include/AboutDialog.h similarity index 100% rename from include/AboutDialog.h rename to src/gui/include/AboutDialog.h diff --git a/include/ActionGroup.h b/src/gui/include/ActionGroup.h similarity index 100% rename from include/ActionGroup.h rename to src/gui/include/ActionGroup.h diff --git a/include/AudioAlsaSetupWidget.h b/src/gui/include/AudioAlsaSetupWidget.h similarity index 100% rename from include/AudioAlsaSetupWidget.h rename to src/gui/include/AudioAlsaSetupWidget.h diff --git a/include/AudioDeviceSetupWidget.h b/src/gui/include/AudioDeviceSetupWidget.h similarity index 100% rename from include/AudioDeviceSetupWidget.h rename to src/gui/include/AudioDeviceSetupWidget.h diff --git a/include/AutomatableButton.h b/src/gui/include/AutomatableButton.h similarity index 100% rename from include/AutomatableButton.h rename to src/gui/include/AutomatableButton.h diff --git a/include/AutomatableModelView.h b/src/gui/include/AutomatableModelView.h similarity index 100% rename from include/AutomatableModelView.h rename to src/gui/include/AutomatableModelView.h diff --git a/include/AutomatableSlider.h b/src/gui/include/AutomatableSlider.h similarity index 100% rename from include/AutomatableSlider.h rename to src/gui/include/AutomatableSlider.h diff --git a/include/AutomationClipView.h b/src/gui/include/AutomationClipView.h similarity index 100% rename from include/AutomationClipView.h rename to src/gui/include/AutomationClipView.h diff --git a/include/AutomationEditor.h b/src/gui/include/AutomationEditor.h similarity index 100% rename from include/AutomationEditor.h rename to src/gui/include/AutomationEditor.h diff --git a/include/AutomationTrackView.h b/src/gui/include/AutomationTrackView.h similarity index 100% rename from include/AutomationTrackView.h rename to src/gui/include/AutomationTrackView.h diff --git a/include/BarModelEditor.h b/src/gui/include/BarModelEditor.h similarity index 100% rename from include/BarModelEditor.h rename to src/gui/include/BarModelEditor.h diff --git a/include/CPULoadWidget.h b/src/gui/include/CPULoadWidget.h similarity index 100% rename from include/CPULoadWidget.h rename to src/gui/include/CPULoadWidget.h diff --git a/include/CaptionMenu.h b/src/gui/include/CaptionMenu.h similarity index 100% rename from include/CaptionMenu.h rename to src/gui/include/CaptionMenu.h diff --git a/include/ClipView.h b/src/gui/include/ClipView.h similarity index 100% rename from include/ClipView.h rename to src/gui/include/ClipView.h diff --git a/include/ColorChooser.h b/src/gui/include/ColorChooser.h similarity index 100% rename from include/ColorChooser.h rename to src/gui/include/ColorChooser.h diff --git a/include/ColorHelper.h b/src/gui/include/ColorHelper.h similarity index 100% rename from include/ColorHelper.h rename to src/gui/include/ColorHelper.h diff --git a/include/ComboBox.h b/src/gui/include/ComboBox.h similarity index 100% rename from include/ComboBox.h rename to src/gui/include/ComboBox.h diff --git a/include/ControlLayout.h b/src/gui/include/ControlLayout.h similarity index 100% rename from include/ControlLayout.h rename to src/gui/include/ControlLayout.h diff --git a/include/ControllerConnectionDialog.h b/src/gui/include/ControllerConnectionDialog.h similarity index 100% rename from include/ControllerConnectionDialog.h rename to src/gui/include/ControllerConnectionDialog.h diff --git a/include/ControllerDialog.h b/src/gui/include/ControllerDialog.h similarity index 100% rename from include/ControllerDialog.h rename to src/gui/include/ControllerDialog.h diff --git a/include/ControllerRackView.h b/src/gui/include/ControllerRackView.h similarity index 100% rename from include/ControllerRackView.h rename to src/gui/include/ControllerRackView.h diff --git a/include/ControllerView.h b/src/gui/include/ControllerView.h similarity index 100% rename from include/ControllerView.h rename to src/gui/include/ControllerView.h diff --git a/include/Controls.h b/src/gui/include/Controls.h similarity index 100% rename from include/Controls.h rename to src/gui/include/Controls.h diff --git a/include/CustomTextKnob.h b/src/gui/include/CustomTextKnob.h similarity index 100% rename from include/CustomTextKnob.h rename to src/gui/include/CustomTextKnob.h diff --git a/include/DeprecationHelper.h b/src/gui/include/DeprecationHelper.h similarity index 100% rename from include/DeprecationHelper.h rename to src/gui/include/DeprecationHelper.h diff --git a/include/Editor.h b/src/gui/include/Editor.h similarity index 100% rename from include/Editor.h rename to src/gui/include/Editor.h diff --git a/include/EffectControlDialog.h b/src/gui/include/EffectControlDialog.h similarity index 100% rename from include/EffectControlDialog.h rename to src/gui/include/EffectControlDialog.h diff --git a/include/EffectRackView.h b/src/gui/include/EffectRackView.h similarity index 100% rename from include/EffectRackView.h rename to src/gui/include/EffectRackView.h diff --git a/include/EffectSelectDialog.h b/src/gui/include/EffectSelectDialog.h similarity index 100% rename from include/EffectSelectDialog.h rename to src/gui/include/EffectSelectDialog.h diff --git a/include/EffectView.h b/src/gui/include/EffectView.h similarity index 100% rename from include/EffectView.h rename to src/gui/include/EffectView.h diff --git a/include/EnvelopeAndLfoView.h b/src/gui/include/EnvelopeAndLfoView.h similarity index 100% rename from include/EnvelopeAndLfoView.h rename to src/gui/include/EnvelopeAndLfoView.h diff --git a/include/EnvelopeGraph.h b/src/gui/include/EnvelopeGraph.h similarity index 100% rename from include/EnvelopeGraph.h rename to src/gui/include/EnvelopeGraph.h diff --git a/include/ExportProjectDialog.h b/src/gui/include/ExportProjectDialog.h similarity index 100% rename from include/ExportProjectDialog.h rename to src/gui/include/ExportProjectDialog.h diff --git a/include/FadeButton.h b/src/gui/include/FadeButton.h similarity index 100% rename from include/FadeButton.h rename to src/gui/include/FadeButton.h diff --git a/include/Fader.h b/src/gui/include/Fader.h similarity index 100% rename from include/Fader.h rename to src/gui/include/Fader.h diff --git a/include/FileBrowser.h b/src/gui/include/FileBrowser.h similarity index 100% rename from include/FileBrowser.h rename to src/gui/include/FileBrowser.h diff --git a/include/FileDialog.h b/src/gui/include/FileDialog.h similarity index 100% rename from include/FileDialog.h rename to src/gui/include/FileDialog.h diff --git a/include/FloatModelEditorBase.h b/src/gui/include/FloatModelEditorBase.h similarity index 100% rename from include/FloatModelEditorBase.h rename to src/gui/include/FloatModelEditorBase.h diff --git a/include/Graph.h b/src/gui/include/Graph.h similarity index 100% rename from include/Graph.h rename to src/gui/include/Graph.h diff --git a/include/GroupBox.h b/src/gui/include/GroupBox.h similarity index 100% rename from include/GroupBox.h rename to src/gui/include/GroupBox.h diff --git a/include/GuiApplication.h b/src/gui/include/GuiApplication.h similarity index 100% rename from include/GuiApplication.h rename to src/gui/include/GuiApplication.h diff --git a/include/InstrumentFunctionViews.h b/src/gui/include/InstrumentFunctionViews.h similarity index 100% rename from include/InstrumentFunctionViews.h rename to src/gui/include/InstrumentFunctionViews.h diff --git a/include/InstrumentMidiIOView.h b/src/gui/include/InstrumentMidiIOView.h similarity index 100% rename from include/InstrumentMidiIOView.h rename to src/gui/include/InstrumentMidiIOView.h diff --git a/include/InstrumentSoundShapingView.h b/src/gui/include/InstrumentSoundShapingView.h similarity index 100% rename from include/InstrumentSoundShapingView.h rename to src/gui/include/InstrumentSoundShapingView.h diff --git a/include/InstrumentTrackView.h b/src/gui/include/InstrumentTrackView.h similarity index 100% rename from include/InstrumentTrackView.h rename to src/gui/include/InstrumentTrackView.h diff --git a/include/InstrumentTrackWindow.h b/src/gui/include/InstrumentTrackWindow.h similarity index 99% rename from include/InstrumentTrackWindow.h rename to src/gui/include/InstrumentTrackWindow.h index 48a352cbd30..61ea69264d5 100644 --- a/include/InstrumentTrackWindow.h +++ b/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 b/src/gui/include/InstrumentTuningView.h similarity index 100% rename from include/InstrumentTuningView.h rename to src/gui/include/InstrumentTuningView.h diff --git a/include/Knob.h b/src/gui/include/Knob.h similarity index 100% rename from include/Knob.h rename to src/gui/include/Knob.h diff --git a/include/LadspaControlView.h b/src/gui/include/LadspaControlView.h similarity index 100% rename from include/LadspaControlView.h rename to src/gui/include/LadspaControlView.h diff --git a/include/LcdFloatSpinBox.h b/src/gui/include/LcdFloatSpinBox.h similarity index 100% rename from include/LcdFloatSpinBox.h rename to src/gui/include/LcdFloatSpinBox.h diff --git a/include/LcdSpinBox.h b/src/gui/include/LcdSpinBox.h similarity index 100% rename from include/LcdSpinBox.h rename to src/gui/include/LcdSpinBox.h diff --git a/include/LcdWidget.h b/src/gui/include/LcdWidget.h similarity index 100% rename from include/LcdWidget.h rename to src/gui/include/LcdWidget.h diff --git a/include/LedCheckBox.h b/src/gui/include/LedCheckBox.h similarity index 100% rename from include/LedCheckBox.h rename to src/gui/include/LedCheckBox.h diff --git a/include/LeftRightNav.h b/src/gui/include/LeftRightNav.h similarity index 98% rename from include/LeftRightNav.h rename to src/gui/include/LeftRightNav.h index 49ad25ecf98..630998b8d41 100644 --- a/include/LeftRightNav.h +++ b/src/gui/include/LeftRightNav.h @@ -26,7 +26,7 @@ #define LMMS_GUI_LEFT_RIGHT_NAV_H #include "PixmapButton.h" - +#include namespace lmms::gui { diff --git a/include/LfoGraph.h b/src/gui/include/LfoGraph.h similarity index 100% rename from include/LfoGraph.h rename to src/gui/include/LfoGraph.h diff --git a/include/LinkedModelGroupViews.h b/src/gui/include/LinkedModelGroupViews.h similarity index 100% rename from include/LinkedModelGroupViews.h rename to src/gui/include/LinkedModelGroupViews.h diff --git a/include/LmmsPalette.h b/src/gui/include/LmmsPalette.h similarity index 100% rename from include/LmmsPalette.h rename to src/gui/include/LmmsPalette.h diff --git a/include/LmmsStyle.h b/src/gui/include/LmmsStyle.h similarity index 100% rename from include/LmmsStyle.h rename to src/gui/include/LmmsStyle.h diff --git a/include/Lv2ViewBase.h b/src/gui/include/Lv2ViewBase.h similarity index 100% rename from include/Lv2ViewBase.h rename to src/gui/include/Lv2ViewBase.h diff --git a/include/MainApplication.h b/src/gui/include/MainApplication.h similarity index 100% rename from include/MainApplication.h rename to src/gui/include/MainApplication.h diff --git a/include/MainWindow.h b/src/gui/include/MainWindow.h similarity index 100% rename from include/MainWindow.h rename to src/gui/include/MainWindow.h diff --git a/include/MeterDialog.h b/src/gui/include/MeterDialog.h similarity index 100% rename from include/MeterDialog.h rename to src/gui/include/MeterDialog.h diff --git a/include/MicrotunerConfig.h b/src/gui/include/MicrotunerConfig.h similarity index 100% rename from include/MicrotunerConfig.h rename to src/gui/include/MicrotunerConfig.h diff --git a/include/MidiCCRackView.h b/src/gui/include/MidiCCRackView.h similarity index 100% rename from include/MidiCCRackView.h rename to src/gui/include/MidiCCRackView.h diff --git a/include/MidiClipView.h b/src/gui/include/MidiClipView.h similarity index 100% rename from include/MidiClipView.h rename to src/gui/include/MidiClipView.h diff --git a/include/MidiPortMenu.h b/src/gui/include/MidiPortMenu.h similarity index 100% rename from include/MidiPortMenu.h rename to src/gui/include/MidiPortMenu.h diff --git a/include/MidiSetupWidget.h b/src/gui/include/MidiSetupWidget.h similarity index 100% rename from include/MidiSetupWidget.h rename to src/gui/include/MidiSetupWidget.h diff --git a/include/MixerChannelLcdSpinBox.h b/src/gui/include/MixerChannelLcdSpinBox.h similarity index 100% rename from include/MixerChannelLcdSpinBox.h rename to src/gui/include/MixerChannelLcdSpinBox.h diff --git a/include/MixerChannelView.h b/src/gui/include/MixerChannelView.h similarity index 100% rename from include/MixerChannelView.h rename to src/gui/include/MixerChannelView.h diff --git a/include/MixerView.h b/src/gui/include/MixerView.h similarity index 100% rename from include/MixerView.h rename to src/gui/include/MixerView.h diff --git a/include/ModelView.h b/src/gui/include/ModelView.h similarity index 100% rename from include/ModelView.h rename to src/gui/include/ModelView.h diff --git a/include/NStateButton.h b/src/gui/include/NStateButton.h similarity index 100% rename from include/NStateButton.h rename to src/gui/include/NStateButton.h diff --git a/include/Oscilloscope.h b/src/gui/include/Oscilloscope.h similarity index 100% rename from include/Oscilloscope.h rename to src/gui/include/Oscilloscope.h diff --git a/include/PatternClipView.h b/src/gui/include/PatternClipView.h similarity index 100% rename from include/PatternClipView.h rename to src/gui/include/PatternClipView.h diff --git a/include/PatternEditor.h b/src/gui/include/PatternEditor.h similarity index 100% rename from include/PatternEditor.h rename to src/gui/include/PatternEditor.h diff --git a/include/PatternTrackView.h b/src/gui/include/PatternTrackView.h similarity index 100% rename from include/PatternTrackView.h rename to src/gui/include/PatternTrackView.h diff --git a/include/PeakIndicator.h b/src/gui/include/PeakIndicator.h similarity index 100% rename from include/PeakIndicator.h rename to src/gui/include/PeakIndicator.h diff --git a/include/PianoRoll.h b/src/gui/include/PianoRoll.h similarity index 100% rename from include/PianoRoll.h rename to src/gui/include/PianoRoll.h diff --git a/include/PianoView.h b/src/gui/include/PianoView.h similarity index 100% rename from include/PianoView.h rename to src/gui/include/PianoView.h diff --git a/include/PixmapButton.h b/src/gui/include/PixmapButton.h similarity index 100% rename from include/PixmapButton.h rename to src/gui/include/PixmapButton.h diff --git a/include/PluginBrowser.h b/src/gui/include/PluginBrowser.h similarity index 100% rename from include/PluginBrowser.h rename to src/gui/include/PluginBrowser.h diff --git a/include/PositionLine.h b/src/gui/include/PositionLine.h similarity index 100% rename from include/PositionLine.h rename to src/gui/include/PositionLine.h diff --git a/include/ProjectNotes.h b/src/gui/include/ProjectNotes.h similarity index 100% rename from include/ProjectNotes.h rename to src/gui/include/ProjectNotes.h diff --git a/include/RecentProjectsMenu.h b/src/gui/include/RecentProjectsMenu.h similarity index 100% rename from include/RecentProjectsMenu.h rename to src/gui/include/RecentProjectsMenu.h diff --git a/include/RenameDialog.h b/src/gui/include/RenameDialog.h similarity index 100% rename from include/RenameDialog.h rename to src/gui/include/RenameDialog.h diff --git a/include/RowTableView.h b/src/gui/include/RowTableView.h similarity index 100% rename from include/RowTableView.h rename to src/gui/include/RowTableView.h diff --git a/include/Rubberband.h b/src/gui/include/Rubberband.h similarity index 100% rename from include/Rubberband.h rename to src/gui/include/Rubberband.h diff --git a/include/SampleClipView.h b/src/gui/include/SampleClipView.h similarity index 100% rename from include/SampleClipView.h rename to src/gui/include/SampleClipView.h diff --git a/include/SampleLoader.h b/src/gui/include/SampleLoader.h similarity index 100% rename from include/SampleLoader.h rename to src/gui/include/SampleLoader.h diff --git a/include/SampleTrackView.h b/src/gui/include/SampleTrackView.h similarity index 98% rename from include/SampleTrackView.h rename to src/gui/include/SampleTrackView.h index 2f94bfb5630..bde90ced785 100644 --- a/include/SampleTrackView.h +++ b/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 b/src/gui/include/SampleTrackWindow.h similarity index 100% rename from include/SampleTrackWindow.h rename to src/gui/include/SampleTrackWindow.h diff --git a/include/SampleWaveform.h b/src/gui/include/SampleWaveform.h similarity index 100% rename from include/SampleWaveform.h rename to src/gui/include/SampleWaveform.h diff --git a/include/SendButtonIndicator.h b/src/gui/include/SendButtonIndicator.h similarity index 100% rename from include/SendButtonIndicator.h rename to src/gui/include/SendButtonIndicator.h diff --git a/include/SetupDialog.h b/src/gui/include/SetupDialog.h similarity index 100% rename from include/SetupDialog.h rename to src/gui/include/SetupDialog.h diff --git a/include/SideBar.h b/src/gui/include/SideBar.h similarity index 100% rename from include/SideBar.h rename to src/gui/include/SideBar.h diff --git a/include/SideBarWidget.h b/src/gui/include/SideBarWidget.h similarity index 100% rename from include/SideBarWidget.h rename to src/gui/include/SideBarWidget.h diff --git a/include/SimpleTextFloat.h b/src/gui/include/SimpleTextFloat.h similarity index 100% rename from include/SimpleTextFloat.h rename to src/gui/include/SimpleTextFloat.h diff --git a/include/SongEditor.h b/src/gui/include/SongEditor.h similarity index 100% rename from include/SongEditor.h rename to src/gui/include/SongEditor.h diff --git a/include/StepRecorderWidget.h b/src/gui/include/StepRecorderWidget.h similarity index 100% rename from include/StepRecorderWidget.h rename to src/gui/include/StepRecorderWidget.h diff --git a/include/StringPairDrag.h b/src/gui/include/StringPairDrag.h similarity index 100% rename from include/StringPairDrag.h rename to src/gui/include/StringPairDrag.h diff --git a/include/SubWindow.h b/src/gui/include/SubWindow.h similarity index 100% rename from include/SubWindow.h rename to src/gui/include/SubWindow.h diff --git a/include/TabBar.h b/src/gui/include/TabBar.h similarity index 100% rename from include/TabBar.h rename to src/gui/include/TabBar.h diff --git a/include/TabButton.h b/src/gui/include/TabButton.h similarity index 100% rename from include/TabButton.h rename to src/gui/include/TabButton.h diff --git a/include/TabWidget.h b/src/gui/include/TabWidget.h similarity index 100% rename from include/TabWidget.h rename to src/gui/include/TabWidget.h diff --git a/include/TemplatesMenu.h b/src/gui/include/TemplatesMenu.h similarity index 100% rename from include/TemplatesMenu.h rename to src/gui/include/TemplatesMenu.h diff --git a/include/TempoSyncBarModelEditor.h b/src/gui/include/TempoSyncBarModelEditor.h similarity index 100% rename from include/TempoSyncBarModelEditor.h rename to src/gui/include/TempoSyncBarModelEditor.h diff --git a/include/TempoSyncKnob.h b/src/gui/include/TempoSyncKnob.h similarity index 100% rename from include/TempoSyncKnob.h rename to src/gui/include/TempoSyncKnob.h diff --git a/include/TextFloat.h b/src/gui/include/TextFloat.h similarity index 100% rename from include/TextFloat.h rename to src/gui/include/TextFloat.h diff --git a/include/TimeDisplayWidget.h b/src/gui/include/TimeDisplayWidget.h similarity index 100% rename from include/TimeDisplayWidget.h rename to src/gui/include/TimeDisplayWidget.h diff --git a/include/TimeLineWidget.h b/src/gui/include/TimeLineWidget.h similarity index 100% rename from include/TimeLineWidget.h rename to src/gui/include/TimeLineWidget.h diff --git a/include/ToolButton.h b/src/gui/include/ToolButton.h similarity index 100% rename from include/ToolButton.h rename to src/gui/include/ToolButton.h diff --git a/include/ToolPluginView.h b/src/gui/include/ToolPluginView.h similarity index 100% rename from include/ToolPluginView.h rename to src/gui/include/ToolPluginView.h diff --git a/include/TrackContainerView.h b/src/gui/include/TrackContainerView.h similarity index 100% rename from include/TrackContainerView.h rename to src/gui/include/TrackContainerView.h diff --git a/include/TrackContentWidget.h b/src/gui/include/TrackContentWidget.h similarity index 100% rename from include/TrackContentWidget.h rename to src/gui/include/TrackContentWidget.h diff --git a/include/TrackLabelButton.h b/src/gui/include/TrackLabelButton.h similarity index 100% rename from include/TrackLabelButton.h rename to src/gui/include/TrackLabelButton.h diff --git a/include/TrackOperationsWidget.h b/src/gui/include/TrackOperationsWidget.h similarity index 100% rename from include/TrackOperationsWidget.h rename to src/gui/include/TrackOperationsWidget.h diff --git a/include/TrackRenameLineEdit.h b/src/gui/include/TrackRenameLineEdit.h similarity index 100% rename from include/TrackRenameLineEdit.h rename to src/gui/include/TrackRenameLineEdit.h diff --git a/include/TrackView.h b/src/gui/include/TrackView.h similarity index 100% rename from include/TrackView.h rename to src/gui/include/TrackView.h diff --git a/include/VersionedSaveDialog.h b/src/gui/include/VersionedSaveDialog.h similarity index 100% rename from include/VersionedSaveDialog.h rename to src/gui/include/VersionedSaveDialog.h diff --git a/include/embed.h b/src/gui/include/embed.h similarity index 100% rename from include/embed.h rename to src/gui/include/embed.h diff --git a/include/gui_templates.h b/src/gui/include/gui_templates.h similarity index 100% rename from include/gui_templates.h rename to src/gui/include/gui_templates.h diff --git a/src/tracks/CMakeLists.txt b/src/tracks/CMakeLists.txt deleted file mode 100644 index 75704b00727..00000000000 --- a/src/tracks/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -set(LMMS_SRCS - ${LMMS_SRCS} - tracks/AutomationTrack.cpp - tracks/InstrumentTrack.cpp - tracks/MidiClip.cpp - tracks/PatternTrack.cpp - tracks/SampleTrack.cpp - - PARENT_SCOPE -)