diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-03-18 14:41:33 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-03-18 14:41:33 (GMT) |
| commit | 79ef51a96bbe8b97af140320febd14b3d8ec217c (patch) | |
| tree | e84e0c8d4ec96d21fff13a063ed3df493afd7781 /src/3rdparty/phonon/mmf/videowidget.h | |
| parent | f661bb26dc3b30c3d5113a56885bbe07b90fd3ce (diff) | |
| parent | 0c8d49ca802da435107c489142064e2736b7e10f (diff) | |
| download | Qt-79ef51a96bbe8b97af140320febd14b3d8ec217c.zip Qt-79ef51a96bbe8b97af140320febd14b3d8ec217c.tar.gz Qt-79ef51a96bbe8b97af140320febd14b3d8ec217c.tar.bz2 | |
Merge branch 'mmfphonon' into 4.6
Diffstat (limited to 'src/3rdparty/phonon/mmf/videowidget.h')
| -rw-r--r-- | src/3rdparty/phonon/mmf/videowidget.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/3rdparty/phonon/mmf/videowidget.h b/src/3rdparty/phonon/mmf/videowidget.h index 899dca6..3b6283e 100644 --- a/src/3rdparty/phonon/mmf/videowidget.h +++ b/src/3rdparty/phonon/mmf/videowidget.h @@ -19,8 +19,8 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #ifndef PHONON_MMF_VIDEOWIDGET_H #define PHONON_MMF_VIDEOWIDGET_H +#include "abstractvideooutput.h" #include "mmf_medianode.h" -#include "videooutput.h" #include <QtGui/QWidget> #include <phonon/videowidget.h> @@ -32,8 +32,9 @@ namespace Phonon { namespace MMF { +#ifndef PHONON_MMF_VIDEO_SURFACES class AncestorMoveMonitor; -class VideoOutput; +#endif class VideoWidget : public MediaNode , public Phonon::VideoWidgetInterface @@ -42,9 +43,13 @@ class VideoWidget : public MediaNode Q_INTERFACES(Phonon::VideoWidgetInterface) public: - VideoWidget(AncestorMoveMonitor* ancestorMoveMonitor, QWidget* parent); + VideoWidget(QWidget* parent); ~VideoWidget(); +#ifndef PHONON_MMF_VIDEO_SURFACES + void setAncestorMoveMonitor(AncestorMoveMonitor *ancestorMoveMonitor); +#endif + // VideoWidgetInterface virtual Phonon::VideoWidget::AspectRatio aspectRatio() const; virtual void setAspectRatio(Phonon::VideoWidget::AspectRatio aspectRatio); @@ -66,7 +71,7 @@ protected: void disconnectMediaObject(MediaObject *mediaObject); private: - QScopedPointer<VideoOutput> m_videoOutput; + QScopedPointer<AbstractVideoOutput> m_videoOutput; qreal m_brightness; qreal m_contrast; |