summaryrefslogtreecommitdiffstats
path: root/src/multimedia/audio/qaudiodeviceinfo.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-251-1/+61
|\ | | | | | | | | | | | | | | Conflicts: demos/spectrum/app/app.pro src/gui/egl/qegl.cpp tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro tests/auto/qmenu/tst_qmenu.cpp
| * QAudioDeviceInfo::nearestFormat() consistent across all platformsKurt Korbatits2010-05-191-1/+61
| | | | | | | | | | Task-number:QTBUG-10760 Reviewed-by:Justin McPherson
* | Removed mediaservices.Kurt Korbatits2010-05-181-0/+400
| |
* | Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-151-400/+0
| |
* | Doc: more \since 4.7Volker Hilsheimer2010-02-051-0/+4
| |
* | Merge branch 'master' of ../../qt/masterJustin McPherson2010-01-281-5/+1
|\ \ | |/ | | | | | | | | | | Conflicts: src/multimedia/audio/qaudiodeviceinfo.cpp src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp src/multimedia/audio/qaudioformat.cpp
| * Revert "Frequency to SampleRate and channels to channelCount."Kurt Korbatits2010-01-141-22/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'master' of ../../qt/masterJustin McPherson2010-01-151-5/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: examples/multimedia/audioinput/audioinput.cpp src/multimedia/audio/qaudiodeviceinfo.cpp src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp src/multimedia/audio/qaudioformat.cpp src/multimedia/audio/qaudioinput_win32_p.cpp src/multimedia/audio/qaudiooutput_win32_p.cpp tests/auto/qaudioformat/tst_qaudioformat.cpp
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-081-4/+22
| |\ | | | | | | | | | | | | Conflicts: src/multimedia/audio/qaudioformat.cpp
| | * Frequency to SampleRate and channels to channelCount.Kurt Korbatits2010-01-061-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -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
| * | Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| |/ | | | | | | Reviewed-by: Trust Me
| * Changes to low-level audio API.Kurt Korbatits2009-11-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Added new funcs to QAudioFormat and QAudioDeviceInfo class's.Kurt Korbatits2010-01-151-3/+29
|/ | | | | | | | | | | | QAudioFormat::setChannelCount(), channelCount() QAudioFormat::setSampleRate(), sampleRate() QAudioDeviceInfo::supportedChannelCounts(), supportedSampleRates() Changed all instances to use these new functions instead of channels(),frequency(),setFrequency(),setChannels() supportedChannels(),supportedFrequencies() Old functions still exist but are marked obsolete. Reviewed-by:Justin McPherson
* AudioService API changes; QString->const QString&, remove QAudioDeviceId use ↵Justin McPherson2009-09-241-32/+132
| | | | | | QAudioDeviceInfo. Reviewed-by: Bill King
* Doc: Added some snippets to the multimedia audio docs.Geir Vattekar2009-09-151-1/+5
|
* 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/+270
generated by cgit v0.12 at 2025-01-16 10:43:07 (GMT)