mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-03-05 23:26:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix video reset and apply new video settings

Browse Source 
This allows the changing of bideo settings without having to completely
reset all graphics data.  Will recreate internal output/conversion
buffers and such and reset the main preview.
This commit is contained in:
jp9000
2014-02-22 20:14:19 -07:00
parent 7fcec77351
commit 0ff0d32731
11 changed files with 105 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
obs/window-basic-settings.cpp
View File

@@ -15,6 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/
#include <obs.hpp>
#include <util/util.hpp>
#include <util/lexer.h>
#include <sstream>
@@ -25,6 +26,7 @@
#include "obs-app.hpp"
#include "platform.hpp"
#include "qt-wrappers.hpp"
#include "window-basic-main.hpp"
#include "window-basic-settings.hpp"
#include <util/platform.h>
@@ -205,6 +207,8 @@ void OBSBasicSettings::LoadResolutionLists()
ResetDownscales(cx, cy);
ui->baseResolution->lineEdit()->setText(ResString(cx, cy).c_str());
cx = config_get_uint(GetGlobalConfig(), "Video", "OutputCX");
cy = config_get_uint(GetGlobalConfig(), "Video", "OutputCY");
@@ -254,6 +258,11 @@ void OBSBasicSettings::LoadVideoSettings()
{
loading = true;
if (video_output_active(obs_video())) {
ui->videoPage->setEnabled(false);
ui->videoMsg->setText(QTStr("Settings.Video.CurrentlyActive"));
}
LoadRendererList();
LoadResolutionLists();
LoadFPSData();
@@ -316,6 +325,10 @@ void OBSBasicSettings::SaveVideoSettings()
config_set_uint(GetGlobalConfig(), "Video", "FPSInt", fpsInteger);
config_set_uint(GetGlobalConfig(), "Video", "FPSNum", fpsNumerator);
config_set_uint(GetGlobalConfig(), "Video", "FPSDen", fpsDenominator);
OBSBasic *window = qobject_cast<OBSBasic*>(parent());
if (window)
window->ResetVideo();
}
void OBSBasicSettings::SaveSettings()
@@ -400,12 +413,12 @@ static bool ValidResolutions(Ui::OBSBasicSettings *ui)
if (!ConvertResText(QT_TO_UTF8(baseRes), cx, cy) ||
!ConvertResText(QT_TO_UTF8(outputRes), cx, cy)) {
ui->errorText->setText(
ui->videoMsg->setText(
QTStr("Settings.Video.InvalidResolution"));
return false;
}
ui->errorText->setText("");
ui->videoMsg->setText("");
return true;
}
@@ -421,8 +434,7 @@ void OBSBasicSettings::on_renderer_currentIndexChanged(int index)
{
if (!loading) {
videoChanged = true;
ui->errorText->setText(
QTStr("Settings.ProgramRestart"));
ui->videoMsg->setText(QTStr("Settings.ProgramRestart"));
}
UNUSED_PARAMETER(index);