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

merge fixes (further fixes needed)

Browse source
This commit is contained in:
Volker Fischer 2020-06-20 17:51:03 +02:00
parent 6de42e4d82
commit 2bdc269d3f
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/audiomixerboard.cpp
View file

@ -45,7 +45,7 @@ CChannelFader::CChannelFader ( QWidget* pNW )
pMuteSoloBox = new QWidget ( pFrame ); pMuteSoloBox = new QWidget ( pFrame );
pcbMute = new QCheckBox ( tr ( "Mute" ), pMuteSoloBox ); pcbMute = new QCheckBox ( tr ( "Mute" ), pMuteSoloBox );
pcbSolo = new QCheckBox ( tr ( "Solo" ), pMuteSoloBox ); pcbSolo = new QCheckBox ( tr ( "Solo" ), pMuteSoloBox );
pcbGroup = new QCheckBox ( tr ( "Group" ), pMuteSoloBox ); pcbGroup = new QCheckBox ( tr ( "Grp" ), pMuteSoloBox );
pLabelInstBox = new QGroupBox ( pFrame ); pLabelInstBox = new QGroupBox ( pFrame );
plblLabel = new QLabel ( "", pFrame ); plblLabel = new QLabel ( "", pFrame );
@ -107,9 +107,9 @@ CChannelFader::CChannelFader ( QWidget* pNW )
pLevelsGrid->addWidget ( plbrChannelLevel, 0, Qt::AlignRight ); pLevelsGrid->addWidget ( plbrChannelLevel, 0, Qt::AlignRight );
pLevelsGrid->addWidget ( pFader, 0, Qt::AlignLeft ); pLevelsGrid->addWidget ( pFader, 0, Qt::AlignLeft );
pMuteSoloGrid->addWidget ( pcbMute, 0, Qt::AlignLeft );
pMuteSoloGrid->addWidget ( pcbSolo, 0, Qt::AlignLeft );
pMuteSoloGrid->addWidget ( pcbGroup, 0, Qt::AlignLeft ); pMuteSoloGrid->addWidget ( pcbGroup, 0, Qt::AlignLeft );
pMuteSoloGrid->addWidget ( pcbMute, 0, Qt::AlignLeft );
pMuteSoloGrid->addWidget ( pcbSolo, 0, Qt::AlignLeft );
pMainGrid->addLayout ( pPanGrid ); pMainGrid->addLayout ( pPanGrid );
pMainGrid->addWidget ( pLevelsBox, 0, Qt::AlignHCenter ); pMainGrid->addWidget ( pLevelsBox, 0, Qt::AlignHCenter );
@ -212,7 +212,7 @@ void CChannelFader::SetGUIDesign ( const EGUIDesign eNewDesign )
pPanLabel->setText ( tr ( "PAN" ) ); pPanLabel->setText ( tr ( "PAN" ) );
pcbMute->setText ( tr ( "MUTE" ) ); pcbMute->setText ( tr ( "MUTE" ) );
pcbSolo->setText ( tr ( "SOLO" ) ); pcbSolo->setText ( tr ( "SOLO" ) );
pcbGroup->setText ( tr ( "GROUP" ) ); pcbGroup->setText ( tr ( "GRP" ) );
plbrChannelLevel->SetLevelMeterType ( CMultiColorLEDBar::MT_LED ); plbrChannelLevel->SetLevelMeterType ( CMultiColorLEDBar::MT_LED );
break; break;
@ -239,7 +239,7 @@ void CChannelFader::SetGUIDesign ( const EGUIDesign eNewDesign )
pPanLabel->setText ( tr ( "Pan" ) ); pPanLabel->setText ( tr ( "Pan" ) );
pcbMute->setText ( tr ( "Mute" ) ); pcbMute->setText ( tr ( "Mute" ) );
pcbSolo->setText ( tr ( "Solo" ) ); pcbSolo->setText ( tr ( "Solo" ) );
pcbGroup->setText ( tr ( "Group" ) ); pcbGroup->setText ( tr ( "Grp" ) );
plbrChannelLevel->SetLevelMeterType ( CMultiColorLEDBar::MT_BAR ); plbrChannelLevel->SetLevelMeterType ( CMultiColorLEDBar::MT_BAR );
break; break;
} }
@ -366,6 +366,11 @@ void CChannelFader::SetPanValue ( const int iPan )
} }
} }
void CChannelFader::SetFaderIsSelect ( const bool bIsSelected )
{
pcbGroup->setChecked ( bIsSelected );
}
void CChannelFader::SetFaderIsSolo ( const bool bIsSolo ) void CChannelFader::SetFaderIsSolo ( const bool bIsSolo )
{ {
// changing the state automatically emits the signal, too // changing the state automatically emits the signal, too
@ -391,11 +396,6 @@ void CChannelFader::SetRemoteFaderIsMute ( const bool bIsMute )
} }
} }
void CChannelFader::SetFaderIsSelect ( const bool bIsSelected )
{
pcbGroup->setChecked ( bIsSelected );
}
void CChannelFader::SendFaderLevelToServer ( const int iLevel ) void CChannelFader::SendFaderLevelToServer ( const int iLevel )
{ {
// if mute flag is set or other channel is on solo, do not apply the new // if mute flag is set or other channel is on solo, do not apply the new
@ -1056,7 +1056,6 @@ void CAudioMixerBoard::UpdateGainValue ( const int iChannelIdx,
} }
} }
} }
} }
void CAudioMixerBoard::UpdatePanValue ( const int iChannelIdx, void CAudioMixerBoard::UpdatePanValue ( const int iChannelIdx,