From af5db87ea17249fb558314d24f6c01d8817a8e73 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Mon, 16 Dec 2013 00:04:33 -0700 Subject: [PATCH] update video settings form for fps/video variables --- obs/forms/OBSWindows.cpp | 24 +++++++++++------------- obs/forms/OBSWindows.fbp | 20 ++++++++++---------- obs/forms/OBSWindows.h | 38 +++++++++++++++++++++----------------- 3 files changed, 42 insertions(+), 40 deletions(-) diff --git a/obs/forms/OBSWindows.cpp b/obs/forms/OBSWindows.cpp index b8bfc5110..8ad7141d7 100644 --- a/obs/forms/OBSWindows.cpp +++ b/obs/forms/OBSWindows.cpp @@ -442,9 +442,9 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con bSizer32->Add( 0, 20, 0, wxEXPAND, 5 ); - generalText = new wxStaticText( generalPanel, wxID_ANY, _("Settings.RestartProgram"), wxDefaultPosition, wxDefaultSize, 0 ); - generalText->Wrap( -1 ); - bSizer32->Add( generalText, 1, wxALL|wxEXPAND, 5 ); + generalChangedText = new wxStaticText( generalPanel, wxID_ANY, _("Settings.RestartProgram"), wxDefaultPosition, wxDefaultSize, 0 ); + generalChangedText->Wrap( -1 ); + bSizer32->Add( generalChangedText, 1, wxALL|wxEXPAND, 5 ); generalPanel->SetSizer( bSizer32 ); @@ -490,12 +490,12 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con baseResList = new wxComboBox( videoPanel, ID_BASE_RES, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); fgSizer1->Add( baseResList, 0, wxALL, 2 ); - m_staticText10 = new wxStaticText( videoPanel, wxID_ANY, _("Settings.Video.DownscaleRes"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); + m_staticText10 = new wxStaticText( videoPanel, wxID_ANY, _("Settings.Video.OutputRes"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); m_staticText10->Wrap( -1 ); fgSizer1->Add( m_staticText10, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 2 ); - downscaleResList = new wxComboBox( videoPanel, ID_DOWNSCALE_RES, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - fgSizer1->Add( downscaleResList, 0, wxALL, 2 ); + outputResList = new wxComboBox( videoPanel, ID_DOWNSCALE_RES, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); + fgSizer1->Add( outputResList, 0, wxALL, 2 ); m_staticText11 = new wxStaticText( videoPanel, wxID_ANY, _("Settings.Video.DownscaleFilter"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); m_staticText11->Wrap( -1 ); @@ -525,7 +525,7 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con fgSizer1->Add( m_staticText22, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 2 ); fpsTypeList = new wxChoicebook( videoPanel, ID_FPS_TYPE, wxDefaultPosition, wxDefaultSize, wxCHB_DEFAULT ); - m_panel13 = new wxPanel( fpsTypeList, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_panel13 = new wxPanel( fpsTypeList, ID_FPSPANEL_COMMON, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer45; bSizer45 = new wxBoxSizer( wxHORIZONTAL ); @@ -545,7 +545,7 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con m_panel13->Layout(); bSizer45->Fit( m_panel13 ); fpsTypeList->AddPage( m_panel13, _("Settings.Video.FPS.Common"), true ); - m_panel14 = new wxPanel( fpsTypeList, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_panel14 = new wxPanel( fpsTypeList, ID_FPSPANEL_INTEGER, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer46; bSizer46 = new wxBoxSizer( wxHORIZONTAL ); @@ -557,7 +557,7 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con m_panel14->Layout(); bSizer46->Fit( m_panel14 ); fpsTypeList->AddPage( m_panel14, _("Settings.Video.FPS.Integer"), false ); - m_panel15 = new wxPanel( fpsTypeList, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_panel15 = new wxPanel( fpsTypeList, ID_FPSPANEL_FRACTION, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxFlexGridSizer* fgSizer10; fgSizer10 = new wxFlexGridSizer( 0, 2, 0, 0 ); fgSizer10->SetFlexibleDirection( wxBOTH ); @@ -582,7 +582,7 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con m_panel15->Layout(); fgSizer10->Fit( m_panel15 ); fpsTypeList->AddPage( m_panel15, _("Settings.Video.FPS.Fraction"), false ); - m_panel16 = new wxPanel( fpsTypeList, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxTAB_TRAVERSAL ); + m_panel16 = new wxPanel( fpsTypeList, ID_FPSPANEL_NANOSECONDS, wxDefaultPosition, wxSize( -1,-1 ), wxTAB_TRAVERSAL ); wxBoxSizer* bSizer50; bSizer50 = new wxBoxSizer( wxHORIZONTAL ); @@ -602,10 +602,8 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con bSizer34->Add( 0, 20, 0, wxEXPAND, 5 ); - videoChangedText = new wxStaticText( videoPanel, wxID_ANY, _("Settings.RestartStream"), wxDefaultPosition, wxDefaultSize, 0 ); + videoChangedText = new wxStaticText( videoPanel, wxID_ANY, _("Settings.StreamRestart"), wxDefaultPosition, wxDefaultSize, 0 ); videoChangedText->Wrap( -1 ); - videoChangedText->Hide(); - bSizer34->Add( videoChangedText, 1, wxALL|wxEXPAND, 5 ); diff --git a/obs/forms/OBSWindows.fbp b/obs/forms/OBSWindows.fbp index 92dc6b78a..c5272021e 100644 --- a/obs/forms/OBSWindows.fbp +++ b/obs/forms/OBSWindows.fbp @@ -3185,7 +3185,7 @@ 0 1 - generalText + generalChangedText 1 @@ -3806,7 +3806,7 @@ 0 0 wxID_ANY - Settings.Video.DownscaleRes + Settings.Video.OutputRes 0 @@ -3897,7 +3897,7 @@ 0 1 - downscaleResList + outputResList 1 @@ -4505,7 +4505,7 @@ 0 0 - wxID_ANY + ID_FPSPANEL_COMMON 0 @@ -4681,7 +4681,7 @@ 0 0 - wxID_ANY + ID_FPSPANEL_INTEGER 0 @@ -4853,7 +4853,7 @@ 0 0 - wxID_ANY + ID_FPSPANEL_FRACTION 0 @@ -5285,7 +5285,7 @@ 0 0 - wxID_ANY + ID_FPSPANEL_NANOSECONDS 0 @@ -5471,9 +5471,9 @@ 1 0 - 1 + 0 wxID_ANY - Settings.RestartStream + Settings.StreamRestart 0 @@ -5485,7 +5485,7 @@ 1 - protected + public 1 Resizable diff --git a/obs/forms/OBSWindows.h b/obs/forms/OBSWindows.h index a73aa6ecd..8792b1d93 100644 --- a/obs/forms/OBSWindows.h +++ b/obs/forms/OBSWindows.h @@ -79,20 +79,24 @@ class WindowSubclass; #define ID_DOWNSCALE_FILTER 1032 #define ID_DISABLEAERO 1033 #define ID_FPS_TYPE 1034 -#define ID_FPS_COMMON 1035 -#define ID_FPS_INTEGER 1036 -#define ID_FPS_NUMERATOR 1037 -#define ID_FPS_DENOMINATOR 1038 -#define ID_FPS_NANOSECONDS 1039 -#define ID_SETTINGS_AUDIO 1040 -#define ID_DESKTOP_AUDIO_DEVICE 1041 -#define ID_AUX_AUDIO_DEVICE1 1042 -#define ID_AUX_AUDIO_DEVICE2 1043 -#define ID_AUX_AUDIO_DEVICE3 1044 -#define ID_AUX_AUDIO_DEVICE4 1045 -#define ID_OK 1046 -#define ID_CANCEL 1047 -#define ID_APPLY 1048 +#define ID_FPSPANEL_COMMON 1035 +#define ID_FPS_COMMON 1036 +#define ID_FPSPANEL_INTEGER 1037 +#define ID_FPS_INTEGER 1038 +#define ID_FPSPANEL_FRACTION 1039 +#define ID_FPS_NUMERATOR 1040 +#define ID_FPS_DENOMINATOR 1041 +#define ID_FPSPANEL_NANOSECONDS 1042 +#define ID_FPS_NANOSECONDS 1043 +#define ID_SETTINGS_AUDIO 1044 +#define ID_DESKTOP_AUDIO_DEVICE 1045 +#define ID_AUX_AUDIO_DEVICE1 1046 +#define ID_AUX_AUDIO_DEVICE2 1047 +#define ID_AUX_AUDIO_DEVICE3 1048 +#define ID_AUX_AUDIO_DEVICE4 1049 +#define ID_OK 1050 +#define ID_CANCEL 1051 +#define ID_APPLY 1052 /////////////////////////////////////////////////////////////////////////////// /// Class OBSBasicBase @@ -208,7 +212,6 @@ class OBSBasicSettingsBase : public DialogSubclass wxStaticText* m_staticText20; wxStaticText* m_staticText21; wxPanel* m_panel16; - wxStaticText* videoChangedText; wxPanel* audioPanel; wxStaticText* m_staticText23; wxStaticText* m_staticText24; @@ -229,11 +232,11 @@ class OBSBasicSettingsBase : public DialogSubclass wxListbook* settingsList; wxPanel* generalPanel; wxComboBox* languageList; - wxStaticText* generalText; + wxStaticText* generalChangedText; wxPanel* outputsPanel; wxComboBox* videoAdapterList; wxComboBox* baseResList; - wxComboBox* downscaleResList; + wxComboBox* outputResList; wxComboBox* filterList; wxCheckBox* disableAeroCheckbox; wxChoicebook* fpsTypeList; @@ -242,6 +245,7 @@ class OBSBasicSettingsBase : public DialogSubclass wxSpinCtrl* fpsNumeratorScroller; wxSpinCtrl* fpsDenominatorScroller; wxSpinCtrl* fpsNanosecondsScroller; + wxStaticText* videoChangedText; wxComboBox* desktopAudioDeviceList; wxComboBox* auxAudioDeviceList1; wxComboBox* auxAudioDeviceList2;