summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon/mmf/mediaobject.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Fixed compilation error and one warning, when building with RVCTGareth Stockwell2009-09-301-8/+9
|
* Changes for fixing media object.Frans Englich2009-09-291-20/+20
| | | | | | | | | | | This brings tst_MediaObject to 15/7, from previously not running. Changes involves: * Skipping .qrc related tests * Loading/mimetype detction from file:/ URIs * State fixes * As part of previous point, move state and error handling down in AbstractPlayer.
* Essentially do 's/NULL/0/g', to adhere to Qt coding style.Frans Englich2009-09-241-2/+2
| | | | Addresses review comment.
* Rename videoplayer, to avoid clash with Symbian's headers.Frans Englich2009-09-231-1/+1
|
* Fixed problems with compiling for ARMV5Gareth Stockwell2009-09-101-2/+2
| | | | | | - 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
* Make the MediaObject propagation generic for all kinds of nodes.Frans Englich2009-09-091-29/+3
| | | | | 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 Englich2009-09-091-3/+43
| | | | | | | | | 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::toNativeSeparatorsGareth Stockwell2009-09-071-1/+4
|
* Reformatted code to comply with Qt styleGareth Stockwell2009-08-281-184/+159
|
* Wrapped code using QT_BEGIN/END_NAMESPACE macrosGareth Stockwell2009-08-281-0/+3
|
* Removed over-riding signal declaration from VideoPlayer.Gareth Stockwell2009-08-261-6/+6
| | | | | | | | 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.
* Added some missing signals in MediaObject; fixed seek slider in musicplayer.exeGareth Stockwell2009-08-251-1/+21
|
* Implemented Backend::availableMimeTypesGareth Stockwell2009-08-251-23/+3
|
* Implemented connection between MediaOutput and VideoWidgetGareth Stockwell2009-08-211-0/+10
| | | | | 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-211-8/+4
|
* Tidied up trace statementsGareth Stockwell2009-08-211-0/+17
|
* Started fleshing out the VideoPlayer implementationGareth Stockwell2009-08-201-2/+2
| | | | | | 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.
* Implemented parameter copying between AbstractPlayer instancesGareth Stockwell2009-08-201-4/+35
|
* Added VolumeControlInterface to abstract details of path between MediaObject ↵Gareth Stockwell2009-08-201-5/+1
| | | | and AudioOutput
* Tidying up: removing commented-out codeGareth Stockwell2009-08-191-13/+0
|
* Merged in DummyPlayer changesGareth Stockwell2009-08-191-135/+45
|\
| * Add the DummyPlayer, as discussed with Gareth.Frans Englich2009-08-181-123/+31
| |
* | Started work on VideoPlayer implementationGareth Stockwell2009-08-181-30/+50
|/
* Merged recognizer changes with abstraction for audio / video playback.Gareth Stockwell2009-08-181-482/+215
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+1
| | | | | | | | resolved anyway.
| * More delegation, basic plumbing.Frans Englich2009-08-171-1/+18
| |
| * Delegate from MediaObject.Frans Englich2009-08-171-1/+24
| |
| * Refactor the media object such that we can do both video and sound.Frans Englich2009-08-171-497/+2
| | | | | | | | As per discussions with Gareth.
* | Added recognizer code to determine if file is audio or videoGareth Stockwell2009-08-171-0/+58
|/
* Commit patch by Gareth.Frans Englich2009-08-121-70/+453
| | | | | The patch originally contained all changed done to MMF Phonon, but this commit contains the changes only Gareth did.
* Work.Frans Englich2009-07-211-10/+20
|
* Build fixes, debug code.Frans Englich2009-07-131-32/+32
|
* Pouring.Frans Englich2009-07-031-22/+76
|
* Pouring.Frans Englich2009-07-021-0/+184