diff --git a/obs/forms/OBSWindows.cpp b/obs/forms/OBSWindows.cpp index 8ad7141d7..625fe93bc 100644 --- a/obs/forms/OBSWindows.cpp +++ b/obs/forms/OBSWindows.cpp @@ -472,6 +472,13 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con fgSizer1->SetFlexibleDirection( wxBOTH ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + m_staticText211 = new wxStaticText( videoPanel, wxID_ANY, _("Settings.Video.Renderer"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText211->Wrap( -1 ); + fgSizer1->Add( m_staticText211, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 2 ); + + rendererList = new wxComboBox( videoPanel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY ); + fgSizer1->Add( rendererList, 0, wxALL, 2 ); + m_staticText6 = new wxStaticText( videoPanel, wxID_ANY, _("Settings.Video.Adapter"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); m_staticText6->Wrap( -1 ); m_staticText6->SetMinSize( wxSize( 270,-1 ) ); diff --git a/obs/forms/OBSWindows.fbp b/obs/forms/OBSWindows.fbp index c5272021e..b45b14ed1 100644 --- a/obs/forms/OBSWindows.fbp +++ b/obs/forms/OBSWindows.fbp @@ -3426,6 +3426,180 @@ none 0 2 + + 2 + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Settings.Video.Renderer + + 0 + + + 0 + + 1 + m_staticText211 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + rendererList + 1 + + + public + 1 + + Resizable + -1 + 1 + + wxCB_READONLY + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL diff --git a/obs/forms/OBSWindows.h b/obs/forms/OBSWindows.h index 8792b1d93..771e11450 100644 --- a/obs/forms/OBSWindows.h +++ b/obs/forms/OBSWindows.h @@ -200,6 +200,7 @@ class OBSBasicSettingsBase : public DialogSubclass protected: wxStaticText* m_staticText27; wxPanel* videoPanel; + wxStaticText* m_staticText211; wxStaticText* m_staticText6; wxStaticText* m_staticText8; wxStaticText* m_staticText10; @@ -234,6 +235,7 @@ class OBSBasicSettingsBase : public DialogSubclass wxComboBox* languageList; wxStaticText* generalChangedText; wxPanel* outputsPanel; + wxComboBox* rendererList; wxComboBox* videoAdapterList; wxComboBox* baseResList; wxComboBox* outputResList;