summaryrefslogtreecommitdiffstats
path: root/src/plugins/winrt/qwinrtabstractvideorenderercontrol.h
diff options
context:
space:
mode:
authorMaurice Kalinowski <maurice.kalinowski@theqtcompany.com>2016-04-15 08:33:42 +0200
committerMaurice Kalinowski <maurice.kalinowski@qt.io>2016-04-22 11:44:45 +0000
commita0a20157efab21c07f327c70bd8603b5973f9a39 (patch)
treea2092133497002d2cc701991966209bc5024acba /src/plugins/winrt/qwinrtabstractvideorenderercontrol.h
parent65c9e24c10c7fe715c897572d8f3e5210ea13e07 (diff)
winrt: fix camera control after move to xaml thread
Camera control management has to happen inside the xaml thread, otherwise the behavior is undefined. This results in ie. the first capture not working due to synchronization issues. When (de-)activating the videoRenderer we have to switch to the UI thread first. In addition add focus for Windows 10 (Mobile), previously it was compiled for Windows Phone 8.1 only. On desktop this might return no focus mode to be supported, but API-wise this is available. Task-number: QTBUG-47803 Change-Id: I9b345ebc82502fc6e00aede43b9096893cd0ad53 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/plugins/winrt/qwinrtabstractvideorenderercontrol.h')
-rw-r--r--src/plugins/winrt/qwinrtabstractvideorenderercontrol.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/winrt/qwinrtabstractvideorenderercontrol.h b/src/plugins/winrt/qwinrtabstractvideorenderercontrol.h
index 70227c53c..bfef55fc7 100644
--- a/src/plugins/winrt/qwinrtabstractvideorenderercontrol.h
+++ b/src/plugins/winrt/qwinrtabstractvideorenderercontrol.h
@@ -68,8 +68,6 @@ public:
void setScanLineDirection(QVideoSurfaceFormat::Direction direction);
- void setActive(bool active);
-
BlitMode blitMode() const;
void setBlitMode(BlitMode mode);
@@ -78,6 +76,9 @@ public:
static ID3D11Device *d3dDevice();
+public slots:
+ void setActive(bool active);
+
protected:
void shutdown();