From b21af7809ba1052eaf3f8956d01d5e5f9badb2bc Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Sat, 13 Jun 2009 07:47:05 +0000 Subject: [PATCH] some fixes, added test code --- src/llconclientdlg.cpp | 5 +++++ src/multicolorledbar.cpp | 2 +- src/resources.qrc | 2 ++ src/server.cpp | 4 ++-- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/llconclientdlg.cpp b/src/llconclientdlg.cpp index 49f78d6e..8bf9db24 100755 --- a/src/llconclientdlg.cpp +++ b/src/llconclientdlg.cpp @@ -129,6 +129,11 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP, MultiColorLEDBarInputLevelR->setValue ( 0 ); +// TEST +MultiColorLEDBarInputLevelL->setEnabled ( false ); + + + // init slider controls --- // audio in fader SliderAudInFader->setRange ( AUD_FADER_IN_MIN, AUD_FADER_IN_MAX ); diff --git a/src/multicolorledbar.cpp b/src/multicolorledbar.cpp index c1965ae6..a07bfb22 100755 --- a/src/multicolorledbar.cpp +++ b/src/multicolorledbar.cpp @@ -70,7 +70,7 @@ CMultiColorLEDBar::~CMultiColorLEDBar() void CMultiColorLEDBar::changeEvent ( QEvent* curEvent ) { // act on enabled changed state - if ( (*curEvent).type() == QEvent::EnabledChange ) + if ( curEvent->type() == QEvent::EnabledChange ) { // reset all LEDs Reset ( this->isEnabled() ); diff --git a/src/resources.qrc b/src/resources.qrc index 230b9125..7fd235c3 100755 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -2,6 +2,7 @@ res/CLEDBlack.png res/CLEDBlackSmall.png + res/CLEDDisabledSmall.png res/CLEDGreen.png res/CLEDGreenSmall.png res/CLEDGrey.png @@ -12,6 +13,7 @@ res/CLEDYellowSmall.png res/VLEDBlack.png res/VLEDBlackSmall.png + res/VLEDDisabledSmall.png res/VLEDGreen.png res/VLEDGreenSmall.png res/VLEDGrey.png diff --git a/src/server.cpp b/src/server.cpp index 0e5b08f6..7ff464a9 100755 --- a/src/server.cpp +++ b/src/server.cpp @@ -173,7 +173,7 @@ CVector CServer::ProcessData ( CVector >& vecvecdData, // if channel gain is 1, avoid multiplication for speed optimization if ( vecdGains[j] == static_cast ( 1.0 ) ) { - for ( int i = 0; i < MIN_SERVER_BLOCK_SIZE_SAMPLES; i++ ) + for ( i = 0; i < MIN_SERVER_BLOCK_SIZE_SAMPLES; i++ ) { vecsOutData[i] = Double2Short ( vecsOutData[i] + vecvecdData[j][i] ); @@ -181,7 +181,7 @@ CVector CServer::ProcessData ( CVector >& vecvecdData, } else { - for ( int i = 0; i < MIN_SERVER_BLOCK_SIZE_SAMPLES; i++ ) + for ( i = 0; i < MIN_SERVER_BLOCK_SIZE_SAMPLES; i++ ) { vecsOutData[i] = Double2Short ( vecsOutData[i] +