diff options
| -rw-r--r-- | src/3rdparty/phonon/mmf/mediaobject.cpp | 30 | ||||
| -rw-r--r-- | src/3rdparty/phonon/mmf/mediaobject.h | 12 | ||||
| -rw-r--r-- | src/plugins/phonon/mmf/mmf.pro | 10 |
3 files changed, 34 insertions, 18 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, diff --git a/src/plugins/phonon/mmf/mmf.pro b/src/plugins/phonon/mmf/mmf.pro index 1a1d435..6d404f2 100644 --- a/src/plugins/phonon/mmf/mmf.pro +++ b/src/plugins/phonon/mmf/mmf.pro @@ -1,4 +1,3 @@ -DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend QT += phonon TARGET = phonon_mmf PHONON_MMF_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/mmf @@ -14,6 +13,9 @@ SOURCES += \ $$PHONON_MMF_DIR/backend.cpp \ $$PHONON_MMF_DIR/mediaobject.cpp +# This is needed for having the .qtplugin file properly created on Symbian. +QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend + target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend INSTALLS += target @@ -23,9 +25,9 @@ include(../../qpluginbase.pri) # opposed to the public, where it is placed in epoc32/include. INCLUDEPATH *= /epoc32/include/osextensions -# We need this to be able to resolve ambiguity for VideoPlayer.h. Phonon has -# it, and the SDK has it. -INCLUDEPATH *= /epoc32/include/osextensions /epoc32 +# We need this to be able to resolve ambiguity for VideoPlayer.h. Phonon and +# the SDK has the header. +INCLUDEPATH *= /epoc32 # Temporary steal one of the reserved, until we know that this MMF plugin is # turning into something at all. |