X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fsynthesizer%2Fsynthesizer.h;h=79bc0356b2f361ca47b6cbb8cf494ff640ddef44;hb=6a85ddeaab7b4a87cffb57f105b7a5a96a6e2ff4;hp=3529ce9e8a2139cf79d32429ce8a965c036408f1;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/plugins/synthesizer/synthesizer.h b/cinelerra-5.1/plugins/synthesizer/synthesizer.h index 3529ce9e..79bc0356 100644 --- a/cinelerra-5.1/plugins/synthesizer/synthesizer.h +++ b/cinelerra-5.1/plugins/synthesizer/synthesizer.h @@ -108,13 +108,13 @@ float keyboard_freqs[] = }; #define MAX_FREQS 16 -#define TOTALOSCILLATORS 1 -#define OSCILLATORHEIGHT 40 +#define MAX_OSCILLATORS 256 +#define OSCILLATORHEIGHT yS(40) #define TOTALNOTES ((int)(sizeof(keyboard_freqs) / sizeof(float))) #define MIDDLE_C 24 #define FIRST_TITLE (MIDDLE_C - 12) #define LAST_TITLE (MIDDLE_C + 12) -#define MARGIN 10 +#define YMARGIN yS(10) #define SINE 0 #define SAWTOOTH 1 @@ -254,7 +254,7 @@ public: SynthOscGUI *gui; }; -class SynthOscGUIFreq : public BC_IPot +class SynthOscGUIFreq : public BC_FPot { public: SynthOscGUIFreq(Synth *synth, SynthOscGUI *gui, int y); @@ -510,6 +510,24 @@ public: Synth *synth; }; +class SynthFreqPow1 : public BC_MenuItem +{ +public: + SynthFreqPow1(Synth *synth); + ~SynthFreqPow1(); + int handle_event(); + Synth *synth; +}; + +class SynthFreqPow2 : public BC_MenuItem +{ +public: + SynthFreqPow2(Synth *synth); + ~SynthFreqPow2(); + int handle_event(); + Synth *synth; +}; + class SynthFreqEnum : public BC_MenuItem { public: @@ -519,6 +537,15 @@ public: Synth *synth; }; +class SynthFreqMin : public BC_MenuItem +{ +public: + SynthFreqMin(Synth *synth); + ~SynthFreqMin(); + int handle_event(); + Synth *synth; +}; + class SynthFreqEven : public BC_MenuItem { public: