scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 02:40:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUI: Use random key for preview sockets

Browse Source
This commit is contained in:
Martin Piatka
2022-08-15 14:45:00 +02:00
parent 80a2540c8b
commit 95d064d41a
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gui/QT/option/settings.cpp
View File

@@ -297,6 +297,7 @@ std::string Settings::getLaunchParams() const{
if(getOption("preview").isEnabled()){
out += "--capture-filter preview";
out += ":key=" + getSessRndKey();
}
out += getOption("video.source").getLaunchOption();
@@ -307,6 +308,7 @@ std::string Settings::getLaunchParams() const{
out += dispOpt.getParam();
out += "multiplier:" + dispOpt.getValue() + dispOpt.getSubVals();
out += "#preview";
out += ":key=" + getSessRndKey();
} else {
out += getOption("video.display").getLaunchOption();
}
@@ -314,6 +316,7 @@ std::string Settings::getLaunchParams() const{
if(getOption("preview").isEnabled()){
out += dispOpt.getParam();
out += "preview";
out += ":key=" + getSessRndKey();
}
}
@@ -338,9 +341,12 @@ std::string Settings::getLaunchParams() const{
std::string Settings::getPreviewParams() const{
std::string out;
out += " --capture-filter preview,every:0";
out += " --capture-filter preview";
out += ":key=" + getSessRndKey();
out += ",every:0";
out += getOption("video.source").getLaunchOption();
out += " -d preview";
out += ":key=" + getSessRndKey();
out += getOption("audio.source").getLaunchOption();
out += getOption("audio.source.channels").getLaunchOption();
out += " -r dummy";

4
gui/QT/window/ultragrid_window.cpp
View File

@@ -75,9 +75,9 @@ void UltragridWindow::initializeUgOpts(){
setArgs();
ui.displayPreview->setKey("ug_preview_disp_unix");
ui.displayPreview->setKey("ug_preview_disp_unix" + settings.getSessRndKey());
ui.displayPreview->start();
ui.capturePreview->setKey("ug_preview_cap_unix");
ui.capturePreview->setKey("ug_preview_cap_unix" + settings.getSessRndKey());
ui.capturePreview->start();
QStringList args = QCoreApplication::arguments();