attempt to fix #1512

This commit is contained in:
Hannu Haahti
2014-12-27 11:46:19 +02:00
parent 1cd8c0e2c4
commit bbbe515e58
5 changed files with 46 additions and 39 deletions

View File

@@ -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;

View File

@@ -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;