summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon
diff options
context:
space:
mode:
authorFrans Englich <frans.englich@nokia.com>2009-07-21 11:29:39 (GMT)
committerFrans Englich <frans.englich@nokia.com>2009-07-21 11:29:39 (GMT)
commit7bd7c88d4e555131af035cb7262a5b0b663f63f0 (patch)
treec924f9af1cf7e5d286597e96ebcea5be8d424faf /src/3rdparty/phonon
parent287b6fbddde1e61776676996471256a3b487e4fd (diff)
downloadQt-7bd7c88d4e555131af035cb7262a5b0b663f63f0.zip
Qt-7bd7c88d4e555131af035cb7262a5b0b663f63f0.tar.gz
Qt-7bd7c88d4e555131af035cb7262a5b0b663f63f0.tar.bz2
Work.
Diffstat (limited to 'src/3rdparty/phonon')
-rw-r--r--src/3rdparty/phonon/mmf/mediaobject.cpp30
-rw-r--r--src/3rdparty/phonon/mmf/mediaobject.h12
2 files changed, 28 insertions, 14 deletions
diff --git a/src/3rdparty/phonon/mmf/mediaobject.cpp b/src/3rdparty/phonon/mmf/mediaobject.cpp
index 605fe24..0763c42 100644
--- a/src/3rdparty/phonon/mmf/mediaobject.cpp
+++ b/src/3rdparty/phonon/mmf/mediaobject.cpp
@@ -185,16 +185,6 @@ void MMF::MediaObject::setTransitionTime(qint32)
{
}
-void MMF::MediaObject::MaloLoadingComplete()
-{
- transitTo(StoppedState);
-}
-
-void MMF::MediaObject::MaloLoadingStarted()
-{
- transitTo(LoadingState);
-}
-
void MMF::MediaObject::MdapcInitComplete(TInt aError,
const TTimeIntervalMicroSeconds &)
{
@@ -236,3 +226,23 @@ Phonon::State MMF::MediaObject::state() const
return m_state;
}
+void MMF::MediaObject::MaloLoadingComplete()
+{
+ transitTo(StoppedState);
+}
+
+void MMF::MediaObject::MaloLoadingStarted()
+{
+ transitTo(LoadingState);
+}
+
+void MMF::MediaObject::MvloLoadingComplete()
+{
+ transitTo(StoppedState);
+}
+
+void MMF::MediaObject::MvloLoadingStarted()
+{
+ transitTo(LoadingState);
+}
+
diff --git a/src/3rdparty/phonon/mmf/mediaobject.h b/src/3rdparty/phonon/mmf/mediaobject.h
index 207cb91..ae3cbeb 100644
--- a/src/3rdparty/phonon/mmf/mediaobject.h
+++ b/src/3rdparty/phonon/mmf/mediaobject.h
@@ -78,15 +78,19 @@ namespace Phonon
virtual qint32 transitionTime() const;
virtual void setTransitionTime(qint32);
- // MAudioLoadingObserver
- virtual void MaloLoadingComplete();
- virtual void MaloLoadingStarted();
-
// MDrmAudioPlayerCallback
virtual void MdapcInitComplete(TInt aError,
const TTimeIntervalMicroSeconds &aDuration);
virtual void MdapcPlayComplete(TInt aError);
+ // MAudioLoadingObserver
+ virtual void MaloLoadingComplete();
+ virtual void MaloLoadingStarted();
+
+ // MVideoLoadingObserver
+ virtual void MvloLoadingComplete();
+ virtual void MvloLoadingStarted();
+
Q_SIGNALS:
void totalTimeChanged();
void stateChanged(Phonon::State oldState,