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

Merge branch 'master' of https://github.com/corrados/jamulus

Browse source
This commit is contained in:
Volker Fischer 2020-06-20 20:20:55 +01:00
commit 2289c98f2b
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -22,9 +22,7 @@
TODO grouping does not work as expected: TODO grouping does not work as expected:
- vertical space between check boxes should be smaller - vertical space between check boxes should be smaller
- update help text
TODO minimum height of faders (dependent on style)

19
src/audiomixerboard.cpp
View file

@ -64,10 +64,9 @@ CChannelFader::CChannelFader ( QWidget* pNW )
plbrChannelLevel->setContentsMargins ( 0, 3, 2, 3 ); plbrChannelLevel->setContentsMargins ( 0, 3, 2, 3 );
// setup slider // setup slider
pFader->setPageStep ( 1 ); pFader->setPageStep ( 1 );
pFader->setRange ( 0, AUD_MIX_FADER_MAX ); pFader->setRange ( 0, AUD_MIX_FADER_MAX );
pFader->setTickInterval ( AUD_MIX_FADER_MAX / 9 ); pFader->setTickInterval ( AUD_MIX_FADER_MAX / 9 );
pFader->setMinimumHeight ( 85 ); // if this value is too small, the fader might not be movable with the mouse for fancy skin (#292)
// setup panning control // setup panning control
pPan->setRange ( 0, AUD_MIX_PAN_MAX ); pPan->setRange ( 0, AUD_MIX_PAN_MAX );
@ -205,6 +204,7 @@ void CChannelFader::SetGUIDesign ( const EGUIDesign eNewDesign )
pLabelGrid->addWidget ( plblLabel, 0, Qt::AlignVCenter ); // label next to icons pLabelGrid->addWidget ( plblLabel, 0, Qt::AlignVCenter ); // label next to icons
pLabelInstBox->setMinimumHeight ( 52 ); // maximum hight of the instrument+flag pictures pLabelInstBox->setMinimumHeight ( 52 ); // maximum hight of the instrument+flag pictures
pFader->setMinimumHeight ( 120 ); // if this value is too small, the fader might not be movable with the mouse for fancy skin (#292)
pPan->setFixedSize ( 50, 50 ); pPan->setFixedSize ( 50, 50 );
pPanLabel->setText ( tr ( "PAN" ) ); pPanLabel->setText ( tr ( "PAN" ) );
pcbMute->setText ( tr ( "MUTE" ) ); pcbMute->setText ( tr ( "MUTE" ) );
@ -216,6 +216,7 @@ void CChannelFader::SetGUIDesign ( const EGUIDesign eNewDesign )
case GD_SLIMFADER: case GD_SLIMFADER:
pLabelPictGrid->addWidget ( plblLabel, 0, Qt::AlignHCenter ); // label below icons pLabelPictGrid->addWidget ( plblLabel, 0, Qt::AlignHCenter ); // label below icons
pLabelInstBox->setMinimumHeight ( 84 ); // maximum hight of the instrument+flag+label pLabelInstBox->setMinimumHeight ( 84 ); // maximum hight of the instrument+flag+label
pFader->setMinimumHeight ( 85 );
pPan->setFixedSize ( 28, 28 ); pPan->setFixedSize ( 28, 28 );
pFader->setTickPosition ( QSlider::NoTicks ); pFader->setTickPosition ( QSlider::NoTicks );
pFader->setStyleSheet ( "" ); pFader->setStyleSheet ( "" );
@ -232,6 +233,7 @@ void CChannelFader::SetGUIDesign ( const EGUIDesign eNewDesign )
pFader->setStyleSheet ( "" ); pFader->setStyleSheet ( "" );
pLabelGrid->addWidget ( plblLabel, 0, Qt::AlignVCenter ); // label next to icons pLabelGrid->addWidget ( plblLabel, 0, Qt::AlignVCenter ); // label next to icons
pLabelInstBox->setMinimumHeight ( 52 ); // maximum hight of the instrument+flag pictures pLabelInstBox->setMinimumHeight ( 52 ); // maximum hight of the instrument+flag pictures
pFader->setMinimumHeight ( 85 );
pPan->setFixedSize ( 50, 50 ); pPan->setFixedSize ( 50, 50 );
pPanLabel->setText ( tr ( "Pan" ) ); pPanLabel->setText ( tr ( "Pan" ) );
pcbMute->setText ( tr ( "Mute" ) ); pcbMute->setText ( tr ( "Mute" ) );
@ -397,7 +399,7 @@ void CChannelFader::SetRemoteFaderIsMute ( const bool bIsMute )
} }
} }
void CChannelFader::SendFaderLevelToServer ( const int iLevel, void CChannelFader::SendFaderLevelToServer ( const int iLevel,
const bool bIsGroupUpdate ) const bool bIsGroupUpdate )
{ {
// 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
@ -412,6 +414,7 @@ void CChannelFader::SendFaderLevelToServer ( const int iLevel,
bIsGroupUpdate, bIsGroupUpdate,
iLevel - iPreviousFaderLevel ); iLevel - iPreviousFaderLevel );
// update previous fader level since the level has changed
iPreviousFaderLevel = iLevel; iPreviousFaderLevel = iLevel;
} }
} }
@ -441,6 +444,12 @@ void CChannelFader::SetMute ( const bool bState )
{ {
// mute was unchecked, get current fader value and apply // mute was unchecked, get current fader value and apply
emit gainValueChanged ( CalcFaderGain ( GetFaderLevel() ), bIsMyOwnFader, false, 0 ); emit gainValueChanged ( CalcFaderGain ( GetFaderLevel() ), bIsMyOwnFader, false, 0 );
// TODO When mute or solo is activated, the group synchronization does not work anymore.
// To get a smoother experience, we adjust the previous level as soon as the mute is
// again set to off (if we would not do that, on the next move of the fader the other
// faders in the group would jump which is very bad).
iPreviousFaderLevel = GetFaderLevel();
} }
} }
} }

2
src/clientdlgbase.ui
View file

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>345</width> <width>345</width>
<height>465</height> <height>490</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">