diff options
author | Gabriel Hege <g+qt@hege.cc> | 2014-12-22 13:17:42 +0100 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2014-12-22 15:48:42 +0100 |
commit | 68dbc9ba02475f569905b8b7b37c6a2a2961e030 (patch) | |
tree | b751a07becaf3b3b83932ac311f4dd5bebfd48e2 /src/plugins/alsa/qalsaaudioinput.h | |
parent | 61fd6498614215bef59162c20b44c57da315e000 (diff) | |
download | qtmultimedia-68dbc9ba02475f569905b8b7b37c6a2a2961e030.tar.gz |
Fix: static linking on Linux with both PulseAudio and Alsa plugins
Fixed multiply defined symbols when linking statically with both
PulseAudio and Alsa plugins enabled:
The private classes In/OutputPrivate had identical names and have been
renamed.
Change-Id: I9415beeeed9fb0e14ead3f0ab906f343b3934341
Task-number: QTBUG-43514
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'src/plugins/alsa/qalsaaudioinput.h')
-rw-r--r-- | src/plugins/alsa/qalsaaudioinput.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/alsa/qalsaaudioinput.h b/src/plugins/alsa/qalsaaudioinput.h index abf67e2cd..081636bb3 100644 --- a/src/plugins/alsa/qalsaaudioinput.h +++ b/src/plugins/alsa/qalsaaudioinput.h @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE -class InputPrivate; +class AlsaInputPrivate; class RingBuffer { @@ -157,12 +157,12 @@ private: qreal m_volume; }; -class InputPrivate : public QIODevice +class AlsaInputPrivate : public QIODevice { Q_OBJECT public: - InputPrivate(QAlsaAudioInput* audio); - ~InputPrivate(); + AlsaInputPrivate(QAlsaAudioInput* audio); + ~AlsaInputPrivate(); qint64 readData( char* data, qint64 len); qint64 writeData(const char* data, qint64 len); |