summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Merged recognizer changes with abstraction for audio / video playback.Gareth Stockwell2009-08-181-14/+19
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Audio playback now working to the same extent as prior to the abstraction, with one regression: the initial volume level in the UI is set to zero, although playback is audible. Some cleanup is required: - Functionality common to AudioPlayer and VideoPlayer (e.g. tick timer, changeState function) should be moved into AbstractPlayer. - Files may be opened by multiple instances of MediaObject at at time. For example, the musicplayer example app uses one instance to read file metadata, and one for the actual playback. In order to avoid KErrInUse errors from the file server, files must be opened with an EShare* flag and passed around by handle. At present this is done in a slightly hacky way (i.e. AbstractPlayer::setSource is renamed to setFileSource). - The pointer held by MediaObject::m_player must be checked for nullness in many of the public API calls. This could be made cleaner by implementing a stub derivation of AbstractPlayer, which returns sensible default values. Note that, if functionality such as tick timer handling is going to be pushed upwards from AudioPlayer / VideoPlayer, we should add an intermediate class to the hierarchy so that the overhead of constructing DummyPlayer objects is minimised. At present, media type (audio / video) is only recognised from file streams - this needs to be extended to include HTTP streaming aswell.
| * Rename mmf_videoplayer back to videoplayer, apparently the includes can beFrans Englich2009-08-171-2/+2
| | | | | | | | resolved anyway.
| * Refactor the media object such that we can do both video and sound.Frans Englich2009-08-171-11/+16
| | | | | | | | As per discussions with Gareth.
* | Added recognizer code to determine if file is audio or videoGareth Stockwell2009-08-171-0/+3
|/
* Commit patch by Gareth.Frans Englich2009-08-122-7/+24
| | | | | 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-1247-1933/+1052
|\ | | | | | | | | | | Conflicts: src/3rdparty/phonon/phonon/factory.cpp src/s60installs/qt_libs.pro
| * Update license headers according to commit 858c70f768e.axis2009-08-064-8/+8
| | | | | | | | RevBy: Trust me
| * Replaced $MODULE$ with hardcoded module names.axis2009-08-064-4/+4
| | | | | | | | RevBy: Trust me
| * 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 'qt/master-stable'Jason Barron2009-08-062-0/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe doc/src/classes/qnamespace.qdoc examples/examples.pro src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qobject.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qstandardgestures.h src/gui/kernel/qwidget.cpp
| | * Merge AudioServices into mainline.Justin McPherson2009-08-052-0/+4
| | |
| * | Merge commit 'origin/master'Jason Barron2009-08-0410-18/+15
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Trailing whitespace and tab/space fixes for src/pluginsJanne Anttila2009-08-048-8/+3
| | | |
| | * | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-033-10/+12
| | | | | | | | | | | | | | | | | | | | Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
| * | | Merge commit 'qt/master-stable'Jason Barron2009-08-0410-161/+268
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Merge branch '4.5'Thiago Macieira2009-08-0310-156/+262
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qsharedpointer.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/dialogs/qcolordialog.cpp src/gui/painting/qwindowsurface_raster.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qsharedpointer/externaltests.cpp
| | | * | Qtify void* func => void *funcAnders Bakken2009-07-281-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * | Refactor QDirectFBPaintDeviceAnders Bakken2009-07-287-34/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the engine a member in QDirectFBPaintDevice instead of one in QDirectFBPixmapData and one in QDirectFBWindowSurface. Don't use the default screen for the dfbpaintdevices. Pass one explicitly. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| | | * | Make autorepeat work for DirectFBAnders Bakken2009-07-281-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When holding down a key DirectFB gives us only keypresses. Qt wants these kind of events: press not autorepeat release autorepeat press autorepeat release autorepeat press autorepeat release not autorepeat Reviewed-by: Donald <qt-info@nokia.com>
| | | * | Fix crash in when resizing directfb windowsAnders Bakken2009-07-282-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since QRasterPaintEngine::baseClip was initialized when the QDirectFBPaintEngine was created and the paintengine persists for the window surface we run the risk that the baseClip is of the wrong size. This could lead to crashes and erroneous clipping. Reviewed-by: Donald <qt-info@nokia.com>
| | | * | Compile with DirectFB < 1.0Anders Bakken2009-07-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These porter duff operations were added for 1.0. Reviewed-by: Donald <qt-info@nokia.com>
| | | * | Remove ignore system clip stuff in dfbpaintengineAnders Bakken2009-07-282-5/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Donald <qt-info@nokia.com>
| | | * | Fix off-by-one bug in QDirectFBScreen::flipSurfaceAnders Bakken2009-07-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DFBRegions are exactly like QRects it turns out. x2/y2 == QRect::right()/QRect::bottom() This means I actually can reinterpret_cast QRect to DFBRegions but it's not really worth it. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| | | * | Major clipping patch in QDirectFBPaintEngineAnders Bakken2009-07-281-75/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle region clips by iterating over the rectangles and updating clips accordingly. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| | | * | Make porterduff operations work in DirectFBAnders Bakken2009-07-281-33/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes us not fall back to the raster engine for most of the composition mode operations when doing blits. Primitives are still handled by Qt when composition != SourceOver Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| | * | | Crash DirectFb plugin when resizing verticalyJørgen Lind2009-07-311-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QRasterPaintEngine assumes device does not change size. Therefore create a new engine when resizing. Reviewed-by: Tom
| | * | | Merge branch 'texture_from_pixmap'Tom Cooksey2009-07-301-3/+2
| | |\ \ \
| | | * | | Refactor QImage/QPixmap cleanup hooks into a seperate classTom Cooksey2009-07-281-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new class alows more than one hook to be installed at a time and, for QPixmaps, the hook is told which pixmap is getting deleted. Reviewed-By: Samuel
| * | | | | Merge commit 'qt/master-stable'Jason Barron2009-07-301-3/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro src/gui/graphicsview/qgraphicsitem_p.h
| | * | | | Remove a warning in qdirectfbpaintengineAnders Bakken2009-07-281-3/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | These structures are only used in versions after 0.922. Reviewed-by: Donald <qt-info@nokia.com>
| * | | | Merge commit 'qt/master-stable'Jason Barron2009-07-286-315/+300
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/io/io.pri src/corelib/io/qfilesystemwatcher.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tools/configure/configureapp.cpp
| | * | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-07-246-315/+300
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.h src/3rdparty/webkit/WebCore/page/DragController.cpp src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp src/3rdparty/webkit/WebKit/qt/ChangeLog src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp src/gui/painting/qpaintengineex_p.h tools/linguist/lupdate/main.cpp
| | | * | return when brush is NoBrush in DFBPaintEngineAnders Bakken2009-07-231-0/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| | | * | Fix a bug in directfb mouse handlingAnders Bakken2009-07-222-15/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always check the mouse data we read for coordinates rather than asking the layer. This approach works whether we have layers enabled/window management enabled or any combination thereof. Also, make sure we use a software cursor when either of NO_WM or NO_LAYER is defined. Reviewed: Donald <qt-info@nokia.com>
| | | * | Use BatchBlit in flush/exposeRegionAnders Bakken2009-07-222-35/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor optimization. Also make sure cursor is drawn in flush even if we're not in Offscreen mode. Reviewed-by: TrustMe
| | | * | Use dfbsurface::FillRectangles in solidFillAnders Bakken2009-07-221-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor optimization Reviewed-by: Donald <qt-info@nokia.com>
| | | * | Fix IDirectFBSurface::ReleaseSource callsAnders Bakken2009-07-222-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that these calls are in the right order. Reviewed-by: Donald <qt-info@nokia.com>
| | | * | Fix dfbwindowsurface handling for offscreen modeAnders Bakken2009-07-222-127/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch vastly simplifies the geometry handling (setGeometry/move) It also implements a mode in which DirectFB implementations that do not support windows can use an offscreen buffer as its backing store. Previously the only way to do this was to paint directly on the primary surface. This didn't work when the dfb driver didn't support an accelerated mouse cursor. It also detects the situation when the cursor isn't accelerated and takes care of painting it manually when needed. Reviewed-by: Donald <qt-info@nokia.com>
| | | * | Rewrite QDFBScreen::exposeRegionAnders Bakken2009-07-222-176/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code should be a noop in the case where one has a proper dfb cursor and proper dfb window handling. This was the only case it actually worked. This patch makes it work for a screen cursor rendered by Qt and sets exposeRegion up to work for using an offscreen backing store. Since one can't query the background color set by directfb this patch also adds a connect option to set the background color. This is needed for erasing the background when the mouse cursor moves. Reviewed-by: Donald <qt-info@nokia.com>
| * | | | Merge commit 'qt/master-stable'Jason Barron2009-07-2734-1496/+524
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Qt/EL mouse and keyboard driver cleanup.Robert Griebl2009-07-2319-952/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * removed the vr41xx, yopy and sl5000 drivers (old PDAs) * removed the bus mouse driver (ISA days should be over) * renamed the LinuxIS mouse driver to LinuxInput (consistency with the key driver) * unified the LinuxInput mouse and key driver I/O handling Reviewed-By: Paul
| | * | Compile in release mode for DFB version > 0.9Anders Bakken2009-07-221-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Something went wrong with the integrate from 4.5 to master. Reviewed-by: TrustMe
| | * | Merge commit 'origin/4.5'Olivier Goffart2009-07-223-2/+3
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qt_cocoa_helpers_mac_p.h
| | | * Make sure DFB version macros are definedAnders Bakken2009-07-211-0/+1
| | | | | | | | | | | | | | | | Reviewed-by: Donald <qt-info@nokia.com>
| | | * s/slots/Q_SLOTS/Anders Bakken2009-07-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fix QDirectFBMousePrivate and QDirectFBKeyboardPrivate Reviewed-by: TrustMe
| | * | Partial fix for Qt issue #244648 - QtIcoHandler does not support large & ↵miniak2009-07-201-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Vista PNG format icons Merge-request: 431 Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
| | * | Merge commit 'origin/4.5'Oswald Buddenhagen2009-07-2010-474/+396
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp src/3rdparty/webkit/WebCore/page/DOMWindow.idl src/corelib/io/qdiriterator.cpp src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h tests/auto/qxmlquery/tst_qxmlquery.cpp tools/linguist/lconvert/main.cpp
| | | * Prepare device in DFBPaintEngine::beginAnders Bakken2009-07-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 86ea4dbb5a748491656d9621ecd58238bc3e3d82 accidentally took out this line. Reviewed-by: TrustMe
| | | * Mark virtual functions as virtual in DFBPaintEngAnders Bakken2009-07-171-27/+26
| | | | | | | | | | | | | | | | | | | | | | | | Make the code easier to read. Reviewed-by: TrustMe
| | | * Remove unused function in QDirectFBPaintEngineAnders Bakken2009-07-172-34/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | drawColorSpan is never called from anywhere so we might as well get rid of the code. Reviewed-by: TrustMe
generated by cgit v0.12 at 2024-11-15 17:36:42 (GMT)