[OMPT-svn-commit] OpenMPT r21997 - trunk/OpenMPT/mptrack

[<sv...@op...>]

Author: sagamusix
Date: Sun Oct 27 01:45:44 2024
New Revision: 21997
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21997

Log:
[Imp] Stream Export: Remember Normalize and Clear Plugin Buffer choices across runs.

Modified:
   trunk/OpenMPT/mptrack/Mod2wave.cpp
   trunk/OpenMPT/mptrack/Moddoc.cpp
   trunk/OpenMPT/mptrack/TrackerSettings.cpp
   trunk/OpenMPT/mptrack/TrackerSettings.h

Modified: trunk/OpenMPT/mptrack/Mod2wave.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Mod2wave.cpp	Sun Oct 27 01:30:39 2024	(r21996)
+++ trunk/OpenMPT/mptrack/Mod2wave.cpp	Sun Oct 27 01:45:44 2024	(r21997)
@@ -125,7 +125,7 @@
 {
 	DialogBase::OnInitDialog();
 
-	CheckDlgButton(IDC_CHECK5, BST_UNCHECKED);	// Normalize
+	CheckDlgButton(IDC_CHECK5, m_Settings.normalize ? BST_CHECKED : BST_UNCHECKED);
 	CheckDlgButton(IDC_CHECK3, BST_CHECKED);	// Cue points
 
 	CheckDlgButton(IDC_CHECK4, BST_UNCHECKED);
@@ -183,7 +183,7 @@
 		{
 			GetDlgItem(IDC_GIVEPLUGSIDLETIME)->EnableWindow(TRUE);
 			GetDlgItem(IDC_RENDERSILENCE)->EnableWindow(TRUE);
-			CheckDlgButton(IDC_RENDERSILENCE, BST_CHECKED);
+			CheckDlgButton(IDC_RENDERSILENCE, m_Settings.silencePlugBuffers ? BST_CHECKED : BST_UNCHECKED);
 			break;
 		}
 	}
@@ -726,7 +726,8 @@
 
 	m_Settings.repeatCount = static_cast<uint16>(GetDlgItemInt(IDC_EDIT5, NULL, FALSE));
 	m_Settings.normalize = IsDlgButtonChecked(IDC_CHECK5) != BST_UNCHECKED;
-	m_Settings.silencePlugBuffers = IsDlgButtonChecked(IDC_RENDERSILENCE) != BST_UNCHECKED;
+	if(GetDlgItem(IDC_RENDERSILENCE)->IsWindowEnabled())
+		m_Settings.silencePlugBuffers = IsDlgButtonChecked(IDC_RENDERSILENCE) != BST_UNCHECKED;
 	m_Settings.outputToSample = IsDlgButtonChecked(IDC_RADIO5) != BST_UNCHECKED;
 	m_bGivePlugsIdleTime = IsDlgButtonChecked(IDC_GIVEPLUGSIDLETIME) != BST_UNCHECKED;
 	if (m_bGivePlugsIdleTime)

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp	Sun Oct 27 01:30:39 2024	(r21996)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	Sun Oct 27 01:45:44 2024	(r21997)
@@ -1678,7 +1678,10 @@
 	CWaveConvert wsdlg(pMainFrm, nMinOrder, nMaxOrder, m_SndFile.Order().GetLengthTailTrimmed() - 1, m_SndFile, encFactories);
 	{
 		BypassInputHandler bih;
-		if (wsdlg.DoModal() != IDOK) return;
+		wsdlg.m_Settings.normalize = TrackerSettings::Instance().ExportNormalize;
+		wsdlg.m_Settings.silencePlugBuffers = TrackerSettings::Instance().ExportClearPluginBuffers;
+		if (wsdlg.DoModal() != IDOK)
+			return;
 	}
 
 	EncoderFactoryBase *encFactory = wsdlg.m_Settings.GetEncoderFactory();
@@ -1690,10 +1693,13 @@
 		.DefaultFilename(GetPathNameMpt().GetFilenameBase() + P_(".") + extension)
 		.ExtensionFilter(encFactory->GetTraits().fileDescription + U_(" (*.") + extension.ToUnicode() + U_(")|*.") + extension.ToUnicode() + U_("||"))
 		.WorkingDirectory(TrackerSettings::Instance().PathExport.GetWorkingDir());
-	if(!wsdlg.m_Settings.outputToSample && !dlg.Show()) return;
+	if(!wsdlg.m_Settings.outputToSample && !dlg.Show())
+		return;
 
 	// will set default dir here because there's no setup option for export dir yet (feel free to add one...)
 	TrackerSettings::Instance().PathExport.SetDefaultDir(dlg.GetWorkingDirectory(), true);
+	TrackerSettings::Instance().ExportNormalize = wsdlg.m_Settings.normalize;
+	TrackerSettings::Instance().ExportClearPluginBuffers = wsdlg.m_Settings.silencePlugBuffers;
 
 	mpt::PathString drive, dir, name, ext;
 	dlg.GetFirstFile().SplitPath(nullptr, &drive, &dir, &name, &ext);

Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp	Sun Oct 27 01:30:39 2024	(r21996)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp	Sun Oct 27 01:45:44 2024	(r21997)
@@ -296,6 +296,8 @@
 	// Export
 	, ExportDefaultToSoundcardSamplerate(conf, U_("Export"), U_("DefaultToSoundcardSamplerate"), true)
 	, ExportStreamEncoderSettings(conf, U_("Export"))
+	, ExportNormalize(conf, U_("Export"), U_("Normalize"), false)
+	, ExportClearPluginBuffers(conf, U_("Export"), U_("ClearPluginBuffers"), true)
 	// Components
 	, ComponentsLoadOnStartup(conf, U_("Components"), U_("LoadOnStartup"), ComponentManagerSettingsDefault().LoadOnStartup())
 	, ComponentsKeepLoaded(conf, U_("Components"), U_("KeepLoaded"), ComponentManagerSettingsDefault().KeepLoaded())

Modified: trunk/OpenMPT/mptrack/TrackerSettings.h
==============================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.h	Sun Oct 27 01:30:39 2024	(r21996)
+++ trunk/OpenMPT/mptrack/TrackerSettings.h	Sun Oct 27 01:45:44 2024	(r21997)
@@ -827,6 +827,8 @@
 
 	Setting<bool> ExportDefaultToSoundcardSamplerate;
 	StreamEncoderSettingsConf ExportStreamEncoderSettings;
+	Setting<bool> ExportNormalize;
+	Setting<bool> ExportClearPluginBuffers;
 
 	// Components