summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon/mmf/videowidget.h
diff options
context:
space:
mode:
authorGareth Stockwell <gareth.stockwell@sosco.com>2009-08-21 11:58:45 (GMT)
committerGareth Stockwell <gareth.stockwell@sosco.com>2009-08-21 11:58:45 (GMT)
commit0761ebabf9f3cf6c968f4ce86e31c323dc8fe9c8 (patch)
tree2ad21f1f9e0578fe3db689f0190074402278ca41 /src/3rdparty/phonon/mmf/videowidget.h
parent3f39d630d3dcc161c4a85127129274ca7ea857a2 (diff)
downloadQt-0761ebabf9f3cf6c968f4ce86e31c323dc8fe9c8.zip
Qt-0761ebabf9f3cf6c968f4ce86e31c323dc8fe9c8.tar.gz
Qt-0761ebabf9f3cf6c968f4ce86e31c323dc8fe9c8.tar.bz2
Implemented connection between MediaOutput and VideoWidget
Video is still not visible; need to debug the initialization of the VideoOutput object to determine whether DSA is being aborted.
Diffstat (limited to 'src/3rdparty/phonon/mmf/videowidget.h')
-rw-r--r--src/3rdparty/phonon/mmf/videowidget.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/mmf/videowidget.h b/src/3rdparty/phonon/mmf/videowidget.h
index 6967f7e..5c27c7f 100644
--- a/src/3rdparty/phonon/mmf/videowidget.h
+++ b/src/3rdparty/phonon/mmf/videowidget.h
@@ -22,12 +22,13 @@ along with this library. If not, see <http://www.gnu.org/licenses/>.
#include <QtGui/QWidget>
#include <phonon/videowidget.h>
#include <phonon/videowidgetinterface.h>
-#include "videooutput.h"
namespace Phonon
{
namespace MMF
{
+ class VideoOutput;
+
class VideoWidget : public QObject
, public Phonon::VideoWidgetInterface
{
@@ -53,8 +54,10 @@ namespace Phonon
virtual void setSaturation(qreal saturation);
virtual QWidget *widget();
+ VideoOutput& videoOutput();
+
private:
- QScopedPointer<VideoOutput> m_widget;
+ QScopedPointer<VideoOutput> m_videoOutput;
Phonon::VideoWidget::AspectRatio m_aspectRatio;
qreal m_brightness;