summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon
Commit message (Collapse)AuthorAgeFilesLines
* Update translation sources.Casper van Donderen2011-09-292-5/+5
| | | | Reviewed-By: Geir Vattekar
* Merge branch '4.8-upstream'Thierry Bastian2011-05-192-0/+50
|\
| * Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-282-0/+50
| |\
| | * Legal: add the license header to the hand-editsThiago Macieira2011-04-272-0/+50
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Fix a problem where the video would'nt show on some containersThierry Bastian2011-05-161-8/+22
|/ / | | | | | | | | | | | | | | | | The problem was linked to the detection of a video stream in the graph. Only the decoders were tested but the demuxer can directly provide the video stream. Reviewed-By: TrustMe Task-Number: QTBUG-19348
* | Unbreak build on Mac OS X 10.5 after b0b80d9e8d11c38dTor Arne Vestbø2011-03-041-1/+1
| | | | | | | | Reviewed-by: Fabien Freling
* | Don't treat Objective-C property references as l-valuesTor Arne Vestbø2011-03-021-4/+6
| | | | | | | | | | | | | | Fixes Clang compile issue as Clang is stricter than gcc on this. See http://llvm.org/bugs/show_bug.cgi?id=8770 Reviewed-by: Fabien Freling <fabien.freling@nokia.com>
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-101-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc mkspecs/symbian-gcce/qmake.conf qmake/project.cpp src/corelib/global/qnamespace.qdoc src/declarative/graphicsitems/qdeclarativetext.cpp src/gui/text/qtextdocumentlayout.cpp src/gui/text/qtextdocumentlayout_p.h tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp tests/auto/networkselftest/networkselftest.pro tests/auto/qscriptengine/tst_qscriptengine.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * Fixed "not a valid preprocessing token" on GCCE.axis2011-02-041-1/+1
| | | | | | | | | | | | It seems to be fixed upstream already. RevBy: Gareth Stockwell
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-251-12/+6
|\ \ | |/ | | | | | | | | Conflicts: configure src/network/bearer/bearer.pri
| * Switch default Phonon backend on Symbian from Helix to MMFGareth Stockwell2011-01-191-12/+6
| | | | | | | | | | | | | | | | If both plugins are present on a device, the MMF backend is now loaded by default. Task-number: QT-4472 Reviewed-by: Justin McPherson
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1710-14/+88
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Fixed resource leak in Phonon MMF backendRuth Sadler2011-01-111-0/+2
| | | | | | | | | | Task-number: QTBUG-16513 Reviewed-by: Gareth Stockwell
| * Allow IAP to be selected in Phonon MMF backendRuth Sadler2011-01-1110-14/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Phonon API does not provide any way for the client to specify which network connection should be used for streaming playback. If the application already has a connection open, using a bearer other than the default (e.g. using WiFi when the device default is GPRS), it may be desirable to use it for streaming, rather than allowing the Phonon backend to open a second connection on the default bearer. This patch adds a custom property on the Phonon::MediaObject, called InternetAccessPointName. The client can specify the IAP which Phonon should use by setting this property. Note that support for this property is only provided in the Phonon MMF backend. Task-number: QTBUG-11436 Reviewed-by: Gareth Stockwell
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-206-6/+6
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/plugins/phonon/mmf/mmf.pro src/s60installs/s60installs.pro tests/auto/qapplication/test/test.pro tests/auto/qgraphicsview/tst_qgraphicsview.cpp
| * Fixed several compile and deployment issues in the mmf phonon plugin.axis2010-12-146-6/+6
| | | | | | | | RevBy: Trust me
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-065-83/+83
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: configure qmake/generators/win32/msbuild_objectmodel.cpp src/gui/image/qpnghandler.cpp src/network/access/qnetworkaccessdatabackend.cpp src/opengl/qgl_x11egl.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * Phonon: Fix use of ASCII casting in the PulseAudio support.Thiago Macieira2010-11-261-74/+72
| |
| * Phonon: Fix unused parameter warningThiago Macieira2010-11-261-1/+1
| |
| * Phonon: Fix warning on casting from "false" to QFlags.Thiago Macieira2010-11-261-2/+2
| | | | | | | | Instead, return Features();
| * Phonon: Fix "value not in enum" warning with GCC 4.5.Thiago Macieira2010-11-261-1/+1
| | | | | | | | QMetaType::Float is not a member of QVariant::Type.
| * Ensure that if this is does not have a valid filter when on XP or lessAndy Shaw2010-11-241-5/+7
| | | | | | | | | | | | | | | | | | | | The renderer is only supported on Windows Vista or later so if we are on an earlier version of Windows then this should not be used. In addition this patch also ensures that it resets the filter if any of the needed functions fail. Task-number: QTBUG-13062 Reviewed-by: Thierry Bastian
* | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse ↵Qt Continuous Integration System2010-10-293-5/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: (388 commits) Fix the license in files for Lighthouse Fix typos found by the spellchecking autotest Add missing QT_MODULE macros. Fix qt_defaultDpi, but not use Q_DECL_IMPORT but Q_GUI_EXPORT Compile fix for RVCT 4 Fix QT_BLITTER_RASTEROVERLAY and namespace error Lighthouse: initial COCOA plugin Lighthouse on OS X. Fix QWS generic mac mkspec actually set egl swap interval Remove debug code added by 650a0078e2cef43eff107fe8d2505f64a0bfedf0 Update sections if model content changes. Don't clobber the tty by default Add touch offset Jitter removal Mouse event compression Add keycodes for some additional multimedia keys Make it possible to choose some EGLFS configuration options via envvars use swapInterval=1 by default in EglFS to potentially avoid tearing Lighthouse: make QFontconfigDatabase not override application font ...
| * \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-261-14/+0
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| * \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2211-45/+542
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_win.cpp src/gui/kernel/qwidget.cpp src/gui/text/qfontengine_ft.cpp
| * \ \ \ Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-09-133-5/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/text.pri src/plugins/generic/linuxinput/qlinuxinput.cpp
| | * \ \ \ Merge branch 'qt-4.7' into lighthouse-4.7Paul Olav Tvete2010-09-131-3/+3
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/corelib/tools/qsimd.cpp
| | * | | | | Make phonon gst backend build properlyJørgen Lind2010-09-073-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only software rendering for now... also fix regression I made in QWindowSystemInterface. Its allowed to send in NULL pointers for tlw in some of the functions. So dont ask for the widget data of a NULL pointer.
* | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-271-0/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Phonon MMF backend: set _q_DummyWindowSurface property on VideoWidgetGareth Stockwell2010-10-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents a window surface being created if Phonon::VideoWidget::setFullScreen(true) is called. Since Qt does not ever render any content to the native window in which video is displayed, creation of a surface for that window would consume memory unnecessarily. Task-number: MOBILITY-1315 Reviewed-by: Jason Barron
* | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-261-14/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Phonon MMF backend: removed redundant trace outputGareth Stockwell2010-10-251-14/+0
| | | | |
* | | | | Phonon: Export ObjectDescriptionModel to prevent link errors with ClangTor Arne Vestbø2010-10-151-1/+2
| | | | | | | | | | | | | | | | | | | | Workaround for http://llvm.org/bugs/show_bug.cgi?id=8177
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-0710-44/+540
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msbuild_objectmodel.h qmake/generators/win32/msvc_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/arch/qatomic_arm.h tests/auto/qglthreads/tst_qglthreads.cpp
| * | | Added qmake check for presence of RHttpDownloadMgr headerGareth Stockwell2010-10-033-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | downloadmgrclient.h is not found on S^4 baselines, causing a build failure. This commit is a temporary workaround, which disables progressive download support if the header is not found. The correct solution is to determine whether the RHttpDownloadMgr definition has moved, and if so, to modify the .pro file to include the new path. Task-number: QTBUG-10769 Reviewed-by: TrustMe
| * | | Progressive download in Phonon MMF backend: integrated with playerGareth Stockwell2010-10-018-43/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit integrates the Download class with the media playback classes in the backend, to implement Progressive Download. Note that this PDL implementation has one drawback: when video playback is paused due to shortage of data (i.e. due to the download being temporarily stalled), the display goes black. This is because, when the end of the currently-downloaded data is reached, the playback session is closed. When more data becomes available, the clip is re-opened, a seek is done to reach the previous playback position, and playback is re-started. Closing the playback session closes the video stack's connection to the display, thereby causing the video widget to go black while more data is buffered. This is a consequence of the level in the native video stack at which the Phonon integration is done: managing a network stall without requiring the playback session to be closed would require integration below the MMF client API, specifically at the MMF controller level. Task-number: QTBUG-10769 Reviewed-by: Derick Hawcroft
| * | | Progressive download in Phonon MMF backend: added download managersGareth Stockwell2010-10-012-0/+305
| | |/ | |/| | | | | | | | | | | | | | | | | | | This patch adds a Download class which uses the RHttpDownloadMgr API to download a media clip over HTTP. Task-number: QTBUG-10769 Reviewed-by: Derick Hawcroft
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-101-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * | QString usage cleanupsOswald Buddenhagen2010-09-011-3/+3
| |/ | | | | | | | | - tr() already returns a QString, duh - use multi-arg arg() (heh)
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-1314-25/+128
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpainter.cpp src/gui/text/qtextengine.cpp tests/auto/qimage/tst_qimage.cpp tests/auto/qpainter/tst_qpainter.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-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf
| * Phonon; Update CMakeLists.txtJustin McPherson2010-08-041-1/+1
| |
| * Phonon; Use correct Phonon version numbers.Justin McPherson2010-08-042-4/+4
| | | | | | | | | | Task-number: QTBUG-12627 Reviewed-by: Andrew den Exter
| * Fixed build break on Symbian versions earlier than S^3Gareth Stockwell2010-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The following overload was added in S^3: TInt RApaLsSession::RecognizeData(const TDesC8& aBuffer, TDataRecognitionResult& aDataType) const In order to allow the backend to compile against earlier versions of the platform, this patch calls the RecognizeData overload which taking the same arguments as above, plus a filename (for which KNullDesC is passed). Task-number: QTBUG-6562 Reviewed-by: trustme
| * Added support to Phonon MMF backend for playback of Qt resource filesGareth Stockwell2010-08-0212-20/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The backend accesses the resource file path via MediaSource::url(). A small patch to Phonon was required to enable this, because by default, Phonon passes a QIODevice, rather than the resource file path, to the backend. The backend uses this path to create a QResource object, through which the memory buffer into which the resource file has been read can be accessed. This buffer is wrapped in a Symbian 8-bit descriptor and passed to the OpenDesL() function of the appropriate MMF client utility API. Playback only works for certain file formats, as the Symbian MIME type recognizer does not always work. For example, playback of an audio WAV resource file works, while playback of an MP3 resource file does not. Task-number: QTBUG-6562 Reviewed-by: Justin McPherson
* | Replace gluOrtho2d with glOrtho.Bjørn Erik Nilsen2010-08-101-1/+1
| | | | | | | | | | | | GLU dependency was removed in commit: c67b4cac2e53ae77c4e16487838c17be85e73aa3, so instead of using gluOrtho2d we simply use glOrtho with near=-1 and far=1.
* | Remove the use of deprecated qVariant*Olivier Goffart2010-08-062-4/+4
|/ | | | | | | | | | | | | | | Test directory untouched. This just apply those regexp: git grep -O"sed -i 's/qVariantValue</qvariant_cast</'" qVariantValue git grep -O"sed -i 's/qVariantSetValue(\([^&*\(),]*\), */\\1.setValue(/'" qVariantSetValue git grep -O"sed -i 's/qVariantSetValue *<\([^>]*\)> *(\([^&*\(),]*\), */\\2.setValue<\\1>(/'" qVariantSetValue git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*([^&*\(),]*)\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantFromValue\( *[(<]\)/QVariant::fromValue\\1/'" qVariantFromValue git checkout src/corelib/kernal/qvariant* Rev-by: dev mailing list
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-081-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) fix build with sqlite2 respect UI_DIR when creating image collections Doc: more cleaning Doc: fixing escape character Doc: cleaning html generator Doc: changing index page Doc: fixing link to devnet Doc: adding HTML class names and style docs to the generator Doc: Fixing typo - background file name doc: Added doc for accessing views and models from delegates. Doc: Fixing broken link Doc: fixing typo Doc: fixing typos qdoc: Fixed table of contents for namespace pages. SSL backend: load libraries for certificates only once immediately set function context when entering a namespace Phonon MediaSource fails to load when passed as a resource file Set QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH to default value qdoc: Fixed a few links to QtObject (QML:QtObject) Simplify *= to += after contains() test ...
| * Phonon MediaSource fails to load when passed as a resource fileJens Bache-Wiig2010-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Files fail to load when passing resoure path to mediasource. The original regression seems to be caused by a behavior change as reported here: http://bugreports.qt.nokia.com/browse/QTBUG-12015 Note a merge request is also pending on Gitorious http://gitorious.org/phonon/phonon/merge_requests/17 Task-number: QTBUG-9323 Reviewed-by: thierry
* | Use lower case for including system header filesGareth Stockwell2010-07-076-6/+6
| | | | | | | | | | | | | | | | | | | | | | All platform includes are now lower case, i.e. '#include <foobar.h>' rather than '#include <FooBar.h>'. Note that Qt includes are still camel case, e.g. '#include <QtGui/QWidget>' Task-number: QTBUG-6528 Reviewed-by: trustme
* | Added trace statements to Phonon MMF backendGareth Stockwell2010-07-071-0/+17
| | | | | | | | Reviewed-by: trustme
generated by cgit v0.12 at 2024-08-23 06:16:01 (GMT)