oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implemented base audio playback and scrubbing

Browse Source
This commit is contained in:
itsmattkc
2019-10-14 11:38:29 +11:00
parent b942300aea
commit fe2b0f2dc2
7 changed files with 215 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/viewer/viewer.cpp
+26 -7
View File
@@ -32,8 +32,15 @@
ViewerWidget::ViewerWidget(QWidget *parent) :
QWidget(parent),
viewer_node_(nullptr),
playback_speed_(0)
playback_speed_(0),
// FIXME: Test code
test_file_("/home/matt/Desktop/11 - Santa Monica.raw")
// End test code
{
// FIXME: Test code
test_file_.open(QFile::ReadOnly);
// End test code
// Set up main layout
QVBoxLayout* layout = new QVBoxLayout(this);
layout->setMargin(0);
@@ -172,6 +179,8 @@ void ViewerWidget::UpdateTimeInternal(int64_t i)
if (viewer_node_ != nullptr) {
UpdateTextureFromNode(time_set);
PushScrubbedAudio();
}
emit TimeChanged(i);
@@ -199,18 +208,28 @@ void ViewerWidget::PlayInternal(int speed)
start_timestamp_ = ruler_->GetTime();
playback_speed_ = speed;
QFile* file = new QFile("/home/matt/Desktop/11 - Santa Monica.raw");
if (file->open(QFile::ReadOnly)) {
file->seek(static_cast<qint64>(qFloor(GetTime().toDouble() * 48000 * 2)) * static_cast<qint64>(sizeof(float)));
AudioManager::instance()->StartOutput(file);
}
// FIXME: Test code
test_file_.seek(static_cast<qint64>(qFloor(GetTime().toDouble() * 48000 * 2)) * static_cast<qint64>(sizeof(float)));
AudioManager::instance()->StartOutput(&test_file_);
// End test code
playback_timer_.start();
controls_->ShowPauseButton();
}
void ViewerWidget::PushScrubbedAudio()
{
// FIXME: Test code
if (!IsPlaying()) {
int size_of_sample = qFloor(2 * 48000 * time_base_dbl_) * static_cast<int>(sizeof(float));
test_file_.seek(static_cast<qint64>(qFloor(GetTime().toDouble() * 48000 * 2)) * static_cast<qint64>(sizeof(float)));
QByteArray frame_audio = test_file_.read(size_of_sample);
AudioManager::instance()->PushToOutput(frame_audio);
}
// End test code
}
void ViewerWidget::RulerTimeChange(int64_t i)
{
Pause();
app/widget/viewer/viewer.h
+7
View File
@@ -21,6 +21,7 @@
#ifndef VIEWER_WIDGET_H
#define VIEWER_WIDGET_H
#include <QFile>
#include <QLabel>
#include <QPushButton>
#include <QScrollBar>
@@ -106,6 +107,8 @@ private:
void PlayInternal(int speed);
void PushScrubbedAudio();
ViewerSizer* sizer_;
ViewerGLWidget* gl_widget_;
@@ -129,6 +132,10 @@ private:
int playback_speed_;
// FIXME: Test code
QFile test_file_;
// End test code
private slots:
void RulerTimeChange(int64_t);