Rename MemoryManager.h to Memory.h

include/AudioPort.h

@@ -30,7 +30,7 @@
 #include <QtCore/QMutex>
 #include <QtCore/QMutexLocker>
 
-#include "MemoryManager.h"
+#include "Memory.h"
 #include "PlayHandle.h"
 
 class EffectChain;

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

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<ch_cnt_t CHANNELS=DEFAULT_CHANNELS> class BasicFilters;
 

include/DataFile.h

@@ -30,7 +30,7 @@
 #include <QDomDocument>
 
 #include "lmms_export.h"
-#include "MemoryManager.h"
+#include "Memory.h"
 
 class QTextStream;
 

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 
 

include/DetuningHelper.h

@@ -27,7 +27,7 @@
 #define DETUNING_HELPER_H
 
 #include "InlineAutomation.h"
-#include "MemoryManager.h"
+#include "Memory.h"
 
 class DetuningHelper : public InlineAutomation
 {

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;

include/Instrument.h

@@ -29,7 +29,7 @@
 #include <QString>
 #include "lmms_export.h"
 #include "lmms_basics.h"
-#include "MemoryManager.h"
+#include "Memory.h"
 #include "MidiTime.h"
 #include "Plugin.h"
 

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

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;

include/PlayHandle.h

@@ -30,7 +30,7 @@
 
 #include "lmms_export.h"
 
-#include "MemoryManager.h"
+#include "Memory.h"
 
 #include "ThreadableJob.h"
 #include "lmms_basics.h"

include/Plugin.h

@@ -31,7 +31,7 @@
 
 #include "JournallingObject.h"
 #include "Model.h"
-#include "MemoryManager.h"
+#include "Memory.h"
 
 
 class QWidget;

include/RingBuffer.h

@@ -30,7 +30,7 @@
 #include <QObject>
 #include "lmms_basics.h"
 #include "lmms_math.h"
-#include "MemoryManager.h"
+#include "Memory.h"
 
 class LMMS_EXPORT RingBuffer : public QObject
 {

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;

include/ValueBuffer.h

@@ -28,7 +28,7 @@
 
 #include <vector>
 
-#include "MemoryManager.h"
+#include "Memory.h"
 #include "lmms_export.h"
 
 class LMMS_EXPORT ValueBuffer : public std::vector<float>

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

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;

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"
 

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;

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;

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)

plugins/kicker/KickerOsc.h

@@ -31,7 +31,7 @@
 
 #include "lmms_math.h"
 #include "interpolation.h"
-#include "MemoryManager.h"
+#include "Memory.h"
 
 
 template<class FX = DspEffectLibrary::StereoBypass>

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 ) 		\

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;
 

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;

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

plugins/vibed/string_container.h

@@ -27,7 +27,7 @@
 #include <QVector>
 
 #include "vibrating_string.h"
-#include "MemoryManager.h"
+#include "Memory.h"
 
 
 class stringContainer

plugins/watsyn/Watsyn.h

@@ -35,7 +35,7 @@
 #include "NotePlayHandle.h"
 #include "PixmapButton.h"
 #include <samplerate.h>
-#include "MemoryManager.h"
+#include "Memory.h"
 
 
 #define makeknob( name, x, y, hint, unit, oname ) 		\

src/core/BufferManager.cpp

@@ -28,7 +28,7 @@
 
 #include "Engine.h"
 #include "Mixer.h"
-#include "MemoryManager.h"
+#include "Memory.h"
 
 static fpp_t framesPerPeriod;
 

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

src/core/Memory.cpp

@@ -25,7 +25,7 @@
  */
 
 
-#include "MemoryManager.h"
+#include "Memory.h"
 
 #include <QtCore/QtGlobal>
 #include "rpmalloc.h"
@@ -104,3 +104,4 @@ void _AlignedAllocator_Base::dealloc_impl(void* p)
 	p = static_cast<char*>( p ) - *ptr2;
 	free( p );
 }
+

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"