Skip to content

Commit

Permalink
Move all headers in gui/include that aren't used outside of gui
Browse files Browse the repository at this point in the history
  • Loading branch information
jsmtux committed Jul 5, 2024
1 parent 1ce4be0 commit a16c322
Show file tree
Hide file tree
Showing 87 changed files with 123 additions and 63 deletions.
57 changes: 57 additions & 0 deletions build_original/lmmsconfig.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
#define LMMS_BUILD_LINUX
/* #undef LMMS_BUILD_WIN32 */
/* #undef LMMS_BUILD_WIN64 */
/* #undef LMMS_BUILD_APPLE */
/* #undef LMMS_BUILD_OPENBSD */
/* #undef LMMS_BUILD_FREEBSD */
/* #undef LMMS_BUILD_HAIKU */

/* #undef LMMS_HOST_X86 */
#define LMMS_HOST_X86_64
/* #undef LMMS_HOST_ARM32 */
/* #undef LMMS_HOST_ARM64 */
/* #undef LMMS_HOST_RISCV32 */
/* #undef LMMS_HOST_RISCV64 */
/* #undef LMMS_HOST_PPC32 */
/* #undef LMMS_HOST_PPC64 */

#define LMMS_HAVE_ALSA
#define LMMS_HAVE_FLUIDSYNTH
#define LMMS_HAVE_JACK
#define LMMS_HAVE_JACK_PRENAME
#define LMMS_HAVE_WEAKJACK
/* #undef LMMS_HAVE_LV2 */
/* #undef LMMS_HAVE_SUIL */
/* #undef LMMS_HAVE_MP3LAME */
#define LMMS_HAVE_SNDFILE_MP3
#define LMMS_HAVE_OGGVORBIS
#define LMMS_HAVE_OSS
/* #undef LMMS_HAVE_SNDIO */
/* #undef LMMS_HAVE_PORTAUDIO */
/* #undef LMMS_HAVE_SOUNDIO */
#define LMMS_HAVE_PULSEAUDIO
/* #undef LMMS_HAVE_SDL */
/* #undef LMMS_HAVE_SDL2 */
#define LMMS_HAVE_STK
#define LMMS_HAVE_VST
#define LMMS_HAVE_SF_COMPLEVEL

/* #undef LMMS_DEBUG_FPE */

#define LMMS_HAVE_PTHREAD_H
#define LMMS_HAVE_UNISTD_H
#define LMMS_HAVE_SYS_TYPES_H
#define LMMS_HAVE_SYS_IPC_H
#define LMMS_HAVE_SEMAPHORE_H
#define LMMS_HAVE_SYS_TIME_H
#define LMMS_HAVE_SYS_TIMES_H
#define LMMS_HAVE_SYS_PRCTL_H
#define LMMS_HAVE_SCHED_H
#define LMMS_HAVE_SYS_SOUNDCARD_H
/* #undef LMMS_HAVE_SOUNDCARD_H */
#define LMMS_HAVE_FCNTL_H
#define LMMS_HAVE_SYS_IOCTL_H
#define LMMS_HAVE_CTYPE_H
#define LMMS_HAVE_STRING_H
/* #undef LMMS_HAVE_PROCESS_H */
#define LMMS_HAVE_LOCALE_H
2 changes: 2 additions & 0 deletions build_original/lmmsversion.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#define LMMS_VERSION "1.3.0-alpha.1.656+g1ce4be0d5"
#define LMMS_PROJECT_COPYRIGHT "2008-2024 LMMS Developers"
1 change: 1 addition & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ INCLUDE_DIRECTORIES(
"${CMAKE_SOURCE_DIR}/include"
"${CMAKE_SOURCE_DIR}/src/core/include"
"${CMAKE_SOURCE_DIR}/src/gui/include"
"${CMAKE_SOURCE_DIR}/src"
)

IF(WIN32 AND MSVC)
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/gui/AutomatableModelView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#include "AutomatableModelView.h"
#include "AutomationClip.h"
#include "ControllerConnectionDialog.h"
#include "modals/ControllerConnectionDialog.h"
#include "ControllerConnection.h"
#include "embed.h"
#include "GuiApplication.h"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions src/gui/EffectRackView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
#include <QVBoxLayout>

#include "EffectRackView.h"
#include "EffectSelectDialog.h"
#include "modals/EffectSelectDialog.h"
#include "EffectView.h"
#include "GroupBox.h"
#include "widgets/GroupBox.h"


namespace lmms::gui
Expand Down
2 changes: 1 addition & 1 deletion src/gui/FileBrowser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
#include "ImportFilter.h"
#include "Instrument.h"
#include "InstrumentTrack.h"
#include "InstrumentTrackWindow.h"
#include "instrument/InstrumentTrackWindow.h"
#include "MainWindow.h"
#include "PatternStore.h"
#include "PluginFactory.h"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 7 additions & 7 deletions src/gui/MainWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include <QShortcut>
#include <QSplitter>

