Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Removed call to CCoeControl::SetContainerWindowL for child widgets | Gareth Stockwell | 2009-08-28 | 1 | -3/+0 |
| | |||||
* | Oops: fixed 'Made non-toplevel widgets window-owning' | Gareth Stockwell | 2009-08-28 | 1 | -1/+1 |
| | |||||
* | Reformatted code to comply with Qt style | Gareth Stockwell | 2009-08-28 | 26 | -1686/+1591 |
| | |||||
* | Made non-toplevel widgets window-owning | Gareth Stockwell | 2009-08-28 | 1 | -2/+7 |
| | |||||
* | Wrapped code using QT_BEGIN/END_NAMESPACE macros | Gareth Stockwell | 2009-08-28 | 27 | -33/+251 |
| | |||||
* | Added more tracing to VideoPlayer | Gareth Stockwell | 2009-08-28 | 1 | -14/+15 |
| | |||||
* | Wrapped VideoOuput::dump() in a macro for easier removal later on | Gareth Stockwell | 2009-08-26 | 4 | -2/+10 |
| | |||||
* | Added VideoOutputObserver, to propagate screen region updates back to ↵ | Gareth Stockwell | 2009-08-26 | 7 | -24/+112 |
| | | | | VideoPlayer | ||||
* | Merge branch 'mmfphonon' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | Gareth Stockwell | 2009-08-26 | 4 | -4/+21 |
|\ | | | | | | | mmfphonon | ||||
| * | Rename mediaplayer to qmediaplayer, and make it an example on Symbian. | Frans Englich | 2009-08-26 | 4 | -4/+21 |
| | | | | | | | | | | | | We rename mediaplayer to qmediaplayer to avoid it clashing with Symbian's default media player. We also install it as an example, in order to be able to show case Phonon. | ||||
* | | Removed over-riding signal declaration from VideoPlayer. | Gareth Stockwell | 2009-08-26 | 5 | -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 list | Gareth Stockwell | 2009-08-26 | 1 | -0/+10 |
| | |||||
* | Added a bit more tracing for debugging video visibility | Gareth Stockwell | 2009-08-26 | 4 | -18/+25 |
| | |||||
* | Made video playback visible using a couple of hacks | Gareth Stockwell | 2009-08-25 | 6 | -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.exe | Gareth Stockwell | 2009-08-25 | 11 | -47/+94 |
| | |||||
* | Modified video player to call updateGeometry on video display widget; having ↵ | Gareth Stockwell | 2009-08-25 | 4 | -30/+132 |
| | | | | no effect at present | ||||
* | Added TODO item for fixing up code indenting / formatting | Gareth Stockwell | 2009-08-25 | 1 | -0/+5 |
| | |||||
* | Removed 'fix mediaplayer.exe UI' from the TODO list | Gareth Stockwell | 2009-08-25 | 1 | -3/+0 |
| | |||||
* | Implemented Backend::availableMimeTypes | Gareth Stockwell | 2009-08-25 | 7 | -34/+81 |
| | |||||
* | Fixed problem which caused duplicate entries to appear in media player file ↵ | Gareth Stockwell | 2009-08-24 | 3 | -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 list | Gareth Stockwell | 2009-08-24 | 1 | -0/+58 |
| | |||||
* | Added spaces to trace output for better alignment | Gareth Stockwell | 2009-08-24 | 1 | -2/+2 |
| | |||||
* | Implemented connection between MediaOutput and VideoWidget | Gareth Stockwell | 2009-08-21 | 13 | -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 handling | Gareth Stockwell | 2009-08-21 | 21 | -164/+234 |
| | |||||
* | Tidied up trace statements | Gareth Stockwell | 2009-08-21 | 8 | -51/+125 |
| | |||||
* | Started fleshing out the VideoPlayer implementation | Gareth Stockwell | 2009-08-20 | 8 | -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 implementation | Gareth Stockwell | 2009-08-20 | 5 | -8/+205 |
| | |||||
* | Implemented parameter copying between AbstractPlayer instances | Gareth Stockwell | 2009-08-20 | 16 | -237/+366 |
| | |||||
* | Added VolumeControlInterface to abstract details of path between MediaObject ↵ | Gareth Stockwell | 2009-08-20 | 13 | -111/+201 |
| | | | | and AudioOutput | ||||
* | Tidying up: removing commented-out code | Gareth Stockwell | 2009-08-19 | 1 | -13/+0 |
| | |||||
* | Merged in DummyPlayer changes | Gareth Stockwell | 2009-08-19 | 8505 | -39537/+61139 |
|\ | |||||
| * | Merge branch 'master' into mmfphonon | Frans Englich | 2009-08-19 | 8500 | -39393/+60873 |
| |\ | | | | | | | | | | | | | | | | Conflicts: src/gui/itemviews/qitemselectionmodel.cpp tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp | ||||
| | * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Janne Anttila | 2009-08-19 | 1 | -153/+21 |
| | |\ | |||||
| | | * | As far as we know the bug int the Open C, | Aleksandar Sasha Babic | 2009-08-19 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | regarding SO_REUSEPORT behaviour should be fixed at the moment (1.5.5 Beta). | ||||
| | | * | Removing local function (*accept*, *connect*, *bind* ...) | Aleksandar Sasha Babic | 2009-08-19 | 1 | -150/+20 |
| | | | | | | | | | | | | | | | | and replacing them with the "safe" subtitutes. | ||||
| | * | | Fixed xmlpatterns review comments. | Janne Anttila | 2009-08-19 | 3 | -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 Anttila | 2009-08-19 | 1 | -1/+1 |
| | |/ | | | | | | | | | | Reviewed-by: TrustMe | ||||
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | mread | 2009-08-18 | 2 | -8/+0 |
| | |\ | |||||
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | Janne Koskinen | 2009-08-18 | 1134 | -20582/+33011 |
| | | |\ | |||||
| | | | * | Removing class member as there it is | Aleksandar Sasha Babic | 2009-08-18 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | | | | | definition in respective *.cpp files. | ||||
| | | * | | removed old todos from qclipboard_s60 | Janne Koskinen | 2009-08-18 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two fixme comments removed as functions are now exception safe Reviewed-by: TrustMe | ||||
| | * | | | make the BigAlloc() test keep allocating if it's not done enough already | mread | 2009-08-18 | 1 | -4/+10 |
| | | |/ | | |/| | |||||
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | mread | 2009-08-18 | 15 | -820/+20 |
| | |\ \ | |||||
| | | * \ | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Miikka Heikkinen | 2009-08-18 | 3 | -6/+3 |
| | | |\ \ | |||||
| | | | * | | No need for logging line. Return of -1 | Aleksandar Sasha Babic | 2009-08-18 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | is valid and happens quite often. | ||||
| | | | * | | Trivial, followng the Qt coding style. | Aleksandar Sasha Babic | 2009-08-18 | 1 | -1/+1 |
| | | | | | | |||||
| | | | * | | Trivial coding style related change. | Aleksandar Sasha Babic | 2009-08-18 | 1 | -2/+2 |
| | | | | | | |||||
| | | * | | | Review fixes to qmake | Miikka Heikkinen | 2009-08-18 | 12 | -814/+17 |
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed MWC specific code and makefile - Added INTERNAL to few qmake variables that were only used internally Reviewed-by: Janne Koskinen | ||||
| | * | | | disabled exceptions safety tests for Symbian 3.x as they always fail due to ↵ | mread | 2009-08-18 | 1 | -1/+2 |
| | |/ / | | | | | | | | | | | | | missing thowing new | ||||
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | Shane Kearns | 2009-08-18 | 1068 | -18853/+32721 |
| | |\ \ |