Qt: Remove QAudioOutput-based audio stream

src/duckstation-qt/duckstation-qt.vcxproj

@@ -40,7 +40,6 @@
     <ClCompile Include="gpusettingswidget.cpp" />
     <ClCompile Include="hotkeysettingswidget.cpp" />
     <ClCompile Include="inputbindingwidgets.cpp" />
-    <ClCompile Include="qtaudiostream.cpp" />
     <ClCompile Include="qtdisplaywindow.cpp" />
     <ClCompile Include="gamelistsettingswidget.cpp" />
     <ClCompile Include="gamelistwidget.cpp" />
@@ -60,7 +59,6 @@
     <QtMoc Include="hotkeysettingswidget.h" />
     <QtMoc Include="inputbindingwidgets.h" />
     <QtMoc Include="d3d11displaywindow.h" />
-    <ClInclude Include="qtaudiostream.h" />
     <ClInclude Include="settingwidgetbinder.h" />
     <QtMoc Include="consolesettingswidget.h" />
     <QtMoc Include="gamelistsettingswidget.h" />
@@ -283,7 +281,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(SolutionDir)dep\msvc\lib32-debug;$(SolutionDir)dep\msvc\qt5-x86\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Multimediad.lib;d3d11.lib;dxgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;d3d11.lib;dxgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -304,7 +302,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(SolutionDir)dep\msvc\lib64-debug;$(SolutionDir)dep\msvc\qt5-x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Multimediad.lib;d3d11.lib;dxgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;d3d11.lib;dxgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
@@ -327,7 +325,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(SolutionDir)dep\msvc\lib32-debug;$(SolutionDir)dep\msvc\qt5-x86\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Multimediad.lib;d3d11.lib;dxgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;d3d11.lib;dxgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
@@ -350,7 +348,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(SolutionDir)dep\msvc\lib64-debug;$(SolutionDir)dep\msvc\qt5-x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Multimediad.lib;d3d11.lib;dxgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;d3d11.lib;dxgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -372,7 +370,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>$(SolutionDir)dep\msvc\lib32;$(SolutionDir)dep\msvc\qt5-x86\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Multimedia.lib;d3d11.lib;dxgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;d3d11.lib;dxgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'">
@@ -395,7 +393,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>$(SolutionDir)dep\msvc\lib32;$(SolutionDir)dep\msvc\qt5-x86\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Multimedia.lib;d3d11.lib;dxgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;d3d11.lib;dxgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
   </ItemDefinitionGroup>
@@ -418,7 +416,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>$(SolutionDir)dep\msvc\lib64;$(SolutionDir)dep\msvc\qt5-x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Multimedia.lib;d3d11.lib;dxgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;d3d11.lib;dxgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|x64'">
@@ -441,7 +439,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>$(SolutionDir)dep\msvc\lib64;$(SolutionDir)dep\msvc\qt5-x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Multimedia.lib;d3d11.lib;dxgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;d3d11.lib;dxgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
   </ItemDefinitionGroup>

src/duckstation-qt/duckstation-qt.vcxproj.filters

@@ -29,7 +29,6 @@
     <ClCompile Include="hotkeysettingswidget.cpp" />
     <ClCompile Include="$(IntDir)moc_hotkeysettingswidget.cpp" />
     <ClCompile Include="$(IntDir)moc_inputbindingwidgets.cpp" />
-    <ClCompile Include="qtaudiostream.cpp" />
     <ClCompile Include="d3d11displaywindow.cpp" />
     <ClCompile Include="$(IntDir)moc_d3d11displaywindow.cpp" />
   </ItemGroup>
@@ -37,7 +36,6 @@
     <ClInclude Include="qtsettingsinterface.h" />
     <ClInclude Include="qtutils.h" />
     <ClInclude Include="settingwidgetbinder.h" />
-    <ClInclude Include="qtaudiostream.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="resources">

src/duckstation-qt/qtaudiostream.cpp

