fixed various audio issues

This commit is contained in:
itsmattkc
2018-06-07 03:30:54 -07:00
parent b2b3f5a14e
commit 35e03bd91b
24 changed files with 225 additions and 237 deletions
+4 -9
View File
@@ -69,11 +69,10 @@ void Timeline::seek(long p) {
Clip& c = sequence->get_clip(i);
c.reset_audio = true;
c.frame_sample_index = 0;
c.audio_buffer_write = 0;
}
clear_cache(true, true);
audio_bytes_written = 0;
switch_audio_cache = true;
reading_audio_cache_A = false;
clear_audio_ibuffer();
audio_ibuffer_read = 0;
playhead = p;
}
@@ -92,11 +91,7 @@ void Timeline::play() {
playback_timer.start();
start_msecs = QDateTime::currentMSecsSinceEpoch();
playback_updater.start();
playing = true;
if (switch_audio_cache) {
// add something to pre-cache audio
}
playing = true;
}
void Timeline::pause() {
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef TIMELINE_H
#define TIMELINE_H
#include "ui/timeline-tools.h"
#include "ui/timelinetools.h"
#include <QDockWidget>
#include <QVector>
#include <QTime>
+3 -8
View File
@@ -29,10 +29,6 @@ Viewer::~Viewer()
delete ui;
}
void Viewer::receiver() {
qDebug() << "callback?";
}
void Viewer::set_sequence(Sequence* s) {
bool null_sequence = (s == NULL);
sequence = s;
@@ -45,14 +41,13 @@ void Viewer::set_sequence(Sequence* s) {
ui->pushButton_4->setEnabled(!null_sequence);
ui->pushButton_5->setEnabled(!null_sequence);
init_audio(s);
if (!null_sequence) {
ui->glViewerPane->aspect_ratio = (float) sequence->width / (float) sequence->height;
ui->glViewerPane->adjust();
ui->glViewerPane->adjust();
}
init_audio(s);
connect(audio_output, SIGNAL(notify()), this, SLOT(receiver()));
update();
}
+1 -3
View File
@@ -33,9 +33,7 @@ private slots:
void on_pushButton_4_clicked();
void on_pushButton_3_clicked();
void receiver();
void on_pushButton_3_clicked();
private:
Ui::Viewer *ui;