Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove MemoryManager #7128

Merged
merged 15 commits into from
Feb 25, 2024
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
[submodule "src/3rdparty/qt5-x11embed"]
path = src/3rdparty/qt5-x11embed
url = https://github.com/Lukas-W/qt5-x11embed.git
[submodule "src/3rdparty/rpmalloc/rpmalloc"]
path = src/3rdparty/rpmalloc/rpmalloc
url = https://github.com/mjansson/rpmalloc.git
[submodule "plugins/ZynAddSubFx/zynaddsubfx"]
path = plugins/ZynAddSubFx/zynaddsubfx
url = https://github.com/lmms/zynaddsubfx.git
Expand Down
2 changes: 0 additions & 2 deletions include/AudioPort.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#include <QString>
#include <QMutex>

#include "MemoryManager.h"
#include "PlayHandle.h"

namespace lmms
Expand All @@ -41,7 +40,6 @@ class BoolModel;

class AudioPort : public ThreadableJob
{
MM_OPERATORS
public:
AudioPort( const QString & _name, bool _has_effect_chain = true,
FloatModel * volumeModel = nullptr, FloatModel * panningModel = nullptr,
Expand Down
2 changes: 0 additions & 2 deletions include/AutomatableModel.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#include "Model.h"
#include "TimePos.h"
#include "ValueBuffer.h"
#include "MemoryManager.h"
#include "ModelVisitor.h"


Expand Down Expand Up @@ -77,7 +76,6 @@ class ControllerConnection;
class LMMS_EXPORT AutomatableModel : public Model, public JournallingObject
{
Q_OBJECT
MM_OPERATORS
public:
using AutoModelVector = std::vector<AutomatableModel*>;

Expand Down
5 changes: 0 additions & 5 deletions include/BasicFilters.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
#include "lmms_basics.h"
#include "lmms_constants.h"
#include "interpolation.h"
#include "MemoryManager.h"

namespace lmms
{
Expand All @@ -50,7 +49,6 @@ template<ch_cnt_t CHANNELS=DEFAULT_CHANNELS> class BasicFilters;
template<ch_cnt_t CHANNELS>
class LinkwitzRiley
{
MM_OPERATORS
public:
LinkwitzRiley( float sampleRate )
{
Expand Down Expand Up @@ -145,7 +143,6 @@ using StereoLinkwitzRiley = LinkwitzRiley<2>;
template<ch_cnt_t CHANNELS>
class BiQuad
{
MM_OPERATORS
public:
BiQuad()
{
Expand Down Expand Up @@ -188,7 +185,6 @@ using StereoBiQuad = BiQuad<2>;
template<ch_cnt_t CHANNELS>
class OnePole
{
MM_OPERATORS
public:
OnePole()
{
Expand Down Expand Up @@ -222,7 +218,6 @@ using StereoOnePole = OnePole<2>;
template<ch_cnt_t CHANNELS>
class BasicFilters
{
MM_OPERATORS
public:
enum class FilterType
{
Expand Down
1 change: 0 additions & 1 deletion include/Clip.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ class TrackView;
class LMMS_EXPORT Clip : public Model, public JournallingObject
{
Q_OBJECT
MM_OPERATORS
mapPropertyFromModel(bool,isMuted,setMuted,m_mutedModel);
mapPropertyFromModel(bool,isSolo,setSolo,m_soloModel);
public:
Expand Down
4 changes: 1 addition & 3 deletions include/DataFile.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@

#include <map>
#include <QDomDocument>
#include <vector>
sakertooth marked this conversation as resolved.
Show resolved Hide resolved

#include "lmms_export.h"
#include "MemoryManager.h"

class QTextStream;

Expand All @@ -42,7 +42,6 @@ class ProjectVersion;

class LMMS_EXPORT DataFile : public QDomDocument
{
MM_OPERATORS

using UpgradeMethod = void(DataFile::*)();

Expand Down Expand Up @@ -149,7 +148,6 @@ class LMMS_EXPORT DataFile : public QDomDocument
QDomElement m_head;
Type m_type;
unsigned int m_fileVersion;

} ;


Expand Down
33 changes: 16 additions & 17 deletions include/Delay.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#include "lmms_basics.h"
#include "lmms_math.h"
#include "interpolation.h"
#include "MemoryManager.h"

namespace lmms
{
Expand Down Expand Up @@ -74,20 +73,20 @@ class CombFeedback
m_delay( 0 ),
m_fraction( 0.0 )
{
m_buffer = MM_ALLOC<frame>(maxDelay );
m_buffer = new frame[maxDelay];
memset( m_buffer, 0, sizeof( frame ) * maxDelay );
}
virtual ~CombFeedback()
{
MM_FREE( m_buffer );
delete[] m_buffer;
}

inline void setMaxDelay( int maxDelay )
{
if( maxDelay > m_size )
{
MM_FREE( m_buffer );
m_buffer = MM_ALLOC<frame>( maxDelay );
delete[] m_buffer;
m_buffer = new frame[maxDelay];
memset( m_buffer, 0, sizeof( frame ) * maxDelay );
}
m_size = maxDelay;
Expand Down Expand Up @@ -145,20 +144,20 @@ class CombFeedfwd
m_delay( 0 ),
m_fraction( 0.0 )
{
m_buffer = MM_ALLOC<frame>( maxDelay );
m_buffer = new frame[maxDelay];
memset( m_buffer, 0, sizeof( frame ) * maxDelay );
}
virtual ~CombFeedfwd()
{
MM_FREE( m_buffer );
delete[] m_buffer;
}

inline void setMaxDelay( int maxDelay )
{
if( maxDelay > m_size )
{
MM_FREE( m_buffer );
m_buffer = MM_ALLOC<frame>( maxDelay );
delete[] m_buffer;
m_buffer = new frame[maxDelay];
memset( m_buffer, 0, sizeof( frame ) * maxDelay );
}
m_size = maxDelay;
Expand Down Expand Up @@ -216,20 +215,20 @@ class CombFeedbackDualtap
m_delay( 0 ),
m_fraction( 0.0 )
{
m_buffer = MM_ALLOC<frame>( maxDelay );
m_buffer = new frame[maxDelay];
memset( m_buffer, 0, sizeof( frame ) * maxDelay );
}
virtual ~CombFeedbackDualtap()
{
MM_FREE( m_buffer );
delete[] m_buffer;
}

inline void setMaxDelay( int maxDelay )
{
if( maxDelay > m_size )
{
MM_FREE( m_buffer );
m_buffer = MM_ALLOC<frame>( maxDelay );
delete[] m_buffer;
m_buffer = new frame[maxDelay];
memset( m_buffer, 0, sizeof( frame ) * maxDelay );
}
m_size = maxDelay;
Expand Down Expand Up @@ -297,20 +296,20 @@ class AllpassDelay
m_delay( 0 ),
m_fraction( 0.0 )
{
m_buffer = MM_ALLOC<frame>( maxDelay );
m_buffer = new frame[maxDelay];
memset( m_buffer, 0, sizeof( frame ) * maxDelay );
}
virtual ~AllpassDelay()
{
MM_FREE( m_buffer );
delete[] m_buffer;
}

inline void setMaxDelay( int maxDelay )
{
if( maxDelay > m_size )
{
MM_FREE( m_buffer );
m_buffer = MM_ALLOC<frame>( maxDelay );
delete[] m_buffer;
m_buffer = new frame[maxDelay];
memset( m_buffer, 0, sizeof( frame ) * maxDelay );
}
m_size = maxDelay;
Expand Down
2 changes: 0 additions & 2 deletions include/DetuningHelper.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,13 @@
#define LMMS_DETUNING_HELPER_H

#include "InlineAutomation.h"
#include "MemoryManager.h"

namespace lmms
{

class DetuningHelper : public InlineAutomation
{
Q_OBJECT
MM_OPERATORS
public:
DetuningHelper() :
InlineAutomation()
Expand Down
2 changes: 0 additions & 2 deletions include/Effect.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include "AudioEngine.h"
#include "AutomatableModel.h"
#include "TempoSyncKnobModel.h"
#include "MemoryManager.h"

namespace lmms
{
Expand All @@ -49,7 +48,6 @@ class EffectView;

class LMMS_EXPORT Effect : public Plugin
{
MM_OPERATORS
Q_OBJECT
public:
Effect( const Plugin::Descriptor * _desc,
Expand Down
2 changes: 0 additions & 2 deletions include/Instrument.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include "Flags.h"
#include "lmms_export.h"
#include "lmms_basics.h"
#include "MemoryManager.h"
#include "Plugin.h"
#include "TimePos.h"

Expand All @@ -47,7 +46,6 @@ class Track;

class LMMS_EXPORT Instrument : public Plugin
{
MM_OPERATORS
public:
enum class Flag
{
Expand Down
1 change: 0 additions & 1 deletion include/InstrumentTrack.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ class MidiCCRackView;
class LMMS_EXPORT InstrumentTrack : public Track, public MidiEventProcessor
{
Q_OBJECT
MM_OPERATORS
mapPropertyFromModel(int,getVolume,setVolume,m_volumeModel);
public:
InstrumentTrack( TrackContainer* tc );
Expand Down
111 changes: 0 additions & 111 deletions include/MemoryManager.h

This file was deleted.

Loading
Loading