Changeset 769 for trunk/src/3rdparty/phonon/mmf

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/phonon/mmf/abstractaudioeffect.cpp (modified) (1 diff)
• src/3rdparty/phonon/mmf/abstractaudioeffect.h (modified) (1 diff)
• src/3rdparty/phonon/mmf/abstractmediaplayer.cpp (modified) (10 diffs)
• src/3rdparty/phonon/mmf/abstractmediaplayer.h (modified) (5 diffs)
• src/3rdparty/phonon/mmf/abstractplayer.cpp (modified) (3 diffs)
• src/3rdparty/phonon/mmf/abstractplayer.h (modified) (5 diffs)
• src/3rdparty/phonon/mmf/abstractvideooutput.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/phonon/mmf/abstractvideooutput.cpp )
• src/3rdparty/phonon/mmf/abstractvideooutput.h (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/phonon/mmf/abstractvideooutput.h )
• src/3rdparty/phonon/mmf/abstractvideoplayer.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/phonon/mmf/abstractvideoplayer.cpp )
• src/3rdparty/phonon/mmf/abstractvideoplayer.h (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/phonon/mmf/abstractvideoplayer.h )
• src/3rdparty/phonon/mmf/ancestormovemonitor.cpp (modified) (6 diffs)
• src/3rdparty/phonon/mmf/ancestormovemonitor.h (modified) (5 diffs)
• src/3rdparty/phonon/mmf/audioplayer.cpp (modified) (2 diffs)
• src/3rdparty/phonon/mmf/backend.cpp (modified) (3 diffs)
• src/3rdparty/phonon/mmf/backend.h (modified) (2 diffs)
• src/3rdparty/phonon/mmf/defs.h (modified) (1 diff)
• src/3rdparty/phonon/mmf/mediaobject.cpp (modified) (5 diffs)
• src/3rdparty/phonon/mmf/mediaobject.h (modified) (3 diffs)
• src/3rdparty/phonon/mmf/mmf_videoplayer.cpp (deleted)
• src/3rdparty/phonon/mmf/mmf_videoplayer.h (deleted)
• src/3rdparty/phonon/mmf/utils.cpp (modified) (1 diff)
• src/3rdparty/phonon/mmf/videooutput.cpp (deleted)
• src/3rdparty/phonon/mmf/videooutput.h (deleted)
• src/3rdparty/phonon/mmf/videooutput_dsa.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/phonon/mmf/videooutput_dsa.cpp )
• src/3rdparty/phonon/mmf/videooutput_dsa.h (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/phonon/mmf/videooutput_dsa.h )
• src/3rdparty/phonon/mmf/videooutput_surface.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/phonon/mmf/videooutput_surface.cpp )
• src/3rdparty/phonon/mmf/videooutput_surface.h (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/phonon/mmf/videooutput_surface.h )
• src/3rdparty/phonon/mmf/videoplayer_dsa.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/phonon/mmf/videoplayer_dsa.cpp )
• src/3rdparty/phonon/mmf/videoplayer_dsa.h (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/phonon/mmf/videoplayer_dsa.h )
• src/3rdparty/phonon/mmf/videoplayer_surface.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/phonon/mmf/videoplayer_surface.cpp )
• src/3rdparty/phonon/mmf/videoplayer_surface.h (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/phonon/mmf/videoplayer_surface.h )
• src/3rdparty/phonon/mmf/videowidget.cpp (modified) (4 diffs)
• src/3rdparty/phonon/mmf/videowidget.h (modified) (4 diffs)

trunk/src/3rdparty/phonon/mmf/abstractaudioeffect.cpp

@@ -21 +21 @@
 #include "abstractaudioeffect.h"
 #include "audioplayer.h"
-#include "mmf_videoplayer.h"
 
 QT_BEGIN_NAMESPACE

trunk/src/3rdparty/phonon/mmf/abstractaudioeffect.h

@@ -29 +29 @@
 #include "effectparameter.h"
 #include "mmf_medianode.h"
-#include "mmf_videoplayer.h"
 
 class CMdaAudioOutputStream;

trunk/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp

@@ -49 +49 @@
         :   AbstractPlayer(player)
         ,   m_parent(parent)
-        ,   m_playPending(false)
+        ,   m_pending(NothingPending)
         ,   m_positionTimer(new QTimer(this))
         ,   m_bufferStatusTimer(new QTimer(this))
