Merge pull request #177 from iakov/master

Tiny cleanup

Author: iakov

trikControl/src/audioSynthDevices.cpp

@@ -36,12 +36,17 @@ void AudioSynthDevice::start(int hzFreq)
 {
 	reset();
 	mPos = 0;
-	newCall = true;
 	mHzFreq = hzFreq;
+
+	mOmega = mHzFreq * M_PI / mSampleRate;
+	mY1 = -std::sin(mOmega) * M;
+	mY2 = -std::sin(2 * mOmega) * M;
+	mB = 2.0 * cos(mOmega) * M;
+
 	if (mBuffered) {
 		const qint64 length = (mSampleRate * (mSampleSize / 8));
 		mBuffer.resize(length);
-		generate(mBuffer.data(), length, hzFreq);
+		generate(mBuffer.data(), length);
 	}
 	emit readyRead();
 }
@@ -52,39 +57,28 @@ void AudioSynthDevice::stop()
 	mHzFreq = 0;
 }
 
-// Modefied coupled first-order form algorithm with fixed point arithmetic
-int AudioSynthDevice::generate(char *data, int length, int hzFreq)
+// Modified coupled first-order form algorithm with fixed point arithmetic
+int AudioSynthDevice::generate(char *data, int length)
 {
-	if(hzFreq == 0) return 0;
-  
+	if(mHzFreq == 0)
+		return 0;
+
 	const int channelBytes = mSampleSize / 8;
 
-	qint64 maxlen = length / channelBytes;
+	const qint64 maxlen = length / channelBytes;
 
-	static const int M = 1 << 30;
-	const auto w = hzFreq * M_PI / mSampleRate;
-	const long long b1 = 2.0 * cos(w) * M;
-	static const int AMPLITUDE = (1 << (mSampleSize - 1)) - 1;
+	const int AMPLITUDE = (1 << (mSampleSize - 1)) - 1;
 
 	unsigned char *ptr = reinterpret_cast<unsigned char *>(data);
 
-	// Need to save values between readData(...) calls, so static
-	static long long y0 = 0;
-	static decltype(y0) y1 = 0;
-	static decltype(y0) y2 = 0;
-
-	if (newCall) {
-		y1 = M * std::sin(-w);
-		y2 = M * std::sin(-2 * w);
-		newCall = false;
-	}
+	long long y0;
 
 	int i = 0;
 
 	for (i = 0; i < maxlen; ++i) {
-		y0 = b1 * y1 / M - y2;
-		y2 = b1 * y0 / M - y1;
-		y1 = b1 * y2 / M - y0;
+		y0 = mB * mY1 / M - mY2;
+		mY2 = mB * y0 / M - mY1;
+		mY1 = mB * mY2 / M - y0;
 
 		if (mSampleSize == 8) {
 			const qint8 val = static_cast<qint8>(y0 * AMPLITUDE / M);
@@ -113,7 +107,7 @@ qint64 AudioSynthDevice::readData(char *data, qint64 len)
 
 		return total;
 	} else {
-		return generate(data, len, mHzFreq);
+		return generate(data, len);
 	}
 }
 

trikControl/src/audioSynthDevices.h

@@ -1,4 +1,4 @@
-/* Copyright 2016 Artem Sharganov
+/* Copyright 2016 Artem Sharganov, Iakov Kirilenko
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@ class AudioSynthDevice : public QIODevice
 
 private:
 	/// Sythesize sine wave values
-	int generate(char *data, int length, int hzFreq);
+	int generate(char *data, int lengthBytes);
 
 private:
 
@@ -62,9 +62,16 @@ class AudioSynthDevice : public QIODevice
 	const int mSampleSize;
 
 	/// Mode of device
-	bool mBuffered = false;
+	const bool mBuffered = false;
 
-	/// New call of playTone(...), not readData(...) call
-	bool newCall = true;
+	long long mY1 = 0;
+
+	long long mY2 = 0;
+
+	long long mB = 0;
+
+	static const int M = 1 << 30;
+
+	double mOmega;
 };
 

trikControl/src/brick.cpp

@@ -211,14 +211,10 @@ void Brick::playTone(int hzFreq, int msDuration)
 {
 	QLOG_INFO() << "Playing tone (" << hzFreq << "," << msDuration << ")";
 
-	if (msDuration < 10)
+	if (hzFreq < 0 || msDuration < 0)
 		return;
-	if (hzFreq > 8000)
-		return;
-	if (hzFreq <  20)
-		return;
-	//mHardwareAbstraction->systemSound()->playTone(hzFreq, msDuration);
-	//mTonePlayer->play(hzFreq, msDuration);
+	// mHardwareAbstraction->systemSound()->playTone(hzFreq, msDuration);
+	// mTonePlayer->play(hzFreq, msDuration);
 	QMetaObject::invokeMethod(mTonePlayer.data(), "play", Q_ARG(int, hzFreq), Q_ARG(int, msDuration));
 }
 
@@ -232,6 +228,8 @@ void Brick::stop()
 {
 	QLOG_INFO() << "Stopping brick";
 
+	mTonePlayer->stop();
+
 	for (ServoMotor * const servoMotor : mServoMotors.values()) {
 		servoMotor->powerOff();
 	}

trikControl/src/tonePlayer.cpp

@@ -50,8 +50,8 @@ void TonePlayer::play(int hzFreq, int msDuration)
 		case QAudio::ActiveState:
 			mOutput->suspend();
 			mDevice->reset();
-      			mOutput->resume();
-      			break;
+			mOutput->resume();
+			break;
 		case QAudio::SuspendedState: mOutput->resume(); break;
 		case QAudio::StoppedState:   mOutput->start(mDevice); break;
 		case QAudio::IdleState:      mOutput->start(mDevice); break;

trikControl/src/tonePlayer.h

@@ -51,6 +51,7 @@ public slots:
 	void initializeAudio();
 
 public slots:
+	/// Stop playing
 	void stop();
 };
 }