Skip to content

LMMS Memory Manager #1088

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

Merged
diizy merged 28 commits into from
Nov 18, 2014
Merged

LMMS Memory Manager #1088

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9c25be1
LMMS Memory Manager
diizy Aug 22, 2014
75770b4
Fix 64 bit, increase mm usage
diizy Aug 22, 2014
9972cb3
Fixes
diizy Aug 23, 2014
5e43085
More fixes
diizy Aug 23, 2014
42e67d2
Add dedicated manager for noteplayhandles
diizy Aug 23, 2014
8fb8c68
Changing and fixing some stuff
diizy Aug 24, 2014
3a9e9cc
Use ReadWriteLock for the pools container instead of Mutex
diizy Aug 24, 2014
a821187
Fix arpeggio to work better with the new way to handle note offsets
diizy Aug 24, 2014
3d9a7fb
remove tr.whitespace
diizy Aug 24, 2014
f3ed39a
Fix weird issue with remotevstplugin
diizy Aug 24, 2014
daa5f6c
Use memory management in LADSPA effects
diizy Aug 24, 2014
af60402
Make it possible to use sample-exact controls in LADSPA plugins
diizy Aug 24, 2014
311d33d
Implement BufferManager
diizy Aug 24, 2014
857de8d
Huge structural changes
diizy Aug 26, 2014
1deb80a
Finish audioport rehaul, get vol/pan knobs working again, also some b…
diizy Aug 27, 2014
1864dcf
Fix bugs
diizy Aug 29, 2014
9a3d3cb
Fix windows compiling
diizy Aug 29, 2014
7bc97f5
Fixes
diizy Aug 31, 2014
68b5a21
Initialize BufferManager from within Mixer
tobydox Sep 2, 2014
9fe5516
Remove base64.h again (was re-added accidentally at merge resolution)
diizy Sep 3, 2014
dc4bfdc
Various fixes and precautions
diizy Oct 11, 2014
f25da35
Sanitize all channel outputs when exporting
diizy Oct 15, 2014
50bfed7
Fix Carla in memmgr branch
diizy Oct 15, 2014
8a596b0
Sanitize output of all effects when exporting
diizy Oct 20, 2014
f207613
Some attention on peak controller
diizy Oct 31, 2014
b441bda
Freeverb3: make it work properly on all samplerates
diizy Nov 9, 2014
ba05b75
More peak controller changes:
diizy Nov 10, 2014
815a70a
Sync
diizy Nov 16, 2014
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
Prev Previous commit
Next Next commit
Fix bugs
  • Loading branch information
@diizy
diizy committed Nov 18, 2014
commit 1864dcfaa1260e2659c85d1fb63cb2d428e9f1ab
4 changes: 2 additions & 2 deletions include/MemoryManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include <QtCore/QReadWriteLock>
#include <QtCore/QHash>
#include "MemoryHelper.h"

#include "export.h"

const int MM_CHUNK_SIZE = 64; // granularity of managed memory
const int MM_INITIAL_CHUNKS = 1024 * 1024; // how many chunks to allocate at startup - TODO: make configurable
Expand Down Expand Up @@ -85,7 +85,7 @@ struct PtrInfo
typedef QVector<MemoryPool> MemoryPoolVector;
typedef QHash<void*, PtrInfo> PointerInfoMap;

class MemoryManager
class EXPORT MemoryManager
{
public:
static bool init();
Expand Down
2 changes: 0 additions & 2 deletions src/core/audio/AudioPort.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,6 @@ void AudioPort::doProcessing()
{
const fpp_t fpp = engine::mixer()->framesPerPeriod();

if( m_playHandles.isEmpty() ) return; // skip processing if no playhandles are connected

m_portBuffer = BufferManager::acquire(); // get buffer for processing

engine::mixer()->clearAudioBuffer( m_portBuffer, fpp ); // clear the audioport buffer so we can use it
Expand Down