summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon/mmf/mmf_videoplayer.h
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-12-02 13:31:07 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-12-02 13:31:07 (GMT)
commitf29f1bb287c6b39bd1270802d1579f1c1d53f905 (patch)
treef903e18b163591c3590473e4a117a3c8958d8847 /src/3rdparty/phonon/mmf/mmf_videoplayer.h
parent271936b063fb261293e3f77f7a2273e3a4dbb5d6 (diff)
parent25023911295c201758faaa2c800b2388ddf1e0b0 (diff)
downloadQt-f29f1bb287c6b39bd1270802d1579f1c1d53f905.zip
Qt-f29f1bb287c6b39bd1270802d1579f1c1d53f905.tar.gz
Qt-f29f1bb287c6b39bd1270802d1579f1c1d53f905.tar.bz2
Merge commit 'upstream/4.6' into 4.6
Diffstat (limited to 'src/3rdparty/phonon/mmf/mmf_videoplayer.h')
-rw-r--r--src/3rdparty/phonon/mmf/mmf_videoplayer.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/3rdparty/phonon/mmf/mmf_videoplayer.h b/src/3rdparty/phonon/mmf/mmf_videoplayer.h
index 599bb88..abb1da8 100644
--- a/src/3rdparty/phonon/mmf/mmf_videoplayer.h
+++ b/src/3rdparty/phonon/mmf/mmf_videoplayer.h
@@ -72,6 +72,8 @@ public Q_SLOTS:
void videoWindowChanged();
void aspectRatioChanged();
void scaleModeChanged();
+ void suspendDirectScreenAccess();
+ void resumeDirectScreenAccess();
private:
void construct();
@@ -89,6 +91,9 @@ private:
void applyPendingChanges();
void applyVideoWindowChange();
+ void startDirectScreenAccess();
+ bool stopDirectScreenAccess();
+
// AbstractMediaPlayer
virtual int numberOfMetaDataEntries() const;
virtual QPair<QString, QString> metaDataEntry(int index) const;
@@ -111,6 +116,8 @@ private:
qint64 m_totalTime;
bool m_pendingChanges;
+ bool m_dsaActive;
+ bool m_dsaWasActive;
};