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.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/qalsaaudioinput.cpp')
-rw-r--r-- | src/plugins/alsa/qalsaaudioinput.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/alsa/qalsaaudioinput.cpp b/src/plugins/alsa/qalsaaudioinput.cpp index adaa41c6e..a0a7bf08f 100644 --- a/src/plugins/alsa/qalsaaudioinput.cpp +++ b/src/plugins/alsa/qalsaaudioinput.cpp @@ -244,7 +244,7 @@ QIODevice* QAlsaAudioInput::start() delete audioSource; pullMode = false; - audioSource = new InputPrivate(this); + audioSource = new AlsaInputPrivate(this); audioSource->open(QIODevice::ReadOnly | QIODevice::Unbuffered); deviceState = QAudio::IdleState; @@ -725,7 +725,7 @@ bool QAlsaAudioInput::deviceReady() read(0, buffer_size); } else { // emits readyRead() so user will call read() on QIODevice to get some audio data - InputPrivate* a = qobject_cast<InputPrivate*>(audioSource); + AlsaInputPrivate* a = qobject_cast<AlsaInputPrivate*>(audioSource); a->trigger(); } bytesAvailable = checkBytesReady(); @@ -777,28 +777,28 @@ void QAlsaAudioInput::drain() snd_pcm_drain(handle); } -InputPrivate::InputPrivate(QAlsaAudioInput* audio) +AlsaInputPrivate::AlsaInputPrivate(QAlsaAudioInput* audio) { audioDevice = qobject_cast<QAlsaAudioInput*>(audio); } -InputPrivate::~InputPrivate() +AlsaInputPrivate::~AlsaInputPrivate() { } -qint64 InputPrivate::readData( char* data, qint64 len) +qint64 AlsaInputPrivate::readData( char* data, qint64 len) { return audioDevice->read(data,len); } -qint64 InputPrivate::writeData(const char* data, qint64 len) +qint64 AlsaInputPrivate::writeData(const char* data, qint64 len) { Q_UNUSED(data) Q_UNUSED(len) return 0; } -void InputPrivate::trigger() +void AlsaInputPrivate::trigger() { emit readyRead(); } |