Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | QScopedPointer makes code simpler. | Frans Englich | 2009-09-10 | 2 | -5/+3 |
| | |||||
* | Merge branch 'mmfphonon' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | Gareth Stockwell | 2009-09-10 | 1 | -5/+3 |
|\ | | | | | | | mmfphonon | ||||
| * | Simplify inclusion of osextensions. | Frans Englich | 2009-09-09 | 1 | -5/+3 |
| | | |||||
* | | Fixed problems with compiling for ARMV5 | Gareth Stockwell | 2009-09-10 | 10 | -17/+10 |
|/ | | | | | | - Forward declaration of QScopedPointer containee type was causing an error - Audio effect libraries were declared in the .pro file as e.g. -lBassBoostEffect.lib, causing toolchain to try to link statically - Added several missing MMF:: namespace qualifiers | ||||
* | Added epoc32/include/osextensions include path, necessary to compile in S60 ↵ | Gareth Stockwell | 2009-09-09 | 1 | -0/+2 |
| | | | | 5.0 environment | ||||
* | Improve signal connections between MediaObject and AbstractPlayer. | Frans Englich | 2009-09-09 | 5 | -14/+10 |
| | | | | | MediaObject deals with an AbstractPlayer, so make sure we have the signals declared in that base class, instead of individually in each sub-class. | ||||
* | Make the MediaObject propagation generic for all kinds of nodes. | Frans Englich | 2009-09-09 | 16 | -100/+133 |
| | | | | | Previously the MediaObject propagation was only done for effects, but now it's for all kinds of nodes. This is needed for AudioOutput. | ||||
* | Work on extending the framework for accomodating effects. | Frans Englich | 2009-09-09 | 24 | -67/+993 |
| | | | | | | | | | This extends the framework for being able to handle audio effects, largely affecting how the audio chain is set up, connected and disconnected, and therefore the Backend has been refactored slightly, and the class MediaNode introduced, see its documentation. In addition two effects has been written: BassBoost and AudioEqualizer. | ||||
* | Modified file-loading code to use QDir::toNativeSeparators | Gareth Stockwell | 2009-09-07 | 3 | -25/+4 |
| | |||||
* | Refactored object tree dumping framework into a separate DLL | Gareth Stockwell | 2009-09-07 | 13 | -102/+197 |
| | |||||
* | Oops: removed .lib from libraries in mmf.pro so they are now dynamically linked | Gareth Stockwell | 2009-09-07 | 1 | -6/+6 |
| | |||||
* | Modified MediaPlayer to set names on its child QObject instances | Gareth Stockwell | 2009-09-07 | 1 | -0/+14 |
| | | | | This is useful for debugging, as it helps to associate nodes in the object tree with the corresponding source code. | ||||
* | Added a macro for setting video output region to null | Gareth Stockwell | 2009-09-07 | 2 | -37/+10 |
| | | | | This is useful when debugging problems with the interaction between video rendering, Qt widget rendering and the underlying native control / window system. | ||||
* | Added macros to QtGui for controlling whether widgets are window-owning | Gareth Stockwell | 2009-09-07 | 4 | -6/+96 |
| | | | | | | | | | There are two macros defined in src/gui/kernel/window_owning_control.h: If this is defined, then calling QWidget::winId causes a native window to be created for the associated control If QWIDGET_OWNS_WINDOW is defined, defining this macro means that the parent window for the newly created window is the parent widget's winId. This in turn means that calling QWidget::winId causes native windows to be created for all ancestors of the target widget. If this macro is undefined, the parent window is the parent widget's effectiveWinId. | ||||
* | Added logging to QWidgetPrivate and QSymbianControl | Gareth Stockwell | 2009-09-07 | 2 | -15/+240 |
| | |||||
* | Added visitor-based object tree dumping framework, which dumps details of ↵ | Gareth Stockwell | 2009-09-07 | 11 | -61/+1154 |
| | | | | Symbian control / window associated with each widget | ||||
* | Merge branch 'mmfphonon' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | Gareth Stockwell | 2009-09-01 | 4 | -151/+11 |
|\ | | | | | | | mmfphonon | ||||
| * | Merge branch 'mmfphonon' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | Gareth Stockwell | 2009-08-27 | 0 | -0/+0 |
| |\ | | | | | | | | | | mmfphonon | ||||
| | * | Reformatted code to comply with Qt style | Gareth Stockwell | 2009-08-27 | 25 | -1681/+1591 |
| | | | |||||
| * | | Reformatted code to comply with Qt style | Gareth Stockwell | 2009-08-27 | 26 | -1686/+1591 |
| |/ | |||||
| * | Wrapped code using QT_BEGIN/END_NAMESPACE macros | Gareth Stockwell | 2009-08-27 | 26 | -33/+112 |
| | | |||||
| * | Added more tracing to VideoPlayer | Gareth Stockwell | 2009-08-27 | 1 | -14/+15 |
| | | |||||
* | | Modified hide_sys to correctly mirror action of show_sys | Gareth Stockwell | 2009-09-01 | 1 | -1/+1 |
| | | |||||
* | | Video playback now visible; flickering problems now observed | Gareth Stockwell | 2009-08-28 | 3 | -28/+45 |
| | | |||||
* | | Modified show_sys to call ActivateL on all window-owning controls | Gareth Stockwell | 2009-08-28 | 2 | -3/+10 |
| | | |||||
* | | Deferred call to CVideoPlayerUtility::SetDisplayWindowL until MMF controller ↵ | Gareth Stockwell | 2009-08-28 | 2 | -5/+39 |
| | | | | | | | | has been loaded | ||||
* | | Further modifications to native window resizing code | Gareth Stockwell | 2009-08-28 | 2 | -26/+21 |
| | | |||||
* | | Added code to VideoOutput for painting the video region (currently commented ↵ | Gareth Stockwell | 2009-08-28 | 1 | -4/+5 |
| | | | | | | | | out) | ||||
* | | Experimenting to try and get video to be visible | Gareth Stockwell | 2009-08-28 | 1 | -4/+13 |
| | | |||||
* | | First draft of QWidgetPrivate::setWSGeometry for S60 | Gareth Stockwell | 2009-08-28 | 2 | -4/+151 |
| | | |||||
* | | Removed qobject_cast as per suggestion from Jason Barron | Gareth Stockwell | 2009-08-28 | 1 | -6/+3 |
| | | |||||
* | | 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 |
| |