Merge pull request #1088 from diizy/memmgr

LMMS Memory Manager

Author: diizy

include/AudioPort.h

@@ -22,55 +22,43 @@
  *
  */
 
-#ifndef _AUDIO_PORT_H
-#define _AUDIO_PORT_H
+#ifndef AUDIO_PORT_H
+#define AUDIO_PORT_H
 
 #include <QtCore/QString>
 #include <QtCore/QMutex>
 #include <QtCore/QMutexLocker>
 
 #include "Mixer.h"
+#include "MemoryManager.h"
+#include "PlayHandle.h"
 
 class EffectChain;
+class FloatModel;
 
 class AudioPort : public ThreadableJob
 {
+	MM_OPERATORS
 public:
-	AudioPort( const QString & _name, bool _has_effect_chain = true );
+	AudioPort( const QString & _name, bool _has_effect_chain = true, 
+		FloatModel * volumeModel = NULL, FloatModel * panningModel = NULL );
 	virtual ~AudioPort();
 
-	inline sampleFrame * firstBuffer()
+	inline sampleFrame * buffer()
 	{
-		return m_firstBuffer;
+		return m_portBuffer;
 	}
 
-	inline sampleFrame * secondBuffer()
+	inline void lockBuffer()
 	{
-		return m_secondBuffer;
+		m_portBufferLock.lock();
 	}
 
-	inline void lockFirstBuffer()
+	inline void unlockBuffer()
 	{
-		m_firstBufferLock.lock();
+		m_portBufferLock.unlock();
 	}
 
-	inline void lockSecondBuffer()
-	{
-		m_secondBufferLock.lock();
-	}
-
-	inline void unlockFirstBuffer()
-	{
-		m_firstBufferLock.unlock();
-	}
-
-	inline void unlockSecondBuffer()
-	{
-		m_secondBufferLock.unlock();
-	}
-
-	void nextPeriod();
-
 
 	// indicate whether JACK & Co should provide output-buffer at ext. port
 	inline bool extOutputEnabled() const
@@ -110,28 +98,20 @@ class AudioPort : public ThreadableJob
 	bool processEffects();
 
 	// ThreadableJob stuff
-	virtual void doProcessing( sampleFrame * );
+	virtual void doProcessing();
 	virtual bool requiresProcessing() const
 	{
 		return true;
 	}
 
-
-	enum bufferUsages
-	{
-		NoUsage,
-		FirstBuffer,
-		BothBuffers
-	} ;
-
+	void addPlayHandle( PlayHandle * handle );
+	void removePlayHandle( PlayHandle * handle );
 
 private:
-	volatile bufferUsages m_bufferUsage;
+	volatile bool m_bufferUsage;
 
-	sampleFrame * m_firstBuffer;
-	sampleFrame * m_secondBuffer;
-	QMutex m_firstBufferLock;
-	QMutex m_secondBufferLock;
+	sampleFrame * m_portBuffer;
+	QMutex m_portBufferLock;
 
 	bool m_extOutputEnabled;
 	fx_ch_t m_nextFxChannel;
@@ -140,6 +120,11 @@ class AudioPort : public ThreadableJob
 
 	EffectChain * m_effects;
 
+	PlayHandleList m_playHandles;
+	QMutex m_playHandleLock;
+	
+	FloatModel * m_volumeModel;
+	FloatModel * m_panningModel;
 
 	friend class Mixer;
 	friend class MixerWorkerThread;

include/AutomatableModel.h

@@ -32,7 +32,7 @@
 #include "Model.h"
 #include "MidiTime.h"
 #include "ValueBuffer.h"
-
+#include "MemoryManager.h"
 
 // simple way to map a property of a view to a model
 #define mapPropertyFromModelPtr(type,getfunc,setfunc,modelname)	\
@@ -66,6 +66,7 @@ class ControllerConnection;
 class EXPORT AutomatableModel : public Model, public JournallingObject
 {
 	Q_OBJECT
+	MM_OPERATORS
 public:
 	typedef QVector<AutomatableModel *> AutoModelVector;
 

include/BufferManager.h

@@ -0,0 +1,59 @@
+/*
+ * BufferManager.h - A buffer caching/memory management system
+ *
+ * Copyright (c) 2014 Vesa Kivimäki <contact/dot/diizy/at/nbl/dot/fi>
+ * Copyright (c) 2006-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ *
+ * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program (see COPYING); if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ */
+ 
+#ifndef BUFFER_MANAGER_H
+#define BUFFER_MANAGER_H
+
+#include "MemoryManager.h"
+#include "lmms_basics.h"
+#include "engine.h"
+#include "Mixer.h"
+#include <QtCore/QAtomicInt>
+#include <QtCore/QReadWriteLock>
+
+
+const int BM_INITIAL_BUFFERS = 512;
+//const int BM_INCREMENT = 64;
+
+class EXPORT BufferManager
+{
+public:
+	static void init( fpp_t framesPerPeriod );
+	static sampleFrame * acquire();
+	static void release( sampleFrame * buf );
+	static void refresh();
+//	static void extend( int c );
+	
+private:
+	static sampleFrame ** s_available;
+	static QAtomicInt s_availableIndex;
+	
+	static sampleFrame ** s_released;
+	static QAtomicInt s_releasedIndex;
+//	static QReadWriteLock s_mutex;
+	static int s_size;
+};
+
+#endif

include/ConfigManager.h

@@ -34,7 +34,7 @@
 #include <QtCore/QVector>
 
 #include "export.h"
-
+#include "MemoryManager.h"
 
 class engine;
 
@@ -49,6 +49,7 @@ const QString LOCALE_PATH = "locale/";
 
 class EXPORT ConfigManager
 {
+	MM_OPERATORS
 public:
 	static inline ConfigManager * inst()
 	{

include/DataFile.h

@@ -32,10 +32,11 @@
 
 #include "export.h"
 #include "lmms_basics.h"
-
+#include "MemoryManager.h"
 
 class EXPORT DataFile : public QDomDocument
 {
+	MM_OPERATORS
 public:
 	enum Types
 	{

include/DetuningHelper.h

@@ -23,14 +23,15 @@
  *
  */
 
-#ifndef _DETUNING_HELPER_H
-#define _DETUNING_HELPER_H
+#ifndef DETUNING_HELPER_H
+#define DETUNING_HELPER_H
 
 #include "InlineAutomation.h"
-
+#include "MemoryManager.h"
 
 class DetuningHelper : public InlineAutomation
 {
+	MM_OPERATORS
 public:
 	DetuningHelper() :
 		InlineAutomation()

include/Effect.h

@@ -31,14 +31,15 @@
 #include "Mixer.h"
 #include "AutomatableModel.h"
 #include "TempoSyncKnobModel.h"
-
+#include "MemoryManager.h"
 
 class EffectChain;
 class EffectControls;
 
 
 class EXPORT Effect : public Plugin
 {
+	MM_OPERATORS
 public:
 	Effect( const Plugin::Descriptor * _desc,
 			Model * _parent,

include/FxMixer.h

@@ -76,7 +76,7 @@ class FxChannel : public ThreadableJob
 		void processed();
 
 	private:
-		virtual void doProcessing( sampleFrame * _working_buffer );
+		virtual void doProcessing();
 };
 
 

include/Instrument.h

@@ -43,6 +43,7 @@ class track;
 
 class EXPORT Instrument : public Plugin
 {
+	MM_OPERATORS
 public:
 	enum Flag
 	{

include/InstrumentPlayHandle.h

@@ -28,16 +28,12 @@
 #include "PlayHandle.h"
 #include "Instrument.h"
 #include "NotePlayHandle.h"
+#include "export.h"
 
-
-class InstrumentPlayHandle : public PlayHandle
+class EXPORT InstrumentPlayHandle : public PlayHandle
 {
 public:
-	InstrumentPlayHandle( Instrument* instrument ) :
-		PlayHandle( TypeInstrumentPlayHandle ),
-		m_instrument( instrument )
-	{
-	}
+	InstrumentPlayHandle( Instrument * instrument, InstrumentTrack* instrumentTrack );
 
 	virtual ~InstrumentPlayHandle()
 	{
@@ -88,6 +84,7 @@ class InstrumentPlayHandle : public PlayHandle
 
 private:
 	Instrument* m_instrument;
+	InstrumentTrack * m_instrumentTrack;
 
 } ;