Enable mixer color-coding

include/FxLine.h

@@ -101,6 +101,9 @@ class FxLine : public QWidget
 
 public slots:
 	void renameChannel();
+	void resetColor();
+	void changeColor();
+	void randomColor();
 
 private slots:
 	void renameFinished();

include/FxMixer.h

@@ -32,6 +32,8 @@
 
 #include <atomic>
 
+#include <QColor>
+
 class FxRoute;
 typedef QVector<FxRoute *> FxRouteVector;
 
@@ -69,6 +71,9 @@ class FxChannel : public ThreadableJob
 
 		bool requiresProcessing() const override { return true; }
 		void unmuteForSolo();
+
+		QColor m_color;
+		bool m_hasColor;
 
 
 		std::atomic_int m_dependenciesMet;

src/core/FxMixer.cpp

@@ -73,6 +73,7 @@ FxChannel::FxChannel( int idx, Model * _parent ) :
 	m_lock(),
 	m_channelIndex( idx ),
 	m_queued( false ),
+	m_hasColor( false ),
 	m_dependenciesMet(0)
 {
 	BufferManager::clear( m_buffer, Engine::mixer()->framesPerPeriod() );
@@ -741,6 +742,8 @@ void FxMixer::saveSettings( QDomDocument & _doc, QDomElement & _this )
 		ch->m_soloModel.saveSettings( _doc, fxch, "soloed" );
 		fxch.setAttribute( "num", i );
 		fxch.setAttribute( "name", ch->m_name );
+		fxch.setAttribute( "hascolor", ch->m_hasColor );
+		fxch.setAttribute( "mixercolor", ch->m_color.rgb() );
 
 		// add the channel sends
 		for( int si = 0; si < ch->m_sends.size(); ++si )
@@ -786,6 +789,11 @@ void FxMixer::loadSettings( const QDomElement & _this )
 		m_fxChannels[num]->m_muteModel.loadSettings( fxch, "muted" );
 		m_fxChannels[num]->m_soloModel.loadSettings( fxch, "soloed" );
 		m_fxChannels[num]->m_name = fxch.attribute( "name" );
+		if( fxch.hasAttribute( "hascolor" ) )
+		{
+			m_fxChannels[num]->m_hasColor = fxch.attribute( "hascolor" ).toInt();
+			m_fxChannels[num]->m_color.setRgb( fxch.attribute( "mixercolor" ).toUInt() );
+		}
 
 		m_fxChannels[num]->m_fxChain.restoreState( fxch.firstChildElement(
 			m_fxChannels[num]->m_fxChain.nodeName() ) );

src/gui/widgets/FxLine.cpp

@@ -25,6 +25,10 @@
 
 #include "FxLine.h"
 
+#include <cstdlib>
+#include <ctime>
+
+#include <QColorDialog>
 #include <QGraphicsProxyWidget>
 
 #include "CaptionMenu.h"
@@ -120,6 +124,10 @@ FxLine::FxLine( QWidget * _parent, FxMixerView * _mv, int _channelIndex ) :
 	proxyWidget->setPos( 8, 145 );
 
 	connect( m_renameLineEdit, SIGNAL( editingFinished() ), this, SLOT( renameFinished() ) );
+
+	connect( &Engine::fxMixer()->effectChannel( m_channelIndex )->m_muteModel, SIGNAL( dataChanged() ), this, SLOT( update() ) );
+
+	srand( time( 0 ) );
 }
 
 
