equal
deleted
inserted
replaced
47 |
47 |
48 #include <qvideowindowcontrol.h> |
48 #include <qvideowindowcontrol.h> |
49 #include <qmediaplayer.h> |
49 #include <qmediaplayer.h> |
50 |
50 |
51 #include <QtGui/qmacdefines_mac.h> |
51 #include <QtGui/qmacdefines_mac.h> |
52 #include "qt7videooutputcontrol.h" |
52 #include "qt7videooutput.h" |
53 #include <QtMultimedia/qvideoframe.h> |
53 #include <qvideoframe.h> |
54 |
54 |
55 QT_BEGIN_NAMESPACE |
55 QT_BEGIN_NAMESPACE |
56 |
56 |
57 class QVideoFrame; |
57 class QVideoFrame; |
58 |
58 |
63 { |
63 { |
64 public: |
64 public: |
65 QT7MovieViewRenderer(QObject *parent = 0); |
65 QT7MovieViewRenderer(QObject *parent = 0); |
66 ~QT7MovieViewRenderer(); |
66 ~QT7MovieViewRenderer(); |
67 |
67 |
68 void setEnabled(bool); |
|
69 void setMovie(void *movie); |
68 void setMovie(void *movie); |
|
69 void updateNaturalSize(const QSize &newSize); |
70 |
70 |
71 QAbstractVideoSurface *surface() const; |
71 QAbstractVideoSurface *surface() const; |
72 void setSurface(QAbstractVideoSurface *surface); |
72 void setSurface(QAbstractVideoSurface *surface); |
73 |
73 |
74 void renderFrame(const QVideoFrame &); |
74 void renderFrame(const QVideoFrame &); |
82 void *m_movie; |
82 void *m_movie; |
83 void *m_movieView; |
83 void *m_movieView; |
84 QSize m_nativeSize; |
84 QSize m_nativeSize; |
85 QAbstractVideoSurface *m_surface; |
85 QAbstractVideoSurface *m_surface; |
86 QVideoFrame m_currentFrame; |
86 QVideoFrame m_currentFrame; |
|
87 bool m_pendingRenderEvent; |
87 QMutex m_mutex; |
88 QMutex m_mutex; |
88 }; |
89 }; |
89 |
90 |
90 QT_END_NAMESPACE |
91 QT_END_NAMESPACE |
91 |
92 |