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

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

Author: sagamusix
Date: Thu Dec 19 19:11:15 2024
New Revision: 22577
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22577

Log:
[Ref] Remove CSoundFile::GetDefaultTuning.

Modified:
   trunk/OpenMPT/mptrack/Ctrl_ins.cpp
   trunk/OpenMPT/soundlib/Load_it.cpp
   trunk/OpenMPT/soundlib/ModInstrument.cpp
   trunk/OpenMPT/soundlib/Sndfile.h
   trunk/OpenMPT/test/test.cpp

Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.cpp	Thu Dec 19 19:03:17 2024	(r22576)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp	Thu Dec 19 19:11:15 2024	(r22577)
@@ -2965,7 +2965,7 @@
 	Reporting::Notification(MPT_CFORMAT("Tuning {} was not found. Setting to default tuning.")(mpt::ToCString(m_sndFile.Instruments[m_nInstrument]->pTuning->GetName())));
 
 	CriticalSection cs;
-	pIns->SetTuning(m_sndFile.GetDefaultTuning());
+	pIns->SetTuning(nullptr);
 
 	m_modDoc.SetModified();
 }

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	Thu Dec 19 19:03:17 2024	(r22576)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	Thu Dec 19 19:11:15 2024	(r22577)
@@ -262,13 +262,13 @@
 #endif // MODPLUG_TRACKER
 
 			}
-			csf.Instruments[i]->pTuning = csf.GetDefaultTuning();
+			csf.Instruments[i]->pTuning = nullptr;
 
 		} else
 		{
 			//This 'else' happens probably only in case of corrupted file.
 			if(csf.Instruments[i])
-				csf.Instruments[i]->pTuning = csf.GetDefaultTuning();
+				csf.Instruments[i]->pTuning = nullptr;
 		}
 
 	}

Modified: trunk/OpenMPT/soundlib/ModInstrument.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/ModInstrument.cpp	Thu Dec 19 19:03:17 2024	(r22576)
+++ trunk/OpenMPT/soundlib/ModInstrument.cpp	Thu Dec 19 19:11:15 2024	(r22577)
@@ -159,8 +159,6 @@
 
 	pitchToTempoLock.Set(0);
 
-	pTuning = CSoundFile::GetDefaultTuning();
-
 	AssignSample(sample);
 	ResetNoteMap();
 }

Modified: trunk/OpenMPT/soundlib/Sndfile.h
==============================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h	Thu Dec 19 19:03:17 2024	(r22576)
+++ trunk/OpenMPT/soundlib/Sndfile.h	Thu Dec 19 19:11:15 2024	(r22577)
@@ -409,7 +409,6 @@
 	//Tuning-->
 public:
 	static std::unique_ptr<CTuning> CreateTuning12TET(const mpt::ustring &name);
-	static CTuning *GetDefaultTuning() {return nullptr;}
 	CTuningCollection& GetTuneSpecificTunings() {return *m_pTuningsTuneSpecific;}
 
 	mpt::ustring GetNoteName(const ModCommand::NOTE note, const INSTRUMENTINDEX inst, const NoteName *noteNames = nullptr) const;

Modified: trunk/OpenMPT/test/test.cpp
==============================================================================
--- trunk/OpenMPT/test/test.cpp	Thu Dec 19 19:03:17 2024	(r22576)
+++ trunk/OpenMPT/test/test.cpp	Thu Dec 19 19:11:15 2024	(r22577)
@@ -2823,7 +2823,7 @@
 	VERIFY_EQUAL_NONCONT(pIns->wMidiBank, 2);
 	VERIFY_EQUAL_NONCONT(pIns->midiPWD, 8);
 
-	VERIFY_EQUAL_NONCONT(pIns->pTuning, sndFile.GetDefaultTuning());
+	VERIFY_EQUAL_NONCONT(pIns->pTuning, nullptr);
 
 	VERIFY_EQUAL_NONCONT(pIns->pitchToTempoLock, TEMPO(0, 0));
 
@@ -3144,7 +3144,7 @@
 		VERIFY_EQUAL_NONCONT(pIns->wMidiBank, 2);
 		VERIFY_EQUAL_NONCONT(pIns->midiPWD, -1);
 
-		VERIFY_EQUAL_NONCONT(pIns->pTuning, sndFile.GetDefaultTuning());
+		VERIFY_EQUAL_NONCONT(pIns->pTuning, nullptr);
 
 		VERIFY_EQUAL_NONCONT(pIns->pitchToTempoLock, TEMPO(130, 2000));