Skip to content

Commit 81203a1

Browse files
committed
[Ref] Remove CSoundFile::GetDefaultTuning.
git-svn-id: https://source.openmpt.org/svn/openmpt/trunk/OpenMPT@22577 56274372-70c3-4bfc-bfc3-4c3a0b034d27
1 parent ea14795 commit 81203a1

File tree

5 files changed

+5
-8
lines changed

5 files changed

+5
-8
lines changed

mptrack/Ctrl_ins.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2965,7 +2965,7 @@ void CCtrlInstruments::UpdateTuningComboBox()
29652965
Reporting::Notification(MPT_CFORMAT("Tuning {} was not found. Setting to default tuning.")(mpt::ToCString(m_sndFile.Instruments[m_nInstrument]->pTuning->GetName())));
29662966

29672967
CriticalSection cs;
2968-
pIns->SetTuning(m_sndFile.GetDefaultTuning());
2968+
pIns->SetTuning(nullptr);
29692969

29702970
m_modDoc.SetModified();
29712971
}

soundlib/Load_it.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,13 +262,13 @@ static void ReadTuningMapImpl(std::istream& iStrm, CSoundFile& csf, mpt::Charset
262262
#endif // MODPLUG_TRACKER
263263

264264
}
265-
csf.Instruments[i]->pTuning = csf.GetDefaultTuning();
265+
csf.Instruments[i]->pTuning = nullptr;
266266

267267
} else
268268
{
269269
//This 'else' happens probably only in case of corrupted file.
270270
if(csf.Instruments[i])
271-
csf.Instruments[i]->pTuning = csf.GetDefaultTuning();
271+
csf.Instruments[i]->pTuning = nullptr;
272272
}
273273

274274
}

soundlib/ModInstrument.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,6 @@ ModInstrument::ModInstrument(SAMPLEINDEX sample)
159159

160160
pitchToTempoLock.Set(0);
161161

162-
pTuning = CSoundFile::GetDefaultTuning();
163-
164162
AssignSample(sample);
165163
ResetNoteMap();
166164
}

soundlib/Sndfile.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,6 @@ class CSoundFile
409409
//Tuning-->
410410
public:
411411
static std::unique_ptr<CTuning> CreateTuning12TET(const mpt::ustring &name);
412-
static CTuning *GetDefaultTuning() {return nullptr;}
413412
CTuningCollection& GetTuneSpecificTunings() {return *m_pTuningsTuneSpecific;}
414413

415414
mpt::ustring GetNoteName(const ModCommand::NOTE note, const INSTRUMENTINDEX inst, const NoteName *noteNames = nullptr) const;

test/test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2823,7 +2823,7 @@ static void TestLoadXMFile(const CSoundFile &sndFile)
28232823
VERIFY_EQUAL_NONCONT(pIns->wMidiBank, 2);
28242824
VERIFY_EQUAL_NONCONT(pIns->midiPWD, 8);
28252825

2826-
VERIFY_EQUAL_NONCONT(pIns->pTuning, sndFile.GetDefaultTuning());
2826+
VERIFY_EQUAL_NONCONT(pIns->pTuning, nullptr);
28272827

28282828
VERIFY_EQUAL_NONCONT(pIns->pitchToTempoLock, TEMPO(0, 0));
28292829

@@ -3144,7 +3144,7 @@ static void TestLoadMPTMFile(const CSoundFile &sndFile)
31443144
VERIFY_EQUAL_NONCONT(pIns->wMidiBank, 2);
31453145
VERIFY_EQUAL_NONCONT(pIns->midiPWD, -1);
31463146

3147-
VERIFY_EQUAL_NONCONT(pIns->pTuning, sndFile.GetDefaultTuning());
3147+
VERIFY_EQUAL_NONCONT(pIns->pTuning, nullptr);
31483148

31493149
VERIFY_EQUAL_NONCONT(pIns->pitchToTempoLock, TEMPO(130, 2000));
31503150

0 commit comments

Comments
 (0)