#include "AboutDialog.h"
#include "modals/AboutDialog.h"
#include "AutomationEditor.h"
#include "ControllerRackView.h"
#include "embed.h"
Expand All @@ -47,7 +47,7 @@
#include "GuiApplication.h"
#include "ImportFilter.h"
#include "InstrumentTrackView.h"
#include "InstrumentTrackWindow.h"
#include "instrument/InstrumentTrackWindow.h"
#include "MicrotunerConfig.h"
#include "PatternEditor.h"
#include "PianoRoll.h"
Expand All @@ -58,18 +58,18 @@
#include "ProjectJournal.h"
#include "ProjectNotes.h"
#include "ProjectRenderer.h"
#include "RecentProjectsMenu.h"
#include "menus/RecentProjectsMenu.h"
#include "RemotePlugin.h"
#include "SetupDialog.h"
#include "modals/SetupDialog.h"
#include "SideBar.h"
#include "SongEditor.h"
#include "SubWindow.h"
#include "TemplatesMenu.h"
#include "menus/TemplatesMenu.h"
#include "TextFloat.h"
#include "TimeLineWidget.h"
#include "ToolButton.h"
#include "widgets/ToolButton.h"
#include "ToolPlugin.h"
#include "VersionedSaveDialog.h"
#include "modals/VersionedSaveDialog.h"

#include "lmmsversion.h"

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/gui/MidiCCRackView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include <QWidget>

#include "embed.h"
#include "GroupBox.h"
#include "widgets/GroupBox.h"
#include "GuiApplication.h"
#include "InstrumentTrack.h"
#include "Knob.h"
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/gui/MixerChannelView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "Mixer.h"
#include "MixerChannelView.h"
#include "MixerView.h"
#include "PeakIndicator.h"
#include "widgets/PeakIndicator.h"
#include "Song.h"
#include "ConfigManager.h"

Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/gui/SampleTrackWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#include "SampleTrackView.h"
#include "Song.h"
#include "SubWindow.h"
#include "TrackLabelButton.h"
#include "tracks/TrackLabelButton.h"

