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

Merge remote-tracking branch 'origin/5.4' into dev

Browse Source 
Conflicts:
	.qmake.conf
	src/plugins/gstreamer/camerabin/camerabinsession.cpp

Change-Id: I66a6f3efc5391013934b6b321073c31f25e1de26
This commit is contained in:
Yoann Lopes
2015-01-19 14:35:33 +01:00
parent 9a215d954b 4ab105b89e
commit af2d5a181c
16 changed files with 119 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/alsa/qalsaaudiooutput.h
View File

@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
class QAlsaAudioOutput : public QAbstractAudioOutput
{
friend class OutputPrivate;
friend class AlsaOutputPrivate;
Q_OBJECT
public:
QAlsaAudioOutput(const QByteArray &device);
@@ -137,13 +137,13 @@ private:
qreal m_volume;
};
class OutputPrivate : public QIODevice
class AlsaOutputPrivate : public QIODevice
{
friend class QAlsaAudioOutput;
Q_OBJECT
public:
OutputPrivate(QAlsaAudioOutput* audio);
~OutputPrivate();
AlsaOutputPrivate(QAlsaAudioOutput* audio);
~AlsaOutputPrivate();
qint64 readData( char* data, qint64 len);
qint64 writeData(const char* data, qint64 len);