summaryrefslogtreecommitdiffstats
path: root/src/multimedia
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-134-4/+0
|\
| * Doc: remove \preliminary tag from public multimedia classesVolker Hilsheimer2010-02-124-4/+0
* | Doc: more \since 4.7Volker Hilsheimer2010-02-051-0/+4
* | Doc: add \since 4.7 to new functions.Volker Hilsheimer2010-02-051-0/+8
* | Merge branch 'master' of ../../qt/masterJustin McPherson2010-01-2815-73/+60
|\ \ | |/
| * Revert "Frequency to SampleRate and channels to channelCount."Kurt Korbatits2010-01-1412-96/+49
| * Revert "Added setChannelCount() to QAudioFormat."Kurt Korbatits2010-01-148-34/+19
* | Merge branch 'master' of ../../qt/masterJustin McPherson2010-01-1551-411/+531
|\ \ | |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-01-131-1/+1
| |\
| | * Fix example in QAudioOutput/QAudioInput docsKurt Korbatits2010-01-132-2/+2
| * | Fix code exampleBernhard Rosenkraenzer2010-01-111-1/+1
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-0816-69/+131
| |\ \ | | |/
| | * QAudioInput loses data on Maemo5/other linux platforms.Kurt Korbatits2010-01-071-1/+1
| | * Frequency to SampleRate and channels to channelCount.Kurt Korbatits2010-01-0616-60/+112
| | * Added setChannelCount() to QAudioFormat.Kurt Korbatits2010-01-068-9/+19
| * | Doc: Added the QAudio namespace to the multimedia module documentation.David Boddie2010-01-071-0/+2
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-0750-50/+50
| |\ \
| | * | Update copyright year to 2010Jason McDonald2010-01-0650-50/+50
| | |/
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-063-13/+38
| |\ \ | | |/
| | * The "audioinput" multimedia example locks up the audio input/outputKurt Korbatits2009-12-182-13/+33
| | * no audiodevices found using QAudioDeviceInfo::availableDevices on UbuntuKurt Korbatits2009-12-181-0/+5
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2009-12-184-4/+45
| |\ \ | | |/
| | * Fix up documentation examples for low-level audio.Kurt Korbatits2009-12-092-4/+26
| | * Add -audio-backend and -no-audio-backend configure option.Kurt Korbatits2009-12-092-0/+19
| * | Doc: Made corrections to documentation style and clarified some points.David Boddie2009-12-181-7/+7
| |/
| * No audio devices found for Ubuntu with QAudio classesKurt Korbatits2009-11-164-29/+66
| * Fixed runtime error in QAudioInput::bytesReady() functionKurt Korbatits2009-11-101-0/+3
| * Changes to low-level audio API.Kurt Korbatits2009-11-1033-212/+227
| * Changes to low-level audio API.Kurt Korbatits2009-11-1033-230/+212
| * Merge branch '4.6' of ../qt into 4.6Kurt Korbatits2009-11-101-1/+1
| |\
| | * API review: Rename functions numColors(), setNumColors() and numBytes()Marius Storm-Olsen2009-11-061-1/+1
| * | Fixed runtime error in QAudioInput::bytesReady() functionKurt Korbatits2009-11-091-0/+3
| * | Changes to low-level audio API.Kurt Korbatits2009-11-0533-212/+227
| |/
| * QVideoFrame API review changes.Andrew den Exter2009-11-042-20/+20
| * QVideoSurfaceFormat API review changes.Andrew den Exter2009-11-042-54/+32
| * QAbstractVideoSurface API review changes.Andrew den Exter2009-11-043-29/+44
* | Added new funcs to QAudioFormat and QAudioDeviceInfo class's.Kurt Korbatits2010-01-1516-68/+154
|/
* Fixed clock() function return values in audio class's.Kurt Korbatits2009-10-224-4/+4
* Fixed compile issue with alsa < 1.0.14Kurt Korbatits2009-10-215-4/+74
* Change the frame rate property to a qreal from a QPair<int,int> rationalAndrew den Exter2009-10-152-42/+17
* Fixed thread lockup in win32 backend for QAudioOutput.Kurt Korbatits2009-10-061-3/+4
* Fixed QAudioDeviceInfoInternal::deviceList(QAudio::Mode mode) filteringMartin Banky2009-10-051-17/+9
* Fixed logic in clock() function of audio class's.Kurt Korbatits2009-10-026-4/+10
* Fixed error in notify() signal and totalTime() in QAudioInput andKurt Korbatits2009-09-308-11/+62
* Changed internal tr()'s to be QString::fromLatin1() in alsa builtin.Kurt Korbatits2009-09-292-22/+22
* doc: Fixed three /sa that should be \saThorbjørn Lindeijer2009-09-282-2/+2
* Removed stateChanged and notify signals from win32 qaudiooutput builtin.Kurt Korbatits2009-09-271-4/+0
* AudioService API changes; QString->const QString&, remove QAudioDeviceId use ...Justin McPherson2009-09-2420-524/+274
* Mac audio; emit stateChanged on start, don't flush in push mode.Justin McPherson2009-09-242-0/+9
* Mac audio; Remove signal re-decleration.Justin McPherson2009-09-242-8/+0