@@ -75 +75 @@
 
     case LoadingState:
-        m_playPending = true;
+        setPending(PlayPending);
         break;
 
     case StoppedState:
     case PausedState:
-        doPlay();
-        startPositionTimer();
-        changeState(PlayingState);
+        startPlayback();
         break;
 
@@ -104 +102 @@
     TRACE_ENTRY("state %d", privateState());
 
-    m_playPending = false;
     stopTimers();
 
@@ -110 +107 @@
     case GroundState:
     case LoadingState:
+    case StoppedState:
+        setPending(PausePending);
+        break;
+
     case PausedState:
-    case StoppedState:
         // Do nothing
         break;
@@ -136 +136 @@
     TRACE_ENTRY("state %d", privateState());
 
-    m_playPending = false;
+    setPending(NothingPending);
     stopTimers();
 
@@ -366 +366 @@
 }
 
+void MMF::AbstractMediaPlayer::loadingComplete(int error)
+{
+    Q_ASSERT(Phonon::LoadingState == state());
+
+    if (KErrNone == error) {
+        updateMetaData();
+        changeState(StoppedState);
+    } else {
+        setError(tr("Loading clip failed"), error);
+    }
+}
+
 void MMF::AbstractMediaPlayer::playbackComplete(int error)
 {
     stopTimers();
 
+    if (KErrNone == error && !m_aboutToFinishSent) {
+        const qint64 total = totalTime();
+        emit MMF::AbstractPlayer::tick(total);
+        m_aboutToFinishSent = true;
+        emit aboutToFinish();
+    }
+
     if (KErrNone == error) {
-        changeState(StoppedState);
+        changeState(PausedState);
 
         // MediaObject::switchToNextSource deletes the current player, so we
@@ -380 +399 @@
     else {
         setError(tr("Playback complete"), error);
+        emit finished();
     }
 }
@@ -394 +414 @@
 void MMF::AbstractMediaPlayer::positionTick()
 {
-    emitMarksIfReached();
-
     const qint64 current = currentTime();
+    emitMarksIfReached(current);
     emit MMF::AbstractPlayer::tick(current);
 }
 
-void MMF::AbstractMediaPlayer::emitMarksIfReached()
-{
-    const qint64 current = currentTime();
+void MMF::AbstractMediaPlayer::emitMarksIfReached(qint64 current)
+{
     const qint64 total = totalTime();
     const qint64 remaining = total - current;
@@ -436 +454 @@
 }
 
+void MMF::AbstractMediaPlayer::setPending(Pending pending)
+{
+    const Phonon::State oldState = state();
+    m_pending = pending;
+    const Phonon::State newState = state();
+    if (newState != oldState)
+        emit stateChanged(newState, oldState);
+}
+
+void MMF::AbstractMediaPlayer::startPlayback()
+{
+    doPlay();
+    startPositionTimer();
+    changeState(PlayingState);
+}
+
 void MMF::AbstractMediaPlayer::bufferStatusTick()
 {
     emit MMF::AbstractPlayer::bufferStatus(bufferStatus());
+}
+
+Phonon::State MMF::AbstractMediaPlayer::phononState(PrivateState state) const
+{
+    Phonon::State result = AbstractPlayer::phononState(state);
+
+    if (PausePending == m_pending) {
+        Q_ASSERT(Phonon::StoppedState == result || Phonon::LoadingState == result);
+        result = Phonon::PausedState;
+    }
+
+    return result;
 }
 
@@ -448 +494 @@
     const Phonon::State newPhononState = phononState(newState);
 
-    // TODO: add some invariants to check that the transition is valid
-    AbstractPlayer::changeState(newState);
-
     if (LoadingState == oldPhononState && StoppedState == newPhononState) {
-        // Ensure initial volume is set on MMF API before starting playback
-        doVolumeChanged();
-
-        // Check whether play() was called while clip was being loaded.  If so,
-        // playback should be started now
-        if (m_playPending) {
-            TRACE_0("play was called while loading; starting playback now");
-            m_playPending = false;
-            play();
-        }
+        switch (m_pending) {
+        case NothingPending:
+            AbstractPlayer::changeState(newState);
+            break;
+
+        case PlayPending:
+            changeState(PlayingState); // necessary in order to apply initial volume
+            doVolumeChanged();
+            startPlayback();
+            break;
+
+        case PausePending:
+            AbstractPlayer::changeState(PausedState);
+            break;
+        }
+
+        setPending(NothingPending);
+    } else {
+        AbstractPlayer::changeState(newState);
     }
 }

trunk/src/3rdparty/phonon/mmf/abstractmediaplayer.h

@@ -61 +61 @@
     // AbstractPlayer
     virtual void doSetTickInterval(qint32 interval);
+    virtual Phonon::State phononState(PrivateState state) const;
+    virtual void changeState(PrivateState newState);
 
     virtual void doPlay() = 0;
@@ -71 +73 @@
     virtual int bufferStatus() const = 0;
     virtual void close() = 0;
-    virtual void changeState(PrivateState newState);
 
     void updateMetaData();
@@ -81 +82 @@
     void bufferingComplete();
     void maxVolumeChanged(int maxVolume);
+    void loadingComplete(int error);
     void playbackComplete(int error);
 
@@ -92 +94 @@
     void stopTimers();
     void doVolumeChanged();
-    void emitMarksIfReached();
+    void emitMarksIfReached(qint64 position);
     void resetMarksIfRewound();
+    void startPlayback();
+
+    enum Pending {
+        NothingPending,
+        PausePending,
+        PlayPending
+    };
+
+    void setPending(Pending pending);
 
 private Q_SLOTS:
@@ -102 +113 @@
     MediaObject *const          m_parent;
 
-    /**
-     * This flag is set to true if play is called when the object is
-     * in a Loading state.  Once loading is complete, playback will
-     * be started.
-     */
-    bool                        m_playPending;
+    Pending                     m_pending;
 
     QScopedPointer<QTimer>      m_positionTimer;

trunk/src/3rdparty/phonon/mmf/abstractplayer.cpp

@@ -49 +49 @@
         m_transitionTime = player->m_transitionTime;
         m_prefinishMark = player->m_prefinishMark;
+
+        // This is to prevent unwanted state transitions occurring as a result
+        // of MediaObject::switchToNextSource() during playlist playback.
+        if (StoppedState == player->m_state)
+            m_state = player->m_state;
     }
 }
