summaryrefslogtreecommitdiffstats
path: root/src/multimedia
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-253-21/+23
|\
| * Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-252-9/+9
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-243-21/+23
| |\ \
| | * | Compile Qt in C++0x mode.Thiago Macieira2010-03-201-17/+17
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-182-4/+6
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-182-4/+6
| | | |\ \
| | | | * | Rename QTimestamp to QElapsedTimerThiago Macieira2010-03-172-6/+6
| | | | * | Port QtMultimedia uses of QTime as a stopwatch to QTimestamp (unix code only)Thiago Macieira2010-03-172-4/+6
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-252-3/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-252-3/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-241-2/+2
| | |\ \ \ \
| | | * | | | Calculate period size correctly.Justin McPherson2010-03-241-2/+2
| | * | | | | Symbian QAudioOutput::suspend() was resetting processedUSecs() to zeroGareth Stockwell2010-03-241-1/+2
| | |/ / / /
* | | | | | Rename loopCount to loops, in line with other declarative elements.Justin McPherson2010-03-252-9/+9
|/ / / / /
* | | | | Added extra video buffer handle types.Dmytro Poplavskiy2010-03-242-0/+4
| |/ / / |/| | |
* | | | Replace AspectRatioMode enum from QVideoWidget with Qt::AspectRatioMode.Andrew den Exter2010-03-187-65/+79
| |/ / |/| |
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-173-30/+52
|\ \ \ | |/ / | | / | |/ |/|
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-163-30/+52
| |\
| | * Use AudioConverter when not preferred format.Justin McPherson2010-03-162-26/+34
| | * Handle values passed to setNotifyInterval more robustly.Justin McPherson2010-03-162-2/+16
| | * Make sure to check for a valid audioformat before open.Justin McPherson2010-03-162-2/+2
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-151-1/+1
|\ \ \
| * | | That file was forgotten when adding SSE support under mingwThierry Bastian2010-03-151-1/+1
* | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-1515-9/+2603
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Moved Symbian audio backend into QtMultimedia.dllGareth Stockwell2010-03-1210-6/+2571
| |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-03-112-1/+2
| |\
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-03-111-1/+5
| | |\
| | * | Ensure audio converter member is initialized.Justin McPherson2010-03-111-0/+1
| | * | Documentation fix.Justin McPherson2010-03-111-1/+1
| * | | QAudioInput sometimes not writing to QIODeviceKurt Korbatits2010-03-111-0/+20
| | |/ | |/|
| * | QAudioInput::processedUSecs() incorrectKurt Korbatits2010-03-111-1/+5
| |/
| * SIGSEGV after QAudioOutput closed.Kurt Korbatits2010-03-101-0/+3
| * Fixed deadlock introduced by changeKurt Korbatits2010-03-101-1/+2
| * Fixed invokeMethod in alsa implementation.Kurt Korbatits2010-03-101-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-121-4/+10
|\ \
| * | QPainterVideoSurface: assume yuv 420p and YV12 lines are 4 byte aligned.Dmytro Poplavskiy2010-03-121-4/+10
* | | make it possible to use sse2 with mingwThierry Bastian2010-03-113-3/+3
* | | Merge branch '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4....Qt Continuous Integration System2010-03-101-2/+0
|\ \ \ | |/ / |/| |
| * | doc: Fixed several qdoc errors.Martin Smith2010-03-091-2/+0
* | | Updates to qsoundeffect backends.Kurt Korbatits2010-03-094-34/+61
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-0810-467/+200
|\ \
| * | Remove duration property from QSoundEffect.Justin McPherson2010-03-088-44/+0
| * | Fix effects.pri.Justin McPherson2010-03-081-2/+2
| * | Refactor QSoundEffect.Justin McPherson2010-03-089-440/+217
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-065-15/+59
|\ \ \ | |/ / |/| / | |/
| * Linux QAudioOutput playback stutteringKurt Korbatits2010-03-041-1/+43
| * Fix namespace issues.Justin McPherson2010-03-024-13/+13
| * Fix Audio input on OSX 10.6.Justin McPherson2010-03-021-1/+3
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-053-4/+4
|\ \
| * | Fix spelling in enumeration.Justin McPherson2010-03-053-4/+4