[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdemultimedia/kmix
From:       Christian Esken <esken () kde ! org>
Date:       2011-08-19 19:48:36
Message-ID: 20110819194836.26286AC876 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1248126 by esken:

CCBUGS: 206051
Be extra defensive: Don't accidently start timer when polling not required.

 M  +2 -0      backends/mixer_backend.cpp  
 M  +1 -1      core/mixer.h  


--- trunk/KDE/kdemultimedia/kmix/backends/mixer_backend.cpp #1248125:1248126
@@ -140,12 +140,14 @@
 	{
 		// We explicitely exclude Mixer::OK_UNCHANGED and Mixer::ERROR_READ
 		if ( needsPolling() )
+		{
 			_pollingTimer->setInterval(50);
 		QTime fastPollingEndsAt = QTime::currentTime ();
 		fastPollingEndsAt = fastPollingEndsAt.addSecs(5);
 		_fastPollingEndsAt = fastPollingEndsAt;
 		//_fastPollingEndsAt = fastPollingEndsAt;
 		kDebug() << "Start fast polling from " << QTime::currentTime() <<"until " << _fastPollingEndsAt;
+		}
 		emit controlChanged();
 	}
 
--- trunk/KDE/kdemultimedia/kmix/core/mixer.h #1248125:1248126
@@ -56,7 +56,7 @@
 	 * 
 	 */
     enum MixerError { OK=0, ERR_PERM=1, ERR_WRITE, ERR_READ,
-        ERR_OPEN, ERR_LASTERR, OK_UNCHANGED };
+        ERR_OPEN, OK_UNCHANGED };
 
 
     Mixer( QString& ref_driverName, int device );
[prev in list] [next in list] [prev in thread] [next in thread]