Mergefix

include/FadeButton.h

@@ -47,6 +47,7 @@ public:
 public slots:
 	void activate();
 	void noteEnd();
+	void notPlaying();
 
 
 protected:

include/InstrumentTrack.h

@@ -333,7 +333,6 @@ private slots:
 	void midiInSelected();
 	void midiOutSelected();
 	void midiConfigChanged();
-	void muteChanged();
 
 	void assignFxLine( int channelIndex );
 	void createFxLine();
@@ -357,6 +356,10 @@ private:
 
 	QPoint m_lastPos;
 
+	FadeButton * getActivityIndicator()
+	{
+		return m_activityIndicator;
+	}
 
 	friend class InstrumentTrackWindow;
 

include/SampleTrack.h

@@ -29,6 +29,7 @@
 #include <QLayout>
 
 #include "AudioPort.h"
+#include "FadeButton.h"
 #include "FxMixer.h"
 #include "FxLineLcdSpinBox.h"
 #include "Track.h"
@@ -161,6 +162,20 @@ public:
 		return "sampletrack";
 	}
 
+	bool wasPlaying()
+	{
+		return m_wasPlaying;
+	}
+
+	void setWasPlaying(bool wasPlaying)
+	{
+		m_wasPlaying = wasPlaying;
+	}
+
+signals:
+	void playing();
+	void notPlaying();
+
 public slots:
 	void updateTcos();
 	void setPlayingTcos( bool isPlaying );
@@ -171,6 +186,7 @@ private:
 	FloatModel m_panningModel;
 	IntModel m_effectChannelModel;
 	AudioPort m_audioPort;
+	bool m_wasPlaying;
 
 
 
@@ -209,6 +225,7 @@ public:
 
 public slots:
 	void showEffects();
+	void stopPlaying();
 
 
 protected:
@@ -230,9 +247,14 @@ private:
 	SampleTrackWindow * m_window;
 	Knob * m_volumeKnob;
 	Knob * m_panningKnob;
+	FadeButton * m_activityIndicator;
 
 	TrackLabelButton * m_tlb;
 
+	FadeButton * getActivityIndicator()
+	{
+		return m_activityIndicator;
+	}
 
 	friend class SampleTrackWindow;
 

include/Track.h

@@ -39,6 +39,7 @@
 #include "AutomatableModel.h"
 #include "ModelView.h"
 #include "DataFile.h"
+#include "FadeButton.h"
 
 
 class QMenu;
@@ -739,12 +740,17 @@ private:
 
 	Actions m_action;
 
+	virtual FadeButton * getActivityIndicator()
+	{
+		return NULL;
+	}
 
 	friend class TrackLabelButton;
 
 
 private slots:
 	void createTCOView( TrackContentObject * tco );
+	void muteChanged ();
 
 } ;