diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:26:14 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:26:14 +0200 |
| commit | 1925bb404ec47b6e074c5e3b334fe0be12176d7b (patch) | |
| tree | 8d7d79ac1b3a549c20bb4fa77c6f457bf1bb61ea /src/plugins/windowsaudio/qwindowsaudiodeviceinfo.h | |
| parent | 6187b72c51d0c05955d9d814baf8866b8e70fcfe (diff) | |
| parent | f9145aca166ad2ca1514524ce88ded7834eb207c (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
src/multimedia/playback/playlistfileparser.cpp
src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp
Change-Id: I52950def2b8283ae15797d05d4ead6a1256eba19
Diffstat (limited to 'src/plugins/windowsaudio/qwindowsaudiodeviceinfo.h')
| -rw-r--r-- | src/plugins/windowsaudio/qwindowsaudiodeviceinfo.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.h b/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.h index 4bc9488cf..cdbde40d0 100644 --- a/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.h +++ b/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.h @@ -57,7 +57,6 @@ QT_BEGIN_NAMESPACE - const unsigned int MAX_SAMPLE_RATES = 5; const unsigned int SAMPLE_RATES[] = { 8000, 11025, 22050, 44100, 48000 }; @@ -91,15 +90,14 @@ private: QAudio::Mode mode; QString device; quint32 devId; - QAudioFormat nearest; QList<int> sampleRatez; QList<int> channelz; QList<int> sizez; - QList<QAudioFormat::Endian> byteOrderz; - QStringList codecz; QList<QAudioFormat::SampleType> typez; }; + + QT_END_NAMESPACE |