Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Replace tabs with whitespace. | Frans Englich | 2009-10-15 | 1 | -15/+15 |
| | | | | | sed -i -e 's/\t/ /g' `find -name "*.cpp" -or -name "*.h" -or -name "*.pro"` | ||||
* | Remove trailing whitespace. | Frans Englich | 2009-10-15 | 1 | -1/+1 |
| | |||||
* | qdoc: Marked some undocumented Phonon classes internal | Martin Smith | 2009-10-01 | 1 | -0/+4 |
| | |||||
* | Merge branch 'mmfphonon' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | Frans Englich | 2009-09-29 | 1 | -13/+15 |
|\ | | | | | | | | | | | | | mmfphonon Conflicts: src/3rdparty/phonon/mmf/abstractplayer.cpp | ||||
| * | Fixed problem which caused playback to always start at default volume. | Gareth Stockwell | 2009-09-29 | 1 | -13/+15 |
| | | | | | | | | Volume changes made before playback starts are now correctly propagated. | ||||
* | | Changes for fixing media object. | Frans Englich | 2009-09-29 | 1 | -101/+39 |
|/ | | | | | | | | | | | 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. | ||||
* | Remove TODO comment. | Frans Englich | 2009-09-24 | 1 | -1/+0 |
| | | | | Addresses review comment. | ||||
* | Invoke on appropriate states in seek(). | Frans Englich | 2009-09-10 | 1 | -7/+21 |
| | |||||
* | Improve signal connections between MediaObject and AbstractPlayer. | Frans Englich | 2009-09-09 | 1 | -1/+2 |
| | | | | | MediaObject deals with an AbstractPlayer, so make sure we have the signals declared in that base class, instead of individually in each sub-class. | ||||
* | Reformatted code to comply with Qt style | Gareth Stockwell | 2009-08-28 | 1 | -181/+166 |
| | |||||
* | Wrapped code using QT_BEGIN/END_NAMESPACE macros | Gareth Stockwell | 2009-08-28 | 1 | -3/+3 |
| | |||||
* | Removed over-riding signal declaration from VideoPlayer. | Gareth Stockwell | 2009-08-26 | 1 | -1/+1 |
| | | | | | | | | 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.exe | Gareth Stockwell | 2009-08-25 | 1 | -0/+20 |
| | |||||
* | Fixed problem which caused duplicate entries to appear in media player file ↵ | Gareth Stockwell | 2009-08-24 | 1 | -1/+1 |
| | | | | | | 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). | ||||
* | Further tidied up volume handling | Gareth Stockwell | 2009-08-21 | 1 | -33/+42 |
| | |||||
* | Tidied up trace statements | Gareth Stockwell | 2009-08-21 | 1 | -18/+9 |
| | |||||
* | Started fleshing out the VideoPlayer implementation | Gareth Stockwell | 2009-08-20 | 1 | -7/+27 |
| | | | | | | 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 instances | Gareth Stockwell | 2009-08-20 | 1 | -101/+41 |
| | |||||
* | Added VolumeControlInterface to abstract details of path between MediaObject ↵ | Gareth Stockwell | 2009-08-20 | 1 | -23/+9 |
| | | | | and AudioOutput | ||||
* | Added missing return statement | Gareth Stockwell | 2009-08-19 | 1 | -0/+1 |
| | |||||
* | Started work on VideoPlayer implementation | Gareth Stockwell | 2009-08-18 | 1 | -5/+11 |
| | |||||
* | Refactored AudioPlayer and VideoPlayer to separate out common code into ↵ | Gareth Stockwell | 2009-08-18 | 1 | -0/+492 |
AbstractMediaPlayer |