@@ -97 +102 @@
 //-----------------------------------------------------------------------------
 
-void MMF::AbstractPlayer::setVideoOutput(VideoOutput* videoOutput)
+void MMF::AbstractPlayer::setVideoOutput(AbstractVideoOutput* videoOutput)
 {
     m_videoOutput = videoOutput;
@@ -142 +147 @@
 }
 
-Phonon::State MMF::AbstractPlayer::phononState(PrivateState state)
+Phonon::State MMF::AbstractPlayer::phononState(PrivateState state) const
 {
     const Phonon::State phononState =

trunk/src/3rdparty/phonon/mmf/abstractplayer.h

@@ -25 +25 @@
 #include <QObject>
 
-#include "videooutput.h"
+#include "abstractvideooutput.h"
 
 class RFile;
@@ -35 +35 @@
 namespace MMF
 {
-class VideoOutput;
 
 /**
@@ -80 +79 @@
     virtual void volumeChanged(qreal volume);
 
-    void setVideoOutput(VideoOutput* videoOutput);
+    void setVideoOutput(AbstractVideoOutput *videoOutput);
 
     /**
@@ -135 +134 @@
      * Converts PrivateState into the corresponding Phonon::State
      */
-    static Phonon::State phononState(PrivateState state);
+    virtual Phonon::State phononState(PrivateState state) const;
 
     virtual void videoOutputChanged();
@@ -157 +156 @@
 protected:
     // Not owned
-    VideoOutput*                m_videoOutput;
+    AbstractVideoOutput*        m_videoOutput;
 
     qreal                       m_volume;

trunk/src/3rdparty/phonon/mmf/ancestormovemonitor.cpp

@@ -19 +19 @@
 #include "ancestormovemonitor.h"
 #include "utils.h"
-#include "videooutput.h"
+
+#include "videooutput_dsa.h"
 
 #include <QCoreApplication>
@@ -60 +61 @@
 //-----------------------------------------------------------------------------
 
-void AncestorMoveMonitor::registerTarget(VideoOutput *target)
+void AncestorMoveMonitor::registerTarget(DsaVideoOutput *target)
 {
     TRACE_CONTEXT(AncestorMoveMonitor::registerTarget, EVideoInternal);
@@ -94 +95 @@
 }
 
-void AncestorMoveMonitor::unRegisterTarget(VideoOutput *target)
+void AncestorMoveMonitor::unRegisterTarget(DsaVideoOutput *target)
 {
     TRACE_CONTEXT(AncestorMoveMonitor::unRegisterTarget, EVideoInternal);
@@ -127 +128 @@
         if(it != m_hash.end()) {
             const TargetList& targetList = it.value();
-            VideoOutput* target = 0;
+            DsaVideoOutput* target = 0;
             foreach(target, targetList) {
                 switch (event->type()) {
@@ -167 +168 @@
         TRACE("ancestor 0x%08x", ancestor);
         const TargetList& targetList = it.value();
-        VideoOutput* target = 0;
+        DsaVideoOutput* target = 0;
         foreach(target, targetList) {
             TRACE("    target 0x%08x", target);
@@ -175 +176 @@
 }
 
-
-
 QT_END_NAMESPACE
 

trunk/src/3rdparty/phonon/mmf/ancestormovemonitor.h

@@ -30 +30 @@
 namespace MMF
 {
-class VideoOutput;
+class DsaVideoOutput;
 
 class AncestorMoveMonitor : public QObject
@@ -50 +50 @@
      * the target receives a ParentChange event.
      */
-    void registerTarget(VideoOutput *target);
+    void registerTarget(DsaVideoOutput *target);
 
     /**
@@ -58 +58 @@
      * delivered to its ancestors.
      */
-    void unRegisterTarget(VideoOutput *target);
+    void unRegisterTarget(DsaVideoOutput *target);
 
 protected:
@@ -78 +78 @@
      * efficiency of iteration.
      */
-    typedef QList<VideoOutput *> TargetList;
+    typedef QList<DsaVideoOutput *> TargetList;
 
     /**
@@ -93 +93 @@
 QT_END_NAMESPACE
 
-#endif
+#endif // !PHONON_MMF_ANCESTORMOVEMONITOR_H

trunk/src/3rdparty/phonon/mmf/audioplayer.cpp

@@ -100 +100 @@
 #if !defined(__SERIES60_31__)
     const int err = m_player->SetVolume(mmfVolume);
-    if (QSysInfo::s60Version() >= QSysInfo::SV_S60_5_0)
+    if (QSysInfo::s60Version() >= QSysInfo::SV_S60_3_2)
         return err;
     else
@@ -204 +204 @@
         m_totalTime = toMilliSeconds(m_player->Duration());
         emit totalTimeChanged(m_totalTime);
-        updateMetaData();
-        changeState(StoppedState);
-    } else {
-        setError(tr("Opening clip failed"), aError);
     }
+
+    loadingComplete(aError);
 
     TRACE_EXIT_0();

trunk/src/3rdparty/phonon/mmf/backend.cpp

@@ -25 +25 @@
 
 #include "abstractaudioeffect.h"
-#include "ancestormovemonitor.h"
 #include "audiooutput.h"
 #include "audioplayer.h"
@@ -45 +44 @@
 Backend::Backend(QObject *parent)
     : QObject(parent)
+#ifndef PHONON_MMF_VIDEO_SURFACES
     , m_ancestorMoveMonitor(new AncestorMoveMonitor(this))
+#endif
     , m_effectFactory(new EffectFactory(this))
 {
@@ -87 +88 @@
         return m_effectFactory->createAudioEffect(type, parent);
     }
+
     case VideoWidgetClass:
-        result = new VideoWidget(m_ancestorMoveMonitor.data(), qobject_cast<QWidget *>(parent));
+    {
+        VideoWidget *widget = new VideoWidget(qobject_cast<QWidget *>(parent));
+#ifndef PHONON_MMF_VIDEO_SURFACES
+        widget->setAncestorMoveMonitor(m_ancestorMoveMonitor.data());
+#endif
+        result = widget;
+    }
         break;
 

trunk/src/3rdparty/phonon/mmf/backend.h

@@ -20 +20 @@
 #define PHONON_MMF_BACKEND_H
 
+#ifndef PHONON_MMF_VIDEO_SURFACES
 #include "ancestormovemonitor.h"
+#endif
+
 #include "effectfactory.h"
 
@@ -54 +57 @@
 
 private:
+#ifndef PHONON_MMF_VIDEO_SURFACES
     QScopedPointer<AncestorMoveMonitor> m_ancestorMoveMonitor;
+#endif
     QScopedPointer<EffectFactory>       m_effectFactory;
 

trunk/src/3rdparty/phonon/mmf/defs.h

@@ -36 +36 @@
     MediaTypeVideo
 };
+
+enum VideoParameter {
+    WindowHandle        = 0x1,
+    WindowScreenRect    = 0x2,
+    ScaleFactors        = 0x4
+};
+Q_DECLARE_FLAGS(VideoParameters, VideoParameter)
+Q_DECLARE_OPERATORS_FOR_FLAGS(VideoParameters)
+
 }
 }

trunk/src/3rdparty/phonon/mmf/mediaobject.cpp

@@ -23 +23 @@
 #include "utils.h"
 #include "utils.h"
-#include "mmf_videoplayer.h"
+
+#ifdef PHONON_MMF_VIDEO_SURFACES
+#include "videoplayer_surface.h"
+#else
+#include "videoplayer_dsa.h"
+#endif
+
 #include "videowidget.h"
 
@@ -294 +300 @@
 
     case MediaTypeVideo:
-        newPlayer = new VideoPlayer(this, oldPlayer);
+#ifdef PHONON_MMF_VIDEO_SURFACES
+        newPlayer = SurfaceVideoPlayer::create(this, oldPlayer);
+#else
+        newPlayer = DsaVideoPlayer::create(this, oldPlayer);
+#endif
         break;
     }
@@ -314 +324 @@
     connect(m_player.data(), SIGNAL(stateChanged(Phonon::State,Phonon::State)), SIGNAL(stateChanged(Phonon::State,Phonon::State)));
     connect(m_player.data(), SIGNAL(finished()), SIGNAL(finished()));
-    connect(m_player.data(), SIGNAL(tick(qint64)), SIGNAL(tick(qint64)));
     connect(m_player.data(), SIGNAL(bufferStatus(int)), SIGNAL(bufferStatus(int)));
     connect(m_player.data(), SIGNAL(metaDataChanged(QMultiMap<QString,QString>)), SIGNAL(metaDataChanged(QMultiMap<QString,QString>)));
     connect(m_player.data(), SIGNAL(aboutToFinish()), SIGNAL(aboutToFinish()));
-    connect(m_player.data(), SIGNAL(prefinishMarkReached(qint32)), SIGNAL(tick(qint32)));
+    connect(m_player.data(), SIGNAL(prefinishMarkReached(qint32)), SIGNAL(prefinishMarkReached(qint32)));
+    connect(m_player.data(), SIGNAL(prefinishMarkReached(qint32)), SLOT(handlePrefinishMarkReached(qint32)));
+    connect(m_player.data(), SIGNAL(tick(qint64)), SIGNAL(tick(qint64)));
 
     // We need to call setError() after doing the connects, otherwise the
@@ -384 +395 @@
 //-----------------------------------------------------------------------------
 
-void MMF::MediaObject::setVideoOutput(VideoOutput* videoOutput)
+void MMF::MediaObject::setVideoOutput(AbstractVideoOutput* videoOutput)
 {
     m_player->setVideoOutput(videoOutput);
@@ -405 +416 @@
         switchToSource(m_nextSource);
         play();
-    }
-}
+    } else {
+        emit finished();
+    }
+}
+
+//-----------------------------------------------------------------------------
+// Other private functions
+//-----------------------------------------------------------------------------
+
+void MMF::MediaObject::handlePrefinishMarkReached(qint32 time)
+{
+    emit tick(time);
+}
+
 
 QT_END_NAMESPACE

trunk/src/3rdparty/phonon/mmf/mediaobject.h

@@ -39 +39 @@
 {
 class AbstractPlayer;
-class VideoOutput;
+class AbstractVideoOutput;
 
 /**
@@ -86 +86 @@
     AbstractPlayer *abstractPlayer() const;
 
-    void setVideoOutput(VideoOutput* videoOutput);
+    void setVideoOutput(AbstractVideoOutput* videoOutput);
 
 public Q_SLOTS:
@@ -107 +107 @@
     void finished();
     void tick(qint64 time);
+
+private Q_SLOTS:
+    void handlePrefinishMarkReached(qint32);
 
 private:

trunk/src/3rdparty/phonon/mmf/utils.cpp

@@ -53 +53 @@
 }
 
-
-static const TInt KMimePrefixLength = 6; // either "audio/" or "video/"
 _LIT(KMimePrefixAudio, "audio/");
 _LIT(KMimePrefixVideo, "video/");
+_LIT(KMimeSDP, "application/sdp");
+
+enum ConstantStringLengths {
+    KMimePrefixLength = 6, // either "audio/" or "video/",
+    KMimeSDPLength = 15 // "application/sdp"
+};
 
 MMF::MediaType MMF::Utils::mimeTypeToMediaType(const TDesC& mimeType)
 {
-    MediaType result = MediaTypeUnknown;
-
     if (mimeType.Left(KMimePrefixLength).Compare(KMimePrefixAudio) == 0) {
-        result = MediaTypeAudio;
-    } else if (mimeType.Left(KMimePrefixLength).Compare(KMimePrefixVideo) == 0) {
-        result = MediaTypeVideo;
-    }
-
-    return result;
+        return MediaTypeAudio;
+    } else if (mimeType.Left(KMimePrefixLength).Compare(KMimePrefixVideo) == 0 ||
+               mimeType.Left(KMimeSDPLength).Compare(KMimeSDP) == 0) {
+        return MediaTypeVideo;
+    } else
+        return MediaTypeUnknown;
 }
 

trunk/src/3rdparty/phonon/mmf/videowidget.cpp

@@ -19 +19 @@
 #include "mediaobject.h"
 #include "utils.h"
-#include "videooutput.h"
 
 #include "videowidget.h"
+
+#ifdef PHONON_MMF_VIDEO_SURFACES
+#include "videooutput_surface.h"
+#else
+#include "videooutput_dsa.h"
+#endif
 
 QT_BEGIN_NAMESPACE
@@ -46 +51 @@
 //-----------------------------------------------------------------------------
 
-MMF::VideoWidget::VideoWidget
-    (AncestorMoveMonitor* ancestorMoveMonitor, QWidget* parent)
+MMF::VideoWidget::VideoWidget(QWidget *parent)
         :   MediaNode(parent)
-        ,   m_videoOutput(new VideoOutput(ancestorMoveMonitor, parent))
+#ifdef PHONON_MMF_VIDEO_SURFACES
+        ,   m_videoOutput(new SurfaceVideoOutput(parent))
+#else
+        ,   m_videoOutput(new DsaVideoOutput(parent))
+#endif
         ,   m_brightness(DefaultBrightness)
         ,   m_contrast(DefaultContrast)
@@ -68 +76 @@
     TRACE_EXIT_0();
 }
+
+#ifndef PHONON_MMF_VIDEO_SURFACES
+void MMF::VideoWidget::setAncestorMoveMonitor(AncestorMoveMonitor *monitor)
+{
+    static_cast<DsaVideoOutput *>(m_videoOutput.data())->setAncestorMoveMonitor(monitor);
+}
+#endif
 
 
@@ -109 +124 @@
 {
     TRACE_CONTEXT(VideoWidget::setScaleMode, EVideoApi);
-    TRACE("setScaleMode %d", setScaleMode);
+    TRACE("setScaleMode %d", scaleMode);
 
     m_videoOutput->setScaleMode(scaleMode);

trunk/src/3rdparty/phonon/mmf/videowidget.h

@@ -20 +20 @@
 #define PHONON_MMF_VIDEOWIDGET_H
 
+#include "abstractvideooutput.h"
 #include "mmf_medianode.h"
-#include "videooutput.h"
 
 #include <QtGui/QWidget>
@@ -33 +33 @@
 namespace MMF
 {
+#ifndef PHONON_MMF_VIDEO_SURFACES
 class AncestorMoveMonitor;
-class VideoOutput;
+#endif
 
 class VideoWidget       :   public MediaNode
@@ -43 +44 @@
 
 public:
-    VideoWidget(AncestorMoveMonitor* ancestorMoveMonitor, QWidget* parent);
+    VideoWidget(QWidget* parent);
     ~VideoWidget();
+
+#ifndef PHONON_MMF_VIDEO_SURFACES
+    void setAncestorMoveMonitor(AncestorMoveMonitor *ancestorMoveMonitor);
+#endif
 
     // VideoWidgetInterface
@@ -67 +72 @@
 
 private:
-    QScopedPointer<VideoOutput>             m_videoOutput;
+    QScopedPointer<AbstractVideoOutput>     m_videoOutput;
 
     qreal                                   m_brightness;