From 3c73270c238d6d6f5f4dfa19776df002bcd85555 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Thu, 30 Nov 2017 13:19:06 +0100 Subject: [PATCH] Rename MemoryManager.h to Memory.h --- include/AudioPort.h | 2 +- include/AutomatableModel.h | 2 +- include/BasicFilters.h | 2 +- include/DataFile.h | 2 +- include/Delay.h | 2 +- include/DetuningHelper.h | 2 +- include/Effect.h | 2 +- include/Instrument.h | 2 +- include/{MemoryManager.h => Memory.h} | 0 include/MidiEventProcessor.h | 2 +- include/NotePlayHandle.h | 2 +- include/PlayHandle.h | 2 +- include/Plugin.h | 2 +- include/RingBuffer.h | 2 +- include/SampleBuffer.h | 2 +- include/ValueBuffer.h | 2 +- plugins/FreeBoy/Gb_Apu_Buffer.h | 2 +- plugins/GigPlayer/GigPlayer.h | 2 +- plugins/LadspaEffect/LadspaEffect.cpp | 2 +- plugins/Xpressive/ExprSynth.h | 2 +- plugins/bit_invader/bit_invader.h | 2 +- plugins/kicker/CMakeLists.txt | 2 +- plugins/kicker/KickerOsc.h | 2 +- plugins/nes/Nes.h | 2 +- plugins/patman/patman.h | 2 +- plugins/sf2_player/sf2_player.h | 2 +- plugins/sfxr/sfxr.h | 2 +- plugins/vibed/string_container.h | 2 +- plugins/watsyn/Watsyn.h | 2 +- src/core/BufferManager.cpp | 2 +- src/core/CMakeLists.txt | 2 +- src/core/{MemoryManager.cpp => Memory.cpp} | 3 ++- src/core/Mixer.cpp | 2 +- 33 files changed, 33 insertions(+), 32 deletions(-) rename include/{MemoryManager.h => Memory.h} (100%) rename src/core/{MemoryManager.cpp => Memory.cpp} (99%) diff --git a/include/AudioPort.h b/include/AudioPort.h index 2842c6a17..a5c29b32e 100644 --- a/include/AudioPort.h +++ b/include/AudioPort.h @@ -30,7 +30,7 @@ #include #include -#include "MemoryManager.h" +#include "Memory.h" #include "PlayHandle.h" class EffectChain; diff --git a/include/AutomatableModel.h b/include/AutomatableModel.h index 3e0b6143d..0f2216c48 100644 --- a/include/AutomatableModel.h +++ b/include/AutomatableModel.h @@ -32,7 +32,7 @@ #include "Model.h" #include "MidiTime.h" #include "ValueBuffer.h" -#include "MemoryManager.h" +#include "Memory.h" #include "ModelVisitor.h" // simple way to map a property of a view to a model diff --git a/include/BasicFilters.h b/include/BasicFilters.h index c3a76d36e..9a8e81915 100644 --- a/include/BasicFilters.h +++ b/include/BasicFilters.h @@ -41,7 +41,7 @@ #include "lmms_basics.h" #include "lmms_constants.h" #include "interpolation.h" -#include "MemoryManager.h" +#include "Memory.h" template class BasicFilters; diff --git a/include/DataFile.h b/include/DataFile.h index 5890693da..59e50b028 100644 --- a/include/DataFile.h +++ b/include/DataFile.h @@ -30,7 +30,7 @@ #include #include "lmms_export.h" -#include "MemoryManager.h" +#include "Memory.h" class QTextStream; diff --git a/include/Delay.h b/include/Delay.h index 0e32a7635..7a709fd2c 100644 --- a/include/Delay.h +++ b/include/Delay.h @@ -30,7 +30,7 @@ #include "lmms_basics.h" #include "lmms_math.h" #include "interpolation.h" -#include "MemoryManager.h" +#include "Memory.h" // brief usage diff --git a/include/DetuningHelper.h b/include/DetuningHelper.h index de0acc826..0cccf9943 100644 --- a/include/DetuningHelper.h +++ b/include/DetuningHelper.h @@ -27,7 +27,7 @@ #define DETUNING_HELPER_H #include "InlineAutomation.h" -#include "MemoryManager.h" +#include "Memory.h" class DetuningHelper : public InlineAutomation { diff --git a/include/Effect.h b/include/Effect.h index 4dc50e8a4..eaa5f6506 100644 --- a/include/Effect.h +++ b/include/Effect.h @@ -31,7 +31,7 @@ #include "Mixer.h" #include "AutomatableModel.h" #include "TempoSyncKnobModel.h" -#include "MemoryManager.h" +#include "Memory.h" class EffectChain; class EffectControls; diff --git a/include/Instrument.h b/include/Instrument.h index 2179a1f72..241bff9f7 100644 --- a/include/Instrument.h +++ b/include/Instrument.h @@ -29,7 +29,7 @@ #include #include "lmms_export.h" #include "lmms_basics.h" -#include "MemoryManager.h" +#include "Memory.h" #include "MidiTime.h" #include "Plugin.h" diff --git a/include/MemoryManager.h b/include/Memory.h similarity index 100% rename from include/MemoryManager.h rename to include/Memory.h diff --git a/include/MidiEventProcessor.h b/include/MidiEventProcessor.h index b48f75d2b..7022eaf3a 100644 --- a/include/MidiEventProcessor.h +++ b/include/MidiEventProcessor.h @@ -27,7 +27,7 @@ #include "MidiEvent.h" #include "MidiTime.h" -#include "MemoryManager.h" +#include "Memory.h" // all classes being able to process MIDI-events should inherit from this class MidiEventProcessor diff --git a/include/NotePlayHandle.h b/include/NotePlayHandle.h index ae55c9ebb..99add8185 100644 --- a/include/NotePlayHandle.h +++ b/include/NotePlayHandle.h @@ -32,7 +32,7 @@ #include "Note.h" #include "PlayHandle.h" #include "Track.h" -#include "MemoryManager.h" +#include "Memory.h" class QReadWriteLock; class InstrumentTrack; diff --git a/include/PlayHandle.h b/include/PlayHandle.h index 1760e1ec7..6e71c7619 100644 --- a/include/PlayHandle.h +++ b/include/PlayHandle.h @@ -30,7 +30,7 @@ #include "lmms_export.h" -#include "MemoryManager.h" +#include "Memory.h" #include "ThreadableJob.h" #include "lmms_basics.h" diff --git a/include/Plugin.h b/include/Plugin.h index af42b0f10..2c5f90669 100644 --- a/include/Plugin.h +++ b/include/Plugin.h @@ -31,7 +31,7 @@ #include "JournallingObject.h" #include "Model.h" -#include "MemoryManager.h" +#include "Memory.h" class QWidget; diff --git a/include/RingBuffer.h b/include/RingBuffer.h index c761616bd..99c888511 100644 --- a/include/RingBuffer.h +++ b/include/RingBuffer.h @@ -30,7 +30,7 @@ #include #include "lmms_basics.h" #include "lmms_math.h" -#include "MemoryManager.h" +#include "Memory.h" class LMMS_EXPORT RingBuffer : public QObject { diff --git a/include/SampleBuffer.h b/include/SampleBuffer.h index 26e856025..4eae226fd 100644 --- a/include/SampleBuffer.h +++ b/include/SampleBuffer.h @@ -36,7 +36,7 @@ #include "lmms_basics.h" #include "lmms_math.h" #include "shared_object.h" -#include "MemoryManager.h" +#include "Memory.h" class QPainter; diff --git a/include/ValueBuffer.h b/include/ValueBuffer.h index f9869de88..5f847f632 100644 --- a/include/ValueBuffer.h +++ b/include/ValueBuffer.h @@ -28,7 +28,7 @@ #include -#include "MemoryManager.h" +#include "Memory.h" #include "lmms_export.h" class LMMS_EXPORT ValueBuffer : public std::vector diff --git a/plugins/FreeBoy/Gb_Apu_Buffer.h b/plugins/FreeBoy/Gb_Apu_Buffer.h index 5228b7b8a..01e44fbcd 100644 --- a/plugins/FreeBoy/Gb_Apu_Buffer.h +++ b/plugins/FreeBoy/Gb_Apu_Buffer.h @@ -25,7 +25,7 @@ #include "Gb_Apu.h" #include "Multi_Buffer.h" -#include "MemoryManager.h" +#include "Memory.h" class Gb_Apu_Buffer : public Gb_Apu { MM_OPERATORS diff --git a/plugins/GigPlayer/GigPlayer.h b/plugins/GigPlayer/GigPlayer.h index b9467b91b..49465be2a 100644 --- a/plugins/GigPlayer/GigPlayer.h +++ b/plugins/GigPlayer/GigPlayer.h @@ -38,7 +38,7 @@ #include "Knob.h" #include "LcdSpinBox.h" #include "LedCheckbox.h" -#include "MemoryManager.h" +#include "Memory.h" #include "gig.h" class GigInstrumentView; diff --git a/plugins/LadspaEffect/LadspaEffect.cpp b/plugins/LadspaEffect/LadspaEffect.cpp index d7e66bf47..719982521 100644 --- a/plugins/LadspaEffect/LadspaEffect.cpp +++ b/plugins/LadspaEffect/LadspaEffect.cpp @@ -38,7 +38,7 @@ #include "EffectChain.h" #include "AutomationPattern.h" #include "ControllerConnection.h" -#include "MemoryManager.h" +#include "Memory.h" #include "ValueBuffer.h" #include "Song.h" diff --git a/plugins/Xpressive/ExprSynth.h b/plugins/Xpressive/ExprSynth.h index bb25fd036..01e98ebe9 100644 --- a/plugins/Xpressive/ExprSynth.h +++ b/plugins/Xpressive/ExprSynth.h @@ -31,7 +31,7 @@ #include "AutomatableModel.h" #include "Graph.h" #include "Instrument.h" -#include "MemoryManager.h" +#include "Memory.h" class ExprFrontData; diff --git a/plugins/bit_invader/bit_invader.h b/plugins/bit_invader/bit_invader.h index 793831e4a..07562c76e 100644 --- a/plugins/bit_invader/bit_invader.h +++ b/plugins/bit_invader/bit_invader.h @@ -33,7 +33,7 @@ #include "Knob.h" #include "PixmapButton.h" #include "LedCheckbox.h" -#include "MemoryManager.h" +#include "Memory.h" class oscillator; class bitInvaderView; diff --git a/plugins/kicker/CMakeLists.txt b/plugins/kicker/CMakeLists.txt index 0ac9f87b5..1334d11aa 100644 --- a/plugins/kicker/CMakeLists.txt +++ b/plugins/kicker/CMakeLists.txt @@ -1,3 +1,3 @@ INCLUDE(BuildPlugin) -BUILD_PLUGIN(kicker kicker.cpp kicker.h MOCFILES kicker.h EMBEDDED_RESOURCES artwork.png logo.png) +BUILD_PLUGIN(kicker kicker.cpp kicker.h KickerOsc.h MOCFILES kicker.h EMBEDDED_RESOURCES artwork.png logo.png) diff --git a/plugins/kicker/KickerOsc.h b/plugins/kicker/KickerOsc.h index 1375725b3..4fd66a6bb 100644 --- a/plugins/kicker/KickerOsc.h +++ b/plugins/kicker/KickerOsc.h @@ -31,7 +31,7 @@ #include "lmms_math.h" #include "interpolation.h" -#include "MemoryManager.h" +#include "Memory.h" template diff --git a/plugins/nes/Nes.h b/plugins/nes/Nes.h index bbf326d32..9e093b533 100644 --- a/plugins/nes/Nes.h +++ b/plugins/nes/Nes.h @@ -34,7 +34,7 @@ #include "TempoSyncKnob.h" #include "NotePlayHandle.h" #include "PixmapButton.h" -#include "MemoryManager.h" +#include "Memory.h" #define makeknob( name, x, y, hint, unit, oname ) \ diff --git a/plugins/patman/patman.h b/plugins/patman/patman.h index 8d5689b73..5b7f6fd65 100644 --- a/plugins/patman/patman.h +++ b/plugins/patman/patman.h @@ -30,7 +30,7 @@ #include "InstrumentView.h" #include "SampleBuffer.h" #include "AutomatableModel.h" -#include "MemoryManager.h" +#include "Memory.h" class PixmapButton; diff --git a/plugins/sf2_player/sf2_player.h b/plugins/sf2_player/sf2_player.h index 1dde587ad..8127d6232 100644 --- a/plugins/sf2_player/sf2_player.h +++ b/plugins/sf2_player/sf2_player.h @@ -37,7 +37,7 @@ #include "LcdSpinBox.h" #include "LedCheckbox.h" #include "fluidsynthshims.h" -#include "MemoryManager.h" +#include "Memory.h" class sf2InstrumentView; class sf2Font; diff --git a/plugins/sfxr/sfxr.h b/plugins/sfxr/sfxr.h index 20ae54c96..1214aeb37 100644 --- a/plugins/sfxr/sfxr.h +++ b/plugins/sfxr/sfxr.h @@ -34,7 +34,7 @@ #include "Graph.h" #include "PixmapButton.h" #include "LedCheckbox.h" -#include "MemoryManager.h" +#include "Memory.h" enum SfxrWaves diff --git a/plugins/vibed/string_container.h b/plugins/vibed/string_container.h index f61508079..08ab78798 100644 --- a/plugins/vibed/string_container.h +++ b/plugins/vibed/string_container.h @@ -27,7 +27,7 @@ #include #include "vibrating_string.h" -#include "MemoryManager.h" +#include "Memory.h" class stringContainer diff --git a/plugins/watsyn/Watsyn.h b/plugins/watsyn/Watsyn.h index 079e532e4..1dd6f6b87 100644 --- a/plugins/watsyn/Watsyn.h +++ b/plugins/watsyn/Watsyn.h @@ -35,7 +35,7 @@ #include "NotePlayHandle.h" #include "PixmapButton.h" #include -#include "MemoryManager.h" +#include "Memory.h" #define makeknob( name, x, y, hint, unit, oname ) \ diff --git a/src/core/BufferManager.cpp b/src/core/BufferManager.cpp index 2df7bcaa9..ed658866c 100644 --- a/src/core/BufferManager.cpp +++ b/src/core/BufferManager.cpp @@ -28,7 +28,7 @@ #include "Engine.h" #include "Mixer.h" -#include "MemoryManager.h" +#include "Memory.h" static fpp_t framesPerPeriod; diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 7a3484149..c84c222bd 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -31,7 +31,7 @@ set(LMMS_SRCS core/LadspaManager.cpp core/LfoController.cpp core/LocklessAllocator.cpp - core/MemoryManager.cpp + core/Memory.cpp core/MeterModel.cpp core/MicroTimer.cpp core/Mixer.cpp diff --git a/src/core/MemoryManager.cpp b/src/core/Memory.cpp similarity index 99% rename from src/core/MemoryManager.cpp rename to src/core/Memory.cpp index 06368172e..1a870d68c 100644 --- a/src/core/MemoryManager.cpp +++ b/src/core/Memory.cpp @@ -25,7 +25,7 @@ */ -#include "MemoryManager.h" +#include "Memory.h" #include #include "rpmalloc.h" @@ -104,3 +104,4 @@ void _AlignedAllocator_Base::dealloc_impl(void* p) p = static_cast( p ) - *ptr2; free( p ); } + diff --git a/src/core/Mixer.cpp b/src/core/Mixer.cpp index 8d3a6c2cb..29301fa63 100644 --- a/src/core/Mixer.cpp +++ b/src/core/Mixer.cpp @@ -36,7 +36,7 @@ #include "NotePlayHandle.h" #include "ConfigManager.h" #include "SamplePlayHandle.h" -#include "MemoryManager.h" +#include "Memory.h" // platform-specific audio-interface-classes #include "AudioAlsa.h"