From d84da6cdfb9027a67b8ab50fe2c23374acc3b245 Mon Sep 17 00:00:00 2001
From: Florian Jung <flo@thinkpad.(none)>
Date: Sat, 8 Jan 2011 18:27:40 +0100
Subject: Added some of the bugfixes to the note_compiler and removed
 use_pfactor

---
 note_compiler/templates/set_param.1         |  2 ++
 note_compiler/templates/set_param.2         | 34 -----------------------------
 note_compiler/templates/set_param.filter    |  7 ++++++
 note_compiler/templates/set_param.filterenv | 34 +++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 34 deletions(-)
 delete mode 100644 note_compiler/templates/set_param.2
 create mode 100644 note_compiler/templates/set_param.filter
 create mode 100644 note_compiler/templates/set_param.filterenv

(limited to 'note_compiler/templates')

diff --git a/note_compiler/templates/set_param.1 b/note_compiler/templates/set_param.1
index 3d20dfe..21fc983 100644
--- a/note_compiler/templates/set_param.1
+++ b/note_compiler/templates/set_param.1
@@ -23,3 +23,5 @@
 		case VIB_LFO: sel_osc->vibrato_lfo=v; break;
 		case WAVEFORM: sel_osc->waveform=v; break;
 		case SYNC: sel_osc->sync=(v!=0); break;
+		case MODULATION: sel_orig_osc->fm_strength[p.index]=v; apply_pfactor(); break;
+    case OUTPUT: sel_orig_osc->output=v; apply_pfactor(); break;
diff --git a/note_compiler/templates/set_param.2 b/note_compiler/templates/set_param.2
deleted file mode 100644
index aaa21b4..0000000
--- a/note_compiler/templates/set_param.2
+++ /dev/null
@@ -1,34 +0,0 @@
-		case FILTER_ATTACK:
-			if (filter_params.enabled)
-				filter_envelope->set_attack(v*samp_rate/filter_update_frames >>SCALE);
-			else
-				output_note("NOTE: cannot set filter-attack when filter is disabled");
-			break;
-
-		case FILTER_DECAY:
-			if (filter_params.enabled)
-				filter_envelope->set_decay(v*samp_rate/filter_update_frames >>SCALE);
-			else
-				output_note("NOTE: cannot set filter-decay when filter is disabled");
-			break;
-
-		case FILTER_SUSTAIN:
-			if (filter_params.enabled)
-				filter_envelope->set_sustain(v);
-			else
-				output_note("NOTE: cannot set filter-sustain when filter is disabled");
-			break;
-
-		case FILTER_RELEASE:
-			if (filter_params.enabled)
-				filter_envelope->set_release(v*samp_rate/filter_update_frames >>SCALE);
-			else
-				output_note("NOTE: cannot set filter-release when filter is disabled");
-			break;
-
-		case FILTER_HOLD:
-			if (filter_params.enabled)
-				filter_envelope->set_hold(v!=0);
-			else
-				output_note("NOTE: cannot set filter-hold when filter is disabled");
-			break;
diff --git a/note_compiler/templates/set_param.filter b/note_compiler/templates/set_param.filter
new file mode 100644
index 0000000..797d30b
--- /dev/null
+++ b/note_compiler/templates/set_param.filter
@@ -0,0 +1,7 @@
+		
+		case FILTER_ENABLED: output_note("NOTE: cannot enable filter in playing notes"); break;
+		case FILTER_ENV_AMOUNT: orig.filter_params.env_amount=float(v)/ONE; apply_pfactor(); break;
+		case FILTER_OFFSET: orig.filter_params.freqfactor_offset=float(v)/ONE; apply_pfactor(); break;
+		case FILTER_RESONANCE: orig.filter_params.resonance=float(v)/ONE; apply_pfactor(); break;
+		case FILTER_TREMOLO: filter_params.trem_strength=v; break;
+		case FILTER_TREM_LFO: filter_params.trem_lfo=v; break;
diff --git a/note_compiler/templates/set_param.filterenv b/note_compiler/templates/set_param.filterenv
new file mode 100644
index 0000000..aaa21b4
--- /dev/null
+++ b/note_compiler/templates/set_param.filterenv
@@ -0,0 +1,34 @@
+		case FILTER_ATTACK:
+			if (filter_params.enabled)
+				filter_envelope->set_attack(v*samp_rate/filter_update_frames >>SCALE);
+			else
+				output_note("NOTE: cannot set filter-attack when filter is disabled");
+			break;
+
+		case FILTER_DECAY:
+			if (filter_params.enabled)
+				filter_envelope->set_decay(v*samp_rate/filter_update_frames >>SCALE);
+			else
+				output_note("NOTE: cannot set filter-decay when filter is disabled");
+			break;
+
+		case FILTER_SUSTAIN:
+			if (filter_params.enabled)
+				filter_envelope->set_sustain(v);
+			else
+				output_note("NOTE: cannot set filter-sustain when filter is disabled");
+			break;
+
+		case FILTER_RELEASE:
+			if (filter_params.enabled)
+				filter_envelope->set_release(v*samp_rate/filter_update_frames >>SCALE);
+			else
+				output_note("NOTE: cannot set filter-release when filter is disabled");
+			break;
+
+		case FILTER_HOLD:
+			if (filter_params.enabled)
+				filter_envelope->set_hold(v!=0);
+			else
+				output_note("NOTE: cannot set filter-hold when filter is disabled");
+			break;
-- 
cgit v1.2.3