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

Gui: preview selected video source even before starting UltraGrid

Browse Source
This commit is contained in:
Martin Piatka
2018-02-07 19:30:41 +01:00
committed by Martin Piatka
parent 3845c277d5
commit 65c6a26257
2 changed files with 59 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
gui/QT/ultragrid_window.cpp
View File

@@ -19,7 +19,7 @@ UltragridWindow::UltragridWindow(QWidget *parent): QMainWindow(parent){
connect(ui.startButton, SIGNAL(clicked()), this, SLOT(start()));
connect(&process, SIGNAL(readyReadStandardOutput()), this, SLOT(outputAvailable()));
connect(&process, SIGNAL(readyReadStandardError()), this, SLOT(outputAvailable()));
connect(&process, SIGNAL(stateChanged(QProcess::ProcessState)), this, SLOT(setStartBtnText(QProcess::ProcessState)));
connect(&process, SIGNAL(stateChanged(QProcess::ProcessState)), this, SLOT(processStateChanged(QProcess::ProcessState)));
connect(ui.networkDestinationEdit, SIGNAL(textEdited(const QString &)), this, SLOT(setArgs()));
@@ -28,9 +28,10 @@ UltragridWindow::UltragridWindow(QWidget *parent): QMainWindow(parent){
connect(ui.actionRefresh, SIGNAL(triggered()), this, SLOT(queryOpts()));
connect(ui.actionAdvanced, SIGNAL(toggled(bool)), this, SLOT(setAdvanced(bool)));
connect(ui.actionShow_Terminal, SIGNAL(triggered()), this, SLOT(showLog()));
connect(ui.previewCheckBox, SIGNAL(toggled(bool)), this, SLOT(enablePreview(bool)));
opts.emplace_back(new SourceOption(&ui,
ultragridExecutable));
sourceOption = new SourceOption(&ui, ultragridExecutable);
opts.emplace_back(sourceOption);
opts.emplace_back(new DisplayOption(&ui,
ultragridExecutable));
@@ -54,7 +55,11 @@ UltragridWindow::UltragridWindow(QWidget *parent): QMainWindow(parent){
connect(opt.get(), SIGNAL(changed()), this, SLOT(setArgs()));
}
connect(sourceOption, SIGNAL(changed()), this, SLOT(startPreview()));
queryOpts();
startPreview();
}
void UltragridWindow::about(){
@@ -85,9 +90,13 @@ void UltragridWindow::outputAvailable(){
void UltragridWindow::start(){
if(process.pid() > 0){
process.terminate();
if(!process.waitForFinished(1000))
process.kill();
return;
}
stopPreview();
QString command(ultragridExecutable);
command += " ";
@@ -97,6 +106,31 @@ void UltragridWindow::start(){
process.start(command);
}
void UltragridWindow::startPreview(){
if(process.state() != QProcess::NotRunning || !ui.previewCheckBox->isChecked()){
return;
}
if(previewProcess.state() != QProcess::NotRunning)
stopPreview();
QString command(ultragridExecutable);
command += " ";
command += sourceOption->getLaunchParam();
command += "-d preview";
previewProcess.start(command);
}
void UltragridWindow::stopPreview(){
previewProcess.terminate();
/* The shared preview memory must be released before a new one
* can be created. Here we wait 0.5s to allow the preview process
* exit gracefully. If it is still running after that we kill it */
if(!previewProcess.waitForFinished(500))
previewProcess.kill();
}
void UltragridWindow::editArgs(const QString &text){
launchArgs = text;
}
@@ -144,3 +178,18 @@ void UltragridWindow::setStartBtnText(QProcess::ProcessState s){
ui.startButton->setText("Start");
}
}
void UltragridWindow::enablePreview(bool enable){
if(enable)
startPreview();
else
stopPreview();
}
void UltragridWindow::processStateChanged(QProcess::ProcessState s){
setStartBtnText(s);
if(s == QProcess::NotRunning){
startPreview();
}
}

7
gui/QT/ultragrid_window.hpp
View File

@@ -23,12 +23,14 @@ private:
QString ultragridExecutable;
QProcess process;
QProcess previewProcess;
QString launchArgs;
QStringList getOptionsForParam(QString param);
LogWindow log;
std::vector<std::unique_ptr<UltragridOption>> opts;
UltragridOption *sourceOption;
public slots:
@@ -41,10 +43,15 @@ public slots:
void showLog();
void startPreview();
void stopPreview();
private slots:
void queryOpts();
void setAdvanced(bool);
void setStartBtnText(QProcess::ProcessState);
void processStateChanged(QProcess::ProcessState);
void enablePreview(bool);
};