diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-10-19 10:04:57 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-10-19 14:21:21 (GMT) |
| commit | f9d36789b4f2565f342f22d62a5106e5d5ca3389 (patch) | |
| tree | e12f900a45e8cb31ab4556221373f1935e6d9760 | |
| parent | 6018d7a21a1ba336a59e3cda161b7cfeb144b4b5 (diff) | |
| download | Qt-f9d36789b4f2565f342f22d62a5106e5d5ca3389.zip Qt-f9d36789b4f2565f342f22d62a5106e5d5ca3389.tar.gz Qt-f9d36789b4f2565f342f22d62a5106e5d5ca3389.tar.bz2 | |
Does not disable full screen when end of video playlist is reached.
Tested on Symbian and Windows(DS9).
Task-number: QTBUG-4869
Reviewed-by: Gareth Stockwell
| -rw-r--r-- | demos/qmediaplayer/mediaplayer.cpp | 3 | ||||
| -rw-r--r-- | src/3rdparty/phonon/mmf/mmf_videoplayer.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/demos/qmediaplayer/mediaplayer.cpp b/demos/qmediaplayer/mediaplayer.cpp index baac236..e1ceb0e 100644 --- a/demos/qmediaplayer/mediaplayer.cpp +++ b/demos/qmediaplayer/mediaplayer.cpp @@ -367,6 +367,9 @@ void MediaPlayer::stateChanged(Phonon::State newstate, Phonon::State oldstate) case Phonon::PausedState: case Phonon::StoppedState: playButton->setIcon(playIcon); + + m_videoWidget->setFullScreen(false); + if (m_MediaObject.currentSource().type() != Phonon::MediaSource::Invalid){ playButton->setEnabled(true); rewindButton->setEnabled(true); diff --git a/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp b/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp index a93aca0..d1d2337 100644 --- a/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp +++ b/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp @@ -300,8 +300,8 @@ void MMF::VideoPlayer::MvpuoPlayComplete(TInt aError) TRACE_CONTEXT(VideoPlayer::MvpuoPlayComplete, EVideoApi) TRACE_ENTRY("state %d error %d", state(), aError); - // TODO Q_UNUSED(aError); // suppress warnings in release builds + changeState(StoppedState); TRACE_EXIT_0(); } |