summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Reformatted code to comply with Qt styleGareth Stockwell2009-08-2726-1686/+1591
|
* Wrapped code using QT_BEGIN/END_NAMESPACE macrosGareth Stockwell2009-08-2726-33/+112
|
* Added more tracing to VideoPlayerGareth Stockwell2009-08-271-14/+15
|
* Wrapped VideoOuput::dump() in a macro for easier removal later onGareth Stockwell2009-08-264-2/+10
|
* Added VideoOutputObserver, to propagate screen region updates back to ↵Gareth Stockwell2009-08-267-24/+112
| | | | VideoPlayer
* Removed over-riding signal declaration from VideoPlayer.Gareth Stockwell2009-08-265-26/+7
| | | | | | | | This was causing the stateChanged signal not to propagate up to the Phonon client. In the case of the mediaplayer demo, this causes the app not to show() the ancestor of the VideoWidget, resulting in the layout not being updated when the clip has been loaded. This means that the hack to explicitly call show() on this ancestor from the backend has been removed. Now the layout is correctly updated, but the size of VideoOutput::winId()->Rect() is still incorrect, so the hack to hard-code the screen rectangle passed to CVideoPlayerUtility is left in place.
* Updated the TODO listGareth Stockwell2009-08-261-0/+10
|
* Added a bit more tracing for debugging video visibilityGareth Stockwell2009-08-264-18/+25
|
* Made video playback visible using a couple of hacksGareth Stockwell2009-08-256-7/+115
| | | | | | | | | | | | These hacks, which are enabled using macros in defs.h, are: PHONON_MMF_HARD_CODE_VIDEO_RECT VideoPlayer should obtain the screen rectangle into which video rendering will occur, using the CoeControl associated with the video widget (i.e. the VideoOutput object). However, this control always has co-ordinates (relative to its parent) of (0,0)-(100,30), regardless of whether updateGeometry() and show() are called on the widget. So, this macro just hard-codes the screen rectangle to a value which works when the breakfast.mp4 clip is used for testing. PHONON_MMF_EXPLICITLY_SHOW_VIDEO_WIDGET In order that the video region does not overwrite the slider and buttons below it, the parent widget of the VideoObject instance must be appropriately re-sized. Debugging showed that both the parent and grandparent of VideoObject are in fact invisible at the time playback begins, so for now we just manually call show() on the grandparent. Clearly both of these are only temporary measures, for use until the underlying cause of the problem has been determined.
* Added some missing signals in MediaObject; fixed seek slider in musicplayer.exeGareth Stockwell2009-08-2511-47/+94
|
* Modified video player to call updateGeometry on video display widget; having ↵Gareth Stockwell2009-08-254-30/+132
| | | | no effect at present
* Added TODO item for fixing up code indenting / formattingGareth Stockwell2009-08-251-0/+5
|
* Removed 'fix mediaplayer.exe UI' from the TODO listGareth Stockwell2009-08-251-3/+0
|
* Implemented Backend::availableMimeTypesGareth Stockwell2009-08-257-34/+81
|
* Fixed problem which caused duplicate entries to appear in media player file ↵Gareth Stockwell2009-08-243-16/+2
| | | | | | list. This was due to the backend returning an incorrect initial state value. Phonon::MMF::AbstractMediaPlayer::GroundState is now correctly mapped to Phonon::LoadingState. (Previously it mapped to Phonon::StoppedState).
* Added TODO listGareth Stockwell2009-08-241-0/+58
|
* Added spaces to trace output for better alignmentGareth Stockwell2009-08-241-2/+2
|
* Implemented connection between MediaOutput and VideoWidgetGareth Stockwell2009-08-2113-40/+198
| | | | | Video is still not visible; need to debug the initialization of the VideoOutput object to determine whether DSA is being aborted.
* Further tidied up volume handlingGareth Stockwell2009-08-2121-164/+234
|
* Tidied up trace statementsGareth Stockwell2009-08-218-51/+125
|
* Started fleshing out the VideoPlayer implementationGareth Stockwell2009-08-208-40/+118
| | | | | | Now loads, prepares and plays a clip, but the video is not visible because it's not yet wired up to a VideoWidget. Video 'playback' can be tested using the demos/mediaplayer application, but the menus are not displayed properly, so a video clip filename must be hardcoded in main.cpp and passed to the MediaPlayer constructor.
* Added stub VideoWidget implementationGareth Stockwell2009-08-205-8/+205
|
* Implemented parameter copying between AbstractPlayer instancesGareth Stockwell2009-08-2016-237/+366
|
* Added VolumeControlInterface to abstract details of path between MediaObject ↵Gareth Stockwell2009-08-2013-111/+201
| | | | and AudioOutput
* Tidying up: removing commented-out codeGareth Stockwell2009-08-191-13/+0
|
* Merged in DummyPlayer changesGareth Stockwell2009-08-193675-17269/+49541
|\
| * Merge branch 'master' into mmfphononFrans Englich2009-08-193670-17125/+49275
| |\ | | | | | | | | | | | | | | | Conflicts: src/gui/itemviews/qitemselectionmodel.cpp tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
| | * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-191-153/+21
| | |\
| | | * As far as we know the bug int the Open C,Aleksandar Sasha Babic2009-08-191-3/+1
| | | | | | | | | | | | | | | | | | | | regarding SO_REUSEPORT behaviour should be fixed at the moment (1.5.5 Beta).
| | | * Removing local function (*accept*, *connect*, *bind* ...)Aleksandar Sasha Babic2009-08-191-150/+20
| | | | | | | | | | | | | | | | and replacing them with the "safe" subtitutes.
| | * | Fixed xmlpatterns review comments.Janne Anttila2009-08-193-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In comments it was stated that RVCT version is just fine for all platforms and ifdef are not needed. Also the compilers will really optimize extra temp variables for the other compilers. Reviewed-by: Janne Koskinen
| | * | Trivial whitespace removal from src/xml/sax/qxml.cpp.Janne Anttila2009-08-191-1/+1
| | |/ | | | | | | | | | Reviewed-by: TrustMe
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Koskinen2009-08-18750-10649/+38347
| | |\
| | | * Removing class member as there it isAleksandar Sasha Babic2009-08-181-6/+0
| | | | | | | | | | | | | | | | definition in respective *.cpp files.
| | | * No need for logging line. Return of -1Aleksandar Sasha Babic2009-08-181-3/+0
| | | | | | | | | | | | | | | | is valid and happens quite often.
| | | * Trivial, followng the Qt coding style.Aleksandar Sasha Babic2009-08-181-1/+1
| | | |
| | | * Trivial coding style related change.Aleksandar Sasha Babic2009-08-181-2/+2
| | | |
| | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-184-27/+33
| | | |\
| | | | * Added ignore rules for Symbian build files.axis2009-08-181-0/+1
| | | | |
| | | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-1817-74/+52
| | | | |\
| | | | | * Use qt_TDesC2QString() instead qstringFromDesc().Aleksandar Sasha Babic2009-08-171-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | That way we will avoid duplicated functionality.
| | | | * | Fixes to Symbian native engine for QFileSystemWatcher.Shane Kearns2009-08-182-12/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The wrong version of cancel was used, resulting in all filesystem notifications being cancelled when one path was removed from the engine. For directory notifications, changed ENotifyAll to ENotifyEntry to reduce the spurious directory changed notifications which come from file modifications within that directory. On Symbian OS, opening a file for overwrite (truncate mode in Qt terms) will cause a directory change notification, the OS considers it to be the same type of event as creating a new file for the first time. Other platforms presumably do not have this behaviour otherwise the auto test would fail there as well. Reviewed-by: miikka heikkinen
| | | * | | Remove qpaintdevice_s60.cpp.Jason Barron2009-08-182-74/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The functionality in this file was recently moved into qpaintdevice.cpp so this file can be removed. Also remove a define which is no longer required.
| | | * | | Merge commit 'qt/master'Jason Barron2009-08-18731-10514/+38289
| | | |\ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples.qdoc doc/src/plugins-howto.qdoc doc/src/topics.qdoc examples/phonon/musicplayer/mainwindow.cpp src/3rdparty/freetype/src/base/ftobjs.c src/corelib/global/qglobal.h src/corelib/tools/qalgorithms.h src/corelib/tools/qshareddata.cpp src/corelib/tools/qsharedpointer.cpp src/corelib/tools/tools.pri src/corelib/xml/qxmlstream.h src/gui/painting/painting.pri src/gui/widgets/qdatetimeedit.cpp tests/auto/qdesktopservices/qdesktopservices.pro tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tests/auto/qtextcodec/test/test.pro
| | | | * | Optimize QMatrix4x4::rotate() for 0, 90, 180, 270 degrees.Rhys Weatherley2009-08-181-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith
| | | | * | Clean up DirectFB with WM enabledAnders Bakken2009-08-174-76/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we have proper window manager support from DirectFB we shouldn't create our own primary surface. This patch vastly cleans up a number of issues in QDirectFBScreen regarding this. Reviewed-by: Donald <qt-info@nokia.com>
| | | | * | Clean up DirectFB definesAnders Bakken2009-08-171-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make QT_DIRECTFB_WM be defined if QT_NO_DIRECTFB_WM is not. This makes it possible to write more readable code. Reviewed-by: Donald <qt-info@nokia.com>
| | | | * | Clean up primary surface handling in DFBAnders Bakken2009-08-173-28/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid confusion rename QDirectFBScreen::dfbSurface() primarySurface() since this is what it is. Reviewed-by: Donald <qt-info@nokia.com>
| | | | * | Fix a bug in wrt DFBWindowSurface's paintEngineAnders Bakken2009-08-172-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we recreate the paint engine if it's 0 in beginPaint. Also don't delete the paint engine in moves, only resizes. Reviewed-by: Donald <qt-info@nokia.com>
| | | | * | fix includes to use lower-caseHarald Fernengel2009-08-1714-25/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes sure that we can bootstrap QtCore easier on weird platforms without having to run syncqt first
generated by cgit v0.12 at 2025-01-27 07:57:24 (GMT)