Fixed #3443. Added and fixed mixer automation labels. (#3453)

LMMS · Mar 26, 2017 · 4dc5d14 · 4dc5d14
1 parent 6004eda
commit 4dc5d14
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/core/FxMixer.cpp b/src/core/FxMixer.cpp
@@ -562,7 +562,7 @@ void FxMixer::mixToChannel( const sampleFrame * _buf, fx_ch_t _ch )
 
 void FxMixer::prepareMasterMix()
 {
-	BufferManager::clear( m_fxChannels[0]->m_buffer, 
+	BufferManager::clear( m_fxChannels[0]->m_buffer,
 					Engine::mixer()->framesPerPeriod() );
 }
 
@@ -635,7 +635,7 @@ void FxMixer::masterMix( sampleFrame * _buf )
 	// reset channel process state
 	for( int i = 0; i < numChannels(); ++i)
 	{
-		BufferManager::clear( m_fxChannels[i]->m_buffer, 
+		BufferManager::clear( m_fxChannels[i]->m_buffer,
 				Engine::mixer()->framesPerPeriod() );
 		m_fxChannels[i]->reset();
 		m_fxChannels[i]->m_queued = false;
@@ -668,7 +668,9 @@ void FxMixer::clearChannel(fx_ch_t index)
 	ch->m_muteModel.setValue( false );
 	ch->m_soloModel.setValue( false );
 	ch->m_name = ( index == 0 ) ? tr( "Master" ) : tr( "FX %1" ).arg( index );
-	ch->m_volumeModel.setDisplayName( ch->m_name );
+	ch->m_volumeModel.setDisplayName( ch->m_name + ">" + tr( "Volume" ) );
+	ch->m_muteModel.setDisplayName( ch->m_name + ">" + tr( "Mute" ) );
+	ch->m_soloModel.setDisplayName( ch->m_name + ">" + tr( "Solo" ) );
 
 	// send only to master
 	if( index > 0)