From f12f481955828af1b4f28491858c67f05bc278c6 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sat, 26 Sep 2020 17:47:38 +0100 Subject: [PATCH] Remove unused member variable that breaks the Raspberry Pi build --- Audio/soundout.cpp | 3 +-- Audio/soundout.h | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Audio/soundout.cpp b/Audio/soundout.cpp index 5e89de147..fe7c58fbf 100644 --- a/Audio/soundout.cpp +++ b/Audio/soundout.cpp @@ -51,7 +51,7 @@ void SoundOutput::setFormat (QAudioDeviceInfo const& device, unsigned channels, m_framesBuffered = frames_buffered; } -void SoundOutput::restart (AudioDevice * source) +void SoundOutput::restart (QIODevice * source) { if (!m_device.isNull ()) { @@ -111,7 +111,6 @@ void SoundOutput::restart (AudioDevice * source) #endif } m_stream->setCategory ("production"); - m_source = source; m_stream->start (source); // qDebug () << "SoundOut selected buffer size (bytes):" << m_stream->bufferSize () << "period size:" << m_stream->periodSize (); } diff --git a/Audio/soundout.h b/Audio/soundout.h index 95efaeb15..76711660d 100644 --- a/Audio/soundout.h +++ b/Audio/soundout.h @@ -6,9 +6,8 @@ #include #include #include -#include -class AudioDevice; +class QIODevice; class QAudioDeviceInfo; // An instance of this sends audio data to a specified soundcard. @@ -30,7 +29,7 @@ public: public Q_SLOTS: void setFormat (QAudioDeviceInfo const& device, unsigned channels, int frames_buffered = 0); - void restart (AudioDevice *); + void restart (QIODevice *); void suspend (); void resume (); void reset (); @@ -52,7 +51,6 @@ private: QAudioDeviceInfo m_device; unsigned m_channels; QScopedPointer m_stream; - QPointer m_source; int m_framesBuffered; qreal m_volume; bool error_;