6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-05 21:32:55 +00:00
Code Issues Projects Releases Wiki Activity

QIODevice isn't guaranteed thread safe, so use of it is now thread confined.

Browse Source
This commit is contained in:
Thomas Harte 2020-06-06 21:14:04 -04:00
parent fe1b6812f1
commit 68b165e244
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OSBindings/Qt/mainwindow.cpp
View File

@ -7,6 +7,14 @@
#include "../../Numeric/CRC.hpp" #include "../../Numeric/CRC.hpp"
namespace {
struct AudioEvent: public QEvent {
AudioEvent() : QEvent(QEvent::Type::User) {}
std::vector<int16_t> audio;
};
}
/* /*
General Qt implementation notes: General Qt implementation notes:
@ -172,7 +180,7 @@ void MainWindow::launchMachine() {
// are available, and — at least for now — assume 512 samples/buffer is a good size. // are available, and — at least for now — assume 512 samples/buffer is a good size.
audioIsStereo = (idealFormat.channelCount() > 1) && speaker->get_is_stereo(); audioIsStereo = (idealFormat.channelCount() > 1) && speaker->get_is_stereo();
audioIs8bit = idealFormat.sampleSize() < 16; audioIs8bit = idealFormat.sampleSize() < 16;
const int samplesPerBuffer = 512; const int samplesPerBuffer = 65536;
speaker->set_output_rate(idealFormat.sampleRate(), samplesPerBuffer, audioIsStereo); speaker->set_output_rate(idealFormat.sampleRate(), samplesPerBuffer, audioIsStereo);
// Adjust format appropriately, and create an audio output. // Adjust format appropriately, and create an audio output.
@ -227,9 +235,13 @@ void MainWindow::launchMachine() {
} }
void MainWindow::speaker_did_complete_samples(Outputs::Speaker::Speaker *, const std::vector<int16_t> &buffer) { void MainWindow::speaker_did_complete_samples(Outputs::Speaker::Speaker *, const std::vector<int16_t> &buffer) {
const auto bytesWritten = audioIODevice->write(reinterpret_cast<const char *>(buffer.data()), qint64(buffer.size())); // Forward this buffrer to the QThread that QAudioOutput lives on.
AudioEvent *event = new AudioEvent;
event->audio = buffer;
QApplication::instance()->postEvent(this, event);
// const auto bytesWritten = audioIODevice->write(reinterpret_cast<const char *>(buffer.data()), qint64(buffer.size()));
// qDebug() << bytesWritten << "; " << audioOutput->state(); // qDebug() << bytesWritten << "; " << audioOutput->state();
(void)bytesWritten; // (void)bytesWritten;
} }
void MainWindow::dragEnterEvent(QDragEnterEvent* event) { void MainWindow::dragEnterEvent(QDragEnterEvent* event) {
@ -307,6 +319,13 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *event) {
} }
} break; } break;
case QEvent::User: {
const auto audioEvent = dynamic_cast<AudioEvent *>(event);
if(audioEvent) {
audioIODevice->write(reinterpret_cast<const char *>(audioEvent->audio.data()), qint64(audioEvent->audio.size()));
}
} break;
default: default:
break; break;
} }