From 1fddc81c0426011c4797648d91a8b5dfbbe9eb9e Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Sun, 26 Jan 2014 00:25:32 +0100
Subject: [PATCH] InstrumentTrack: removed option for disabling activity
 indicators

Probably never used by anyone and just makes code unneccessarily complex.
---
 include/setup_dialog.h         |  2 --
 src/gui/setup_dialog.cpp       | 30 ++++--------------------------
 src/tracks/InstrumentTrack.cpp |  9 ++-------
 3 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/include/setup_dialog.h b/include/setup_dialog.h
index 866cea7d9..53c2be08f 100644
--- a/include/setup_dialog.h
+++ b/include/setup_dialog.h
@@ -102,7 +102,6 @@ private slots:
 	void openDefaultSoundfont();
 	void openBackgroundArtwork();
 
-	void toggleDisableChActInd( bool _disabled );
 	void toggleSmoothScroll( bool _enabled );
 	void toggleAutoSave( bool _enabled );
 	void toggleOneInstrumentTrackWindow( bool _enabled );
@@ -153,7 +152,6 @@ private:
 #endif
 	QString m_backgroundArtwork;
 
-	bool m_disableChActInd;
 	bool m_smoothScroll;
 	bool m_enableAutoSave;
 	bool m_oneInstrumentTrackWindow;
diff --git a/src/gui/setup_dialog.cpp b/src/gui/setup_dialog.cpp
index 5703d739c..d863833b6 100644
--- a/src/gui/setup_dialog.cpp
+++ b/src/gui/setup_dialog.cpp
@@ -108,8 +108,6 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
 	m_stkDir( configManager::inst()->stkDir() ),
 #endif
 	m_backgroundArtwork( configManager::inst()->backgroundArtwork() ),
-	m_disableChActInd( configManager::inst()->value( "ui",
-				"disablechannelactivityindicators" ).toInt() ),
 	m_smoothScroll( configManager::inst()->value( "ui", "smoothscroll" ).toInt() ),
 	m_enableAutoSave( configManager::inst()->value( "ui", "enableautosave" ).toInt() ),
 	m_oneInstrumentTrackWindow( configManager::inst()->value( "ui",
@@ -511,20 +509,11 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
 	tabWidget * ui_fx_tw = new tabWidget( tr( "UI effects vs. "
 						"performance" ).toUpper(),
 								performance );
-	ui_fx_tw->setFixedHeight( 120 );
-
-	ledCheckBox * disable_ch_act_ind = new ledCheckBox(
-				tr( "Disable channel activity indicators" ),
-								ui_fx_tw );
-	disable_ch_act_ind->move( 10, 20 );
-	disable_ch_act_ind->setChecked( m_disableChActInd );
-	connect( disable_ch_act_ind, SIGNAL( toggled( bool ) ),
-				this, SLOT( toggleDisableChActInd( bool ) ) );
-
+	ui_fx_tw->setFixedHeight( 80 );
 
 	ledCheckBox * smoothScroll = new ledCheckBox(
 			tr( "Smooth scroll in Song Editor" ), ui_fx_tw );
-	smoothScroll->move( 10, 40 );
+	smoothScroll->move( 10, 20 );
 	smoothScroll->setChecked( m_smoothScroll );
 	connect( smoothScroll, SIGNAL( toggled( bool ) ),
 				this, SLOT( toggleSmoothScroll( bool ) ) );
@@ -532,7 +521,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
 
 	ledCheckBox * autoSave = new ledCheckBox(
 			tr( "Enable auto save feature" ), ui_fx_tw );
-	autoSave->move( 10, 60 );
+	autoSave->move( 10, 40 );
 	autoSave->setChecked( m_enableAutoSave );
 	connect( autoSave, SIGNAL( toggled( bool ) ),
 				this, SLOT( toggleAutoSave( bool ) ) );
@@ -541,7 +530,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
 	ledCheckBox * animAFP = new ledCheckBox(
 				tr( "Show playback cursor in AudioFileProcessor" ),
 								ui_fx_tw );
-	animAFP->move( 10, 80 );
+	animAFP->move( 10, 60 );
 	animAFP->setChecked( m_animateAFP );
 	connect( animAFP, SIGNAL( toggled( bool ) ),
 				this, SLOT( toggleAnimateAFP( bool ) ) );
@@ -808,9 +797,6 @@ void setupDialog::accept()
 						QString::number( !m_MMPZ ) );
 	configManager::inst()->setValue( "mixer", "hqaudio",
 					QString::number( m_hqAudioDev ) );
-	configManager::inst()->setValue( "ui",
-					"disablechannelactivityindicators",
-					QString::number( m_disableChActInd ) );
 	configManager::inst()->setValue( "ui", "smoothscroll",
 					QString::number( m_smoothScroll ) );
 	configManager::inst()->setValue( "ui", "enableautosave",
@@ -967,14 +953,6 @@ void setupDialog::toggleHQAudioDev( bool _enabled )
 
 
 
-void setupDialog::toggleDisableChActInd( bool _disabled )
-{
-	m_disableChActInd = _disabled;
-}
-
-
-
-
 void setupDialog::toggleSmoothScroll( bool _enabled )
 {
 	m_smoothScroll = _enabled;
diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp
index fd16fc90d..0b55bf53f 100644
--- a/src/tracks/InstrumentTrack.cpp
+++ b/src/tracks/InstrumentTrack.cpp
@@ -364,13 +364,6 @@ void InstrumentTrack::processOutEvent( const MidiEvent& event, const MidiTime& t
 	{
 		case MidiNoteOn:
 			m_piano.setKeyState( event.key(), true );
-			if( !configManager::inst()->value( "ui", "disablechannelactivityindicators" ).toInt() )
-			{
-				if( m_notes[event.key()] == NULL )
-				{
-					emit newNote();
-				}
-			}
 			k = masterKey( event.key() );
 			if( k >= 0 && k < NumKeys )
 			{
@@ -380,6 +373,8 @@ void InstrumentTrack::processOutEvent( const MidiEvent& event, const MidiTime& t
 				}
 				++m_runningMidiNotes[k];
 				m_instrument->handleMidiEvent( MidiEvent( MidiNoteOn, midiPort()->realOutputChannel(), k, event.velocity() ), time );
+
+				emit newNote();
 			}
 			break;