From df97e0ebb7f6591c50f3a588cb2a74901d38ac4a Mon Sep 17 00:00:00 2001
From: Florian Jung <flo@thinkpad.(none)>
Date: Sun, 9 Jan 2011 19:09:05 +0100
Subject: Merged branch for compiled notes

The synthesizer is now able to load and use compiled, optimized shared
objects of programs. There's also a note-compiler which creates the code
for such objects.

TODO:
  - let the note-compiler automatically compile OR rename it to
    code-emitter
---
 synth/note.h | 32 +++++---------------------------
 1 file changed, 5 insertions(+), 27 deletions(-)

(limited to 'synth/note.h')

diff --git a/synth/note.h b/synth/note.h
index 26ce379..03a7180 100644
--- a/synth/note.h
+++ b/synth/note.h
@@ -7,27 +7,22 @@
 #include "envelope.h"
 #include "fixed.h"
 #include "filter.h"
+#include "note_skel.h"
 
-class Note
+class Note : public NoteSkel
 {
 	public:
 		Note(int n, float v,program_t &prg, jack_nframes_t pf, fixed_t pb, int prg_no);
 		~Note();
 		fixed_t get_sample();
-		int get_note();
-		void set_note(int n);
-		void set_note(int n, bool do_port);
-		void set_freq(float f);
-		void set_freq(float f, bool do_port);
-		void set_pitchbend(fixed_t pb);
-		void set_vel(float v);
-		void set_portamento_frames(jack_nframes_t f);
+
 		void release_quickly(jack_nframes_t maxt);
 		void release();
 		void reattack();
 		bool still_active();
 		void set_param(const parameter_t &p, fixed_t v);
-		int get_program(){return program;}
+		
+		void destroy();
 		
 	private:
 		void do_ksl();
@@ -37,10 +32,6 @@ class Note
 		void apply_pfactor();
 
 		Envelope **envelope;
-
-		fixed_t freq, dest_freq, old_freq;
-		fixed_t vel;
-		jack_nframes_t portamento_t, portamento_frames;
 		
 		int env_frame_counter;
 		
@@ -55,12 +46,6 @@ class Note
 		
 		pfactor_value_t pfactor;
 		
-		int note;
-		int program;
-		program_t *curr_prg;
-		
-		fixed_t pitchbend;
-		
 		LowPassFilter filter;
 		Envelope *filter_envelope;
 		filter_params_t filter_params;
@@ -71,13 +56,6 @@ class Note
 			oscillator_t *oscillator;
 			filter_params_t filter_params;
 		} orig;
-		
-/* *einstellungen: oszillatoren, deren lautstärke etc.
- * note
- * lautstärke
- * *pitchbend
- * *portamento time
- */
 };
 
 
-- 
cgit v1.2.3