summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon/mmf/mediaobject.h
diff options
context:
space:
mode:
authorGareth Stockwell <ext-gareth.stockwell@nokia.com>2009-12-04 11:49:12 (GMT)
committerGareth Stockwell <ext-gareth.stockwell@nokia.com>2009-12-08 13:07:39 (GMT)
commit3f648dc075689e2ffedda2769cc76b4a56fb1073 (patch)
treee216758e5d86e14c7d3d8630796e11f355b4add4 /src/3rdparty/phonon/mmf/mediaobject.h
parent8e21fc62fe40c8e393007516958c216ad8dbd629 (diff)
downloadQt-3f648dc075689e2ffedda2769cc76b4a56fb1073.zip
Qt-3f648dc075689e2ffedda2769cc76b4a56fb1073.tar.gz
Qt-3f648dc075689e2ffedda2769cc76b4a56fb1073.tar.bz2
Implemented node disconnection in Phonon MMF backend
Task-number: QTBUG-4663 Reviewed-by: Frans Englich
Diffstat (limited to 'src/3rdparty/phonon/mmf/mediaobject.h')
-rw-r--r--src/3rdparty/phonon/mmf/mediaobject.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/mmf/mediaobject.h b/src/3rdparty/phonon/mmf/mediaobject.h
index 7c39598..668b953 100644
--- a/src/3rdparty/phonon/mmf/mediaobject.h
+++ b/src/3rdparty/phonon/mmf/mediaobject.h
@@ -75,6 +75,10 @@ public:
virtual qint32 transitionTime() const;
virtual void setTransitionTime(qint32);
+ // MediaNode
+ void connectMediaObject(MediaObject *mediaObject);
+ void disconnectMediaObject(MediaObject *mediaObject);
+
/**
* This class owns the AbstractPlayer, and will delete it upon
* destruction.
@@ -83,8 +87,6 @@ public:
void setVideoOutput(VideoOutput* videoOutput);
- virtual bool activateOnMediaObject(MediaObject *);
-
public Q_SLOTS:
void volumeChanged(qreal volume);
void switchToNextSource();