From 7c0ab622f1a930172a86e940ccae020dd5be9aca Mon Sep 17 00:00:00 2001 From: Dave French Date: Wed, 28 Jan 2015 12:16:21 +0000 Subject: [PATCH] Proposed fix for 1595 Instrument track activity LED lights when muted --- include/FadeButton.h | 1 + include/InstrumentTrack.h | 1 + src/gui/widgets/FadeButton.cpp | 5 +++++ src/tracks/InstrumentTrack.cpp | 15 +++++++++++++++ 4 files changed, 22 insertions(+) diff --git a/include/FadeButton.h b/include/FadeButton.h index 6e7371f9f..4f05b3491 100644 --- a/include/FadeButton.h +++ b/include/FadeButton.h @@ -39,6 +39,7 @@ public: _activated_color, QWidget * _parent ); virtual ~FadeButton(); + void setActiveColor( const QColor & activated_color ); public slots: diff --git a/include/InstrumentTrack.h b/include/InstrumentTrack.h index 16536c081..85a19c3de 100644 --- a/include/InstrumentTrack.h +++ b/include/InstrumentTrack.h @@ -225,6 +225,7 @@ protected slots: void updateBaseNote(); void updatePitch(); void updatePitchRange(); + void muteHasChanged(); private: diff --git a/src/gui/widgets/FadeButton.cpp b/src/gui/widgets/FadeButton.cpp index 3495ae959..4fea14f97 100644 --- a/src/gui/widgets/FadeButton.cpp +++ b/src/gui/widgets/FadeButton.cpp @@ -55,6 +55,11 @@ FadeButton::~FadeButton() { } +void FadeButton::setActiveColor( const QColor & activated_color ) +{ + m_activatedColor = activated_color; +} + diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp index cd598529e..a527e4300 100644 --- a/src/tracks/InstrumentTrack.cpp +++ b/src/tracks/InstrumentTrack.cpp @@ -124,6 +124,7 @@ InstrumentTrack::InstrumentTrack( TrackContainer* tc ) : connect( &m_baseNoteModel, SIGNAL( dataChanged() ), this, SLOT( updateBaseNote() ) ); connect( &m_pitchModel, SIGNAL( dataChanged() ), this, SLOT( updatePitch() ) ); connect( &m_pitchRangeModel, SIGNAL( dataChanged() ), this, SLOT( updatePitchRange() ) ); + connect( &m_mutedModel, SIGNAL( dataChanged() ), this, SLOT( muteHasChanged() ) ); m_effectChannelModel.setRange( 0, Engine::fxMixer()->numChannels()-1, 1); @@ -136,6 +137,7 @@ InstrumentTrack::InstrumentTrack( TrackContainer* tc ) : setName( tr( "Default preset" ) ); + } @@ -549,6 +551,19 @@ void InstrumentTrack::updatePitchRange() processOutEvent( MidiEvent( MidiControlChange, midiPort()->realOutputChannel(), MidiControllerDataEntry, midiPitchRange() ) ); } +void InstrumentTrack::muteHasChanged() +{ + if( m_mutedModel.value() ) + { + m_fb->setActiveColor( QColor( "red" ) ); + } else + { + m_fb->setActiveColor( QApplication::palette().color( QPalette::Active, + QPalette::BrightText ) ); + } + +} +