Merge pull request #1516 from grejppi/master-mute

attempt to fix #1512

include/AudioPort.h

@@ -35,13 +35,15 @@
 
 class EffectChain;
 class FloatModel;
+class BoolModel;
 
 class AudioPort : public ThreadableJob
 {
 	MM_OPERATORS
 public:
-	AudioPort( const QString & _name, bool _has_effect_chain = true, 
-		FloatModel * volumeModel = NULL, FloatModel * panningModel = NULL );
+	AudioPort( const QString & _name, bool _has_effect_chain = true,
+		FloatModel * volumeModel = NULL, FloatModel * panningModel = NULL,
+		BoolModel * mutedModel = NULL );
 	virtual ~AudioPort();
 
 	inline sampleFrame * buffer()
@@ -117,14 +119,15 @@ private:
 	fx_ch_t m_nextFxChannel;
 
 	QString m_name;
-	
+
 	EffectChain * m_effects;
 
 	PlayHandleList m_playHandles;
 	QMutex m_playHandleLock;
-	
+
 	FloatModel * m_volumeModel;
 	FloatModel * m_panningModel;
+	BoolModel * m_mutedModel;
 
 	friend class Mixer;
 	friend class MixerWorkerThread;

include/Track.h

@@ -120,7 +120,7 @@ public:
 	{
 		return m_length;
 	}
-	
+
 	virtual void movePosition( const MidiTime & _pos );
 	virtual void changeLength( const MidiTime & _length );
 
@@ -539,7 +539,9 @@ private:
 	QString m_name;
 	int m_height;
 
+protected:
 	BoolModel m_mutedModel;
+private:
 	BoolModel m_soloModel;
 	bool m_mutedBeforeSolo;