summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-16100-153/+267
|\
| * Merge commit upstream/4.6 into oslo-staging-2/4.6Olivier Goffart2009-11-1399-146/+249
| |\
| | * Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-131-2/+3
| | |\
| | * | Phonon; Integrate changes to .desktop fileJustin McPherson2009-11-121-0/+42
| | * | Phonon; Integrate changes to cmake files.Justin McPherson2009-11-124-20/+38
| | * | Gstreamer: Do not assume that the list index is the same as the deviceJustin McPherson2009-11-121-2/+10
| | * | Gstreamer: Added DVD supportJustin McPherson2009-11-121-15/+19
| | * | Gstreamer: Do not assume that the list index is the same as the device id.Justin McPherson2009-11-121-4/+7
| | * | gstreamer: Set the glib app name only once and do it in the backend.Justin McPherson2009-11-122-1/+7
| | * | Gstreamer: Detect more mimetypesJustin McPherson2009-11-121-2/+9
| | * | reduce the speed of CD drive to 2X while playing CD audio to limit CDJustin McPherson2009-11-121-3/+15
| | * | gstreamer: Do not call gst_deinit() but do free the device and effect manager...Justin McPherson2009-11-121-1/+0
| | * | Remove rogue \refs from documentation.Justin McPherson2009-11-122-2/+2
| | * | Import change 924855 from phonon-svn.Justin McPherson2009-11-121-2/+6
| | * | Import change 932546 from phonon-svn.Justin McPherson2009-11-1291-91/+91
| | * | Import change 950964 from phonon-svn.Justin McPherson2009-11-121-2/+2
| | * | Import change 953828 from phonon-svnJustin McPherson2009-11-121-1/+1
| * | | Fix QT_NO_PHONON_SETTINGSGROUPJørgen Lind2009-11-123-4/+14
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-11-123-5/+22
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Shane Kearns2009-11-101-1/+1
| | |\ \ | | | |/
| * | | Fixed a crash when configuring an audio effect with the Phonon dialogThierry Bastian2009-11-121-2/+3
| | |/ | |/|
| * | Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-091-1/+1
| |\ \
| | * | API review: Rename numRects() -> rectCount()Marius Storm-Olsen2009-11-091-1/+1
* | | | Merge branch '4.6' into mmfphononFrans Englich2009-11-164-6/+28
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-091-1/+6
| |\ \ \ | | |/ /
| | * | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-0619-64/+458
| | |\ \
| | * | | Fix Phonon's video renderer on windows with openglThierry Bastian2009-11-061-1/+6
| | | |/ | | |/|
| * | | Fix qdoc errors in the MMF Phonon backend.Frans Englich2009-11-063-5/+22
| | |/ | |/|
* | | Implemented aspect ratio and scale mode handling in Phonon MMF backendGareth Stockwell2009-11-1317-337/+380
* | | Allowed execution of pause command when backend is in error stateGareth Stockwell2009-11-091-1/+1
* | | Removed infinite recursion from Phonon::MMF::MediaObject::errorTypeGareth Stockwell2009-11-091-1/+1
* | | Merge branch 'mmfphonon' of scm.dev.nokia.troll.no:qt/qt-s60-public into mmfp...Gareth Stockwell2009-11-098-42/+9
|\ \ \
| * | | Replace mmfphonondebug.lib with #ifndef QT_NO_DEBUG.Frans Englich2009-11-098-42/+9
* | | | Fixed compiler warning for RVCT 2.2Gareth Stockwell2009-11-091-23/+24
|/ / /
* | | Removed logging from Phonon MMF backendGareth Stockwell2009-11-051-8/+0
|/ /
* | Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-042-3/+3
|\ \ | |/
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-032-3/+3
| |\
| | * Doc/i18n: Fixed source strings for translation.David Boddie2009-11-032-3/+3
* | | Implemented metadata handling in Phonon MMF backendGareth Stockwell2009-11-048-2/+71
* | | Removed some logging from MMF Phonon backendGareth Stockwell2009-11-041-2/+2
* | | Fixed crash opening audio clip when video clip currently openGareth Stockwell2009-11-031-0/+3
* | | Merge branch '4.6' into mmfphononGareth Stockwell2009-11-0325-33/+125
|\ \ \ | |/ /
| * | Merge commit 'origin/4.6' into featureJørgen Lind2009-11-021-4/+7
| |\ \
| | * | Phonon: allows to stream wave files from QIODeviceThierry Bastian2009-10-231-4/+7
| | |/
| * | Fix QT_NO_PHONON_VIDEOJørgen Lind2009-10-298-8/+17
| * | Fix LIBRARY and SETTINGS in phononJørgen Lind2009-10-297-6/+37
| * | Fix QT_NO_PROPERTIESJørgen Lind2009-10-292-2/+4
| * | Added QT_NO_PHONON_EFFECT to gstreamer backendJørgen Lind2009-10-295-8/+10
| * | Fix QT_NO_PHONON_ABSTRACTMEDIASTREAM in phononJørgen Lind2009-10-295-1/+41
| * | Fix QFeature QT_NO_PHONON_VOLUMEFADEREFFECTJørgen Lind2009-10-293-4/+8