summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon/mmf/videoplayer.cpp
diff options
context:
space:
mode:
authorGareth Stockwell <gareth.stockwell@sosco.com>2009-08-25 14:19:11 (GMT)
committerGareth Stockwell <gareth.stockwell@sosco.com>2009-08-25 14:19:11 (GMT)
commitf3defb60f21cfe2456ace1148afcce43112f9c51 (patch)
tree1f7420f2b83eff53615f4b427f4f19a0b6f34b7b /src/3rdparty/phonon/mmf/videoplayer.cpp
parent9bcdcc33e1abd202a5b0ec156ff22624bd21740c (diff)
downloadQt-f3defb60f21cfe2456ace1148afcce43112f9c51.zip
Qt-f3defb60f21cfe2456ace1148afcce43112f9c51.tar.gz
Qt-f3defb60f21cfe2456ace1148afcce43112f9c51.tar.bz2
Added some missing signals in MediaObject; fixed seek slider in musicplayer.exe
Diffstat (limited to 'src/3rdparty/phonon/mmf/videoplayer.cpp')
-rw-r--r--src/3rdparty/phonon/mmf/videoplayer.cpp31
1 files changed, 14 insertions, 17 deletions
diff --git a/src/3rdparty/phonon/mmf/videoplayer.cpp b/src/3rdparty/phonon/mmf/videoplayer.cpp
index 1e9522c..002c6f6 100644
--- a/src/3rdparty/phonon/mmf/videoplayer.cpp
+++ b/src/3rdparty/phonon/mmf/videoplayer.cpp
@@ -124,6 +124,19 @@ void MMF::VideoPlayer::doStop()
m_player->Stop();
}
+void MMF::VideoPlayer::doSeek(qint64 ms)
+{
+ TRACE_CONTEXT(VideoPlayer::doSeek, EVideoApi);
+
+ TRAPD(err, m_player->SetPositionL(TTimeIntervalMicroSeconds(ms * 1000)));
+
+ if(KErrNone != err)
+ {
+ TRACE("SetPositionL error %d", err);
+ setError(NormalError);
+ }
+}
+
int MMF::VideoPlayer::setDeviceVolume(int mmfVolume)
{
TRAPD(err, m_player->SetVolumeL(mmfVolume));
@@ -141,22 +154,6 @@ void MMF::VideoPlayer::close()
m_player->Close();
}
-void MMF::VideoPlayer::seek(qint64 ms)
-{
- TRACE_CONTEXT(VideoPlayer::seek, EVideoApi);
- TRACE_ENTRY("state %d pos %Ld", state(), ms);
-
- TRAPD(err, m_player->SetPositionL(TTimeIntervalMicroSeconds(ms)));
-
- if(KErrNone != err)
- {
- TRACE("SetPositionL error %d", err);
- setError(NormalError);
- }
-
- TRACE_EXIT_0();
-}
-
bool MMF::VideoPlayer::hasVideo() const
{
return true;
@@ -232,7 +229,7 @@ void MMF::VideoPlayer::MvpuoPrepareComplete(TInt aError)
videoOutput().setFrameSize(m_frameSize);
- emit totalTimeChanged();
+ emit totalTimeChanged(totalTime());
changeState(StoppedState);
}
else