slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix: static linking on Linux with both PulseAudio and Alsa plugins

Browse Source 
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>
This commit is contained in:
Gabriel Hege
2014-12-22 13:17:42 +01:00
committed by Yoann Lopes
parent 61fd649861
commit 68dbc9ba02
8 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/pulseaudio/qaudiooutput_pulse.cpp
View File

@@ -237,7 +237,7 @@ QIODevice *QPulseAudioOutput::start()
if (!open())
return Q_NULLPTR;
m_audioSource = new OutputPrivate(this);
m_audioSource = new PulseOutputPrivate(this);
m_audioSource->open(QIODevice::WriteOnly|QIODevice::Unbuffered);
m_pullMode = false;
@@ -604,12 +604,12 @@ void QPulseAudioOutput::reset()
stop();
}
OutputPrivate::OutputPrivate(QPulseAudioOutput *audio)
PulseOutputPrivate::PulseOutputPrivate(QPulseAudioOutput *audio)
{
m_audioDevice = qobject_cast<QPulseAudioOutput*>(audio);
}
qint64 OutputPrivate::readData(char *data, qint64 len)
qint64 PulseOutputPrivate::readData(char *data, qint64 len)
{
Q_UNUSED(data)
Q_UNUSED(len)
@@ -617,7 +617,7 @@ qint64 OutputPrivate::readData(char *data, qint64 len)
return 0;
}
qint64 OutputPrivate::writeData(const char *data, qint64 len)
qint64 PulseOutputPrivate::writeData(const char *data, qint64 len)
{
int retry = 0;
qint64 written = 0;