@@ -1,84 +0,0 @@
-#include "qtaudiostream.h"
-#include <QtCore/QDebug>
-#include <QtMultimedia/QAudioOutput>
-
-QtAudioStream::QtAudioStream()
-{
-  QIODevice::open(QIODevice::ReadOnly);
-}
-
-QtAudioStream::~QtAudioStream() = default;
-
-std::unique_ptr<AudioStream> QtAudioStream::Create()
-{
-  return std::make_unique<QtAudioStream>();
-}
-
-bool QtAudioStream::OpenDevice()
-{
-  QAudioFormat format;
-  format.setSampleRate(m_output_sample_rate);
-  format.setChannelCount(m_channels);
-  format.setSampleSize(sizeof(SampleType) * 8);
-  format.setCodec("audio/pcm");
-  format.setByteOrder(QAudioFormat::LittleEndian);
-  format.setSampleType(QAudioFormat::SignedInt);
-
-  QAudioDeviceInfo adi = QAudioDeviceInfo::defaultOutputDevice();
-  if (!adi.isFormatSupported(format))
-  {
-    qWarning() << "Audio format not supported by device";
-    return false;
-  }
-
-  m_output = std::make_unique<QAudioOutput>(format);
-  m_output->setBufferSize(sizeof(SampleType) * m_channels * m_buffer_size);
-  return true;
-}
-
-void QtAudioStream::PauseDevice(bool paused)
-{
-  if (paused)
-  {
-    m_output->stop();
-    return;
-  }
-
-  m_output->start(this);
-}
-
-void QtAudioStream::CloseDevice()
-{
-  m_output.reset();
-}
-
-void QtAudioStream::BufferAvailable() {}
-
-bool QtAudioStream::isSequential() const
-{
-  return true;
-}
-
-qint64 QtAudioStream::bytesAvailable() const
-{
-  return GetSamplesAvailable() * m_channels * sizeof(SampleType);
-}
-
-qint64 QtAudioStream::readData(char* data, qint64 maxlen)
-{
-  const u32 num_samples = static_cast<u32>(maxlen) / sizeof(SampleType) / m_channels;
-  const u32 read_samples = ReadSamples(reinterpret_cast<SampleType*>(data), num_samples);
-  const u32 silence_samples = num_samples - read_samples;
-  if (silence_samples > 0)
-  {
-    std::memset(reinterpret_cast<SampleType*>(data) + (read_samples * m_channels), 0,
-                silence_samples * m_channels * sizeof(SampleType));
-  }
-
-  return num_samples * m_channels * sizeof(SampleType);
-}
-
-qint64 QtAudioStream::writeData(const char* data, qint64 len)
-{
-  return 0;
-}

src/duckstation-qt/qtaudiostream.h

@@ -1,29 +0,0 @@
-#pragma once
-#include "common/audio_stream.h"
-#include <QtCore/QIODevice>
-#include <memory>
-
-class QAudioOutput;
-
-class QtAudioStream final : public AudioStream, private QIODevice
-{
-public:
-  QtAudioStream();
-  ~QtAudioStream();
-
-  static std::unique_ptr<AudioStream> Create();
-
-protected:
-  bool OpenDevice() override;
-  void PauseDevice(bool paused) override;
-  void CloseDevice() override;
-  void BufferAvailable() override;
-
-private:
-  bool isSequential() const override;
-  qint64 bytesAvailable() const override;
-  qint64 readData(char* data, qint64 maxlen) override;
-  qint64 writeData(const char* data, qint64 len) override;
-
-  std::unique_ptr<QAudioOutput> m_output;
-};

src/duckstation-qt/qthostinterface.cpp

@@ -1,5 +1,6 @@
 #include "qthostinterface.h"
 #include "common/assert.h"
+#include "common/audio_stream.h"
 #include "common/byte_stream.h"
 #include "common/log.h"
 #include "common/string_util.h"
@@ -7,7 +8,6 @@
 #include "core/game_list.h"
 #include "core/gpu.h"
 #include "core/system.h"
-#include "qtaudiostream.h"
 #include "qtsettingsinterface.h"
 #include "qtutils.h"
 #include <QtCore/QCoreApplication>