eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

rename variable

Browse source
This commit is contained in:
Volker Fischer 2020-07-07 22:07:19 +02:00
parent 38cdd659e1
commit 46bb1435a0
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/audiomixerboard.cpp
View file

@ -128,8 +128,8 @@ CChannelFader::CChannelFader ( QWidget* pNW )
pMainGrid->addWidget ( pLabelInstBox ); pMainGrid->addWidget ( pLabelInstBox );
// reset current fader // reset current fader
strGroupBaseText = "Grp"; // this will most probably overwritten by SetGUIDesign() strGroupBaseText = "Grp"; // this will most probably overwritten by SetGUIDesign()
iInstrPicFixedWidth = INVALID_INDEX; // this will most probably overwritten by SetGUIDesign() iInstrPicMaxWidth = INVALID_INDEX; // this will most probably overwritten by SetGUIDesign()
Reset(); Reset();
// add help text to controls // add help text to controls
@ -228,7 +228,7 @@ void CChannelFader::SetGUIDesign ( const EGUIDesign eNewDesign )
pcbSolo->setText ( tr ( "SOLO" ) ); pcbSolo->setText ( tr ( "SOLO" ) );
strGroupBaseText = tr ( "GRP" ); strGroupBaseText = tr ( "GRP" );
plbrChannelLevel->SetLevelMeterType ( CLevelMeter::MT_LED ); plbrChannelLevel->SetLevelMeterType ( CLevelMeter::MT_LED );
iInstrPicFixedWidth = INVALID_INDEX; // no instrument picture scaling iInstrPicMaxWidth = INVALID_INDEX; // no instrument picture scaling
break; break;
case GD_SLIMFADER: case GD_SLIMFADER:
@ -243,7 +243,7 @@ void CChannelFader::SetGUIDesign ( const EGUIDesign eNewDesign )
pcbSolo->setText ( tr ( "S" ) ); pcbSolo->setText ( tr ( "S" ) );
strGroupBaseText = tr ( "G" ); strGroupBaseText = tr ( "G" );
plbrChannelLevel->SetLevelMeterType ( CLevelMeter::MT_SLIM_BAR ); plbrChannelLevel->SetLevelMeterType ( CLevelMeter::MT_SLIM_BAR );
iInstrPicFixedWidth = 18; // scale instrument picture to avoid enlarging the width by the picture iInstrPicMaxWidth = 18; // scale instrument picture to avoid enlarging the width by the picture
break; break;
default: default:
@ -259,7 +259,7 @@ void CChannelFader::SetGUIDesign ( const EGUIDesign eNewDesign )
pcbSolo->setText ( tr ( "Solo" ) ); pcbSolo->setText ( tr ( "Solo" ) );
strGroupBaseText = tr ( "Grp" ); strGroupBaseText = tr ( "Grp" );
plbrChannelLevel->SetLevelMeterType ( CLevelMeter::MT_BAR ); plbrChannelLevel->SetLevelMeterType ( CLevelMeter::MT_BAR );
iInstrPicFixedWidth = INVALID_INDEX; // no instrument picture scaling iInstrPicMaxWidth = INVALID_INDEX; // no instrument picture scaling
break; break;
} }
@ -631,10 +631,10 @@ void CChannelFader::SetChannelInfos ( const CChannelInfo& cChanInfo )
// set correct picture // set correct picture
QPixmap pixInstr ( strCurResourceRef ); QPixmap pixInstr ( strCurResourceRef );
if ( ( iInstrPicFixedWidth != INVALID_INDEX ) && ( pixInstr.width() > iInstrPicFixedWidth ) ) if ( ( iInstrPicMaxWidth != INVALID_INDEX ) && ( pixInstr.width() > iInstrPicMaxWidth ) )
{ {
// scale instrument picture on request (scale to the width with correct aspect ratio) // scale instrument picture on request (scale to the width with correct aspect ratio)
plblInstrument->setPixmap ( pixInstr.scaledToWidth ( iInstrPicFixedWidth, Qt::SmoothTransformation ) ); plblInstrument->setPixmap ( pixInstr.scaledToWidth ( iInstrPicMaxWidth, Qt::SmoothTransformation ) );
} }
else else
{ {

2
src/audiomixerboard.h
View file

@ -119,7 +119,7 @@ protected:
double dPreviousFaderLevel; double dPreviousFaderLevel;
int iGroupID; int iGroupID;
QString strGroupBaseText; QString strGroupBaseText;
int iInstrPicFixedWidth; int iInstrPicMaxWidth;
public slots: public slots:
void OnLevelValueChanged ( int value ) { SendFaderLevelToServer ( value, false ); } void OnLevelValueChanged ( int value ) { SendFaderLevelToServer ( value, false ); }