summaryrefslogtreecommitdiffstats
path: root/src/plugins/phonon
Commit message (Collapse)AuthorAgeFilesLines
* Fixed build errors due to header filename clashes between epoc32/include and ↵Gareth Stockwell2009-09-281-12/+5
| | | | | | | | Phonon. Both epoc32/include and $QTDIR/include/Phonon contain a file called videoplayer.h. Both of these directories are listed as SYSTEMINCLUDE paths in the generated MMP file, with the Phonon path coming first. This means that '#include <videoplayer.h>' picks up the Phonon header rather than (as intended) the Symbian one. A new qmake variable, PREPEND_INCLUDEPATH, is defined, allowing the .pro file to specify that /epoc32/include should be the first SYSTEMINCLUDE.
* Rename videoplayer, to avoid clash with Symbian's headers.Frans Englich2009-09-231-2/+2
|
* Experimenting to make video visible.Gareth Stockwell2009-09-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | Removed the hack to set translucent window background in the mediaplayer. Then tried the following: 1. Direct write to backing store: does not work (backing bitmap is 16MU) 2. Set window background color: does not work (is over-written by control's Draw function) 3. Brush using CWindowGc from widget's paint event: does not work (is over-written by control's Draw function) 4. Hack QSymbianControl to blit a transparent bitmap from the Draw function: does work 5. Hack QSymbianControl to brush using CWindowGc from the Draw function: does work Configuration 5 is the one being committed. Other things we could try: 6. Trigger switch to 16MA backing store if child widgets have been created. This could be tested by calling RWindowTreeNode::Child on the TLW's window. - Maybe we could test whether the child window's display mode is 16MA? 7. Somehow tell QSymbianControl not to draw anything at all - Based on setting Qt::WA_PaintOnScreen? - Then we either: - (Ideally) do nothing, and rely on video stack to paint the necessary transparency - Brush using CWindowGc from widget's paint event
* RoomLevel is not available in SDK 3.1, remove it.Frans Englich2009-09-231-1/+1
| | | | In any case, we haven't implemented this effect.
* Replaced explicit epoc32/include path with (more portable) ↵Gareth Stockwell2009-09-231-1/+1
| | | | MW_LAYER_SYSTEMINCLUDE macro
* Added a utility function for reading color of individual pixels from the screenGareth Stockwell2009-09-231-0/+1
|
* Make mmfphonondebug static, and do some build fixes.Frans Englich2009-09-163-3/+5
|
* Fixes to include paths, required due to objectdump renamingGareth Stockwell2009-09-151-2/+2
|
* Rename objectdump to mmfphonondebug in order to avoid conflicts.Frans Englich2009-09-142-3/+3
|
* Reserve & use UIDs.Frans Englich2009-09-142-4/+5
|
* Merge branch 'mmfphonon' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Gareth Stockwell2009-09-101-5/+3
|\ | | | | | | mmfphonon
| * Simplify inclusion of osextensions.Frans Englich2009-09-091-5/+3
| |
* | Fixed problems with compiling for ARMV5Gareth Stockwell2009-09-101-1/+1
|/ | | | | | - 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 Stockwell2009-09-091-0/+2
| | | | 5.0 environment
* Work on extending the framework for accomodating effects.Frans Englich2009-09-092-14/+26
| | | | | | | | | 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.
* Refactored object tree dumping framework into a separate DLLGareth Stockwell2009-09-073-88/+109
|
* Oops: removed .lib from libraries in mmf.pro so they are now dynamically linkedGareth Stockwell2009-09-071-6/+6
|
* Added visitor-based object tree dumping framework, which dumps details of ↵Gareth Stockwell2009-09-071-0/+15
| | | | Symbian control / window associated with each widget
* Added VideoOutputObserver, to propagate screen region updates back to ↵Gareth Stockwell2009-08-261-0/+1
| | | | VideoPlayer
* Further tidied up volume handlingGareth Stockwell2009-08-211-1/+3
|
* Added stub VideoWidget implementationGareth Stockwell2009-08-201-1/+3
|
* Implemented parameter copying between AbstractPlayer instancesGareth Stockwell2009-08-201-0/+2
|
* Added VolumeControlInterface to abstract details of path between MediaObject ↵Gareth Stockwell2009-08-201-1/+2
| | | | and AudioOutput
* Merged in DummyPlayer changesGareth Stockwell2009-08-192-8/+10
|\
| * Merge branch 'master' into mmfphononFrans Englich2009-08-191-1/+1
| |\ | | | | | | | | | | | | | | | Conflicts: src/gui/itemviews/qitemselectionmodel.cpp tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
| | * Use LIBS_PRIVATE on Mac and X11.Thiago Macieira2009-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the Mac, it means "-framework ApplicationServices -framework Carbon -framework AppKit" are no longer part of the default LIBS in Qt applications. This required a lot of fixes where we used Mac-specific code in Qt. On X11, it was very straightforward, because we apparently use very little of X11 outside QtGui. I haven't changed the Windows-specific LIBS paths, because I don't know how Windows behaves. Windows has DLLs, but it links to static "import" libraries. So is it static linking or dynamic linking? Reviewed-By: Marius Storm-Olsen
| | * Long live Qt!Lars Knoll2009-03-235-0/+235
| |
| * Add the DummyPlayer, as discussed with Gareth.Frans Englich2009-08-181-2/+4
| |
* | Started work on VideoPlayer implementationGareth Stockwell2009-08-181-0/+4
| |
* | Refactored AudioPlayer and VideoPlayer to separate out common code into ↵Gareth Stockwell2009-08-181-13/+15
|/ | | | AbstractMediaPlayer
* 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-121-7/+23
| | | | | The patch originally contained all changed done to MMF Phonon, but this commit contains the changes only Gareth did.
* Work.Frans Englich2009-07-211-4/+6
|
* Work.Frans Englich2009-07-181-1/+9
|
* Pouring.Frans Englich2009-07-022-42/+13
|
* Hook in the MMF backend.Frans Englich2009-07-011-0/+54
|
* Long live Qt for S60!axis2009-04-245-0/+235
generated by cgit v0.12 at 2024-11-22 08:16:28 (GMT)