History

Merge branch 'master' into tony/remove-joint-states

Anthony J. Thibault committed 10 years ago

Commit 11bfed42 parents 549a8f7 85b826618 files · +956 −90Browse files

Showing the changes to interface/src/Application.cpp (1 of 18 files). Show all

Unified · Split

interface/src/Application.cpp+2−2
@@ -454,14 +454,14 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : · 453 unmodified lines
454 audioIO->setOrientationGetter([this]{ return getMyAvatar()->getOrientationForAudio(); });454 audioIO->setOrientationGetter([this]{ return getMyAvatar()->getOrientationForAudio(); });
455 455
456 audioIO->moveToThread(audioThread);456 audioIO->moveToThread(audioThread);
457 recording::Frame::registerFrameHandler(AudioConstants::AUDIO_FRAME_NAME, [=](recording::Frame::ConstPointer frame) {457 recording::Frame::registerFrameHandler(AudioConstants::getAudioFrameName(), [=](recording::Frame::ConstPointer frame) {
458 audioIO->handleRecordedAudioInput(frame->data);458 audioIO->handleRecordedAudioInput(frame->data);
459 });459 });
460 460
461 connect(audioIO.data(), &AudioClient::inputReceived, [](const QByteArray& audio){461 connect(audioIO.data(), &AudioClient::inputReceived, [](const QByteArray& audio){
462 static auto recorder = DependencyManager::get<recording::Recorder>();462 static auto recorder = DependencyManager::get<recording::Recorder>();
463 if (recorder->isRecording()) {463 if (recorder->isRecording()) {
464 static const recording::FrameType AUDIO_FRAME_TYPE = recording::Frame::registerFrameType(AudioConstants::AUDIO_FRAME_NAME);464 static const recording::FrameType AUDIO_FRAME_TYPE = recording::Frame::registerFrameType(AudioConstants::getAudioFrameName());
465 recorder->recordFrame(AUDIO_FRAME_TYPE, audio);465 recorder->recordFrame(AUDIO_FRAME_TYPE, audio);
466 }466 }
467 });467 });