diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-24 14:04:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-24 14:04:05 (GMT) |
| commit | 81babd25bda845118c2291640a9e34170977e6fd (patch) | |
| tree | 42d58f5edd5c2cd0e62a3cf054624bf1da2c742d /src/multimedia/audio/qaudiodeviceinfo_alsa_p.h | |
| parent | e5935fb92f89ab88daa0060465e665a626bfa88b (diff) | |
| parent | 31c57832f44bc38e90717b706446dfe612a81a6e (diff) | |
| download | Qt-81babd25bda845118c2291640a9e34170977e6fd.zip Qt-81babd25bda845118c2291640a9e34170977e6fd.tar.gz Qt-81babd25bda845118c2291640a9e34170977e6fd.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fixed compile error introduced by win32 surround sound support change.
Added surround sound support to alsa low-level audio backend.
Added surround sound support to win32 low-level audio backend.
Diffstat (limited to 'src/multimedia/audio/qaudiodeviceinfo_alsa_p.h')
| -rw-r--r-- | src/multimedia/audio/qaudiodeviceinfo_alsa_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h index 6f9a459..8525980 100644 --- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h +++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h @@ -98,6 +98,11 @@ private: bool open(); void close(); + void checkSurround(); + bool surround40; + bool surround51; + bool surround71; + QString device; QAudio::Mode mode; QAudioFormat nearest; |