namespace lmms::gui
{
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/gui/clips/AutomationClipView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "embed.h"
#include "GuiApplication.h"
#include "ProjectJournal.h"
#include "RenameDialog.h"
#include "gui/modals/RenameDialog.h"
#include "StringPairDrag.h"
#include "TextFloat.h"
#include "Track.h"
Expand Down
4 changes: 2 additions & 2 deletions src/gui/clips/MidiClipView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@

#include "AutomationEditor.h"
#include "ConfigManager.h"
#include "DeprecationHelper.h"
#include "gui/DeprecationHelper.h"
#include "GuiApplication.h"
#include "MidiClip.h"
#include "PianoRoll.h"
#include "RenameDialog.h"
#include "gui/modals/RenameDialog.h"
#include "TrackView.h"

namespace lmms::gui
Expand Down
2 changes: 1 addition & 1 deletion src/gui/clips/PatternClipView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "MainWindow.h"
#include "PatternClip.h"
#include "PatternStore.h"
#include "RenameDialog.h"
#include "gui/modals/RenameDialog.h"

namespace lmms::gui
{
Expand Down
4 changes: 2 additions & 2 deletions src/gui/editors/AutomationEditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
#define __USE_XOPEN
#endif

#include "ActionGroup.h"
#include "gui/ActionGroup.h"
#include "AutomationNode.h"
#include "ComboBox.h"
#include "DeprecationHelper.h"
#include "gui/DeprecationHelper.h"
#include "DetuningHelper.h"
#include "Engine.h"
#include "GuiApplication.h"
Expand Down
6 changes: 3 additions & 3 deletions src/gui/editors/PianoRoll.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@
#include <utility>

#include "AutomationEditor.h"
#include "ActionGroup.h"
#include "gui/ActionGroup.h"
#include "Clipboard.h"
#include "ComboBox.h"
#include "ConfigManager.h"
#include "DataFile.h"
#include "debug.h"
#include "DeprecationHelper.h"
#include "gui/DeprecationHelper.h"
#include "DetuningHelper.h"
#include "embed.h"
#include "GuiApplication.h"
Expand All @@ -65,7 +65,7 @@
#include "PatternStore.h"
#include "PianoView.h"
#include "PositionLine.h"
#include "SimpleTextFloat.h"
#include "gui/widgets/SimpleTextFloat.h"
#include "SongEditor.h"
#include "StepRecorderWidget.h"
#include "TextFloat.h"
Expand Down
File renamed without changes.
14 changes: 7 additions & 7 deletions src/gui/editors/SongEditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,26 +34,26 @@
#include <QSlider>
#include <QTimeLine>

#include "ActionGroup.h"
#include "gui/ActionGroup.h"
#include "AudioDevice.h"
#include "AudioEngine.h"
#include "AutomatableSlider.h"
#include "gui/widgets/AutomatableSlider.h"
#include "ClipView.h"
#include "ComboBox.h"
#include "ConfigManager.h"
#include "CPULoadWidget.h"
#include "DeprecationHelper.h"
#include "gui/widgets/CPULoadWidget.h"
#include "gui/DeprecationHelper.h"
#include "embed.h"
#include "GuiApplication.h"
#include "LcdSpinBox.h"
#include "MainWindow.h"
#include "MeterDialog.h"
#include "Oscilloscope.h"
#include "gui/widgets/MeterDialog.h"
#include "gui/widgets/Oscilloscope.h"
#include "PianoRoll.h"
#include "PositionLine.h"
#include "SubWindow.h"
#include "TextFloat.h"
#include "TimeDisplayWidget.h"
#include "gui/widgets/TimeDisplayWidget.h"
#include "TimeLineWidget.h"
#include "TrackView.h"

Expand Down
2 changes: 1 addition & 1 deletion src/gui/editors/TimeLineWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include "ConfigManager.h"
#include "embed.h"
#include "GuiApplication.h"
#include "NStateButton.h"
#include "gui/widgets/NStateButton.h"
#include "TextFloat.h"

namespace lmms::gui
Expand Down
2 changes: 1 addition & 1 deletion src/gui/editors/TrackContainerView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "AudioEngine.h"
#include "DataFile.h"
#include "MainWindow.h"
#include "FileBrowser.h"
#include "gui/FileBrowser.h"
#include "ImportFilter.h"
#include "Instrument.h"
#include "InstrumentTrack.h"
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/gui/instrument/EnvelopeGraph.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#include "EnvelopeAndLfoParameters.h"
#include "lmms_math.h"
#include "ColorHelper.h"
#include "gui/ColorHelper.h"

#include <cmath>

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/gui/instrument/InstrumentFunctionViews.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "InstrumentFunctions.h"
#include "InstrumentFunctionViews.h"
#include "ComboBox.h"
#include "GroupBox.h"
#include "gui/widgets/GroupBox.h"
#include "gui_templates.h"
#include "Knob.h"
#include "TempoSyncKnob.h"
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions src/gui/instrument/InstrumentMidiIOView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
#include <QVBoxLayout>

#include "InstrumentMidiIOView.h"
#include "MidiPortMenu.h"
#include "gui/menus/MidiPortMenu.h"
#include "AudioEngine.h"
#include "Engine.h"
#include "embed.h"
#include "GroupBox.h"
#include "gui/widgets/GroupBox.h"
#include "gui_templates.h"
#include "LcdSpinBox.h"
#include "MidiClient.h"
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions src/gui/instrument/InstrumentSoundShapingView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
#include "EnvelopeAndLfoParameters.h"
#include "EnvelopeAndLfoView.h"
#include "ComboBox.h"
#include "GroupBox.h"
#include "gui/widgets/GroupBox.h"
#include "gui_templates.h"
#include "Knob.h"
#include "TabWidget.h"
#include "gui/widgets/TabWidget.h"


namespace lmms::gui
Expand Down
File renamed without changes.
10 changes: 5 additions & 5 deletions src/gui/instrument/InstrumentTrackWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
#include "EffectRackView.h"
#include "embed.h"
#include "Engine.h"
#include "FileBrowser.h"
#include "gui/FileBrowser.h"
#include "FileDialog.h"
#include "GroupBox.h"
#include "gui/widgets/GroupBox.h"
#include "MixerChannelLcdSpinBox.h"
#include "GuiApplication.h"
#include "Instrument.h"
Expand All @@ -55,17 +55,17 @@
#include "Knob.h"
#include "LcdSpinBox.h"
#include "LedCheckBox.h"
#include "LeftRightNav.h"
#include "gui/widgets/LeftRightNav.h"
#include "MainWindow.h"
#include "PianoView.h"
#include "PluginFactory.h"
#include "PluginView.h"
#include "Song.h"
#include "StringPairDrag.h"
#include "SubWindow.h"
#include "TabWidget.h"
#include "gui/widgets/TabWidget.h"
#include "TrackContainerView.h"
#include "TrackLabelButton.h"
#include "gui/tracks/TrackLabelButton.h"


namespace lmms::gui
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/gui/instrument/InstrumentTuningView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include <QVBoxLayout>

#include "ComboBox.h"
#include "GroupBox.h"
#include "gui/widgets/GroupBox.h"
#include "GuiApplication.h"
#include "gui_templates.h"
#include "InstrumentTrack.h"
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/gui/instrument/LfoGraph.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

#include "EnvelopeAndLfoParameters.h"
#include "Oscillator.h"
#include "ColorHelper.h"
#include "gui/ColorHelper.h"

#include "gui_templates.h"

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit a16c322

Please sign in to comment.