From 6d8160c51810fde74d8251fd094921b9beaf9269 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Fri, 28 Mar 2008 18:41:46 +0000 Subject: [PATCH] bug fix --- src/llconclientdlg.cpp | 2 +- src/multicolorled.cpp | 17 +++++++++++++---- windows/sound.h | 4 ++-- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/llconclientdlg.cpp b/src/llconclientdlg.cpp index 0d5015ed..6c354d8f 100755 --- a/src/llconclientdlg.cpp +++ b/src/llconclientdlg.cpp @@ -255,7 +255,7 @@ void CLlconClientDlg::OnConnectDisconBut() { // Restart timer to ensure that the text is visible at // least the time for one complete interval - TimerStatus.setInterval ( STATUSBAR_UPDATE_TIME ); + TimerStatus.start ( STATUSBAR_UPDATE_TIME ); // show the error in the status bar TextLabelStatus->setText ( tr ( "invalid address" ) ); diff --git a/src/multicolorled.cpp b/src/multicolorled.cpp index dec07a28..47093b9b 100755 --- a/src/multicolorled.cpp +++ b/src/multicolorled.cpp @@ -56,7 +56,12 @@ CMultiColorLED::CMultiColorLED ( QWidget* parent, Qt::WindowFlags f ) eColorFlag = RL_GREY; // 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 ( &TimerRedLight, SIGNAL ( timeout() ), @@ -145,19 +150,19 @@ void CMultiColorLED::SetLight ( const int iNewStatus ) case MUL_COL_LED_GREEN: // green light bFlagGreenLi = true; - TimerGreenLight.setInterval ( iUpdateTime ); + TimerGreenLight.start(); break; case MUL_COL_LED_YELLOW: // yellow light bFlagYellowLi = true; - TimerYellowLight.setInterval ( iUpdateTime ); + TimerYellowLight.start(); break; case MUL_COL_LED_RED: // red light bFlagRedLi = true; - TimerRedLight.setInterval ( iUpdateTime ); + TimerRedLight.start(); break; } @@ -175,4 +180,8 @@ void CMultiColorLED::SetUpdateTime ( const int iNUTi ) { iUpdateTime = iNUTi; } + + TimerGreenLight.setInterval ( iUpdateTime ); + TimerYellowLight.setInterval ( iUpdateTime ); + TimerRedLight.setInterval ( iUpdateTime ); } diff --git a/windows/sound.h b/windows/sound.h index 6e13f744..3e4ebe7b 100755 --- a/windows/sound.h +++ b/windows/sound.h @@ -35,8 +35,8 @@ /* Definitions ****************************************************************/ // switch here between ASIO (Steinberg) or native Windows(TM) sound interface -//#undef USE_ASIO_SND_INTERFACE -#define USE_ASIO_SND_INTERFACE +#undef USE_ASIO_SND_INTERFACE +//#define USE_ASIO_SND_INTERFACE #define NUM_IN_OUT_CHANNELS 2 /* Stereo recording (but we only