equal
deleted
inserted
replaced
16 |
16 |
17 */ |
17 */ |
18 |
18 |
19 #include "mediaobject.h" |
19 #include "mediaobject.h" |
20 #include "utils.h" |
20 #include "utils.h" |
21 #include "videooutput.h" |
|
22 |
21 |
23 #include "videowidget.h" |
22 #include "videowidget.h" |
|
23 |
|
24 #ifdef PHONON_MMF_VIDEO_SURFACES |
|
25 #include "videooutput_surface.h" |
|
26 #else |
|
27 #include "videooutput_dsa.h" |
|
28 #endif |
24 |
29 |
25 QT_BEGIN_NAMESPACE |
30 QT_BEGIN_NAMESPACE |
26 |
31 |
27 using namespace Phonon; |
32 using namespace Phonon; |
28 using namespace Phonon::MMF; |
33 using namespace Phonon::MMF; |
43 |
48 |
44 //----------------------------------------------------------------------------- |
49 //----------------------------------------------------------------------------- |
45 // Constructor / destructor |
50 // Constructor / destructor |
46 //----------------------------------------------------------------------------- |
51 //----------------------------------------------------------------------------- |
47 |
52 |
48 MMF::VideoWidget::VideoWidget |
53 MMF::VideoWidget::VideoWidget(QWidget *parent) |
49 (AncestorMoveMonitor* ancestorMoveMonitor, QWidget* parent) |
|
50 : MediaNode(parent) |
54 : MediaNode(parent) |
51 , m_videoOutput(new VideoOutput(ancestorMoveMonitor, parent)) |
55 #ifdef PHONON_MMF_VIDEO_SURFACES |
|
56 , m_videoOutput(new SurfaceVideoOutput(parent)) |
|
57 #else |
|
58 , m_videoOutput(new DsaVideoOutput(parent)) |
|
59 #endif |
52 , m_brightness(DefaultBrightness) |
60 , m_brightness(DefaultBrightness) |
53 , m_contrast(DefaultContrast) |
61 , m_contrast(DefaultContrast) |
54 , m_hue(DefaultHue) |
62 , m_hue(DefaultHue) |
55 , m_saturation(DefaultSaturation) |
63 , m_saturation(DefaultSaturation) |
56 { |
64 { |
65 TRACE_CONTEXT(VideoWidget::~VideoWidget, EVideoApi); |
73 TRACE_CONTEXT(VideoWidget::~VideoWidget, EVideoApi); |
66 TRACE_ENTRY_0(); |
74 TRACE_ENTRY_0(); |
67 |
75 |
68 TRACE_EXIT_0(); |
76 TRACE_EXIT_0(); |
69 } |
77 } |
|
78 |
|
79 #ifndef PHONON_MMF_VIDEO_SURFACES |
|
80 void MMF::VideoWidget::setAncestorMoveMonitor(AncestorMoveMonitor *monitor) |
|
81 { |
|
82 static_cast<DsaVideoOutput *>(m_videoOutput.data())->setAncestorMoveMonitor(monitor); |
|
83 } |
|
84 #endif |
70 |
85 |
71 |
86 |
72 //----------------------------------------------------------------------------- |
87 //----------------------------------------------------------------------------- |
73 // VideoWidgetInterface |
88 // VideoWidgetInterface |
74 //----------------------------------------------------------------------------- |
89 //----------------------------------------------------------------------------- |