More fixes

include/InstrumentTrack.h

@@ -60,6 +60,7 @@ class trackLabelButton;
 class EXPORT InstrumentTrack : public track, public MidiEventProcessor
 {
 	Q_OBJECT
+	MM_OPERATORS
 	mapPropertyFromModel(int,getVolume,setVolume,m_volumeModel);
 public:
 	InstrumentTrack( TrackContainer* tc );

include/MemoryManager.h

@@ -127,4 +127,32 @@ static void operator delete[] ( void * ptr )	\
 // and just for symmetry...
 #define MM_FREE( ptr ) MemoryManager::free( ptr )
 
+
+
+// for debugging purposes
+
+#define MM_OPERATORS_DEBUG												\
+public: 																\
+static void * operator new ( size_t size )							\
+{																		\
+	qDebug( "MM_OPERATORS_DEBUG: new called for %d bytes", size );		\
+	return MemoryManager::alloc( size );								\
+}																		\
+static void * operator new[] ( size_t size )							\
+{																		\
+	qDebug( "MM_OPERATORS_DEBUG: new[] called for %d bytes", size );	\
+	return MemoryManager::alloc( size );								\
+}																		\
+static void operator delete ( void * ptr )							\
+{																		\
+	qDebug( "MM_OPERATORS_DEBUG: delete called for %p", ptr );			\
+	MemoryManager::free( ptr );										\
+}																		\
+static void operator delete[] ( void * ptr )						\
+{																		\
+	qDebug( "MM_OPERATORS_DEBUG: delete[] called for %p", ptr );		\
+	MemoryManager::free( ptr );										\
+}
+
+
 #endif

include/NotePlayHandle.h

@@ -91,8 +91,6 @@ public:
 		return m_frequency;
 	}
 
-	void updateFrequency();
-
 	/*! Returns frequency without pitch wheel influence */
 	float unpitchedFrequency() const
 	{
@@ -240,10 +238,15 @@ public:
 		return m_songGlobalParentOffset;
 	}
 
+	void setFrequencyUpdate()
+	{
+		m_frequencyNeedsUpdate = true;
+	}
 
 private:
 	class BaseDetuning
 	{
+		MM_OPERATORS
 	public:
 		BaseDetuning( DetuningHelper* detuning );
 
@@ -263,6 +266,8 @@ private:
 
 	} ;
 
+	void updateFrequency();
+
 	InstrumentTrack* m_instrumentTrack;		// needed for calling
 											// InstrumentTrack::playNote
 	f_cnt_t m_frames;						// total frames to play
@@ -298,6 +303,7 @@ private:
 	const int m_midiChannel;
 	const Origin m_origin;
 
+	bool m_frequencyNeedsUpdate;				// used to update pitch
 } ;
 
 #endif

include/Oscillator.h

@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _OSCILLATOR_H
-#define _OSCILLATOR_H
+#ifndef OSCILLATOR_H
+#define OSCILLATOR_H
 
 #include "lmmsconfig.h"
 
@@ -43,6 +43,7 @@ class IntModel;
 
 class EXPORT Oscillator
 {
+	MM_OPERATORS
 public:
 	enum WaveShapes
 	{

include/track.h

@@ -76,6 +76,7 @@ const int TCO_BORDER_WIDTH = 2;
 class trackContentObject : public Model, public JournallingObject
 {
 	Q_OBJECT
+	MM_OPERATORS
 	mapPropertyFromModel(bool,isMuted,setMuted,m_mutedModel);
 	mapPropertyFromModel(bool,isSolo,setSolo,m_soloModel);
 public:
@@ -406,6 +407,7 @@ signals:
 class EXPORT track : public Model, public JournallingObject
 {
 	Q_OBJECT
+	MM_OPERATORS
 	mapPropertyFromModel(bool,isMuted,setMuted,m_mutedModel);
 	mapPropertyFromModel(bool,isSolo,setSolo,m_soloModel);
 public: