[OMPT-svn-commit] OpenMPT r22627 - in trunk/OpenMPT/libopenmpt: plugin-common xmp-openmpt

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

Author: manx
Date: Fri Dec 27 13:13:54 2024
New Revision: 22627
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22627

Log:
[Imp] xmp-openmpt: Do not show "Default" in settings for sample rate and channels. Show "XMPlay output format" instead, which makes it more clear what this actually does.

Modified:
   trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_gui.cpp
   trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_settings.hpp
   trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp

Modified: trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_gui.cpp
==============================================================================
--- trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_gui.cpp	Fri Dec 27 12:44:54 2024	(r22626)
+++ trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_gui.cpp	Fri Dec 27 13:13:54 2024	(r22627)
@@ -127,7 +127,7 @@
 
 		selected = false;
 		if ( !s->no_default_format ) {
-			m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( TEXT("Default") ), 0 );
+			m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( s->player_setting_name ? s->player_setting_name.value().c_str() : TEXT("Default") ), 0 );
 		}
 		m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( TEXT("6000") ), 6000 );
 		m_ComboBoxSamplerate.SetItemData( m_ComboBoxSamplerate.AddString( TEXT("8000") ), 8000 );
@@ -154,7 +154,7 @@
 
 		selected = false;
 		if ( !s->no_default_format ) {
-			m_ComboBoxChannels.SetItemData( m_ComboBoxChannels.AddString( TEXT("Default") ), 0 );
+			m_ComboBoxChannels.SetItemData( m_ComboBoxChannels.AddString( s->player_setting_name ? s->player_setting_name.value().c_str() : TEXT("Default") ), 0 );
 		}
 		m_ComboBoxChannels.SetItemData( m_ComboBoxChannels.AddString( TEXT("Mono") ), 1 );
 		m_ComboBoxChannels.SetItemData( m_ComboBoxChannels.AddString( TEXT("Stereo") ), 2 );

Modified: trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_settings.hpp
==============================================================================
--- trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_settings.hpp	Fri Dec 27 12:44:54 2024	(r22626)
+++ trunk/OpenMPT/libopenmpt/plugin-common/libopenmpt_plugin_settings.hpp	Fri Dec 27 13:13:54 2024	(r22627)
@@ -12,6 +12,7 @@
 
 #include <windows.h>
 
+#include <optional>
 #include <string>
 
 
@@ -33,6 +34,7 @@
 	int interpolationfilterlength = 8;
 	int ramping = -1;
 	int vis_allow_scroll = 1;
+	std::optional<std::basic_string<TCHAR>> player_setting_name = std::nullopt;
 	changed_func changed = nullptr;
 };
 
@@ -70,10 +72,11 @@
 		}
 	}
 public:
-	settings( const std::basic_string<TCHAR> & subkey, bool no_default_format_ )
-		: subkey(subkey)
+	settings( const std::basic_string<TCHAR> & subkey_, bool no_default_format_, const std::optional<std::basic_string<TCHAR>> & player_setting_name_ = std::nullopt)
+		: subkey(subkey_)
 	{
 		no_default_format = no_default_format_;
+		player_setting_name = player_setting_name_;
 		if (!no_default_format) {
 			samplerate = 0;
 			channels = 0;

Modified: trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp
==============================================================================
--- trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp	Fri Dec 27 12:44:54 2024	(r22626)
+++ trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp	Fri Dec 27 13:13:54 2024	(r22627)
@@ -132,7 +132,7 @@
 	}
 public:
 	xmp_openmpt_settings()
-		: libopenmpt::plugin::settings(TEXT(SHORT_TITLE), false)
+		: libopenmpt::plugin::settings(TEXT(SHORT_TITLE), false, TEXT("XMPlay output format"))
 	{
 		return;
 	}