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/qalsaaudiooutput.cpp | |
parent | 61fd6498614215bef59162c20b44c57da315e000 (diff) |
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/qalsaaudiooutput.cpp')
-rw-r--r-- | src/plugins/alsa/qalsaaudiooutput.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/alsa/qalsaaudiooutput.cpp b/src/plugins/alsa/qalsaaudiooutput.cpp index fde2bc9bf..c9c024aed 100644 --- a/src/plugins/alsa/qalsaaudiooutput.cpp +++ b/src/plugins/alsa/qalsaaudiooutput.cpp @@ -247,7 +247,7 @@ QIODevice* QAlsaAudioOutput::start() close(); - audioSource = new OutputPrivate(this); + audioSource = new AlsaOutputPrivate(this); audioSource->open(QIODevice::WriteOnly|QIODevice::Unbuffered); pullMode = false; @@ -785,14 +785,14 @@ void QAlsaAudioOutput::reset() stop(); } -OutputPrivate::OutputPrivate(QAlsaAudioOutput* audio) +AlsaOutputPrivate::AlsaOutputPrivate(QAlsaAudioOutput* audio) { audioDevice = qobject_cast<QAlsaAudioOutput*>(audio); } -OutputPrivate::~OutputPrivate() {} +AlsaOutputPrivate::~AlsaOutputPrivate() {} -qint64 OutputPrivate::readData( char* data, qint64 len) +qint64 AlsaOutputPrivate::readData( char* data, qint64 len) { Q_UNUSED(data) Q_UNUSED(len) @@ -800,7 +800,7 @@ qint64 OutputPrivate::readData( char* data, qint64 len) return 0; } -qint64 OutputPrivate::writeData(const char* data, qint64 len) +qint64 AlsaOutputPrivate::writeData(const char* data, qint64 len) { int retry = 0; qint64 written = 0; |