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

GUI: Add display options

Browse Source
This commit is contained in:
Martin Piatka
2019-05-03 13:25:32 +02:00
parent a4eea95391
commit cea756e613
3 changed files with 130 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,6 +181,12 @@ const static struct{
{"decklink.device", Option::StringOpt, ":device=", "", false, "video.source", "decklink"},
{"video.display", Option::StringOpt, " -d ", "", false, "", ""},
{"gl.novsync", Option::BoolOpt, ":novsync", "f", false, "video.display", "gl"},
{"gl.deinterlace", Option::BoolOpt, ":d", "f", false, "video.display", "gl"},
{"gl.fullscreen", Option::BoolOpt, ":fs", "f", false, "video.display", "gl"},
{"gl.nodecorate", Option::BoolOpt, ":nodecorate", "f", false, "video.display", "gl"},
{"gl.cursor", Option::BoolOpt, ":cursor", "f", false, "video.display", "gl"},
{"sdl.deinterlace", Option::BoolOpt, ":d", "f", false, "video.display", "sdl"},
{"sdl.fullscreen", Option::BoolOpt, ":fs", "f", false, "video.display", "sdl"},
{"video.compress", Option::StringOpt, " -c ", "", false, "", ""},
{"libavcodec.codec", Option::StringOpt, ":codec=", "", false, "video.compress", "libavcodec"},
{"H.264.bitrate", Option::StringOpt, ":bitrate=", "", false, "video.compress.libavcodec.codec", "H.264"},

7
gui/QT/option/settings_ui.cpp
View File

@@ -180,6 +180,13 @@ void SettingsUi::initSettingsWin(Ui::Settings *ui){
addControl(new RadioButtonUi(ui->fecMultRadio, "mult", settings, "network.fec.type"));
addControl(new RadioButtonUi(ui->fecLdgmRadio, "ldgm", settings, "network.fec.type"));
addControl(new RadioButtonUi(ui->fecRsRadio, "rs", settings, "network.fec.type"));
addControl(new CheckboxUi(ui->glCursor, settings, "video.display.gl.cursor"));
addControl(new CheckboxUi(ui->glDeinterlace, settings, "video.display.gl.deinterlace"));
addControl(new CheckboxUi(ui->glFullscreen, settings, "video.display.gl.fullscreen"));
addControl(new CheckboxUi(ui->glNoDecorate, settings, "video.display.gl.nodecorate"));
addControl(new CheckboxUi(ui->glNoVsync, settings, "video.display.gl.novsync"));
addControl(new CheckboxUi(ui->sdlDeinterlace, settings, "video.display.sdl.deinterlace"));
addControl(new CheckboxUi(ui->sdlFullscreen, settings, "video.display.sdl.fullscreen"));
addControl(new RadioButtonUi(ui->ldgmSimpCpuRadio, "CPU", settings, "network.fec.ldgm.device"));
addControl(new RadioButtonUi(ui->ldgmSimpGpuRadio, "GPU", settings, "network.fec.ldgm.device"));
addControl(new RadioButtonUi(ui->ldgmCpuRadio, "CPU", settings, "network.fec.ldgm.device"));

118
gui/QT/ui/settings.ui
View File

@@ -17,7 +17,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="Network">
<property name="sizePolicy">
@@ -381,6 +381,106 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="Display">
<attribute name="title">
<string>Display</string>
</attribute>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QListWidget" name="displayListView">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="currentRow">
<number>0</number>
</property>
<item>
<property name="text">
<string>Gl</string>
</property>
</item>
<item>
<property name="text">
<string>SDL</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QStackedWidget" name="displayStack">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>3</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="glPage">
<layout class="QFormLayout" name="formLayout_2">
<item row="0" column="0">
<widget class="QCheckBox" name="glDeinterlace">
<property name="text">
<string>Deinterlace</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="glFullscreen">
<property name="text">
<string>Fullscreen</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="glNoDecorate">
<property name="text">
<string>Disable window decorations</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="glCursor">
<property name="text">
<string>Show cursor</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QCheckBox" name="glNoVsync">
<property name="text">
<string>Disable vsync</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="sdl_page">
<layout class="QFormLayout" name="formLayout_3">
<item row="0" column="0">
<widget class="QCheckBox" name="sdlDeinterlace">
<property name="text">
<string>Deinterlace</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="sdlFullscreen">
<property name="text">
<string>Fullscreen</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="accelTab">
<attribute name="title">
<string>Acceleration</string>
@@ -500,5 +600,21 @@
</hint>
</hints>
</connection>
<connection>
<sender>displayListView</sender>
<signal>currentRowChanged(int)</signal>
<receiver>displayStack</receiver>
<slot>setCurrentIndex(int)</slot>
<hints>
<hint type="sourcelabel">
<x>69</x>
<y>168</y>
</hint>
<hint type="destinationlabel">
<x>272</x>
<y>168</y>
</hint>
</hints>
</connection>
</connections>
</ui>