[OMPT-svn-commit] OpenMPT r23227 - in branches/OpenMPT-1.32: . mptrack/plugins soundlib/plugins/dmo

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

Author: sagamusix
Date: Fri May 30 12:19:51 2025
New Revision: 23227
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23227

Log:
Merged revision(s) 23224, 23226 from trunk/OpenMPT:
[Fix] Flanger: Also display the Flanger's wave shape as Square, not Triangle like in the original DMO plugin.
[Imp] Compressor: Display the ratio setting as an actual ratio.
........
[Fix] LFO Plugin Editor: Improve handling of no plugin being selected for output.
[Imp] MIDI I/O Plugin Editor: Ask if files that are unlikely to be SysEx dumps should really be loaded.
........

Modified:
   branches/OpenMPT-1.32/   (props changed)
   branches/OpenMPT-1.32/mptrack/plugins/LFOPluginEditor.cpp
   branches/OpenMPT-1.32/mptrack/plugins/MidiInOutEditor.cpp
   branches/OpenMPT-1.32/soundlib/plugins/dmo/Compressor.cpp
   branches/OpenMPT-1.32/soundlib/plugins/dmo/Flanger.cpp

Modified: branches/OpenMPT-1.32/mptrack/plugins/LFOPluginEditor.cpp
==============================================================================
--- branches/OpenMPT-1.32/mptrack/plugins/LFOPluginEditor.cpp	Fri May 30 12:19:25 2025	(r23226)
+++ branches/OpenMPT-1.32/mptrack/plugins/LFOPluginEditor.cpp	Fri May 30 12:19:51 2025	(r23227)
@@ -123,6 +123,13 @@
 		m_plugParam.ResetContent();
 		SetWindowLongPtr(m_plugParam, GWLP_USERDATA, 0);
 	}
+	const BOOL enableWindow = outPlug ? TRUE : FALSE;
+	m_midiCC.EnableWindow(enableWindow);
+	m_midiChnEdit.EnableWindow(enableWindow);
+	m_midiChnSpin.EnableWindow(enableWindow);
+	GetDlgItem(IDC_RADIO7)->EnableWindow(enableWindow);
+	GetDlgItem(IDC_RADIO8)->EnableWindow(enableWindow);
+
 	m_plugParam.SetRedraw(TRUE);
 	m_locked = false;
 }
@@ -170,7 +177,7 @@
 void LFOPluginEditor::UpdateView(UpdateHint hint)
 {
 	CAbstractVstEditor::UpdateView(hint);
-	m_outPlug.Update(PluginComboBox::Config{PluginComboBox::ShowLibraryNames}
+	m_outPlug.Update(PluginComboBox::Config{PluginComboBox::ShowLibraryNames | PluginComboBox::ShowNoPlugin}
 		.Hint(hint)
 		.CurrentSelection(m_lfoPlugin.m_pMixStruct->GetOutputPlugin())
 		.FirstPlugin(m_lfoPlugin.GetSlot() + 1), m_lfoPlugin.GetSoundFile());
@@ -333,14 +340,11 @@
 		return;
 
 	PLUGINDEX plug = m_outPlug.GetSelection().value_or(PLUGINDEX_INVALID);
-	if(plug > m_lfoPlugin.GetSlot() && plug < MAX_MIXPLUGINS)
-	{
-		m_lfoPlugin.GetSoundFile().m_MixPlugins[m_lfoPlugin.GetSlot()].SetOutputPlugin(plug);
-		m_lfoPlugin.SetModified();
-		UpdateParamDisplays();
-		if(CModDoc *modDoc = m_lfoPlugin.GetSoundFile().GetpModDoc(); modDoc != nullptr)
-			modDoc->UpdateAllViews(nullptr, PluginHint(m_lfoPlugin.GetSlot() + 1).Info(), this);
-	}
+	m_lfoPlugin.GetSoundFile().m_MixPlugins[m_lfoPlugin.GetSlot()].SetOutputPlugin(plug);
+	m_lfoPlugin.SetModified();
+	UpdateParamDisplays();
+	if(CModDoc *modDoc = m_lfoPlugin.GetSoundFile().GetpModDoc(); modDoc != nullptr)
+		modDoc->UpdateAllViews(nullptr, PluginHint(m_lfoPlugin.GetSlot() + 1).Info(), this);
 }
 
 

Modified: branches/OpenMPT-1.32/mptrack/plugins/MidiInOutEditor.cpp
==============================================================================
--- branches/OpenMPT-1.32/mptrack/plugins/MidiInOutEditor.cpp	Fri May 30 12:19:25 2025	(r23226)
+++ branches/OpenMPT-1.32/mptrack/plugins/MidiInOutEditor.cpp	Fri May 30 12:19:51 2025	(r23227)
@@ -14,6 +14,7 @@
 #include "MidiInOut.h"
 #include "../FileDialog.h"
 #include "../Mptrack.h"
+#include "../Reporting.h"
 #include "../resource.h"
 #include "../UpdateHints.h"
 #include "../../soundlib/MIDIEvents.h"
@@ -288,6 +289,11 @@
 	FileReader file = GetFileReader(f);
 	std::vector<uint8> dump;
 	file.ReadVector(dump, file.GetLength());
+	if(!dump.empty() && dump[0] < 0x80)
+	{
+		if(Reporting::Confirm("This file is most likely not a valid SysEx dump. Load it anyway?") != cnfYes)
+			return;
+	}
 	static_cast<MidiInOut &>(m_VstPlugin).SetInitialMidiDump(std::move(dump));
 	m_locked = true;
 	UpdateMidiDump();

Modified: branches/OpenMPT-1.32/soundlib/plugins/dmo/Compressor.cpp
==============================================================================
--- branches/OpenMPT-1.32/soundlib/plugins/dmo/Compressor.cpp	Fri May 30 12:19:25 2025	(r23226)
+++ branches/OpenMPT-1.32/soundlib/plugins/dmo/Compressor.cpp	Fri May 30 12:19:51 2025	(r23227)
@@ -177,6 +177,8 @@
 	case kCompRelease:
 	case kCompPredelay:
 		return _T("ms");
+	case kCompRatio:
+		return _T(": 1");
 	}
 	return CString();
 }

Modified: branches/OpenMPT-1.32/soundlib/plugins/dmo/Flanger.cpp
==============================================================================
--- branches/OpenMPT-1.32/soundlib/plugins/dmo/Flanger.cpp	Fri May 30 12:19:25 2025	(r23226)
+++ branches/OpenMPT-1.32/soundlib/plugins/dmo/Flanger.cpp	Fri May 30 12:19:51 2025	(r23227)
@@ -124,7 +124,7 @@
 		value = FrequencyInHertz();
 		break;
 	case kFlangerWaveShape:
-		return (value < 1) ? _T("Triangle") : _T("Sine");
+		return (value < 1) ? _T("Square") : _T("Sine");
 		break;
 	case kFlangerPhase:
 		switch(Phase())