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

some fixes, added test code

Browse source
This commit is contained in:
Volker Fischer 2009-06-13 07:47:05 +00:00
parent bcf39db392
commit b21af7809b
4 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/llconclientdlg.cpp
View file

@ -129,6 +129,11 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP,
MultiColorLEDBarInputLevelR->setValue ( 0 ); MultiColorLEDBarInputLevelR->setValue ( 0 );
// TEST
MultiColorLEDBarInputLevelL->setEnabled ( false );
// init slider controls --- // init slider controls ---
// audio in fader // audio in fader
SliderAudInFader->setRange ( AUD_FADER_IN_MIN, AUD_FADER_IN_MAX ); SliderAudInFader->setRange ( AUD_FADER_IN_MIN, AUD_FADER_IN_MAX );

2
src/multicolorledbar.cpp
View file

@ -70,7 +70,7 @@ CMultiColorLEDBar::~CMultiColorLEDBar()
void CMultiColorLEDBar::changeEvent ( QEvent* curEvent ) void CMultiColorLEDBar::changeEvent ( QEvent* curEvent )
{ {
// act on enabled changed state // act on enabled changed state
if ( (*curEvent).type() == QEvent::EnabledChange ) if ( curEvent->type() == QEvent::EnabledChange )
{ {
// reset all LEDs // reset all LEDs
Reset ( this->isEnabled() ); Reset ( this->isEnabled() );

2
src/resources.qrc
View file

@ -2,6 +2,7 @@
<qresource prefix="/png/LEDs" > <qresource prefix="/png/LEDs" >
<file>res/CLEDBlack.png</file> <file>res/CLEDBlack.png</file>
<file>res/CLEDBlackSmall.png</file> <file>res/CLEDBlackSmall.png</file>
<file>res/CLEDDisabledSmall.png</file>
<file>res/CLEDGreen.png</file> <file>res/CLEDGreen.png</file>
<file>res/CLEDGreenSmall.png</file> <file>res/CLEDGreenSmall.png</file>
<file>res/CLEDGrey.png</file> <file>res/CLEDGrey.png</file>
@ -12,6 +13,7 @@
<file>res/CLEDYellowSmall.png</file> <file>res/CLEDYellowSmall.png</file>
<file>res/VLEDBlack.png</file> <file>res/VLEDBlack.png</file>
<file>res/VLEDBlackSmall.png</file> <file>res/VLEDBlackSmall.png</file>
<file>res/VLEDDisabledSmall.png</file>
<file>res/VLEDGreen.png</file> <file>res/VLEDGreen.png</file>
<file>res/VLEDGreenSmall.png</file> <file>res/VLEDGreenSmall.png</file>
<file>res/VLEDGrey.png</file> <file>res/VLEDGrey.png</file>

4
src/server.cpp
View file

@ -173,7 +173,7 @@ CVector<short> CServer::ProcessData ( CVector<CVector<double> >& vecvecdData,
// if channel gain is 1, avoid multiplication for speed optimization // if channel gain is 1, avoid multiplication for speed optimization
if ( vecdGains[j] == static_cast<double> ( 1.0 ) ) if ( vecdGains[j] == static_cast<double> ( 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] = vecsOutData[i] =
Double2Short ( vecsOutData[i] + vecvecdData[j][i] ); Double2Short ( vecsOutData[i] + vecvecdData[j][i] );
@ -181,7 +181,7 @@ CVector<short> CServer::ProcessData ( CVector<CVector<double> >& vecvecdData,
} }
else else
{ {
for ( int i = 0; i < MIN_SERVER_BLOCK_SIZE_SAMPLES; i++ ) for ( i = 0; i < MIN_SERVER_BLOCK_SIZE_SAMPLES; i++ )
{ {
vecsOutData[i] = vecsOutData[i] =
Double2Short ( vecsOutData[i] + Double2Short ( vecsOutData[i] +