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

bug fix

Browse Source
This commit is contained in:
Volker Fischer 2008-03-28 18:41:46 +00:00
parent c1f366cdf5
commit 6d8160c518
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/llconclientdlg.cpp
View File

@ -255,7 +255,7 @@ void CLlconClientDlg::OnConnectDisconBut()
{ {
// Restart timer to ensure that the text is visible at // Restart timer to ensure that the text is visible at
// least the time for one complete interval // least the time for one complete interval
TimerStatus.setInterval ( STATUSBAR_UPDATE_TIME ); TimerStatus.start ( STATUSBAR_UPDATE_TIME );
// show the error in the status bar // show the error in the status bar
TextLabelStatus->setText ( tr ( "invalid address" ) ); TextLabelStatus->setText ( tr ( "invalid address" ) );

17
src/multicolorled.cpp
View File

@ -56,7 +56,12 @@ CMultiColorLED::CMultiColorLED ( QWidget* parent, Qt::WindowFlags f )
eColorFlag = RL_GREY; eColorFlag = RL_GREY;
// init update time // init update time
iUpdateTime = DEFAULT_UPDATE_TIME; SetUpdateTime ( DEFAULT_UPDATE_TIME );
// init timers -> we want to have single shot timers
TimerRedLight.setSingleShot ( true );
TimerGreenLight.setSingleShot ( true );
TimerYellowLight.setSingleShot ( true );
// connect timer events to the desired slots // connect timer events to the desired slots
connect ( &TimerRedLight, SIGNAL ( timeout() ), connect ( &TimerRedLight, SIGNAL ( timeout() ),
@ -145,19 +150,19 @@ void CMultiColorLED::SetLight ( const int iNewStatus )
case MUL_COL_LED_GREEN: case MUL_COL_LED_GREEN:
// green light // green light
bFlagGreenLi = true; bFlagGreenLi = true;
TimerGreenLight.setInterval ( iUpdateTime ); TimerGreenLight.start();
break; break;
case MUL_COL_LED_YELLOW: case MUL_COL_LED_YELLOW:
// yellow light // yellow light
bFlagYellowLi = true; bFlagYellowLi = true;
TimerYellowLight.setInterval ( iUpdateTime ); TimerYellowLight.start();
break; break;
case MUL_COL_LED_RED: case MUL_COL_LED_RED:
// red light // red light
bFlagRedLi = true; bFlagRedLi = true;
TimerRedLight.setInterval ( iUpdateTime ); TimerRedLight.start();
break; break;
} }
@ -175,4 +180,8 @@ void CMultiColorLED::SetUpdateTime ( const int iNUTi )
{ {
iUpdateTime = iNUTi; iUpdateTime = iNUTi;
} }
TimerGreenLight.setInterval ( iUpdateTime );
TimerYellowLight.setInterval ( iUpdateTime );
TimerRedLight.setInterval ( iUpdateTime );
} }

4
windows/sound.h
View File

@ -35,8 +35,8 @@
/* Definitions ****************************************************************/ /* Definitions ****************************************************************/
// switch here between ASIO (Steinberg) or native Windows(TM) sound interface // switch here between ASIO (Steinberg) or native Windows(TM) sound interface
//#undef USE_ASIO_SND_INTERFACE #undef USE_ASIO_SND_INTERFACE
#define USE_ASIO_SND_INTERFACE //#define USE_ASIO_SND_INTERFACE
#define NUM_IN_OUT_CHANNELS 2 /* Stereo recording (but we only #define NUM_IN_OUT_CHANNELS 2 /* Stereo recording (but we only