From 4dc5d14ea35e382bf7a2f9a8e16ca92bf3af4abf Mon Sep 17 00:00:00 2001 From: Karmo Rosental Date: Sun, 26 Mar 2017 21:58:41 +0300 Subject: [PATCH] Fixed #3443. Added and fixed mixer automation labels. (#3453) --- src/core/FxMixer.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/core/FxMixer.cpp b/src/core/FxMixer.cpp index 56284f9cafd..5ac23639a5c 100644 --- 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)