diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-01-19 14:35:33 +0100 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-01-19 14:45:09 +0100 |
| commit | af2d5a181c3d48e04c2459d551f320cfd7186630 (patch) | |
| tree | d7187e0c81d0c300cf4e645eedccd359e27124c3 /src/plugins/alsa/qalsaaudioinput.h | |
| parent | 9a215d954b00b6d07568392a1894341027c1af5a (diff) | |
| parent | 4ab105b89e13c746b08fb807e2104bfca05e88f1 (diff) | |
| download | qtmultimedia-af2d5a181c3d48e04c2459d551f320cfd7186630.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
src/plugins/gstreamer/camerabin/camerabinsession.cpp
Change-Id: I66a6f3efc5391013934b6b321073c31f25e1de26
Diffstat (limited to 'src/plugins/alsa/qalsaaudioinput.h')
| -rw-r--r-- | src/plugins/alsa/qalsaaudioinput.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/alsa/qalsaaudioinput.h b/src/plugins/alsa/qalsaaudioinput.h index 19af68950..1c09dc70f 100644 --- a/src/plugins/alsa/qalsaaudioinput.h +++ b/src/plugins/alsa/qalsaaudioinput.h @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE -class InputPrivate; +class AlsaInputPrivate; class RingBuffer { @@ -158,12 +158,12 @@ private: qreal m_volume; }; -class InputPrivate : public QIODevice +class AlsaInputPrivate : public QIODevice { Q_OBJECT public: - InputPrivate(QAlsaAudioInput* audio); - ~InputPrivate(); + AlsaInputPrivate(QAlsaAudioInput* audio); + ~AlsaInputPrivate(); qint64 readData( char* data, qint64 len); qint64 writeData(const char* data, qint64 len); |