From 98c9121ac2eaac864041c43ca1e4355a6041ef4a Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Wed, 29 Jan 2014 02:34:58 -0800
Subject: [PATCH] Move audio initialization into thread

---
 src/platform/qt/AudioDevice.cpp | 23 ++++++++++++++++++-----
 src/platform/qt/AudioDevice.h   |  7 +++----
 src/platform/qt/Window.cpp      | 20 +++-----------------
 src/platform/qt/Window.h        |  1 -
 4 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/src/platform/qt/AudioDevice.cpp b/src/platform/qt/AudioDevice.cpp
index 8ed46ee7c..9b18870c7 100644
--- a/src/platform/qt/AudioDevice.cpp
+++ b/src/platform/qt/AudioDevice.cpp
@@ -32,18 +32,31 @@ qint64 AudioDevice::writeData(const char*, qint64) {
 	return 0;
 }
 
-AudioDevice::Thread::Thread(AudioDevice* device, QObject* parent)
+AudioDevice::Thread::Thread(QObject* parent)
 	: QThread(parent)
-	, m_device(device)
 {
 	// Nothing to do
 }
 
-void AudioDevice::Thread::setOutput(QAudioOutput* output) {
-	m_audio = output;
+void AudioDevice::Thread::setInput(GBAAudio* input) {
+	m_input = input;
 }
 
 void AudioDevice::Thread::run() {
-	m_audio->start(m_device);
+	QAudioFormat format;
+	format.setSampleRate(44100);
+	format.setChannelCount(2);
+	format.setSampleSize(16);
+	format.setCodec("audio/pcm");
+	format.setByteOrder(QAudioFormat::LittleEndian);
+	format.setSampleType(QAudioFormat::SignedInt);
+
+	AudioDevice device(m_input);
+	QAudioOutput audioOutput(format);
+	audioOutput.setBufferSize(1024);
+	device.setFormat(audioOutput.format());
+
+	audioOutput.start(&device);
 	exec();
+	audioOutput.stop();
 }
diff --git a/src/platform/qt/AudioDevice.h b/src/platform/qt/AudioDevice.h
index 1a7a2cc66..9dcba11b7 100644
--- a/src/platform/qt/AudioDevice.h
+++ b/src/platform/qt/AudioDevice.h
@@ -20,16 +20,15 @@ public:
 
 	class Thread : public QThread {
 	public:
-		Thread(AudioDevice* device, QObject* parent = 0);
+		Thread(QObject* parent = 0);
 
-		void setOutput(QAudioOutput* output);
+		void setInput(GBAAudio* input);
 
 	protected:
 		void run();
 
 	private:
-		QAudioOutput* m_audio;
-		AudioDevice* m_device;
+		GBAAudio* m_input;
 	};
 
 protected:
diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp
index f12600793..e12533966 100644
--- a/src/platform/qt/Window.cpp
+++ b/src/platform/qt/Window.cpp
@@ -24,21 +24,7 @@ void Window::selectROM() {
 }
 
 void Window::setupAudio(GBAAudio* audio) {
-	AudioDevice* device = new AudioDevice(audio, this);
-	AudioDevice::Thread* thread = new AudioDevice::Thread(device, this);
-	if (!m_audio) {
-		QAudioFormat format;
-		format.setSampleRate(44100);
-		format.setChannelCount(2);
-		format.setSampleSize(16);
-		format.setCodec("audio/pcm");
-		format.setByteOrder(QAudioFormat::LittleEndian);
-		format.setSampleType(QAudioFormat::SignedInt);
-
-		m_audio = new QAudioOutput(format, this);
-		m_audio->setBufferSize(1024);
-	}
-	device->setFormat(m_audio->format());
-	thread->setOutput(m_audio);
-	thread->start();
+	AudioDevice::Thread* thread = new AudioDevice::Thread(this);
+	thread->setInput(audio);
+	thread->start(QThread::HighPriority);
 }
diff --git a/src/platform/qt/Window.h b/src/platform/qt/Window.h
index fc21c7bca..ea641cfbb 100644
--- a/src/platform/qt/Window.h
+++ b/src/platform/qt/Window.h
@@ -24,7 +24,6 @@ private slots:
 	void setupAudio(GBAAudio*);
 
 private:
-	QAudioOutput* m_audio;
 	GameController* m_controller;
 	Display* m_display;
 };