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

If the actual ASIO buffer delay is not one of the 128, 256 or 512 samples, you do not see the number in the GUI. Add a info text on what buffer size is actually used.

Browse source
This commit is contained in:
Volker Fischer 2015-03-15 06:59:30 +00:00
parent f8f00c5a20
commit 4b43210eb8
1 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/clientsettingsdlg.cpp
View file

@ -447,6 +447,16 @@ void CClientSettingsDlg::UpdateSoundCardFrame()
const int iCurActualBufSize = const int iCurActualBufSize =
pClient->GetSndCrdActualMonoBlSize(); pClient->GetSndCrdActualMonoBlSize();
// check which predefined size is used (it is possible that none is used)
const bool bPreferredChecked =
( iCurActualBufSize == SYSTEM_FRAME_SIZE_SAMPLES * FRAME_SIZE_FACTOR_PREFERRED );
const bool bDefaultChecked =
( iCurActualBufSize == SYSTEM_FRAME_SIZE_SAMPLES * FRAME_SIZE_FACTOR_DEFAULT );
const bool bSafeChecked =
( iCurActualBufSize == SYSTEM_FRAME_SIZE_SAMPLES * FRAME_SIZE_FACTOR_SAFE );
// Set radio buttons according to current value (To make it possible // Set radio buttons according to current value (To make it possible
// to have all radio buttons unchecked, we have to disable the // to have all radio buttons unchecked, we have to disable the
// exclusive check for the radio button group. We require all radio // exclusive check for the radio button group. We require all radio
@ -454,16 +464,9 @@ void CClientSettingsDlg::UpdateSoundCardFrame()
// support any of the buffer sizes and therefore all radio buttons // support any of the buffer sizes and therefore all radio buttons
// are disabeld and unchecked.). // are disabeld and unchecked.).
SndCrdBufferDelayButtonGroup.setExclusive ( false ); SndCrdBufferDelayButtonGroup.setExclusive ( false );
rbtBufferDelayPreferred->setChecked ( bPreferredChecked );
rbtBufferDelayPreferred->setChecked ( iCurActualBufSize == rbtBufferDelayDefault->setChecked ( bDefaultChecked );
SYSTEM_FRAME_SIZE_SAMPLES * FRAME_SIZE_FACTOR_PREFERRED ); rbtBufferDelaySafe->setChecked ( bSafeChecked );
rbtBufferDelayDefault->setChecked ( iCurActualBufSize ==
SYSTEM_FRAME_SIZE_SAMPLES * FRAME_SIZE_FACTOR_DEFAULT );
rbtBufferDelaySafe->setChecked ( iCurActualBufSize ==
SYSTEM_FRAME_SIZE_SAMPLES * FRAME_SIZE_FACTOR_SAFE );
SndCrdBufferDelayButtonGroup.setExclusive ( true ); SndCrdBufferDelayButtonGroup.setExclusive ( true );
// disable radio buttons which are not supported by audio interface // disable radio buttons which are not supported by audio interface
@ -475,6 +478,21 @@ void CClientSettingsDlg::UpdateSoundCardFrame()
rbtBufferDelaySafe->setEnabled ( rbtBufferDelaySafe->setEnabled (
pClient->GetFraSiFactSafeSupported() ); pClient->GetFraSiFactSafeSupported() );
// If any of our predefined sizes is chosen, use the regular group box
// title text. If not, show the actual buffer size. Otherwise the user
// would not know which buffer size is actually used.
if ( bPreferredChecked || bDefaultChecked || bSafeChecked )
{
// default title text
grbSoundCrdBufDelay->setTitle ( "Buffer Delay" );
}
else
{
// special title text with buffer size information added
grbSoundCrdBufDelay->setTitle ( "Buffer Delay: " +
GenSndCrdBufferDelayString ( iCurActualBufSize ) );
}
} }
void CClientSettingsDlg::UpdateSoundChannelSelectionFrame() void CClientSettingsDlg::UpdateSoundChannelSelectionFrame()