diff options
author | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-10-07 16:22:21 (GMT) |
---|---|---|
committer | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-10-09 06:51:18 (GMT) |
commit | dda32cb904430e225566b047004b93c7be8ecca9 (patch) | |
tree | 6f9263c608bc478182b2c32ce9b9bf17aed5b6dd /src/3rdparty/phonon | |
parent | 23cbcae5c847342d69e593cae5406ce8344b7030 (diff) | |
download | Qt-dda32cb904430e225566b047004b93c7be8ecca9.zip Qt-dda32cb904430e225566b047004b93c7be8ecca9.tar.gz Qt-dda32cb904430e225566b047004b93c7be8ecca9.tar.bz2 |
Reformatting to comply with Qt code style
Reviewed-by: Frans Englich
Diffstat (limited to 'src/3rdparty/phonon')
-rw-r--r-- | src/3rdparty/phonon/mmf/mmf_videoplayer.cpp | 16 | ||||
-rw-r--r-- | src/3rdparty/phonon/mmf/mmf_videoplayer.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp b/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp index fdb7ff4..6d7e0ed 100644 --- a/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp +++ b/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp @@ -81,9 +81,9 @@ void MMF::VideoPlayer::construct() // TODO: is this the correct way to handle errors which occur when // creating a Symbian object in the constructor of a Qt object? - - // TODO: check whether videoOutput is visible? If not, then the - // corresponding window will not be active, meaning that the + + // TODO: check whether videoOutput is visible? If not, then the + // corresponding window will not be active, meaning that the // clipping region will be set to empty and the video will not be // visible. If this is the case, we should set m_mmfOutputChangePending // and respond to future showEvents from the videoOutput widget. @@ -120,13 +120,13 @@ MMF::VideoPlayer::~VideoPlayer() void MMF::VideoPlayer::doPlay() { TRACE_CONTEXT(VideoPlayer::doPlay, EVideoApi); - + // See comment in updateMmfOutput if(m_mmfOutputChangePending) { TRACE_0("MMF output change pending - pushing now"); updateMmfOutput(); } - + m_player->Play(); } @@ -149,7 +149,7 @@ void MMF::VideoPlayer::doStop() void MMF::VideoPlayer::doSeek(qint64 ms) { TRACE_CONTEXT(VideoPlayer::doSeek, EVideoApi); - + bool wasPlaying = false; if(state() == PlayingState) { // The call to SetPositionL does not have any effect if playback is @@ -258,8 +258,8 @@ void MMF::VideoPlayer::MvpuoPrepareComplete(TInt aError) if(m_mmfOutputChangePending) { TRACE_0("MMF output change pending - pushing now"); updateMmfOutput(); - } - + } + emit totalTimeChanged(totalTime()); changeState(StoppedState); } else { diff --git a/src/3rdparty/phonon/mmf/mmf_videoplayer.h b/src/3rdparty/phonon/mmf/mmf_videoplayer.h index d3e148a..8072404 100644 --- a/src/3rdparty/phonon/mmf/mmf_videoplayer.h +++ b/src/3rdparty/phonon/mmf/mmf_videoplayer.h @@ -99,7 +99,7 @@ private: qint64 m_totalTime; bool m_mmfOutputChangePending; - + }; } |