Make Filter Effects/Volume Global

eulyderg · Jun 17, 2021 · 975c2cc · 975c2cc
1 parent a077906
commit 975c2cc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/Source/Channels6581.cpp b/Source/Channels6581.cpp
@@ -99,11 +99,12 @@ bool CChannelHandler6581::HandleEffect(effect_t EffNum, unsigned char EffParam)
 		break;
 	}
 	case EF_SID_FILTER_MODE: {
-		s_iFilterMode = EffParam & 0xF;
 		if (EffParam == 0)
 			s_iFilterEnable &= ~(1U << (m_iChannelID - CHANID_6581_CH1));
-		else
+		else {
 			s_iFilterEnable |= (1U << (m_iChannelID - CHANID_6581_CH1));
+			s_iFilterMode = EffParam & 0xF;
+		}
 		break;
 	}
 	default: return CChannelHandler::HandleEffect(EffNum, EffParam);

diff --git a/Source/FamiTrackerView.cpp b/Source/FamiTrackerView.cpp
@@ -1591,7 +1591,8 @@ bool CFamiTrackerView::PlayerGetNote(int Track, int Frame, int Channel, int Row,
 	}
 	else {
 		// These effects will pass even if the channel is muted
-		const int PASS_EFFECTS[] = {EF_HALT, EF_JUMP, EF_SPEED, EF_SKIP, EF_GROOVE};		// // //
+		const int PASS_EFFECTS[] = {EF_HALT, EF_JUMP, EF_SPEED, EF_SKIP, EF_GROOVE,
+			EF_SID_FILTER_CUTOFF_HI,  EF_SID_FILTER_CUTOFF_LO, EF_SID_FILTER_RESONANCE, EF_SID_FILTER_MODE};		// // //
 		int Columns = pDoc->GetEffColumns(Track, Channel) + 1;
 
 		NoteData.Note		= HALT;

diff --git a/Source/SoundGen.cpp b/Source/SoundGen.cpp
@@ -2370,7 +2370,8 @@ void CSoundGen::ReadPatternRow()
 	stChanNote NoteData;
 
 	for (int i = 0; i < Channels; ++i) {
-		if (m_pTrackerView->PlayerGetNote(m_iPlayTrack, m_iPlayFrame, i, m_iPlayRow, NoteData))
+		if (m_pTrackerView->PlayerGetNote(m_iPlayTrack, m_iPlayFrame, i, m_iPlayRow, NoteData)
+			|| (i >= m_pDocument->GetChannelIndex(CHANID_6581_CH1) && i <= m_pDocument->GetChannelIndex(CHANID_6581_CH3)))
 			QueueNote(i, NoteData, NOTE_PRIO_1);
 	}
 	if (m_bDoHalt) {		// // //

diff --git a/version.h b/version.h
@@ -46,4 +46,4 @@
 		STR(VERSION_REV)
 
 
-#define APP_NAME_VERSION	APP_NAME " " VERSION_STR ".0Ea"
+#define APP_NAME_VERSION	APP_NAME " " VERSION_STR ".10a"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -46,4 +46,4 @@
		STR(VERSION_REV)


		#define APP_NAME_VERSION APP_NAME " " VERSION_STR ".0Ea"
		#define APP_NAME_VERSION APP_NAME " " VERSION_STR ".10a"