@@ -148,6 +156,7 @@ void FxLine::setChannelIndex( int index )
 void FxLine::drawFxLine( QPainter* p, const FxLine *fxLine, bool isActive, bool sendToThis, bool receiveFromThis )
 {
 	QString name = Engine::fxMixer()->effectChannel( m_channelIndex )->m_name;
+	bool muted = Engine::fxMixer()->effectChannel( m_channelIndex )->m_muteModel.value();
 	QString elidedName = elideName( name );
 	if( !m_inRename && m_renameLineEdit->text() != elidedName )
 	{
@@ -157,7 +166,13 @@ void FxLine::drawFxLine( QPainter* p, const FxLine *fxLine, bool isActive, bool
 	int width = fxLine->rect().width();
 	int height = fxLine->rect().height();
 
-	p->fillRect( fxLine->rect(), isActive ? fxLine->backgroundActive() : p->background() );
+	QColor color = muted ? ( isActive ? fxLine->backgroundActive().color() : p->background().color() )
+					: ( Engine::fxMixer()->effectChannel( m_channelIndex )->m_hasColor ? ( isActive ? Engine::fxMixer()->effectChannel( m_channelIndex )->m_color.darker( 120 ) 
+					: Engine::fxMixer()->effectChannel( m_channelIndex )->m_color.darker( 150 ) )
+					: ( isActive ? fxLine->backgroundActive().color()
+					: p->background().color() ) );
+
+	p->fillRect( fxLine->rect(), color );
 
 	// inner border
 	p->setPen( isActive ? fxLine->strokeInnerActive() : fxLine->strokeInnerInactive() );
@@ -238,6 +253,11 @@ void FxLine::contextMenuEvent( QContextMenuEvent * )
 		contextMenu->addSeparator();
 	}
 	contextMenu->addAction( embed::getIconPixmap( "cancel" ), tr( "Remove &unused channels" ), this, SLOT( removeUnusedChannels() ) );
+
+	contextMenu->addSeparator();
+	contextMenu->addAction( embed::getIconPixmap( "colorize" ), tr( "Set channel color" ), this, SLOT( changeColor() ) );
+	contextMenu->addAction( embed::getIconPixmap( "colorize" ), tr( "Remove channel color" ), this, SLOT( resetColor() ) );
+	contextMenu->addAction( embed::getIconPixmap( "colorize" ), tr( "Pick random channel color" ), this, SLOT( randomColor() ) );
 	contextMenu->exec( QCursor::pos() );
 	delete contextMenu;
 }
@@ -395,3 +415,57 @@ void FxLine::setStrokeInnerInactive( const QColor & c )
 {
 	m_strokeInnerInactive = c;
 }
+
+void FxLine::changeColor()
+{
+	QColorDialog colorDialog( Engine::fxMixer()->effectChannel( m_channelIndex )->m_color );
+	QColor buffer( 0, 0, 0 );
+
+	for( int i = 0; i < 48; i += 6 )
+	{
+		for( int j = 0; j < 6; j++ )
+		{
+			buffer.setHsl( qMax( 0, 44 * ( i / 6 ) - 1 ), 150 - 20 * j, 140 - 10 * j );
+			colorDialog.setStandardColor( i + j, buffer );
+		}
+
+	}
+
+	QColor new_color = colorDialog.getColor( Engine::fxMixer()->effectChannel( m_channelIndex )->m_color );
+	if( ! new_color.isValid() )
+	{ return; }
+
+	Engine::fxMixer()->effectChannel( m_channelIndex )->m_color = new_color;
+	Engine::fxMixer()->effectChannel( m_channelIndex )->m_hasColor = true;
+
+	update();
+}
+
+void FxLine::resetColor()
+{
+	Engine::fxMixer()->effectChannel( m_channelIndex )->m_hasColor = false;
+	update();
+}
+
+void FxLine::randomColor()
+{
+	int index = rand() % 48;
+	QColor buffer( 0, 0, 0 );
+
+	for( int i = 0; i < 48; i += 6 )
+	{
+		for( int j = 0; j < 6; j++ )
+		{
+			if( i + j + 1 == index )
+			{
+				buffer.setHsl( qMax( 0, 44 * ( i / 6 ) - 1 ), 150 - 20 * j, 140 - 10 * j );	
+				break;
+			}
+		}
+
+	}
+
+	Engine::fxMixer()->effectChannel( m_channelIndex )->m_color = buffer;
+	Engine::fxMixer()->effectChannel( m_channelIndex )->m_hasColor = true;
+	update();
+}