summaryrefslogtreecommitdiffstats
path: root/demos/qmediaplayer
diff options
context:
space:
mode:
authorGareth Stockwell <ext-gareth.stockwell@nokia.com>2009-11-18 16:39:47 (GMT)
committerGareth Stockwell <ext-gareth.stockwell@nokia.com>2009-11-19 09:56:18 (GMT)
commita599898061b8b76bbd313d7b3ea0a4e0e9a6e8ed (patch)
tree6cab4d8804153607ae25ef1cb7feb3544f480445 /demos/qmediaplayer
parente0a7245eba7207eaf43b1855a58c76dd3cf7b41b (diff)
downloadQt-a599898061b8b76bbd313d7b3ea0a4e0e9a6e8ed.zip
Qt-a599898061b8b76bbd313d7b3ea0a4e0e9a6e8ed.tar.gz
Qt-a599898061b8b76bbd313d7b3ea0a4e0e9a6e8ed.tar.bz2
Mediaplayer: do not exit full-screen when paused
This modifies the patch which introduced "exit full screen when end of playback is reached": f9d36789 Reviewed-by: Frans Englich
Diffstat (limited to 'demos/qmediaplayer')
-rw-r--r--demos/qmediaplayer/mediaplayer.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/demos/qmediaplayer/mediaplayer.cpp b/demos/qmediaplayer/mediaplayer.cpp
index aa716c5..1cca3dc 100644
--- a/demos/qmediaplayer/mediaplayer.cpp
+++ b/demos/qmediaplayer/mediaplayer.cpp
@@ -363,12 +363,12 @@ void MediaPlayer::stateChanged(Phonon::State newstate, Phonon::State oldstate)
}
QMessageBox::warning(this, "Phonon Mediaplayer", m_MediaObject.errorString(), QMessageBox::Close);
break;
- case Phonon::PausedState:
- case Phonon::StoppedState:
- playButton->setIcon(playIcon);
+ case Phonon::StoppedState:
m_videoWidget->setFullScreen(false);
-
+ // Fall through
+ case Phonon::PausedState:
+ playButton->setIcon(playIcon);
if (m_MediaObject.currentSource().type() != Phonon::MediaSource::Invalid){
playButton->setEnabled(true);
rewindButton->setEnabled(true);