summaryrefslogtreecommitdiffstats
path: root/src/multimedia/audio/qaudioinput.cpp
Commit message (Collapse)AuthorAgeFilesLines
* 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-multimedia-team into ↵Qt Continuous Integration System2010-01-131-1/+1
|\ | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: Fix example in QAudioOutput/QAudioInput docs
| * Fix example in QAudioOutput/QAudioInput docsKurt Korbatits2010-01-131-1/+1
| | | | | | | | | | | | Fixed error in doc comments. Reviewed-by:Justin McPherson
* | 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
* | Update copyright year to 2010Jason McDonald2010-01-061-1/+1
|/ | | | Reviewed-by: Trust Me
* Fix up documentation examples for low-level audio.Kurt Korbatits2009-12-091-2/+13
| | | | | | | | | QTBUG-6548 QAudioOutput::start() crashes when the QIODevice is destructed Made documentation clearer. Task-number:QTBUG-6548 Reviewed-by:Justin McPherson
* No audio devices found for Ubuntu with QAudio classesKurt Korbatits2009-11-161-1/+0
| | | | | | | Changed alsa implementation to present audio devices from alsa. Task-number:QTBUG-5723 Reviewed-by:Justin McPherson
* Changes to low-level audio API.Kurt Korbatits2009-11-101-28/+35
| | | | | | | | | | | | | 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-35/+28
| | | | | | | | | | | | | | | 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-28/+35
| | | | | | | | | | | | | 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
* doc: Fixed three /sa that should be \saThorbjørn Lindeijer2009-09-281-1/+1
|
* AudioService API changes; QString->const QString&, remove QAudioDeviceId use ↵Justin McPherson2009-09-241-5/+5
| | | | | | QAudioDeviceInfo. Reviewed-by: Bill King
* Doc: Added some snippets to the multimedia audio docs.Geir Vattekar2009-09-151-1/+6
|
* 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
* 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/+400
generated by cgit v0.12 at 2024-11-08 08:56:28 (GMT)