summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon
Commit message (Collapse)AuthorAgeFilesLines
* Refactor the media object such that we can do both video and sound.Frans Englich2009-08-178-598/+1602
| | | | As per discussions with Gareth.
* Pushing compile fix from Gareth, modified by me.Frans Englich2009-08-141-3/+5
| | | | Seems this code path was broken.
* Commit patch by Gareth.Frans Englich2009-08-127-123/+741
| | | | | The patch originally contained all changed done to MMF Phonon, but this commit contains the changes only Gareth did.
* Merge branch 'master' into topic/mmfphononFrans Englich2009-08-1226-275/+204
|\ | | | | | | | | | | Conflicts: src/3rdparty/phonon/phonon/factory.cpp src/s60installs/qt_libs.pro
| * Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATEHarald Fernengel2009-08-062-2/+2
| | | | | | | | | | | | Rationale: We're using template magic now to get the private pointer in qglobal.h, so no need to have two macros. Also keeps backward compatibility with outside (KDE) code.
| * Merge commit 'origin/master'Jason Barron2009-08-042-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/corelib/kernel/qmetatype.cpp src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/gui/graphicsview/qgraphicssceneevent.h src/gui/itemviews/qheaderview.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qgesture.h src/gui/kernel/qgesturerecognizer.h src/gui/painting/qpaintengine_raster.cpp src/network/access/qhttpnetworkreply.cpp src/network/access/qnetworkcookie.h src/network/socket/qnativesocketengine_unix.cpp
| | * Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-032-2/+2
| | | | | | | | | | | | | | | Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
| * | Merge commit 'qt/master-stable'Jason Barron2009-08-049-23/+28
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/openssl/openssl.pri demos/embedded/embedded.pro examples/itemviews/chart/chart.pro examples/network/network.pro examples/painting/painterpaths/painterpaths.pro examples/threads/mandelbrot/mandelbrot.pro qmake/project.cpp src/3rdparty/libtiff/libtiff/tif_config.h src/corelib/arch/arch.pri src/corelib/global/qglobal.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qcore_unix_p.h src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/corelib/tools/qsharedpointer_impl.h src/corelib/tools/tools.pri src/gui/kernel/qaction.h src/gui/kernel/qapplication.cpp src/gui/painting/qregion.h src/gui/widgets/qlineedit.cpp src/gui/widgets/qlineedit_p.h src/network/socket/qnativesocketengine_unix.cpp tests/auto/qdir/tst_qdir.cpp tests/auto/qdiriterator/tst_qdiriterator.cpp tests/auto/qhttp/qhttp.pro tests/auto/qline/qline.pro tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qresourceengine/qresourceengine.pro tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qstring/qstring.pro tests/auto/qtcpsocket/qtcpsocket.pro tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| | * | Fixed warnings on phonon/ds9 with mingw (gcc 4)Thierry Bastian2009-08-039-23/+28
| | | | | | | | | | | | | | | | Reviewed-by: Trustme
| * | | Merge commit 'qt/master-stable'Jason Barron2009-07-2723-250/+178
| |\ \ \ | | |/ / | | | / | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe qmake/Makefile.unix qmake/generators/makefile.cpp src/corelib/global/qglobal.h src/corelib/kernel/kernel.pri src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qaction.cpp src/gui/kernel/qaction.h src/gui/kernel/qaction_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget.h src/gui/kernel/qwidget_mac.mm src/gui/painting/qgraphicssystemfactory.cpp src/gui/styles/qwindowsstyle.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qabstractscrollarea_p.h src/network/access/qnetworkaccessdebugpipebackend.cpp src/network/socket/qlocalsocket_unix.cpp src/network/socket/qnativesocketengine_p.h src/network/socket/qnativesocketengine_unix.cpp src/openvg/qpaintengine_vg.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qdir/tst_qdir.cpp tests/auto/qfile/tst_qfile.cpp tests/auto/qobject/tst_qobject.cpp tests/auto/qpathclipper/qpathclipper.pro tests/auto/qprocess/tst_qprocess.cpp tests/auto/qsettings/tst_qsettings.cpp tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qsqlquerymodel/qsqlquerymodel.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qwidget/tst_qwidget.cpp
| | * Fixed another memory leak in Phonon on windowsThierry Bastian2009-07-171-3/+1
| | | | | | | | | | | | | | | This would happen if you we didn't free the memory allocator when disconnecting the fake source from a sink (eg. video renderer)
| | * Documentation and whitespace fixes in phononDavid Faure2009-07-165-51/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | - fix wrong copy/pasted comments (including the whole docs for isSeekable) - make docs of Notifier more generic (there are 3 signals, not just one) - untabify Merge-request: 875 Reviewed-by: Leonardo Sobral Cunha <leo.cunha@nokia.com>
| | * Phonon: fixed a big memory leak on WindowsThierry Bastian2009-07-162-2/+4
| | | | | | | | | | | | | | | | | | | | | If you had deleted a VideoWidget, it could not free the memory taken because we still had a reference on it. Task-number: 258202
| | * Phonon videos on windows would not show with video acceleration disabledThierry Bastian2009-07-101-1/+1
| | | | | | | | | | | | Task-number: 257805
| | * Phonon: Fixed a possible race conditionThierry Bastian2009-07-081-7/+13
| | | | | | | | | | | | Task-number: 257495
| | * Phonon: Fixed a possible race conditionThierry Bastian2009-07-081-1/+1
| | | | | | | | | | | | Task-number: 257495
| | * Phonon: take advantage of more modern compiler to initialize structThierry Bastian2009-07-064-80/+27
| | | | | | | | | | | | This was not supported before by MSVC6 and MSVC2002
| | * Phonon: Some work done on binary sizeThierry Bastian2009-07-0613-105/+88
| | | | | | | | | | | | removing foreach seems to help on Windows
| | * src/3rdparty/phonon: Remove QT_WA and non-Unicode code paths, dropping Win9x ↵miniak2009-07-011-4/+1
| | | | | | | | | | | | | | | | | | | | | and NT support Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
* | | 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
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: src/plugins/plugins.pro src/s60installs/qt.iby
| * | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp
| | * Phonon::VolumeSlider: Fixed the isMuteVisiblefunctionThierry Bastian2009-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that it was relying on button->isVisible whereas it should rely on isHidden. isVisible returns false initially when the whole widget is not yet shown. I also added an autotest for it. Task-number: 256331
| * | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-257-139/+572
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring Qt 4.6 into the Qt-S60 repo. Conflicts: configure.exe mkspecs/features/qttest_p4.prf qmake/generators/makefile.cpp src/corelib/io/qdir.cpp src/corelib/io/qprocess.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qobject.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/corelib/thread/qthread_p.h src/corelib/tools/qvector.h src/gui/dialogs/qdialog.cpp src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qmessagebox.cpp src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsview.cpp src/gui/image/qpixmapcache.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/painting/qdrawhelper.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qmenubar.cpp src/network/socket/qlocalserver.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qitemdelegate/tst_qitemdelegate.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qpixmap/qpixmap.pro
| | * Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-121-1/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| | * \ Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-086-64/+294
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/phonon/qt7/quicktimevideoplayer.mm src/gui/text/qfontengine_win.cpp tools/linguist/shared/cpp.cpp
| | * \ \ 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
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| | * | | | | Ensure that the export symbols are correct. Patch supplied by Saleem/Dallas ↵Frans Englich2009-05-191-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | team. Reviewed-By: Thiago Reviewed-By: jbache
| | * | | | | Merge branch '4.5'Thiago Macieira2009-05-111-0/+5
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.5'Rhys Weatherley2009-04-211-18/+9
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| | * \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-013-7/+11
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/inputmethod/qximinputcontext_x11.cpp
| | * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/gui/dialogs/qfiledialog_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp tests/auto/network-settings.h tests/auto/qitemdelegate/tst_qitemdelegate.cpp
| * | | | | | | Fix compile error on TigerRichard Moe Gustavsen2009-06-101-1/+2
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the "for-in" syntax is only available on 10.5+ Reviewed-by: MortenS
| * | | | | | Mac: play music from CD does not work in PhononRichard Moe Gustavsen2009-06-086-83/+313
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ...because it was never implemented. This patch does that. Task-number: 255377
* | | | | | Make Qt exception safer.Robert Griebl2009-06-103-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the branch haralds-haralds-qt-s60-topics/topic/exceptions, which also contains the full history. Rev-By: Harald Fernengel Rev-By: Ralf Engels
* | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-082-0/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qlocalsocket/tst_qlocalsocket.cpp
| * | | | | Fixed aspect ratio on WindowsThierry Bastian2009-06-022-0/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | - When changing the aspect ratio, the video wouldn't update. - The VMR9 can in some cases try to manage the aspect ratio itself and then fights our system. This is now disabled.
* | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-021-1/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/itemviews/puzzle/puzzle.pro examples/qtconcurrent/imagescaling/imagescaling.pro examples/widgets/movie/movie.pro tools/configure/configureapp.cpp Will rebuild configure.exe in next commit.
| * | | | Fix a crash in Phonon::EffectWidgetJens Bache-Wiig2009-05-261-1/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating a UI based on double types we only assigned the control pointer in certain cases. This would crash because the tooltip did not check for the pointer, but the real issue was that we didnt assign the control in the first place. Task-number: 249710 Reviewed-by: Richard Moe Gustavsen
* | | | Ensure that the export symbols are correct. Patch supplied by Saleem/Dallas ↵Frans Englich2009-05-191-1/+5
|/ / / | | | | | | | | | | | | | | | | | | team. Reviewed-By: Thiago Reviewed-By: jbache
* | | Make sure syncqt creates the Phonon/Global file.Thiago Macieira2009-05-111-0/+5
| |/ |/| | | | | | | The standard Phonon package has this file and it points to phononnamespace.h
generated by cgit v0.12 at 2024-10-26 07:24:33 (GMT)