summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon
Commit message (Expand)AuthorAgeFilesLines
* Started work on VideoPlayer implementationGareth Stockwell2009-08-192-6/+12
* Started work on VideoPlayer implementationGareth Stockwell2009-08-189-123/+210
* Refactored AudioPlayer and VideoPlayer to separate out common code into Abstr...Gareth Stockwell2009-08-188-1079/+730
* Merged recognizer changes with abstraction for audio / video playback.Gareth Stockwell2009-08-1811-558/+1867
|\
| * Rename mmf_videoplayer back to videoplayer, apparently the includes can beFrans Englich2009-08-173-2/+2
| * More delegation, basic plumbing.Frans Englich2009-08-177-22/+41
| * Delegate from MediaObject.Frans Englich2009-08-173-1/+41
| * Refactor the media object such that we can do both video and sound.Frans Englich2009-08-178-598/+1602
| * Pushing compile fix from Gareth, modified by me.Frans Englich2009-08-141-3/+5
* | Added recognizer code to determine if file is audio or videoGareth Stockwell2009-08-172-0/+68
* | Fixed a bug which prevented phonon from compilingGareth Stockwell2009-08-141-0/+2
|/
* Commit patch by Gareth.Frans Englich2009-08-127-123/+741
* Merge branch 'master' into topic/mmfphononFrans Englich2009-08-1226-275/+204
|\
| * Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATEHarald Fernengel2009-08-062-2/+2
| * Merge commit 'origin/master'Jason Barron2009-08-042-2/+2
| |\
| | * Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-032-2/+2
| * | Merge commit 'qt/master-stable'Jason Barron2009-08-049-23/+28
| |\ \
| | * | Fixed warnings on phonon/ds9 with mingw (gcc 4)Thierry Bastian2009-08-039-23/+28
| * | | Merge commit 'qt/master-stable'Jason Barron2009-07-2723-250/+178
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Fixed another memory leak in Phonon on windowsThierry Bastian2009-07-171-3/+1
| | * Documentation and whitespace fixes in phononDavid Faure2009-07-165-51/+46
| | * Phonon: fixed a big memory leak on WindowsThierry Bastian2009-07-162-2/+4
| | * Phonon videos on windows would not show with video acceleration disabledThierry Bastian2009-07-101-1/+1
| | * Phonon: Fixed a possible race conditionThierry Bastian2009-07-081-7/+13
| | * Phonon: Fixed a possible race conditionThierry Bastian2009-07-081-1/+1
| | * Phonon: take advantage of more modern compiler to initialize structThierry Bastian2009-07-064-80/+27
| | * Phonon: Some work done on binary sizeThierry Bastian2009-07-0613-105/+88
| | * src/3rdparty/phonon: Remove QT_WA and non-Unicode code paths, dropping Win9x ...miniak2009-07-011-4/+1
* | | Crash fixes.Frans Englich2009-07-212-3/+6
* | | Work.Frans Englich2009-07-212-14/+28
* | | Merge commit 'origin/master' into topic/mmfphononFrans Englich2009-07-216-59/+261
|\ \ \ | |/ /
| * | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-1/+1
| |\ \ | | |/
| | * Phonon::VolumeSlider: Fixed the isMuteVisiblefunctionThierry Bastian2009-06-171-1/+1
| * | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-257-139/+572
| |\ \ | | |/
| | * Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-121-1/+2
| | |\
| | * \ Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-086-64/+294
| | |\ \
| | * \ \ Merge branch '4.5'Denis Dzyubenko2009-06-022-0/+3
| | |\ \ \
| | * \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-271-1/+2
| | |\ \ \ \
| | * | | | | Ensure that the export symbols are correct. Patch supplied by Saleem/Dallas t...Frans Englich2009-05-191-1/+5
| | * | | | | Merge branch '4.5'Thiago Macieira2009-05-111-0/+5
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.5'Rhys Weatherley2009-04-211-18/+9
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-013-7/+11
| | |\ \ \ \ \ \ \
| | * | | | | | | | Long live Qt!Lars Knoll2009-03-23305-0/+49051
| | / / / / / / /
* | | | | | | | | Work.Frans Englich2009-07-183-2/+10
* | | | | | | | | Build fixes, debug code.Frans Englich2009-07-134-47/+58
* | | | | | | | | Adjust comment field.Frans Englich2009-07-032-2/+8
* | | | | | | | | Load Helix backend before loading the Phonon backend.Frans Englich2009-07-031-1/+17
* | | | | | | | | Pouring.Frans Englich2009-07-035-32/+184
* | | | | | | | | Pouring.Frans Englich2009-07-026-0/+519
* | | | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-296-83/+314
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |