From dde6013710c49b238caf42b6dbdd2f1eed17e0cc Mon Sep 17 00:00:00 2001 From: Silas Della Contrada <s.develop@4-dc.de> Date: Mon, 25 Jan 2021 12:25:54 -0500 Subject: [PATCH] lol --- VanadiumCast.pro | 4 ++-- VanadiumCast/VanadiumCast.pro | 2 +- VanadiumCast/res/gui/fragments/PageDevices.qml | 4 ++-- VanadiumCast/res/gui/fragments/PageMedia.qml | 6 +++--- VanadiumCast/res/gui/fragments/PageStreaming.qml | 2 +- VanadiumCast/res/gui/main.qml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/VanadiumCast.pro b/VanadiumCast.pro index 25f68f1..3895fd2 100644 --- a/VanadiumCast.pro +++ b/VanadiumCast.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs SUBDIRS += backend \ VanadiumCast \ - QtAV +# QtAV -backend.depends = QtAV +#backend.depends = QtAV VanadiumCast.depends = backend diff --git a/VanadiumCast/VanadiumCast.pro b/VanadiumCast/VanadiumCast.pro index 3048b51..a499be8 100644 --- a/VanadiumCast/VanadiumCast.pro +++ b/VanadiumCast/VanadiumCast.pro @@ -1,4 +1,4 @@ -QT += core quick quickcontrols2 gui widgets multimedia network concurrent av avwidgets +QT += core quick quickcontrols2 gui widgets multimedia network concurrent CONFIG += qtquickcompiler diff --git a/VanadiumCast/res/gui/fragments/PageDevices.qml b/VanadiumCast/res/gui/fragments/PageDevices.qml index 9c11897..c2d7dce 100644 --- a/VanadiumCast/res/gui/fragments/PageDevices.qml +++ b/VanadiumCast/res/gui/fragments/PageDevices.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick 2.14 +import QtQuick.Controls 2.14 import QtQuick.Controls.Universal 2.12 import QtQuick.Controls.Material 2.12 import "qrc:/gui/model" diff --git a/VanadiumCast/res/gui/fragments/PageMedia.qml b/VanadiumCast/res/gui/fragments/PageMedia.qml index 7e204c3..86af02b 100644 --- a/VanadiumCast/res/gui/fragments/PageMedia.qml +++ b/VanadiumCast/res/gui/fragments/PageMedia.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick 2.14 +import QtQuick.Controls 2.14 import QtQuick.Dialogs 1.2 import QtAV 1.6 import QtQuick.Controls.Material 2.12 @@ -114,7 +114,7 @@ Page { anchors.topMargin: 8 height: 1280 width: 720 - videoCodecPriority: ["VAAPI", "QSV", "DXVA", "MMAL", "CUDA", "FFMPEG"] + videoCodecPriority: ["QSV", "DXVA", "MMAL", "CUDA", "FFMPEG"] audioBackends: ["OpenAL", "XAudio2", "null"] Component.onCompleted: console.log(previewVideo.audioBackends) smooth: true diff --git a/VanadiumCast/res/gui/fragments/PageStreaming.qml b/VanadiumCast/res/gui/fragments/PageStreaming.qml index 7045e6f..9a678f2 100644 --- a/VanadiumCast/res/gui/fragments/PageStreaming.qml +++ b/VanadiumCast/res/gui/fragments/PageStreaming.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.14 import QtQuick.Controls 2.12 Page { diff --git a/VanadiumCast/res/gui/main.qml b/VanadiumCast/res/gui/main.qml index c02a143..3054600 100644 --- a/VanadiumCast/res/gui/main.qml +++ b/VanadiumCast/res/gui/main.qml @@ -1,5 +1,5 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick 2.14 +import QtQuick.Controls 2.14 import QtMultimedia 5.12 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 -- GitLab