History

Fixing dangling thread issues, consolidating thread management

Bradley Austin Davis committed 9 years ago

Commit fc6a2781 parent a36727722 files · +204 −199Browse files

Showing the changes to interface/src/scripting/LimitlessVoiceRecognitionScriptingInterface.cpp (1 of 22 files). Show all

Unified · Split

interface/src/scripting/LimitlessVoiceRecognitionScriptingInterface.cpp+5−4
@@ -9,9 +9,12 @@ · 8 unmodified lines
9// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html9// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
10//10//
11 11
12#include <QtConcurrent/QtConcurrentRun>
13
14#include <ThreadHelpers.h>
12#include <src/InterfaceLogging.h>15#include <src/InterfaceLogging.h>
13#include <src/ui/AvatarInputs.h>16#include <src/ui/AvatarInputs.h>
14#include <QtConcurrent/QtConcurrentRun>17
15#include "LimitlessVoiceRecognitionScriptingInterface.h"18#include "LimitlessVoiceRecognitionScriptingInterface.h"
16 19
17const float LimitlessVoiceRecognitionScriptingInterface::_audioLevelThreshold = 0.33f;20const float LimitlessVoiceRecognitionScriptingInterface::_audioLevelThreshold = 0.33f;
@@ -24,9 +27,7 @@ LimitlessVoiceRecognitionScriptingInterface::LimitlessVoiceRecognitionScriptingI · 6 unmodified lines
24 connect(&_voiceTimer, &QTimer::timeout, this, &LimitlessVoiceRecognitionScriptingInterface::voiceTimeout);27 connect(&_voiceTimer, &QTimer::timeout, this, &LimitlessVoiceRecognitionScriptingInterface::voiceTimeout);
25 connect(&_connection, &LimitlessConnection::onReceivedTranscription, this, [this](QString transcription){emit onReceivedTranscription(transcription);});28 connect(&_connection, &LimitlessConnection::onReceivedTranscription, this, [this](QString transcription){emit onReceivedTranscription(transcription);});
26 connect(&_connection, &LimitlessConnection::onFinishedSpeaking, this, [this](QString transcription){emit onFinishedSpeaking(transcription);});29 connect(&_connection, &LimitlessConnection::onFinishedSpeaking, this, [this](QString transcription){emit onFinishedSpeaking(transcription);});
27 _connection.moveToThread(&_connectionThread);30 moveToNewNamedThread(&_connection, "Limitless Connection");
28 _connectionThread.setObjectName("Limitless Connection");
29 _connectionThread.start();
30}31}
31 32
32void LimitlessVoiceRecognitionScriptingInterface::update() {33void LimitlessVoiceRecognitionScriptingInterface::update() {