GUI fixes

This commit is contained in:
Volker Fischer 2009-08-02 19:46:29 +00:00
parent 22713c9c7a
commit d398c917ff

View file

@ -95,25 +95,13 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent,
rButBufferDelaySafe->setText ( GenSndCrdBufferDelayString ( rButBufferDelaySafe->setText ( GenSndCrdBufferDelayString (
FRAME_SIZE_FACTOR_SAFE * SYSTEM_BLOCK_FRAME_SAMPLES ) ); FRAME_SIZE_FACTOR_SAFE * SYSTEM_BLOCK_FRAME_SAMPLES ) );
// sound card buffer delay // sound card buffer delay inits
switch ( pClient->GetSndCrdPrefMonoFrameSizeFactor() )
{
case FRAME_SIZE_FACTOR_PREFERRED:
rButBufferDelayPreferred->setChecked ( true );
break;
case FRAME_SIZE_FACTOR_DEFAULT:
rButBufferDelayDefault->setChecked ( true );
break;
case FRAME_SIZE_FACTOR_SAFE:
rButBufferDelaySafe->setChecked ( true );
break;
}
SndCrdBufferDelayButtonGroup.addButton ( rButBufferDelayPreferred ); SndCrdBufferDelayButtonGroup.addButton ( rButBufferDelayPreferred );
SndCrdBufferDelayButtonGroup.addButton ( rButBufferDelayDefault ); SndCrdBufferDelayButtonGroup.addButton ( rButBufferDelayDefault );
SndCrdBufferDelayButtonGroup.addButton ( rButBufferDelaySafe ); SndCrdBufferDelayButtonGroup.addButton ( rButBufferDelaySafe );
UpdateSoundCardFrame();
// Connections ------------------------------------------------------------- // Connections -------------------------------------------------------------
// timers // timers
@ -180,22 +168,37 @@ QString CClientSettingsDlg::GenSndCrdBufferDelayString ( const int iFrameSize,
void CClientSettingsDlg::UpdateSoundCardFrame() void CClientSettingsDlg::UpdateSoundCardFrame()
{ {
// update slider value and text // update slider value and text
const int iCurPrefBufIdx = pClient->GetSndCrdPrefMonoFrameSizeFactor(); const int iCurPrefFrameSizeFactor =
const int iCurActualBufSize = pClient->GetSndCrdActualMonoBlSize(); pClient->GetSndCrdPrefMonoFrameSizeFactor();
/* const int iCurActualBufSize =
SliderSndCrdBufferDelay->setValue ( iCurPrefBufIdx ); pClient->GetSndCrdActualMonoBlSize();
// update radio buttons
switch ( iCurPrefFrameSizeFactor )
{
case FRAME_SIZE_FACTOR_PREFERRED:
rButBufferDelayPreferred->setChecked ( true );
break;
case FRAME_SIZE_FACTOR_DEFAULT:
rButBufferDelayDefault->setChecked ( true );
break;
case FRAME_SIZE_FACTOR_SAFE:
rButBufferDelaySafe->setChecked ( true );
break;
}
// preferred size // preferred size
const int iPrefBufSize = const int iPrefBufSize =
CSndCrdBufferSizes::GetBufferSizeFromIndex ( iCurPrefBufIdx ); iCurPrefFrameSizeFactor * SYSTEM_BLOCK_FRAME_SAMPLES;
*/
// actual size (use yellow color if different from preferred size) // actual size (use yellow color if different from preferred size)
const QString strActSizeValues = const QString strActSizeValues =
GenSndCrdBufferDelayString ( iCurActualBufSize ); GenSndCrdBufferDelayString ( iCurActualBufSize );
// if ( iPrefBufSize != iCurActualBufSize ) if ( iPrefBufSize != iCurActualBufSize )
if ( 0 ) // TEST
{ {
TextLabelActualSndCrdBufDelay->setText ( "<font color=""red"">" + TextLabelActualSndCrdBufDelay->setText ( "<font color=""red"">" +
strActSizeValues + "</font>" ); strActSizeValues + "</font>" );