From 6018d7a21a1ba336a59e3cda161b7cfeb144b4b5 Mon Sep 17 00:00:00 2001 From: Frans Englich Date: Fri, 16 Oct 2009 16:31:27 +0200 Subject: Kill warning, simplify code. Reviewed-by: TrustMe --- src/3rdparty/phonon/mmf/audiooutput.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/3rdparty/phonon/mmf/audiooutput.cpp b/src/3rdparty/phonon/mmf/audiooutput.cpp index 5a00f60..bb0e5bc 100644 --- a/src/3rdparty/phonon/mmf/audiooutput.cpp +++ b/src/3rdparty/phonon/mmf/audiooutput.cpp @@ -102,15 +102,17 @@ bool MMF::AudioOutput::activateOnMediaObject(MediaObject *mo) QHash MMF::AudioOutput::audioOutputDescription(int index) { + QHash retval; + if (index == AudioOutputDeviceID) { QHash retval; retval.insert("name", QCoreApplication::translate("Phonon::MMF", "Audio Output")); retval.insert("description", QCoreApplication::translate("Phonon::MMF", "The audio output device")); retval.insert("available", true); - - return retval; } + + return retval; } QT_END_NAMESPACE -- cgit v0.12 From f9d36789b4f2565f342f22d62a5106e5d5ca3389 Mon Sep 17 00:00:00 2001 From: Frans Englich Date: Mon, 19 Oct 2009 12:04:57 +0200 Subject: 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 --- demos/qmediaplayer/mediaplayer.cpp | 3 +++ src/3rdparty/phonon/mmf/mmf_videoplayer.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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(); } -- cgit v0.12