summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/audio/main.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | Reviewed-by: Trust Me
* Doc: Updated example license to three clause BSD license.David Boddie2010-06-101-27/+26
| | | | | | | See change 8f47373e3795d7ec50387d5f1a771a59567bdaea for context. Reviewed-by: Trust Me Requested-by: Legal
* Doc: these files are NOT part of the test suite of the Qt toolkitThiago Macieira2010-02-201-1/+1
|
* Revert "Frequency to SampleRate and channels to channelCount."Kurt Korbatits2010-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | 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-1/+1
| | | | | | | | | | | | | | | | | | | | 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-2/+2
|\ | | | | | | | | Conflicts: src/multimedia/audio/qaudioformat.cpp
| * Frequency to SampleRate and channels to channelCount.Kurt Korbatits2010-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | -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
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-071-1/+1
|\ \
| * | Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| |/ | | | | | | Reviewed-by: Trust Me
* | Doc: Fixed comments in a code snippet.David Boddie2009-12-181-1/+1
|/ | | | Reviewed-by: Trust Me
* AudioService API changes; QString->const QString&, remove QAudioDeviceId use ↵Justin McPherson2009-09-241-2/+1
| | | | | | QAudioDeviceInfo. Reviewed-by: Bill King
* Fix license headers.Jason McDonald2009-09-171-0/+40
| | | | Reviewed-by: Trust Me
* Doc: Added some snippets to the multimedia audio docs.Geir Vattekar2009-09-151-0/+109
generated by cgit v0.12 at 2024-10-04 18:51:30 (GMT)