From aaf94ef69dab60b016044671f4036d603b836e28 Mon Sep 17 00:00:00 2001 From: Spekular Date: Thu, 30 Apr 2020 22:07:00 +0200 Subject: [PATCH] Formatting chananges --- src/core/Track.cpp | 11 ++++++----- src/tracks/SampleTrack.cpp | 37 +++++++++++++++++-------------------- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/src/core/Track.cpp b/src/core/Track.cpp index de01457bb..2711f9944 100644 --- a/src/core/Track.cpp +++ b/src/core/Track.cpp @@ -3066,13 +3066,14 @@ void TrackView::muteChanged() if (m_track->m_mutedModel.value()) { actind->setActiveColor(QApplication::palette().color( - QPalette::Active, - QPalette::Highlight)); - } else + QPalette::Active, QPalette::Highlight + )); + } + else { actind->setActiveColor(QApplication::palette().color( - QPalette::Active, - QPalette::BrightText)); + QPalette::Active, QPalette::BrightText + )); } } } diff --git a/src/tracks/SampleTrack.cpp b/src/tracks/SampleTrack.cpp index 060018656..8d2ca8aba 100644 --- a/src/tracks/SampleTrack.cpp +++ b/src/tracks/SampleTrack.cpp @@ -585,21 +585,19 @@ void SampleTCOView::paintEvent( QPaintEvent * pe ) -SampleTrack::SampleTrack( TrackContainer* tc ) : - Track( Track::SampleTrack, tc ), - m_volumeModel( DefaultVolume, MinVolume, MaxVolume, 0.1f, this, - tr( "Volume" ) ), - m_panningModel( DefaultPanning, PanningLeft, PanningRight, 0.1f, - this, tr( "Panning" ) ), - m_effectChannelModel( 0, 0, 0, this, tr( "FX channel" ) ), - m_audioPort( tr( "Sample track" ), true, &m_volumeModel, &m_panningModel, &m_mutedModel ), +SampleTrack::SampleTrack(TrackContainer* tc) : + Track(Track::SampleTrack, tc), + m_volumeModel(DefaultVolume, MinVolume, MaxVolume, 0.1f, this, tr("Volume")), + m_panningModel(DefaultPanning, PanningLeft, PanningRight, 0.1f, this, tr("Panning")), + m_effectChannelModel(0, 0, 0, this, tr("FX channel")), + m_audioPort(tr("Sample track"), true, &m_volumeModel, &m_panningModel, &m_mutedModel), m_isPlaying(false) { - setName( tr( "Sample track" ) ); - m_panningModel.setCenterValue( DefaultPanning ); - m_effectChannelModel.setRange( 0, Engine::fxMixer()->numChannels()-1, 1); + setName(tr("Sample track")); + m_panningModel.setCenterValue(DefaultPanning); + m_effectChannelModel.setRange(0, Engine::fxMixer()->numChannels()-1, 1); - connect( &m_effectChannelModel, SIGNAL( dataChanged() ), this, SLOT( updateEffectChannel() ) ); + connect(&m_effectChannelModel, SIGNAL(dataChanged()), this, SLOT(updateEffectChannel())); } @@ -836,13 +834,12 @@ SampleTrackView::SampleTrackView( SampleTrack * _t, TrackContainerView* tcv ) : m_panningKnob->setLabel( tr( "PAN" ) ); m_panningKnob->show(); - m_activityIndicator = new FadeButton(QApplication::palette().color(QPalette::Active, - QPalette::Background), - QApplication::palette().color(QPalette::Active, - QPalette::BrightText), - QApplication::palette().color(QPalette::Active, - QPalette::BrightText).darker(), - getTrackSettingsWidget()); + m_activityIndicator = new FadeButton( + QApplication::palette().color(QPalette::Active, QPalette::Background), + QApplication::palette().color(QPalette::Active, QPalette::BrightText), + QApplication::palette().color(QPalette::Active, QPalette::BrightText).darker(), + getTrackSettingsWidget() + ); m_activityIndicator->setGeometry(settingsWidgetWidth-2*24-11, 2, 8, 28); m_activityIndicator->show(); connect(_t, SIGNAL(playingChanged()), this, SLOT(updateIndicator())); @@ -860,7 +857,7 @@ SampleTrackView::SampleTrackView( SampleTrack * _t, TrackContainerView* tcv ) : void SampleTrackView::updateIndicator() { - if (model()->isPlaying()) m_activityIndicator->activateOnce(); + if (model()->isPlaying()) { m_activityIndicator->activateOnce(); } else { m_activityIndicator->noteEnd(); } }