hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #2586 from Fastigium/buffer-fix

Browse Source 
Drop PresetPreviewPlayHandle's shared buffer system
This commit is contained in:
Oskar Wallgren
2016-02-23 16:52:44 +01:00
parent 8d91dd657d 76f6b18632
commit a4649c8e6e
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/PresetPreviewPlayHandle.cpp
View File

@@ -118,6 +118,8 @@ PresetPreviewPlayHandle::PresetPreviewPlayHandle( const QString & _preset_file,
{
s_previewTC->lockData();
setUsesBuffer( false );
if( s_previewTC->previewNote() != NULL )
{
s_previewTC->previewNote()->mute();
@@ -185,6 +187,8 @@ PresetPreviewPlayHandle::PresetPreviewPlayHandle( const QString & _preset_file,
s_previewTC->setPreviewNote( m_previewNote );
Engine::mixer()->addPlayHandle( m_previewNote );
s_previewTC->unlockData();
Engine::projectJournal()->setJournalling( j );
}
@@ -201,7 +205,7 @@ PresetPreviewPlayHandle::~PresetPreviewPlayHandle()
// then set according state
s_previewTC->setPreviewNote( NULL );
}
NotePlayHandleManager::release( m_previewNote );
m_previewNote->noteOff();
s_previewTC->unlockData();
}
@@ -210,7 +214,8 @@ PresetPreviewPlayHandle::~PresetPreviewPlayHandle()
void PresetPreviewPlayHandle::play( sampleFrame * _working_buffer )
{
m_previewNote->play( _working_buffer );
// Do nothing; the preview instrument is played by m_previewNote, which
// has been added to the mixer
}