Merge pull request #2822 from jasp00/rm-track

Fix removal of track when notes are playing

plugins/GigPlayer/GigPlayer.cpp

@@ -40,6 +40,7 @@
 #include "Engine.h"
 #include "InstrumentTrack.h"
 #include "InstrumentPlayHandle.h"
+#include "Mixer.h"
 #include "NotePlayHandle.h"
 #include "Knob.h"
 #include "Song.h"

plugins/audio_file_processor/audio_file_processor.cpp

@@ -35,6 +35,7 @@
 #include "Engine.h"
 #include "Song.h"
 #include "InstrumentTrack.h"
+#include "Mixer.h"
 #include "NotePlayHandle.h"
 #include "interpolation.h"
 #include "gui_templates.h"

plugins/bit_invader/bit_invader.cpp

@@ -32,6 +32,7 @@
 #include "InstrumentTrack.h"
 #include "Knob.h"
 #include "LedCheckbox.h"
+#include "Mixer.h"
 #include "NotePlayHandle.h"
 #include "Oscillator.h"
 #include "PixmapButton.h"

plugins/carlabase/carla.cpp

@@ -32,6 +32,7 @@
 #include "gui_templates.h"
 #include "InstrumentPlayHandle.h"
 #include "InstrumentTrack.h"
+#include "Mixer.h"
 
 #include <QApplication>
 #include <QFileDialog>

plugins/kicker/kicker.cpp

@@ -31,6 +31,7 @@
 #include "Engine.h"
 #include "InstrumentTrack.h"
 #include "Knob.h"
+#include "Mixer.h"
 #include "NotePlayHandle.h"
 #include "KickerOsc.h"
 

plugins/lb302/lb302.h

@@ -37,7 +37,6 @@
 #include "InstrumentView.h"
 #include "LedCheckbox.h"
 #include "Knob.h"
-#include "Mixer.h"
 #include "NotePlayHandle.h"
 #include <QMutex>
 

plugins/nes/Nes.cpp

@@ -33,6 +33,7 @@
 #include "Song.h"
 #include "lmms_math.h"
 #include "interpolation.h"
+#include "Mixer.h"
 #include "Oscillator.h"
 
 #include "embed.cpp"

plugins/opl2/opl2instrument.cpp

@@ -40,6 +40,7 @@
 #include "Engine.h"
 #include "InstrumentPlayHandle.h"
 #include "InstrumentTrack.h"
+#include "Mixer.h"
 
 #include <QDomDocument>
 #include <QFile>

plugins/organic/organic.cpp

@@ -33,6 +33,7 @@
 #include "Engine.h"
 #include "InstrumentTrack.h"
 #include "Knob.h"
+#include "Mixer.h"
 #include "NotePlayHandle.h"
 #include "Oscillator.h"
 #include "PixmapButton.h"

plugins/papu/papu_instrument.cpp

@@ -32,6 +32,7 @@
 #include "base64.h"
 #include "InstrumentTrack.h"
 #include "Knob.h"
+#include "Mixer.h"
 #include "NotePlayHandle.h"
 #include "PixmapButton.h"
 #include "ToolTip.h"

plugins/sf2_player/sf2_player.cpp

@@ -33,6 +33,7 @@
 #include "Engine.h"
 #include "InstrumentTrack.h"
 #include "InstrumentPlayHandle.h"
+#include "Mixer.h"
 #include "NotePlayHandle.h"
 #include "Knob.h"
 #include "Song.h"

plugins/sfxr/sfxr.cpp

@@ -49,6 +49,7 @@ float frnd(float range)
 #include "Song.h"
 #include "MidiEvent.h"
 #include "MidiTime.h"
+#include "Mixer.h"
 
 #include "embed.cpp"
 

plugins/sid/sid_instrument.cpp

@@ -35,6 +35,7 @@
 #include "Engine.h"
 #include "InstrumentTrack.h"
 #include "Knob.h"
+#include "Mixer.h"
 #include "NotePlayHandle.h"
 #include "PixmapButton.h"
 #include "ToolTip.h"

plugins/stk/mallets/mallets.cpp

@@ -37,6 +37,7 @@
 #include "gui_templates.h"
 #include "GuiApplication.h"
 #include "InstrumentTrack.h"
+#include "Mixer.h"
 
 #include "embed.cpp"
 

plugins/triple_oscillator/TripleOscillator.cpp

@@ -33,6 +33,7 @@
 #include "Engine.h"
 #include "InstrumentTrack.h"
 #include "Knob.h"
+#include "Mixer.h"
 #include "NotePlayHandle.h"
 #include "PixmapButton.h"
 #include "SampleBuffer.h"

plugins/vestige/vestige.cpp

@@ -38,6 +38,7 @@
 #include "InstrumentTrack.h"
 #include "VstPlugin.h"
 #include "MainWindow.h"
+#include "Mixer.h"
 #include "GuiApplication.h"
 #include "PixmapButton.h"
 #include "StringPairDrag.h"

plugins/vibed/vibed.cpp

@@ -29,6 +29,7 @@
 #include "vibed.h"
 #include "Engine.h"
 #include "InstrumentTrack.h"
+#include "Mixer.h"
 #include "NotePlayHandle.h"
 #include "ToolTip.h"
 #include "base64.h"

plugins/vst_base/VstPlugin.cpp

@@ -48,6 +48,7 @@
 #include "ConfigManager.h"
 #include "GuiApplication.h"
 #include "MainWindow.h"
+#include "Mixer.h"
 #include "Song.h"
 #include "templates.h"
 #include "FileDialog.h"

plugins/vst_base/VstPlugin.h

@@ -32,7 +32,6 @@
 #include <QTimer>
 #include <QWidget>
 
-#include "Mixer.h"
 #include "JournallingObject.h"
 #include "communication.h"
 

plugins/watsyn/Watsyn.cpp

@@ -32,6 +32,7 @@
 #include "ToolTip.h"
 #include "Song.h"
 #include "lmms_math.h"
+#include "Mixer.h"
 #include "interpolation.h"
 
 #include "embed.cpp"

plugins/zynaddsubfx/ZynAddSubFx.cpp

@@ -42,6 +42,7 @@
 #include "StringPairDrag.h"
 #include "RemoteZynAddSubFx.h"
 #include "LocalZynAddSubFx.h"
+#include "Mixer.h"
 #include "ControllerConnection.h"
 
 #include "embed.cpp"