Remove unused default volume model in SamplePlayHandle (#8349)

Removes construction of the unused default volume model from `SamplePlayHandle`. Frequent construction of this model was causing performance slowdowns due to the model having to find and create a journaling ID in a for loop inside `ProjectJournal::allocID`, leading to the exhaustion of available IDs very quickly. There were also general improvements made to `SamplePlayHandle` (using NSDMI, removing other unused members, etc).

Author: sakertooth

include/SamplePlayHandle.h

@@ -27,7 +27,6 @@
 #define LMMS_SAMPLE_PLAY_HANDLE_H
 
 #include "Sample.h"
-#include "AutomatableModel.h"
 #include "PlayHandle.h"
 
 namespace lmms
@@ -73,27 +72,14 @@ class LMMS_EXPORT SamplePlayHandle : public PlayHandle
 		m_patternTrack = pt;
 	}
 
-	void setVolumeModel( FloatModel * _model )
-	{
-		m_volumeModel = _model;
-	}
-
-
 private:
-	Sample* m_sample;
-	bool m_doneMayReturnTrue;
-
-	f_cnt_t m_frame;
 	Sample::PlaybackState m_state;
-
-	const bool m_ownAudioBusHandle;
-
-	FloatModel m_defaultVolumeModel;
-	FloatModel * m_volumeModel;
-	Track * m_track;
-
-	PatternTrack* m_patternTrack;
-
+	f_cnt_t m_frame = 0;
+	Sample* m_sample = nullptr;
+	Track* m_track = nullptr;
+	PatternTrack* m_patternTrack = nullptr;
+	bool m_doneMayReturnTrue = true;
+	bool m_ownAudioBusHandle = false;
 } ;
 
 

src/core/SamplePlayHandle.cpp

@@ -26,25 +26,17 @@
 #include "AudioEngine.h"
 #include "AudioBusHandle.h"
 #include "Engine.h"
-#include "Note.h"
 #include "PatternTrack.h"
 #include "SampleClip.h"
 #include "SampleTrack.h"
 
 namespace lmms
 {
 
-
-SamplePlayHandle::SamplePlayHandle(Sample* sample, bool ownAudioBusHandle) :
-	PlayHandle(Type::SamplePlayHandle),
-	m_sample(sample),
-	m_doneMayReturnTrue(true),
-	m_frame(0),
-	m_ownAudioBusHandle(ownAudioBusHandle),
-	m_defaultVolumeModel(DefaultVolume, MinVolume, MaxVolume, 1),
-	m_volumeModel(&m_defaultVolumeModel),
-	m_track(nullptr),
-	m_patternTrack(nullptr)
+SamplePlayHandle::SamplePlayHandle(Sample* sample, bool ownAudioBusHandle)
+	: PlayHandle(Type::SamplePlayHandle)
+	, m_sample(sample)
+	, m_ownAudioBusHandle(ownAudioBusHandle)
 {
 	if (ownAudioBusHandle)
 	{

src/tracks/SampleTrack.cpp

@@ -152,7 +152,6 @@ bool SampleTrack::play( const TimePos & _start, const f_cnt_t _frames,
 			else
 			{
 				auto smpHandle = new SamplePlayHandle(st);
-				smpHandle->setVolumeModel( &m_volumeModel );
 				smpHandle->setPatternTrack(pattern_track);
 				handle = smpHandle;
 			}