diff --git a/interface/src/Recorder.cpp b/interface/src/Recorder.cpp index 52d183332d..1d2ad3f059 100644 --- a/interface/src/Recorder.cpp +++ b/interface/src/Recorder.cpp @@ -223,7 +223,7 @@ void Player::startPlaying() { _audioThread = new QThread(); _options.setPosition(_avatar->getPosition()); _options.setOrientation(_avatar->getOrientation()); - _injector.reset(new AudioInjector(_recording->getAudio(), _options)); + _injector.reset(new AudioInjector(_recording->getAudio(), _options), &QObject::deleteLater); _injector->moveToThread(_audioThread); _audioThread->start(); QMetaObject::invokeMethod(_injector.data(), "injectAudio", Qt::QueuedConnection); @@ -317,13 +317,13 @@ bool Player::computeCurrentFrame() { } void writeRecordingToFile(RecordingPointer recording, QString filename) { - qDebug() << "Writing recording to " << filename; + qDebug() << "Writing recording to " << filename << "."; QElapsedTimer timer; QFile file(filename); if (!file.open(QIODevice::WriteOnly)){ return; } - qDebug() << file.fileName(); + timer.start(); QDataStream fileStream(&file); @@ -443,20 +443,21 @@ void writeRecordingToFile(RecordingPointer recording, QString filename) { fileStream << recording->_audio->getByteArray(); - qDebug() << "Wrote " << file.size() << " bytes in " << timer.elapsed(); + qDebug() << "Wrote " << file.size() << " bytes in " << timer.elapsed() << " ms."; } RecordingPointer readRecordingFromFile(RecordingPointer recording, QString filename) { - qDebug() << "Reading recording from " << filename; + qDebug() << "Reading recording from " << filename << "."; if (!recording) { recording.reset(new Recording()); } + QElapsedTimer timer; QFile file(filename); if (!file.open(QIODevice::ReadOnly)){ return recording; } - + timer.start(); QDataStream fileStream(&file); fileStream >> recording->_timestamps; @@ -557,7 +558,7 @@ RecordingPointer readRecordingFromFile(RecordingPointer recording, QString filen recording->addAudioPacket(audioArray); - qDebug() << "Read " << file.size() << " bytes"; + qDebug() << "Read " << file.size() << " bytes in " << timer.elapsed() << " ms."; return recording; } diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index b3805d15c7..41c0f3032b 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -528,6 +528,7 @@ void MyAvatar::startRecording() { } Application::getInstance()->getAudio()->setRecorder(_recorder); _recorder->startRecording(); + } void MyAvatar::stopRecording() { diff --git a/interface/src/scripting/WindowScriptingInterface.cpp b/interface/src/scripting/WindowScriptingInterface.cpp index 7cf37b4424..7a85fc7117 100644 --- a/interface/src/scripting/WindowScriptingInterface.cpp +++ b/interface/src/scripting/WindowScriptingInterface.cpp @@ -295,7 +295,6 @@ QScriptValue WindowScriptingInterface::showBrowse(const QString& title, const QS // filename if the directory is valid. QString path = ""; QFileInfo fileInfo = QFileInfo(directory); - qDebug() << "File: " << directory << fileInfo.isFile(); if (fileInfo.isDir()) { fileInfo.setFile(directory, "__HIFI_INVALID_FILE__"); path = fileInfo.filePath(); @@ -303,7 +302,6 @@ QScriptValue WindowScriptingInterface::showBrowse(const QString& title, const QS QFileDialog fileDialog(Application::getInstance()->getWindow(), title, path, nameFilter); fileDialog.setAcceptMode(acceptMode); - qDebug() << "Opening!"; QUrl fileUrl(directory); if (acceptMode == QFileDialog::AcceptSave) { fileDialog.setFileMode(QFileDialog::Directory);