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.h
View File

@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
class QPulseAudioOutput : public QAbstractAudioOutput
{
friend class OutputPrivate;
friend class PulseOutputPrivate;
Q_OBJECT
public:
@@ -139,14 +139,14 @@ private:
pa_sample_spec m_spec;
};
class OutputPrivate : public QIODevice
class PulseOutputPrivate : public QIODevice
{
friend class QPulseAudioOutput;
Q_OBJECT
public:
OutputPrivate(QPulseAudioOutput *audio);
virtual ~OutputPrivate() {}
PulseOutputPrivate(QPulseAudioOutput *audio);
virtual ~PulseOutputPrivate() {}
protected:
qint64 readData(char *data, qint64 len);