Skip to content

Commit

Permalink
[Ref] Remove dead, incorrect code. It should never be possible that b…
Browse files Browse the repository at this point in the history
…oth record group bits are set at once.

git-svn-id: https://source.openmpt.org/svn/openmpt/trunk/OpenMPT@21829 56274372-70c3-4bfc-bfc3-4c3a0b034d27
  • Loading branch information
sagamusix committed Oct 15, 2024
1 parent 3b8262a commit 7001888
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 12 deletions.
2 changes: 1 addition & 1 deletion mptrack/ChannelManagerDlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ void CChannelManagerDlg::OnRestore()
m_ModDoc->MuteChannel(state.sourceChn, state.memoryMute);
break;
case kRecordSelect:
m_ModDoc->ReinitRecordState(true);
m_ModDoc->ReinitRecordState();
for(auto &state : m_states)
m_ModDoc->SetChannelRecordGroup(state.sourceChn, static_cast<RecordGroup>(state.memoryRecordGroup));
break;
Expand Down
13 changes: 3 additions & 10 deletions mptrack/Moddoc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1426,17 +1426,10 @@ void CModDoc::ToggleChannelRecordGroup(CHANNELINDEX channel, RecordGroup recordG
}


void CModDoc::ReinitRecordState(bool unselect)
void CModDoc::ReinitRecordState()
{
if(unselect)
{
m_bsMultiRecordMask.reset();
m_bsMultiSplitRecordMask.reset();
} else
{
m_bsMultiRecordMask.set();
m_bsMultiSplitRecordMask.set();
}
m_bsMultiRecordMask.reset();
m_bsMultiSplitRecordMask.reset();
}


Expand Down
2 changes: 1 addition & 1 deletion mptrack/Moddoc.h
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ class CModDoc final : public CDocument
RecordGroup GetChannelRecordGroup(CHANNELINDEX channel) const;
void SetChannelRecordGroup(CHANNELINDEX channel, RecordGroup recordGroup);
void ToggleChannelRecordGroup(CHANNELINDEX channel, RecordGroup recordGroup);
void ReinitRecordState(bool unselect = true);
void ReinitRecordState();

CHANNELINDEX GetNumChannels() const noexcept { return m_SndFile.GetNumChannels(); }
UINT GetPatternSize(PATTERNINDEX nPat) const;
Expand Down

0 comments on commit 7001888

Please sign in to comment.