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

Defer updates to SampleBuffer

Browse Source 
Removed global lock from the Mixer
This commit is contained in:
Javier Serrano Polo
2016-06-18 05:29:21 +02:00
parent ecf9db66bd
commit 5606a04ad7
16 changed files with 65 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/GigPlayer/GigPlayer.cpp
View File

@@ -43,6 +43,7 @@
#include "Mixer.h"
#include "NotePlayHandle.h"
#include "Knob.h"
#include "SampleBuffer.h"
#include "Song.h"
#include "ConfigManager.h"
#include "endian_handling.h"

2
plugins/GigPlayer/GigPlayer.h
View File

@@ -30,6 +30,7 @@
#include <QList>
#include <QMutex>
#include <QMutexLocker>
#include <samplerate.h>
#include "Instrument.h"
#include "PixmapButton.h"
@@ -37,7 +38,6 @@
#include "Knob.h"
#include "LcdSpinBox.h"
#include "LedCheckbox.h"
#include "SampleBuffer.h"
#include "MemoryManager.h"
#include "gig.h"

1
plugins/sf2_player/sf2_player.cpp
View File

@@ -36,6 +36,7 @@
#include "Mixer.h"
#include "NotePlayHandle.h"
#include "Knob.h"
#include "SampleBuffer.h"
#include "Song.h"
#include "patches_dialog.h"

2
plugins/sf2_player/sf2_player.h
View File

@@ -28,6 +28,7 @@
#define SF2_PLAYER_H
#include <QMutex>
#include <samplerate.h>
#include "Instrument.h"
#include "PixmapButton.h"
@@ -36,7 +37,6 @@
#include "LcdSpinBox.h"
#include "LedCheckbox.h"
#include "fluidsynth.h"
#include "SampleBuffer.h"
#include "MemoryManager.h"
class sf2InstrumentView;

4
plugins/vestige/vestige.cpp
View File

@@ -644,7 +644,7 @@ void VestigeInstrumentView::openPlugin()
{
return;
}
Engine::mixer()->lock();
Engine::mixer()->requestChangeInModel();
if (m_vi->p_subWindow != NULL) {
delete m_vi->p_subWindow;
@@ -652,7 +652,7 @@ void VestigeInstrumentView::openPlugin()
}
m_vi->loadFile( ofd.selectedFiles()[0] );
Engine::mixer()->unlock();
Engine::mixer()->doneChangeInModel();
if( m_vi->m_plugin && m_vi->m_plugin->pluginWidget() )
{
m_vi->m_plugin->pluginWidget()->setWindowIcon(