diff options
| author | checkraisefold <devsmash1@gmail.com> | 2024-05-10 12:22:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-10 15:22:58 -0400 |
| commit | e7d28b96da929754d3f65f78ab88db76e6ca98b7 (patch) | |
| tree | cfdd3769b65e4bca80f27f8d24dcb33fb5f8d3d7 /resources/qml | |
| parent | Update flat-manager-client (diff) | |
| download | nheko-e7d28b96da929754d3f65f78ab88db76e6ca98b7.tar.xz | |
Windows screenshare/video call support, general call improvements (#1725)
* Initial support for d3d11 qml video item * Windows screenshare support, D3D11 * misc fixes * further window visibility checks * preview updates * fix qml preview * fix compositor * add libnice plugin dep * re-run formatter * final formatter fix [skip ci] * fix tumbleweed build --------- Co-authored-by: Joseph Donofry <rubberduckie3554@gmail.com>
Diffstat (limited to 'resources/qml')
| -rw-r--r-- | resources/qml/TimelineView.qml | 2 | ||||
| -rw-r--r-- | resources/qml/voip/ScreenShare.qml | 2 | ||||
| -rw-r--r-- | resources/qml/voip/VideoCallD3D11.qml | 9 |
3 files changed, 11 insertions, 2 deletions
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml index 085ca073..c29eb537 100644 --- a/resources/qml/TimelineView.qml +++ b/resources/qml/TimelineView.qml @@ -119,7 +119,7 @@ Item { searchString: topBar.searchString } Loader { - source: CallManager.isOnCall && CallManager.callType != Voip.VOICE ? "voip/VideoCall.qml" : "" + source: CallManager.isOnCall && CallManager.callType != Voip.VOICE ? (Qt.platform.os != "windows" ? "voip/VideoCall.qml" : "voip/VideoCallD3D11.qml") : "" onLoaded: TimelineManager.setVideoCallItem() } diff --git a/resources/qml/voip/ScreenShare.qml b/resources/qml/voip/ScreenShare.qml index d3661933..3c3b43ce 100644 --- a/resources/qml/voip/ScreenShare.qml +++ b/resources/qml/voip/ScreenShare.qml @@ -63,7 +63,7 @@ Popup { } ComboBox { - visible: CallManager.screenShareType == Voip.X11 + visible: CallManager.screenShareType == Voip.X11 || CallManager.screenShareType == Voip.D3D11 id: windowCombo Layout.fillWidth: true diff --git a/resources/qml/voip/VideoCallD3D11.qml b/resources/qml/voip/VideoCallD3D11.qml new file mode 100644 index 00000000..b91722a8 --- /dev/null +++ b/resources/qml/voip/VideoCallD3D11.qml @@ -0,0 +1,9 @@ +// SPDX-FileCopyrightText: Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + +import org.freedesktop.gstreamer.Qt6D3D11VideoItem 1.0 + +GstD3D11Qt6VideoItem { + objectName: "videoCallItem" +} |