[OMPT-svn-commit] OpenMPT r21110 - in trunk/OpenMPT: mptrack soundlib

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

Author: sagamusix
Date: Sat Jun 29 14:08:57 2024
New Revision: 21110
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21110

Log:
[Ref] Make CSoundFile::m_nType and CSoundFile::m_pModDoc private.

Modified:
   trunk/OpenMPT/mptrack/Ctrl_ins.cpp
   trunk/OpenMPT/mptrack/MainFrm.cpp
   trunk/OpenMPT/mptrack/Moddoc.cpp
   trunk/OpenMPT/mptrack/Moddoc.h
   trunk/OpenMPT/mptrack/View_gen.cpp
   trunk/OpenMPT/soundlib/Sndfile.h

Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.cpp	Sat Jun 29 13:54:54 2024	(r21109)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp	Sat Jun 29 14:08:57 2024	(r21110)
@@ -713,7 +713,7 @@
 			return true;
 		}
 
-		else if ((!m_bIns) && (sndFile.m_nType & (MOD_TYPE_IT | MOD_TYPE_MPT)))	//in note column
+		else if(!m_bIns && !(sndFile.GetType() & MOD_TYPE_XM))
 		{
 			uint32 n = pIns->NoteMap[m_nNote];
 

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	Sat Jun 29 13:54:54 2024	(r21109)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	Sat Jun 29 14:08:57 2024	(r21110)
@@ -1041,10 +1041,10 @@
 	FlagSet<Notification::Type> notifyType(Notification::Default);
 	Notification::Item notifyItem = 0;
 
-	if(m_pSndFile->m_pModDoc)
+	if(CModDoc *modDoc = m_pSndFile->GetpModDoc())
 	{
-		notifyType = m_pSndFile->m_pModDoc->GetNotificationType();
-		notifyItem = m_pSndFile->m_pModDoc->GetNotificationItem();
+		notifyType = modDoc->GetNotificationType();
+		notifyItem = modDoc->GetNotificationItem();
 	}
 
 	// Add an entry to the notification history
@@ -1643,7 +1643,8 @@
 	{
 		CriticalSection cs;
 		InitPreview();
-		m_WaveFile.m_nType = sndFile.GetType();
+		m_WaveFile.ChangeModTypeTo(sndFile.GetType(), false);
+		m_WaveFile.m_playBehaviour = sndFile.m_playBehaviour;
 		if ((nInstrument) && (nInstrument <= sndFile.GetNumInstruments()))
 		{
 			m_WaveFile.m_nInstruments = 1;
@@ -1685,7 +1686,7 @@
 	m_WaveFile.Create(FileReader());
 	m_WaveFile.Order().SetDefaultTempoInt(125);
 	m_WaveFile.Order().SetDefaultSpeed(6);
-	m_WaveFile.m_nType = MOD_TYPE_MPT;
+	m_WaveFile.ChangeModTypeTo(MOD_TYPE_MPT, false);
 	m_WaveFile.ChnSettings.resize(2);
 	m_WaveFile.m_nInstruments = 1;
 	m_WaveFile.m_nTempoMode = TempoMode::Classic;

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp	Sat Jun 29 13:54:54 2024	(r21109)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	Sat Jun 29 14:08:57 2024	(r21110)
@@ -243,7 +243,7 @@
 		MPT_CFORMAT("File: {}\nLast saved with: {}, you are using OpenMPT {}\n\n")
 		(filename, m_SndFile.m_modFormat.madeWithTracker, Version::Current()));
 
-	if((m_SndFile.m_nType == MOD_TYPE_NONE) || (!m_SndFile.GetNumChannels()))
+	if((GetModType() == MOD_TYPE_NONE) || (!m_SndFile.GetNumChannels()))
 		return FALSE;
 
 	const bool noColors = std::find_if(std::begin(m_SndFile.ChnSettings), std::begin(m_SndFile.ChnSettings) + GetNumChannels(), [](const auto &settings) {

Modified: trunk/OpenMPT/mptrack/Moddoc.h
==============================================================================
--- trunk/OpenMPT/mptrack/Moddoc.h	Sat Jun 29 13:54:54 2024	(r21109)
+++ trunk/OpenMPT/mptrack/Moddoc.h	Sat Jun 29 14:08:57 2024	(r21110)
@@ -177,7 +177,7 @@
 	void PostMessageToAllViews(UINT uMsg, WPARAM wParam = 0, LPARAM lParam = 0);
 	void SendNotifyMessageToAllViews(UINT uMsg, WPARAM wParam = 0, LPARAM lParam = 0);
 	void SendMessageToActiveView(UINT uMsg, WPARAM wParam = 0, LPARAM lParam = 0);
-	MODTYPE GetModType() const { return m_SndFile.m_nType; }
+	MODTYPE GetModType() const noexcept { return m_SndFile.GetType(); }
 	INSTRUMENTINDEX GetNumInstruments() const { return m_SndFile.m_nInstruments; }
 	SAMPLEINDEX GetNumSamples() const { return m_SndFile.m_nSamples; }
 

Modified: trunk/OpenMPT/mptrack/View_gen.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/View_gen.cpp	Sat Jun 29 13:54:54 2024	(r21109)
+++ trunk/OpenMPT/mptrack/View_gen.cpp	Sat Jun 29 14:08:57 2024	(r21110)
@@ -410,7 +410,7 @@
 			}
 
 			// Enable/Disable controls for this channel
-			BOOL bIT = ((bEnable) && (sndFile.m_nType & (MOD_TYPE_IT|MOD_TYPE_MPT)));
+			BOOL bIT = ((bEnable) && (sndFile.GetType() & (MOD_TYPE_IT|MOD_TYPE_MPT)));
 			GetDlgItem(IDC_CHECK1 + ichn * 2)->EnableWindow(bEnable);
 			GetDlgItem(IDC_CHECK2 + ichn * 2)->EnableWindow(bIT);
 
@@ -421,7 +421,7 @@
 			m_spinPan[ichn].EnableWindow(bEnable && !(sndFile.GetType() & (MOD_TYPE_XM|MOD_TYPE_MOD)));
 			GetDlgItem(IDC_EDIT1 + ichn * 2)->EnableWindow(bIT);	// channel vol
 			GetDlgItem(IDC_EDIT2 + ichn * 2)->EnableWindow(bEnable && !(sndFile.GetType() & (MOD_TYPE_XM|MOD_TYPE_MOD)));	// channel pan
-			GetDlgItem(IDC_EDIT9 + ichn)->EnableWindow(((bEnable) && (sndFile.m_nType & (MOD_TYPE_XM|MOD_TYPE_IT|MOD_TYPE_MPT))));	// channel name
+			GetDlgItem(IDC_EDIT9 + ichn)->EnableWindow(((bEnable) && (sndFile.GetType() & (MOD_TYPE_XM|MOD_TYPE_IT|MOD_TYPE_MPT))));	// channel name
 			m_CbnEffects[ichn].EnableWindow(bEnable & (sndFile.GetModSpecifications().supportsPlugins ? TRUE : FALSE));
 		}
 		UnlockControls();

Modified: trunk/OpenMPT/soundlib/Sndfile.h
==============================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h	Sat Jun 29 13:54:54 2024	(r21109)
+++ trunk/OpenMPT/soundlib/Sndfile.h	Sat Jun 29 14:08:57 2024	(r21110)
@@ -461,12 +461,11 @@
 
 	static constexpr uint32 TICKS_ROW_FINISHED = uint32_max - 1u;
 
-public:	// for Editing
+private:
 #ifdef MODPLUG_TRACKER
 	CModDoc *m_pModDoc = nullptr;  // Can be a null pointer for example when previewing samples from the treeview.
 #endif // MODPLUG_TRACKER
 	Enum<MODTYPE> m_nType;
-private:
 	ModContainerType m_ContainerType = ModContainerType::None;
 public:
 	SAMPLEINDEX m_nSamples = 0;