diff --git a/CMakeLists.txt b/CMakeLists.txt index a93d7383a..f439815cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -634,11 +634,20 @@ ENDIF() SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DLMMS_DEBUG") SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DLMMS_DEBUG") +if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") + add_compile_definitions(NDEBUG) + SET(STATUS_ASSERTIONS "Disabled") +else() + remove_definitions(-DNDEBUG) + SET(STATUS_ASSERTIONS "Enabled") +endif() + if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.16") set(NOOP_COMMAND "${CMAKE_COMMAND}" "-E" "true") else() set(NOOP_COMMAND "${CMAKE_COMMAND}" "-E" "echo") endif() + if(STRIP) # TODO CMake 3.19: Now that CONFIG generator expressions support testing for # multiple configurations, combine the OR into a single CONFIG expression. @@ -865,6 +874,7 @@ MESSAGE( "* Debug using UBSanitizer : ${STATUS_DEBUG_UBSAN}\n" "* Debug packaging commands : ${STATUS_DEBUG_CPACK}\n" "* Profile using GNU profiler : ${STATUS_GPROF}\n" +"* Debug assertions : ${STATUS_ASSERTIONS}\n" ) MESSAGE( diff --git a/include/AudioDevice.h b/include/AudioDevice.h index 228b1c1aa..0a649bbe0 100644 --- a/include/AudioDevice.h +++ b/include/AudioDevice.h @@ -28,7 +28,7 @@ #include #include -#include "lmms_basics.h" +#include "LmmsTypes.h" class QThread; diff --git a/include/AudioEngine.h b/include/AudioEngine.h index 13758284d..20579f54d 100644 --- a/include/AudioEngine.h +++ b/include/AudioEngine.h @@ -34,7 +34,7 @@ #include #include "AudioDevice.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" #include "SampleFrame.h" #include "LocklessList.h" #include "FifoBuffer.h" diff --git a/include/AudioEngineProfiler.h b/include/AudioEngineProfiler.h index b0d62a1dc..cee1ea0dd 100644 --- a/include/AudioEngineProfiler.h +++ b/include/AudioEngineProfiler.h @@ -29,7 +29,7 @@ #include #include -#include "lmms_basics.h" +#include "LmmsTypes.h" #include "MicroTimer.h" namespace lmms diff --git a/include/AutomationEditor.h b/include/AutomationEditor.h index eb3d229a3..61f1cb791 100644 --- a/include/AutomationEditor.h +++ b/include/AutomationEditor.h @@ -37,7 +37,7 @@ #include "MidiClip.h" #include "SampleClip.h" #include "TimePos.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" #include "SampleThumbnail.h" class QPainter; diff --git a/include/BandLimitedWave.h b/include/BandLimitedWave.h index c70b8f6eb..0c38413ef 100644 --- a/include/BandLimitedWave.h +++ b/include/BandLimitedWave.h @@ -31,7 +31,7 @@ class QString; #include "lmms_export.h" #include "interpolation.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" #include "lmms_math.h" #include "Engine.h" #include "AudioEngine.h" diff --git a/include/BasicFilters.h b/include/BasicFilters.h index 51d617480..a0ab32871 100644 --- a/include/BasicFilters.h +++ b/include/BasicFilters.h @@ -36,7 +36,9 @@ #include #include -#include "lmms_basics.h" +#include "lmms_constants.h" +#include "LmmsTypes.h" + namespace lmms { @@ -207,7 +209,7 @@ public: inline float update( float s, ch_cnt_t ch ) { - if (std::abs(s) < 1.0e-10f && std::abs(m_z1[ch]) < 1.0e-10f) { return 0.0f; } + if (std::abs(s) < F_EPSILON && std::abs(m_z1[ch]) < F_EPSILON) { return 0.0f; } return m_z1[ch] = s * m_a0 + m_z1[ch] * m_b1; } @@ -593,7 +595,7 @@ public: case FilterType::Formantfilter: case FilterType::FastFormant: { - if (std::abs(_in0) < 1.0e-10f && std::abs(m_vflast[0][_chnl]) < 1.0e-10f) { return 0.0f; } // performance hack - skip processing when the numbers get too small + if (std::abs(_in0) < F_EPSILON && std::abs(m_vflast[0][_chnl]) < F_EPSILON) { return 0.0f; } // performance hack - skip processing when the numbers get too small const int os = m_type == FilterType::FastFormant ? 1 : 4; // no oversampling for fast formant for( int o = 0; o < os; ++o ) diff --git a/include/BufferManager.h b/include/BufferManager.h index 84602f121..0a39114ca 100644 --- a/include/BufferManager.h +++ b/include/BufferManager.h @@ -27,7 +27,7 @@ #define LMMS_BUFFER_MANAGER_H #include "lmms_export.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" namespace lmms { diff --git a/include/CPULoadWidget.h b/include/CPULoadWidget.h index bed10b05e..17a046e37 100644 --- a/include/CPULoadWidget.h +++ b/include/CPULoadWidget.h @@ -31,7 +31,7 @@ #include #include -#include "lmms_basics.h" +#include "LmmsTypes.h" namespace lmms::gui diff --git a/include/ControllerRackView.h b/include/ControllerRackView.h index 93d1e8438..436618303 100644 --- a/include/ControllerRackView.h +++ b/include/ControllerRackView.h @@ -29,7 +29,6 @@ #include #include "SerializingObject.h" -#include "lmms_basics.h" class QPushButton; diff --git a/include/Delay.h b/include/Delay.h index 8ead1c37b..199c592ce 100644 --- a/include/Delay.h +++ b/include/Delay.h @@ -28,7 +28,7 @@ #include -#include "lmms_basics.h" +#include "LmmsTypes.h" namespace lmms { diff --git a/include/DrumSynth.h b/include/DrumSynth.h index 3b418abd6..2894817fe 100644 --- a/include/DrumSynth.h +++ b/include/DrumSynth.h @@ -28,7 +28,7 @@ #include -#include "lmms_basics.h" +#include "LmmsTypes.h" class QString; diff --git a/include/DspEffectLibrary.h b/include/DspEffectLibrary.h index 656d5b1dd..8b3060334 100644 --- a/include/DspEffectLibrary.h +++ b/include/DspEffectLibrary.h @@ -28,7 +28,7 @@ #include #include "lmms_math.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" #include "SampleFrame.h" namespace lmms::DspEffectLibrary diff --git a/include/EffectRackView.h b/include/EffectRackView.h index fec627a56..f166612e2 100644 --- a/include/EffectRackView.h +++ b/include/EffectRackView.h @@ -30,7 +30,6 @@ #include "EffectChain.h" #include "ModelView.h" -#include "lmms_basics.h" class QScrollArea; class QVBoxLayout; diff --git a/include/Engine.h b/include/Engine.h index 7e19e2e84..cc37ecee8 100644 --- a/include/Engine.h +++ b/include/Engine.h @@ -30,7 +30,7 @@ #include "lmmsconfig.h" #include "lmms_export.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" namespace lmms { diff --git a/include/EnvelopeAndLfoParameters.h b/include/EnvelopeAndLfoParameters.h index 50bfdf787..34cbae5ec 100644 --- a/include/EnvelopeAndLfoParameters.h +++ b/include/EnvelopeAndLfoParameters.h @@ -32,7 +32,7 @@ #include "AutomatableModel.h" #include "SampleBuffer.h" #include "TempoSyncKnobModel.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" namespace lmms { diff --git a/include/Graph.h b/include/Graph.h index cc87b913e..4cb3af512 100644 --- a/include/Graph.h +++ b/include/Graph.h @@ -32,7 +32,7 @@ #include "Model.h" #include "ModelView.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" namespace lmms { diff --git a/include/Instrument.h b/include/Instrument.h index 3f701f12e..21353f725 100644 --- a/include/Instrument.h +++ b/include/Instrument.h @@ -30,7 +30,7 @@ #include "Flags.h" #include "lmms_export.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" #include "Plugin.h" #include "TimePos.h" diff --git a/include/JournallingObject.h b/include/JournallingObject.h index f3e134f34..bc6a89076 100644 --- a/include/JournallingObject.h +++ b/include/JournallingObject.h @@ -27,7 +27,7 @@ #include -#include "lmms_basics.h" +#include "LmmsTypes.h" #include "SerializingObject.h" namespace lmms diff --git a/include/LadspaManager.h b/include/LadspaManager.h index 1a3360231..0d2defafd 100644 --- a/include/LadspaManager.h +++ b/include/LadspaManager.h @@ -36,7 +36,7 @@ #include "lmms_export.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" namespace lmms diff --git a/include/LfoController.h b/include/LfoController.h index 01b4b1862..e884cd5e4 100644 --- a/include/LfoController.h +++ b/include/LfoController.h @@ -31,8 +31,8 @@ #include "AutomatableModel.h" #include "Controller.h" #include "ControllerDialog.h" +#include "SampleBuffer.h" #include "TempoSyncKnobModel.h" -#include "Oscillator.h" namespace lmms { diff --git a/include/debug.h b/include/LmmsCommonMacros.h similarity index 64% rename from include/debug.h rename to include/LmmsCommonMacros.h index 7cf51acaa..9840240f9 100644 --- a/include/debug.h +++ b/include/LmmsCommonMacros.h @@ -1,8 +1,8 @@ /* - * debug.h - header file to be included for debugging purposes - * - * Copyright (c) 2004-2008 Tobias Doerffel + * LmmsCommonMacros.h - defines some common macros used in the codebase * + * Copyright (c) 2025 Roshan M R (Ross Maxx) + * * This file is part of LMMS - https://lmms.io * * This program is free software; you can redistribute it and/or @@ -22,20 +22,15 @@ * */ -#ifndef LMMS_DEBUG_H -#define LMMS_DEBUG_H +#ifndef LMMS_COMMON_MACROS_H +#define LMMS_COMMON_MACROS_H -#include "lmmsconfig.h" +namespace lmms +{ -// Define standard macro NDEBUG when building without debug flag to make sure asserts become no-ops. -#ifndef LMMS_DEBUG -#ifndef NDEBUG - #define NDEBUG -#endif -#endif // LMMS_DEBUG +#define LMMS_STRINGIFY(s) LMMS_STR(s) // a macro used to stringify the plugin name +#define LMMS_STR(PN) #PN -#include -#include +} // namespace lmms - -#endif // LMMS_DEBUG_H +#endif // LMMS_COMMON_MACROS_H diff --git a/include/lmms_basics.h b/include/LmmsTypes.h similarity index 84% rename from include/lmms_basics.h rename to include/LmmsTypes.h index ea9371603..cf759aef9 100644 --- a/include/lmms_basics.h +++ b/include/LmmsTypes.h @@ -1,5 +1,5 @@ /* - * lmms_basics.h - typedefs for common types that are used in the whole app + * LmmsTypes.h - typedefs for common types that are used in the whole app * * Copyright (c) 2004-2009 Tobias Doerffel * @@ -26,13 +26,9 @@ #define LMMS_TYPES_H #include - -#include "lmmsconfig.h" - #include - namespace lmms { @@ -55,20 +51,6 @@ using mix_ch_t = uint16_t; // Mixer-channel (0 to MAX_CHANNEL) using jo_id_t = uint32_t; // (unique) ID of a journalling object -constexpr ch_cnt_t DEFAULT_CHANNELS = 2; - -constexpr char LADSPA_PATH_SEPERATOR = -#ifdef LMMS_BUILD_WIN32 -';'; -#else -':'; -#endif - - - -#define LMMS_STRINGIFY(s) LMMS_STR(s) -#define LMMS_STR(PN) #PN - } // namespace lmms #endif // LMMS_TYPES_H diff --git a/include/LocklessRingBuffer.h b/include/LocklessRingBuffer.h index ec3f4fc52..45dab858f 100644 --- a/include/LocklessRingBuffer.h +++ b/include/LocklessRingBuffer.h @@ -30,7 +30,7 @@ #include -#include "lmms_basics.h" +#include "LmmsTypes.h" namespace lmms { diff --git a/include/Lv2Ports.h b/include/Lv2Ports.h index 1b2986938..8bbf7b4d2 100644 --- a/include/Lv2Ports.h +++ b/include/Lv2Ports.h @@ -34,7 +34,7 @@ #include #include "Flags.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" #include "PluginIssue.h" diff --git a/include/Midi.h b/include/Midi.h index 21db021b3..d68dda318 100644 --- a/include/Midi.h +++ b/include/Midi.h @@ -25,8 +25,6 @@ #ifndef LMMS_MIDI_H #define LMMS_MIDI_H -#include "lmms_basics.h" - namespace lmms { diff --git a/include/MixHelpers.h b/include/MixHelpers.h index a55ad6058..3b0ecf968 100644 --- a/include/MixHelpers.h +++ b/include/MixHelpers.h @@ -25,7 +25,7 @@ #ifndef LMMS_MIX_HELPERS_H #define LMMS_MIX_HELPERS_H -#include "lmms_basics.h" +#include "LmmsTypes.h" namespace lmms { diff --git a/include/Oscillator.h b/include/Oscillator.h index 13d8264be..84e9264c9 100644 --- a/include/Oscillator.h +++ b/include/Oscillator.h @@ -34,7 +34,6 @@ #include "Engine.h" #include "lmms_math.h" -#include "lmmsconfig.h" #include "AudioEngine.h" #include "OscillatorConstants.h" #include "SampleBuffer.h" diff --git a/include/OscillatorConstants.h b/include/OscillatorConstants.h index 85ae38fe8..5aaab6f7a 100644 --- a/include/OscillatorConstants.h +++ b/include/OscillatorConstants.h @@ -28,7 +28,7 @@ #include -#include "lmms_basics.h" +#include "LmmsTypes.h" namespace lmms::OscillatorConstants { diff --git a/include/Oscilloscope.h b/include/Oscilloscope.h index 1e3c52b1e..8675cea33 100644 --- a/include/Oscilloscope.h +++ b/include/Oscilloscope.h @@ -28,7 +28,7 @@ #include #include -#include "lmms_basics.h" +#include "LmmsTypes.h" namespace lmms { diff --git a/include/OutputSettings.h b/include/OutputSettings.h index 8a7ebc993..283826543 100644 --- a/include/OutputSettings.h +++ b/include/OutputSettings.h @@ -26,7 +26,7 @@ #ifndef LMMS_OUTPUT_SETTINGS_H #define LMMS_OUTPUT_SETTINGS_H -#include "lmms_basics.h" +#include "LmmsTypes.h" namespace lmms { diff --git a/include/PianoRoll.h b/include/PianoRoll.h index 8ac59fe0a..fb175c374 100644 --- a/include/PianoRoll.h +++ b/include/PianoRoll.h @@ -35,7 +35,7 @@ #include "ComboBoxModel.h" #include "SerializingObject.h" #include "Note.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" #include "Song.h" #include "StepRecorder.h" #include "StepRecorderWidget.h" diff --git a/include/PlayHandle.h b/include/PlayHandle.h index 5f0256a1a..fbe45471b 100644 --- a/include/PlayHandle.h +++ b/include/PlayHandle.h @@ -32,7 +32,7 @@ #include "Flags.h" #include "ThreadableJob.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" class QThread; diff --git a/include/ProjectJournal.h b/include/ProjectJournal.h index 841bbf094..b5b8fc138 100644 --- a/include/ProjectJournal.h +++ b/include/ProjectJournal.h @@ -28,7 +28,7 @@ #include #include -#include "lmms_basics.h" +#include "LmmsTypes.h" #include "DataFile.h" diff --git a/include/ProjectRenderer.h b/include/ProjectRenderer.h index 14c584a2e..3183fc478 100644 --- a/include/ProjectRenderer.h +++ b/include/ProjectRenderer.h @@ -26,7 +26,6 @@ #define LMMS_PROJECT_RENDERER_H #include "AudioFileDevice.h" -#include "lmmsconfig.h" #include "AudioEngine.h" #include "OutputSettings.h" diff --git a/include/RemotePluginBase.h b/include/RemotePluginBase.h index 787742fc0..53ccce1c7 100644 --- a/include/RemotePluginBase.h +++ b/include/RemotePluginBase.h @@ -27,6 +27,8 @@ #include "MidiEvent.h" +#include "lmmsconfig.h" + #include #include #include diff --git a/include/RingBuffer.h b/include/RingBuffer.h index 41595be19..0a7bb550a 100644 --- a/include/RingBuffer.h +++ b/include/RingBuffer.h @@ -28,7 +28,7 @@ #include #include -#include "lmms_basics.h" +#include "LmmsTypes.h" #include "lmms_export.h" diff --git a/include/SampleBuffer.h b/include/SampleBuffer.h index 8ec6c5886..d21bacf84 100644 --- a/include/SampleBuffer.h +++ b/include/SampleBuffer.h @@ -34,7 +34,7 @@ #include "AudioEngine.h" #include "Engine.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" #include "lmms_export.h" namespace lmms { diff --git a/include/SampleDecoder.h b/include/SampleDecoder.h index 2cfd00977..9109d4121 100644 --- a/include/SampleDecoder.h +++ b/include/SampleDecoder.h @@ -31,7 +31,6 @@ #include #include -#include "lmms_basics.h" #include "SampleFrame.h" namespace lmms { diff --git a/include/SampleFrame.h b/include/SampleFrame.h index 238a85dea..43db2f6e6 100644 --- a/include/SampleFrame.h +++ b/include/SampleFrame.h @@ -26,7 +26,8 @@ #ifndef LMMS_SAMPLEFRAME_H #define LMMS_SAMPLEFRAME_H -#include "lmms_basics.h" +#include "LmmsTypes.h" +#include "lmms_constants.h" #include #include diff --git a/include/SetupDialog.h b/include/SetupDialog.h index 23589f91a..f544b8977 100644 --- a/include/SetupDialog.h +++ b/include/SetupDialog.h @@ -30,7 +30,6 @@ #include "AudioDevice.h" #include "AudioDeviceSetupWidget.h" -#include "lmmsconfig.h" #include "MidiClient.h" #include "MidiSetupWidget.h" diff --git a/include/SweepOscillator.h b/include/SweepOscillator.h deleted file mode 100644 index c7c7938d1..000000000 --- a/include/SweepOscillator.h +++ /dev/null @@ -1,72 +0,0 @@ -/* - * SweepOscillator.h - sweeping oscillator - * - * Copyright (c) 2006-2014 Tobias Doerffel - * - * This file is part of LMMS - https://lmms.io - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program (see COPYING); if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA. - * - */ - -#ifndef LMMS_SWEEP_OSCILLATOR_H -#define LMMS_SWEEP_OSCILLATOR_H - -#include "Oscillator.h" -#include "DspEffectLibrary.h" - -namespace lmms -{ - -template -class SweepOscillator -{ -public: - SweepOscillator( const FX & _fx = FX() ) : - m_phase( 0.0f ), - m_FX( _fx ) - { - } - - virtual ~SweepOscillator() = default; - - void update( SampleFrame* buf, const fpp_t frames, const float freq1, const float freq2, const float sampleRate ) - { - const float df = freq2 - freq1; - for( fpp_t frame = 0; frame < frames; ++frame ) - { - const sample_t s = Oscillator::sinSample( m_phase ); - buf[frame][0] = s; - buf[frame][1] = s; - m_FX.nextSample( buf[frame][0], buf[frame][1] ); - m_phase += ( freq1 + ( frame * df / frames ) ) / sampleRate; - } - } - - -private: - float m_phase; - FX m_FX; - -// inline sample_t getSample( const float _sample ); -// inline void recalcPhase(); - -} ; - - -} // namespace lmms - -#endif // LMMS_SWEEP_OSCILLATOR_H diff --git a/include/ThreadableJob.h b/include/ThreadableJob.h index 9d5a0beee..2f65ed5d9 100644 --- a/include/ThreadableJob.h +++ b/include/ThreadableJob.h @@ -25,7 +25,7 @@ #ifndef LMMS_THREADABLE_JOB_H #define LMMS_THREADABLE_JOB_H -#include "lmms_basics.h" +#include "LmmsTypes.h" #include diff --git a/include/TimePos.h b/include/TimePos.h index 68f3bd01b..ab41832b3 100644 --- a/include/TimePos.h +++ b/include/TimePos.h @@ -29,7 +29,7 @@ #include #include #include "lmms_export.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" namespace lmms { diff --git a/include/Track.h b/include/Track.h index a152640e1..274e7a1fc 100644 --- a/include/Track.h +++ b/include/Track.h @@ -31,7 +31,7 @@ #include "AutomatableModel.h" #include "JournallingObject.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" #include diff --git a/include/embed.h b/include/embed.h index f5156b02e..489a06270 100644 --- a/include/embed.h +++ b/include/embed.h @@ -32,7 +32,8 @@ #include #include "lmms_export.h" -#include "lmms_basics.h" +#include "LmmsCommonMacros.h" + namespace lmms { diff --git a/include/endian_handling.h b/include/endian_handling.h index 7ddb22f22..793b22e46 100644 --- a/include/endian_handling.h +++ b/include/endian_handling.h @@ -25,10 +25,9 @@ #ifndef LMMS_ENDIAN_HANDLING_H #define LMMS_ENDIAN_HANDLING_H +#include #include -#include "lmms_basics.h" - namespace lmms { diff --git a/include/lmms_constants.h b/include/lmms_constants.h index 782e6849d..8be44a404 100644 --- a/include/lmms_constants.h +++ b/include/lmms_constants.h @@ -25,17 +25,23 @@ #ifndef LMMS_CONSTANTS_H #define LMMS_CONSTANTS_H +#include "lmmsconfig.h" +#include "LmmsTypes.h" + namespace lmms { - // Prefer using `approximatelyEqual()` from lmms_math.h rather than // using this directly inline constexpr float F_EPSILON = 1.0e-10f; // 10^-10 +inline constexpr ch_cnt_t DEFAULT_CHANNELS = 2; + // Microtuner inline constexpr unsigned MaxScaleCount = 10; //!< number of scales per project inline constexpr unsigned MaxKeymapCount = 10; //!< number of keyboard mappings per project + +// Note: All constants below are used only in spectrum analyser // Frequency ranges (in Hz). // Arbitrary low limit for logarithmic frequency scale; >1 Hz. inline constexpr auto LOWEST_LOG_FREQ = 5; @@ -79,6 +85,15 @@ inline constexpr auto ARANGE_LOUD_END = 0; inline constexpr auto ARANGE_SILENT_START = -60; inline constexpr auto ARANGE_SILENT_END = -10; + +// This macro is used to handle path seperation properly in windows +constexpr char LADSPA_PATH_SEPERATOR = +#ifdef LMMS_BUILD_WIN32 +';'; +#else +':'; +#endif + } // namespace lmms #endif // LMMS_CONSTANTS_H diff --git a/include/lmms_math.h b/include/lmms_math.h index 1d3de249d..5129743de 100644 --- a/include/lmms_math.h +++ b/include/lmms_math.h @@ -34,7 +34,6 @@ #include #include -#include "lmmsconfig.h" #include "lmms_constants.h" namespace lmms diff --git a/include/panning.h b/include/panning.h index 2945988ba..fa9cde9ee 100644 --- a/include/panning.h +++ b/include/panning.h @@ -26,7 +26,7 @@ #ifndef LMMS_PANNING_H #define LMMS_PANNING_H -#include "lmms_basics.h" +#include "LmmsTypes.h" #include "Midi.h" #include "volume.h" diff --git a/include/versioninfo.h b/include/versioninfo.h index 7495299c2..f2a535313 100644 --- a/include/versioninfo.h +++ b/include/versioninfo.h @@ -1,7 +1,7 @@ #ifndef LMMS_VERSION_INFO_H #define LMMS_VERSION_INFO_H -#include "lmms_basics.h" +#include "LmmsCommonMacros.h" #if defined(__GNUC__) constexpr const char* LMMS_BUILDCONF_COMPILER_VERSION = "GCC " __VERSION__; diff --git a/include/volume.h b/include/volume.h index 382f76780..76c6c37de 100644 --- a/include/volume.h +++ b/include/volume.h @@ -26,7 +26,7 @@ #ifndef LMMS_VOLUME_H #define LMMS_VOLUME_H -#include "lmms_basics.h" +#include "LmmsTypes.h" namespace lmms { diff --git a/plugins/AudioFileProcessor/AudioFileProcessor.cpp b/plugins/AudioFileProcessor/AudioFileProcessor.cpp index 4cc14ba9c..6754624df 100644 --- a/plugins/AudioFileProcessor/AudioFileProcessor.cpp +++ b/plugins/AudioFileProcessor/AudioFileProcessor.cpp @@ -30,7 +30,7 @@ #include "SampleLoader.h" #include "Song.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" #include "plugin_export.h" #include diff --git a/plugins/AudioFileProcessor/AudioFileProcessor.h b/plugins/AudioFileProcessor/AudioFileProcessor.h index acdbc45f7..0548d5b45 100644 --- a/plugins/AudioFileProcessor/AudioFileProcessor.h +++ b/plugins/AudioFileProcessor/AudioFileProcessor.h @@ -32,7 +32,7 @@ #include "Instrument.h" #include "Sample.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" namespace lmms diff --git a/plugins/Delay/StereoDelay.cpp b/plugins/Delay/StereoDelay.cpp index 3187b3f2a..7381dc3e3 100644 --- a/plugins/Delay/StereoDelay.cpp +++ b/plugins/Delay/StereoDelay.cpp @@ -24,7 +24,7 @@ #include "StereoDelay.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" #include "SampleFrame.h" namespace lmms diff --git a/plugins/Delay/StereoDelay.h b/plugins/Delay/StereoDelay.h index ad0e020b5..72b49a9df 100644 --- a/plugins/Delay/StereoDelay.h +++ b/plugins/Delay/StereoDelay.h @@ -25,7 +25,7 @@ #ifndef STEREODELAY_H #define STEREODELAY_H -#include "lmms_basics.h" +#include "LmmsTypes.h" namespace lmms diff --git a/plugins/Eq/EqSpectrumView.h b/plugins/Eq/EqSpectrumView.h index 448c0e378..8246c89bb 100644 --- a/plugins/Eq/EqSpectrumView.h +++ b/plugins/Eq/EqSpectrumView.h @@ -27,7 +27,7 @@ #include #include "fft_helpers.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" namespace lmms { diff --git a/plugins/Flanger/MonoDelay.h b/plugins/Flanger/MonoDelay.h index 2e9324a7d..95bf460c5 100644 --- a/plugins/Flanger/MonoDelay.h +++ b/plugins/Flanger/MonoDelay.h @@ -25,7 +25,7 @@ #ifndef MONODELAY_H #define MONODELAY_H -#include "lmms_basics.h" +#include "LmmsTypes.h" namespace lmms { diff --git a/plugins/LadspaEffect/LadspaMatrixControlDialog.h b/plugins/LadspaEffect/LadspaMatrixControlDialog.h index c5949fa15..fa9a6e1b3 100644 --- a/plugins/LadspaEffect/LadspaMatrixControlDialog.h +++ b/plugins/LadspaEffect/LadspaMatrixControlDialog.h @@ -28,7 +28,7 @@ #include "EffectControlDialog.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" class QGridLayout; diff --git a/plugins/MidiImport/MidiImport.cpp b/plugins/MidiImport/MidiImport.cpp index 785cd079a..24fed85df 100644 --- a/plugins/MidiImport/MidiImport.cpp +++ b/plugins/MidiImport/MidiImport.cpp @@ -43,7 +43,6 @@ #include "GuiApplication.h" #include "MainWindow.h" #include "TimePos.h" -#include "debug.h" #include "Song.h" #include "plugin_export.h" diff --git a/plugins/MultitapEcho/MultitapEcho.cpp b/plugins/MultitapEcho/MultitapEcho.cpp index 3d92e5ae8..ab84138aa 100644 --- a/plugins/MultitapEcho/MultitapEcho.cpp +++ b/plugins/MultitapEcho/MultitapEcho.cpp @@ -25,7 +25,7 @@ #include "MultitapEcho.h" #include "embed.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" #include "lmms_math.h" #include "plugin_export.h" diff --git a/plugins/OpulenZ/OpulenZ.cpp b/plugins/OpulenZ/OpulenZ.cpp index 48dfb6c8c..f5c0e1a8d 100644 --- a/plugins/OpulenZ/OpulenZ.cpp +++ b/plugins/OpulenZ/OpulenZ.cpp @@ -51,7 +51,6 @@ #include #include "embed.h" -#include "debug.h" #include "Knob.h" #include "PixmapButton.h" diff --git a/plugins/SlicerT/SlicerT.h b/plugins/SlicerT/SlicerT.h index 53b8bfb2a..6021f44a3 100644 --- a/plugins/SlicerT/SlicerT.h +++ b/plugins/SlicerT/SlicerT.h @@ -36,7 +36,7 @@ #include "Sample.h" #include "SampleBuffer.h" #include "SlicerTView.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" namespace lmms { diff --git a/plugins/SpectrumAnalyzer/Analyzer.cpp b/plugins/SpectrumAnalyzer/Analyzer.cpp index 7b6086ed2..725c175a4 100644 --- a/plugins/SpectrumAnalyzer/Analyzer.cpp +++ b/plugins/SpectrumAnalyzer/Analyzer.cpp @@ -33,7 +33,7 @@ #endif #include "embed.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" #include "plugin_export.h" namespace lmms diff --git a/plugins/SpectrumAnalyzer/SaProcessor.cpp b/plugins/SpectrumAnalyzer/SaProcessor.cpp index 1ea80f126..d4e5456dc 100644 --- a/plugins/SpectrumAnalyzer/SaProcessor.cpp +++ b/plugins/SpectrumAnalyzer/SaProcessor.cpp @@ -27,11 +27,9 @@ #include #include "lmms_math.h" -#ifdef SA_DEBUG - #include -#endif #include #ifdef SA_DEBUG + #include #include #include #endif diff --git a/plugins/SpectrumAnalyzer/SaProcessor.h b/plugins/SpectrumAnalyzer/SaProcessor.h index 3903bf9d6..12163f63b 100644 --- a/plugins/SpectrumAnalyzer/SaProcessor.h +++ b/plugins/SpectrumAnalyzer/SaProcessor.h @@ -33,7 +33,7 @@ #include #include -#include "lmms_basics.h" +#include "LmmsTypes.h" namespace lmms diff --git a/plugins/TripleOscillator/TripleOscillator.cpp b/plugins/TripleOscillator/TripleOscillator.cpp index 61a6c4919..55ad80082 100644 --- a/plugins/TripleOscillator/TripleOscillator.cpp +++ b/plugins/TripleOscillator/TripleOscillator.cpp @@ -29,7 +29,6 @@ #include "TripleOscillator.h" #include "AudioEngine.h" #include "AutomatableButton.h" -#include "debug.h" #include "Engine.h" #include "InstrumentTrack.h" #include "Knob.h" diff --git a/plugins/Vibed/VibratingString.cpp b/plugins/Vibed/VibratingString.cpp index 5a09a4549..00e178e24 100644 --- a/plugins/Vibed/VibratingString.cpp +++ b/plugins/Vibed/VibratingString.cpp @@ -26,7 +26,7 @@ #include "interpolation.h" #include "AudioEngine.h" #include "Engine.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" #include #include diff --git a/plugins/Vibed/VibratingString.h b/plugins/Vibed/VibratingString.h index d1691415b..3f61e39f0 100644 --- a/plugins/Vibed/VibratingString.h +++ b/plugins/Vibed/VibratingString.h @@ -28,7 +28,7 @@ #include #include -#include "lmms_basics.h" +#include "LmmsTypes.h" namespace lmms { diff --git a/plugins/VstBase/RemoteVstPlugin.cpp b/plugins/VstBase/RemoteVstPlugin.cpp index f8bf39a37..966c16dc8 100644 --- a/plugins/VstBase/RemoteVstPlugin.cpp +++ b/plugins/VstBase/RemoteVstPlugin.cpp @@ -41,10 +41,6 @@ #ifdef LMMS_BUILD_LINUX -#ifndef NOMINMAX -#define NOMINMAX -#endif - #ifndef O_BINARY #define O_BINARY 0 #endif @@ -114,7 +110,7 @@ struct ERect #endif -#include "lmms_basics.h" +#include "LmmsTypes.h" #include "Midi.h" #include "communication.h" #include "IoHelper.h" diff --git a/plugins/VstBase/vst_base.cpp b/plugins/VstBase/vst_base.cpp index 154dca975..544d05e0b 100644 --- a/plugins/VstBase/vst_base.cpp +++ b/plugins/VstBase/vst_base.cpp @@ -24,6 +24,7 @@ */ +#include "LmmsCommonMacros.h" #include "Plugin.h" #include "vstbase_export.h" diff --git a/src/core/AudioEngine.cpp b/src/core/AudioEngine.cpp index 8dcc37434..3eb604fc8 100644 --- a/src/core/AudioEngine.cpp +++ b/src/core/AudioEngine.cpp @@ -36,7 +36,6 @@ #include "EnvelopeAndLfoParameters.h" #include "NotePlayHandle.h" #include "ConfigManager.h" -#include "SamplePlayHandle.h" // platform-specific audio-interface-classes #include "AudioAlsa.h" diff --git a/src/core/BufferManager.cpp b/src/core/BufferManager.cpp index 47598c633..9059064ae 100644 --- a/src/core/BufferManager.cpp +++ b/src/core/BufferManager.cpp @@ -28,8 +28,6 @@ #include "SampleFrame.h" -#include - namespace lmms { diff --git a/src/core/FileSearch.cpp b/src/core/FileSearch.cpp index 8a668360e..cc9d49af2 100644 --- a/src/core/FileSearch.cpp +++ b/src/core/FileSearch.cpp @@ -26,8 +26,6 @@ #include #include -#include - #include namespace lmms { diff --git a/src/core/Instrument.cpp b/src/core/Instrument.cpp index cae16dee8..07614c314 100644 --- a/src/core/Instrument.cpp +++ b/src/core/Instrument.cpp @@ -29,7 +29,7 @@ #include "DummyInstrument.h" #include "InstrumentTrack.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" namespace lmms { diff --git a/src/core/LadspaManager.cpp b/src/core/LadspaManager.cpp index 5b94cac3f..4c982397b 100644 --- a/src/core/LadspaManager.cpp +++ b/src/core/LadspaManager.cpp @@ -36,6 +36,7 @@ #include "ConfigManager.h" #include "LadspaManager.h" #include "PluginFactory.h" +#include "lmms_constants.h" namespace lmms diff --git a/src/core/LfoController.cpp b/src/core/LfoController.cpp index 96ea71f7b..dcdb59b7f 100644 --- a/src/core/LfoController.cpp +++ b/src/core/LfoController.cpp @@ -29,6 +29,7 @@ #include #include "AudioEngine.h" +#include "Oscillator.h" #include "PathUtil.h" #include "SampleLoader.h" #include "Song.h" diff --git a/src/core/Mixer.cpp b/src/core/Mixer.cpp index 0add6008d..6007be466 100644 --- a/src/core/Mixer.cpp +++ b/src/core/Mixer.cpp @@ -26,7 +26,6 @@ #include "AudioEngine.h" #include "AudioEngineWorkerThread.h" -#include "BufferManager.h" #include "Mixer.h" #include "MixHelpers.h" #include "Song.h" diff --git a/src/core/Oscillator.cpp b/src/core/Oscillator.cpp index 5b48ddf3e..7aad9c58e 100644 --- a/src/core/Oscillator.cpp +++ b/src/core/Oscillator.cpp @@ -31,7 +31,6 @@ #endif #include -#include "BufferManager.h" #include "Engine.h" #include "AudioEngine.h" #include "AutomatableModel.h" diff --git a/src/core/RemotePlugin.cpp b/src/core/RemotePlugin.cpp index e0eeff524..25085e3b6 100644 --- a/src/core/RemotePlugin.cpp +++ b/src/core/RemotePlugin.cpp @@ -33,7 +33,6 @@ #include #endif -#include "BufferManager.h" #include "AudioEngine.h" #include "Engine.h" #include "Song.h" diff --git a/src/core/SampleBuffer.cpp b/src/core/SampleBuffer.cpp index fda3f2f66..3283a7142 100644 --- a/src/core/SampleBuffer.cpp +++ b/src/core/SampleBuffer.cpp @@ -27,7 +27,6 @@ #include "PathUtil.h" #include "SampleDecoder.h" -#include "lmms_basics.h" namespace lmms { diff --git a/src/core/SampleDecoder.cpp b/src/core/SampleDecoder.cpp index d3ee091f4..eb640447c 100644 --- a/src/core/SampleDecoder.cpp +++ b/src/core/SampleDecoder.cpp @@ -37,7 +37,7 @@ #include "AudioEngine.h" #include "DrumSynth.h" #include "Engine.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" namespace lmms { diff --git a/src/core/SampleRecordHandle.cpp b/src/core/SampleRecordHandle.cpp index f7003f3be..f62de7885 100644 --- a/src/core/SampleRecordHandle.cpp +++ b/src/core/SampleRecordHandle.cpp @@ -29,7 +29,6 @@ #include "PatternTrack.h" #include "SampleBuffer.h" #include "SampleClip.h" -#include "debug.h" namespace lmms diff --git a/src/core/audio/AudioDevice.cpp b/src/core/audio/AudioDevice.cpp index c02ce5f99..c5d56c997 100644 --- a/src/core/audio/AudioDevice.cpp +++ b/src/core/audio/AudioDevice.cpp @@ -27,7 +27,6 @@ #include "AudioDevice.h" #include "AudioEngine.h" #include "ConfigManager.h" -#include "debug.h" namespace lmms { diff --git a/src/core/audio/AudioSampleRecorder.cpp b/src/core/audio/AudioSampleRecorder.cpp index 0e51c9d2d..2e577d1c6 100644 --- a/src/core/audio/AudioSampleRecorder.cpp +++ b/src/core/audio/AudioSampleRecorder.cpp @@ -26,7 +26,6 @@ #include "AudioSampleRecorder.h" #include "SampleBuffer.h" -#include "debug.h" namespace lmms diff --git a/src/core/audio/AudioSdl.cpp b/src/core/audio/AudioSdl.cpp index 8f533119c..dfbcde737 100644 --- a/src/core/audio/AudioSdl.cpp +++ b/src/core/audio/AudioSdl.cpp @@ -23,7 +23,7 @@ */ #include "AudioSdl.h" -#include "lmms_basics.h" +#include "LmmsTypes.h" #ifdef LMMS_HAVE_SDL diff --git a/src/core/audio/AudioSoundIo.cpp b/src/core/audio/AudioSoundIo.cpp index 851592018..01f804935 100644 --- a/src/core/audio/AudioSoundIo.cpp +++ b/src/core/audio/AudioSoundIo.cpp @@ -30,7 +30,6 @@ #include #include "Engine.h" -#include "debug.h" #include "ConfigManager.h" #include "ComboBox.h" #include "AudioEngine.h" diff --git a/src/core/lv2/Lv2ControlBase.cpp b/src/core/lv2/Lv2ControlBase.cpp index 0147ebd6e..27e6348ae 100644 --- a/src/core/lv2/Lv2ControlBase.cpp +++ b/src/core/lv2/Lv2ControlBase.cpp @@ -31,6 +31,7 @@ #include #include "Engine.h" +#include "lmms_constants.h" #include "Lv2Manager.h" #include "Lv2Proc.h" diff --git a/src/gui/AudioAlsaSetupWidget.cpp b/src/gui/AudioAlsaSetupWidget.cpp index 43872a12f..9764bd863 100644 --- a/src/gui/AudioAlsaSetupWidget.cpp +++ b/src/gui/AudioAlsaSetupWidget.cpp @@ -31,6 +31,7 @@ #include "ConfigManager.h" #include "LcdSpinBox.h" +#include "lmms_constants.h" namespace lmms::gui { diff --git a/src/gui/MixerView.cpp b/src/gui/MixerView.cpp index 5cb99295b..e0b483bd6 100644 --- a/src/gui/MixerView.cpp +++ b/src/gui/MixerView.cpp @@ -22,6 +22,7 @@ * */ +#include "MixerView.h" #include #include @@ -29,10 +30,7 @@ #include #include -#include "lmms_math.h" - #include "MixerChannelView.h" -#include "MixerView.h" #include "Knob.h" #include "Mixer.h" #include "GuiApplication.h" diff --git a/src/gui/editors/AutomationEditor.cpp b/src/gui/editors/AutomationEditor.cpp index 78f5d112a..e1805f727 100644 --- a/src/gui/editors/AutomationEditor.cpp +++ b/src/gui/editors/AutomationEditor.cpp @@ -58,7 +58,6 @@ #include "StringPairDrag.h" #include "TextFloat.h" #include "TimeLineWidget.h" -#include "debug.h" #include "embed.h" #include "FontHelper.h" diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp index d075a70b8..63d2a81a6 100644 --- a/src/gui/editors/PianoRoll.cpp +++ b/src/gui/editors/PianoRoll.cpp @@ -50,7 +50,6 @@ #include "ComboBox.h" #include "ConfigManager.h" #include "DataFile.h" -#include "debug.h" #include "DeprecationHelper.h" #include "DetuningHelper.h" #include "embed.h" diff --git a/src/gui/instrument/EnvelopeGraph.cpp b/src/gui/instrument/EnvelopeGraph.cpp index 3483f46a0..c9d60646e 100644 --- a/src/gui/instrument/EnvelopeGraph.cpp +++ b/src/gui/instrument/EnvelopeGraph.cpp @@ -30,7 +30,6 @@ #include #include "EnvelopeAndLfoParameters.h" -#include "lmms_math.h" #include "ColorHelper.h" #include diff --git a/src/gui/modals/SetupDialog.cpp b/src/gui/modals/SetupDialog.cpp index 06f228ab7..eb65e2a2c 100644 --- a/src/gui/modals/SetupDialog.cpp +++ b/src/gui/modals/SetupDialog.cpp @@ -33,7 +33,6 @@ #include #include "AudioEngine.h" -#include "debug.h" #include "embed.h" #include "Engine.h" #include "FileDialog.h" diff --git a/src/gui/widgets/Oscilloscope.cpp b/src/gui/widgets/Oscilloscope.cpp index bf66fa465..122a13ce9 100644 --- a/src/gui/widgets/Oscilloscope.cpp +++ b/src/gui/widgets/Oscilloscope.cpp @@ -34,7 +34,6 @@ #include "Engine.h" #include "Song.h" #include "embed.h" -#include "BufferManager.h" namespace lmms::gui {