hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Formatting chananges

Browse Source
This commit is contained in:
Spekular
2020-04-30 22:07:00 +02:00
parent ae2af96c9a
commit aaf94ef69d
2 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/Track.cpp
View File

@@ -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
));
}
}
}

37
src/tracks/SampleTrack.cpp
View File

@@ -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(); }
}