summaryrefslogtreecommitdiffstats
path: root/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Removed nearest test from qaudiodeviceinfo unit test.Kurt Korbatits2010-05-201-11/+0
| | | | Reviewed-by:Justin McPherson
* Revert "Frequency to SampleRate and channels to channelCount."Kurt Korbatits2010-01-141-6/+6
| | | | | | | | | | | | | | | | | | | | This reverts commit 80d4a4945d3273a4b2ce91e34597533f661af320. Conflicts: examples/multimedia/audioinput/audioinput.cpp examples/multimedia/audiooutput/audiooutput.cpp src/multimedia/audio/qaudio_mac.cpp src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp src/multimedia/audio/qaudioformat.h src/multimedia/audio/qaudioinput.cpp src/multimedia/audio/qaudiooutput.cpp tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp tests/auto/qaudioformat/tst_qaudioformat.cpp tests/auto/qaudioinput/tst_qaudioinput.cpp tests/auto/qaudiooutput/tst_qaudiooutput.cpp
* Revert "Added setChannelCount() to QAudioFormat."Kurt Korbatits2010-01-141-2/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit f124538ef4840c3d24b4c7e9e7221adb52bdee2c. Conflicts: examples/multimedia/audioinput/audioinput.cpp examples/multimedia/audiooutput/audiooutput.cpp src/multimedia/audio/qaudio_mac.cpp src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp src/multimedia/audio/qaudioformat.h src/multimedia/audio/qaudioinput.cpp src/multimedia/audio/qaudiooutput.cpp tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp tests/auto/qaudioformat/tst_qaudioformat.cpp tests/auto/qaudioinput/tst_qaudioinput.cpp tests/auto/qaudiooutput/tst_qaudiooutput.cpp
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-081-8/+8
|\ | | | | | | | | Conflicts: src/multimedia/audio/qaudioformat.cpp
| * Frequency to SampleRate and channels to channelCount.Kurt Korbatits2010-01-061-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | -Added channelCount(), changed everything to use this instead of channels() in QAudioFormat class. -Added setSampleRate() and sampleRate(), changed everthing to use these instead of setFrequency() and frequency() in QAudioFormat class. -Added supportedSampleRates() and supportedChannelCounts(), changed everything to use these instead of supportedFrequencies() and supportedChannels() in QAudioDeviceInfo class. Reviewed-by:Justin McPherson
| * Added setChannelCount() to QAudioFormat.Kurt Korbatits2010-01-061-1/+1
| | | | | | | | | | | | | | Added setChannelCount() and updated docs/examples/tests to use it instead of setChannels(). Reviewed-by:Justin McPherson
* | Update copyright year to 2010Jason McDonald2010-01-061-1/+1
|/ | | | Reviewed-by: Trust Me
* Changes to low-level audio API.Kurt Korbatits2009-11-101-3/+3
| | | | | | | | | | | | | QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic) QAudio::SuspendState -> QAudio::SuspendedState QAudio::StopState -> QAudio::StoppedState QAudioDeviceInfo::deviceList() -> QAudioDeviceInfo::availableDevices() clock() -> elapsedUSecs() totalTime() -> processedUSecs() QIODevice* start(QIODevice*) -> void start(QIODevice*), QIODevice* start() Reviewed-by:Justin McPherson
* Changes to low-level audio API.Kurt Korbatits2009-11-101-3/+3
| | | | | | | | | | | | | | | QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic) QAudio::SuspendState -> QAudio::SuspendedState QAudio::StopState -> QAudio::StoppedState QAudioDeviceInfo::deviceList() -> QAudioDeviceInfo::availableDevices() clock() -> elapsedUSecs() totalTime() -> processedUSecs() QIODevice* start(QIODevice*) -> void start(QIODevice*), QIODevice* start() Reviewed-by:Justin McPherson
* Changes to low-level audio API.Kurt Korbatits2009-11-051-3/+3
| | | | | | | | | | | | | QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic) QAudio::SuspendState -> QAudio::SuspendedState QAudio::StopState -> QAudio::StoppedState QAudioDeviceInfo::deviceList() -> QAudioDeviceInfo::availableDevices() clock() -> elapsedUSecs() totalTime() -> processedUSecs() QIODevice* start(QIODevice*) -> void start(QIODevice*), QIODevice* start() Reviewed-by:Justin McPherson
* AudioService API changes; QString->const QString&, remove QAudioDeviceId use ↵Justin McPherson2009-09-241-4/+4
| | | | | | QAudioDeviceInfo. Reviewed-by: Bill King
* Update license headers again.Jason McDonald2009-09-091-4/+4
| | | | Reviewed-by: Trust Me
* Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-311-13/+13
| | | | Reviewed-by: Trust Me
* Fixed audio auto tests.Kurt Korbatits2009-08-131-34/+80
| | | | | | Handle platforms that don't have backends. Reviewed-by: Bill King
* Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
| | | | Reviewed-by: Trust Me
* Merge AudioServices into mainline.Justin McPherson2009-08-051-0/+159