summaryrefslogtreecommitdiff
path: root/src/plugins/pulseaudio/qaudioinput_pulse.cpp
diff options
context:
space:
mode:
authorGabriel Hege <g+qt@hege.cc>2014-12-22 13:17:42 +0100
committerYoann Lopes <yoann.lopes@theqtcompany.com>2014-12-22 15:48:42 +0100
commit68dbc9ba02475f569905b8b7b37c6a2a2961e030 (patch)
treeb751a07becaf3b3b83932ac311f4dd5bebfd48e2 /src/plugins/pulseaudio/qaudioinput_pulse.cpp
parent61fd6498614215bef59162c20b44c57da315e000 (diff)
downloadqtmultimedia-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/pulseaudio/qaudioinput_pulse.cpp')
-rw-r--r--src/plugins/pulseaudio/qaudioinput_pulse.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/pulseaudio/qaudioinput_pulse.cpp b/src/plugins/pulseaudio/qaudioinput_pulse.cpp
index ea053578f..fe20e061b 100644
--- a/src/plugins/pulseaudio/qaudioinput_pulse.cpp
+++ b/src/plugins/pulseaudio/qaudioinput_pulse.cpp
@@ -248,7 +248,7 @@ QIODevice *QPulseAudioInput::start()
return Q_NULLPTR;
m_pullMode = false;
- m_audioSource = new InputPrivate(this);
+ m_audioSource = new PulseInputPrivate(this);
m_audioSource->open(QIODevice::ReadOnly | QIODevice::Unbuffered);
setState(QAudio::IdleState);
@@ -661,7 +661,7 @@ bool QPulseAudioInput::deviceReady()
} else {
// emits readyRead() so user will call read() on QIODevice to get some audio data
if (m_audioSource != 0) {
- InputPrivate *a = qobject_cast<InputPrivate*>(m_audioSource);
+ PulseInputPrivate *a = qobject_cast<PulseInputPrivate*>(m_audioSource);
a->trigger();
}
}
@@ -701,24 +701,24 @@ void QPulseAudioInput::onPulseContextFailed()
setState(QAudio::StoppedState);
}
-InputPrivate::InputPrivate(QPulseAudioInput *audio)
+PulseInputPrivate::PulseInputPrivate(QPulseAudioInput *audio)
{
m_audioDevice = qobject_cast<QPulseAudioInput*>(audio);
}
-qint64 InputPrivate::readData(char *data, qint64 len)
+qint64 PulseInputPrivate::readData(char *data, qint64 len)
{
return m_audioDevice->read(data, len);
}
-qint64 InputPrivate::writeData(const char *data, qint64 len)
+qint64 PulseInputPrivate::writeData(const char *data, qint64 len)
{
Q_UNUSED(data)
Q_UNUSED(len)
return 0;
}
-void InputPrivate::trigger()
+void PulseInputPrivate::trigger()
{
emit readyRead();
}