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.

Sign up for GitHub

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
Merged

Remove MemoryManager #7128

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1579932
Test remove rpmalloc
Veratil Jun 22, 2023
432f986
Remove rpmalloc submodule
TechnoPorg Feb 25, 2024
80bba30
Remove MemoryManager.h, MemoryManager.cpp, and all references to both
TechnoPorg Feb 25, 2024
18bbc05
Update wiki
TechnoPorg Feb 25, 2024
00734d5
Remove references to MM_ALLOC and MM_FREE
TechnoPorg Feb 25, 2024
c9e456b
Fix headers
TechnoPorg Feb 25, 2024
325c5cc
Fix rebase issue
TechnoPorg Feb 25, 2024
19dd806
Revert "Update wiki"
TechnoPorg Feb 25, 2024
41c0c5a
Yet more fixes to Git
TechnoPorg Feb 25, 2024
6b4e847
Fix wiki submodule hopefully for good
TechnoPorg Feb 25, 2024
49f722d
It was not fixed.
TechnoPorg Feb 25, 2024
dec5e73
Address review comments
TechnoPorg Feb 25, 2024
a1bd081
Put 2 more tabs back
TechnoPorg Feb 25, 2024
611ad98
Put 1 more tab back for real
TechnoPorg Feb 25, 2024
155424e
Fix odd tab issue
TechnoPorg Feb 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
3 changes: 1 addition & 2 deletions include/DataFile.h
View file
Open in desktop
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 LMMS_EXPORT DataFile : public QDomDocument
{
MM_OPERATORS

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

Expand Down Expand Up @@ -149,7 +148,7 @@
QDomElement m_head;
Type m_type;
unsigned int m_fileVersion;

Check notice on line 151 in include/DataFile.h

View check run for this annotation

codefactor.io / CodeFactor

include/DataFile.h#L151 

Redundant blank line at the end of a code block should be deleted. (whitespace/blank_line)
} ;


Expand Down
41 changes: 20 additions & 21 deletions include/Delay.h
View file
Open in desktop
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 All @@ -98,7 +97,7 @@ class CombFeedback
{
memset( m_buffer, 0, sizeof( frame ) * m_size );
}

inline void setDelay( double delay )
{
m_delay = static_cast<int>( ceil( delay ) );
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 All @@ -169,7 +168,7 @@ class CombFeedfwd
{
memset( m_buffer, 0, sizeof( frame ) * m_size );
}

inline void setDelay( double delay )
{
m_delay = static_cast<int>( ceil( delay ) );
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 All @@ -240,7 +239,7 @@ class CombFeedbackDualtap
{
memset( m_buffer, 0, sizeof( frame ) * m_size );
}
TechnoPorg marked this conversation as resolved.
Show resolved Hide resolved

inline void setDelays( double delay1, double delay2 )
{
m_delay1 = static_cast<int>( ceil( delay1 ) );
Expand Down Expand Up @@ -297,26 +296,26 @@ 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;
m_position %= m_size;
}

TechnoPorg marked this conversation as resolved.
Show resolved Hide resolved
inline void clearHistory()
{
memset( m_buffer, 0, sizeof( frame ) * m_size );
Expand Down
2 changes: 0 additions & 2 deletions include/DetuningHelper.h
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading
Loading