confirm prefs update, fix bg_pixmap sz, plugin layout tweaks

[goodguy/cinelerra.git] / cinelerra-5.1 / plugins / synthesizer / synthesizer.h

diff --git a/cinelerra-5.1/plugins/synthesizer/synthesizer.h b/cinelerra-5.1/plugins/synthesizer/synthesizer.h
index 3529ce9e8a2139cf79d32429ce8a965c036408f1..d8d10bd3070602d49799ae1c49ccb989f669afc6 100644 (file)
--- a/cinelerra-5.1/plugins/synthesizer/synthesizer.h
+++ b/cinelerra-5.1/plugins/synthesizer/synthesizer.h
@@ -28,12 +28,10 @@
 #include "guicast.h"
 #include "mutex.h"
 #include "pluginaclient.h"
+#include "synthesizer.inc"
 #include "vframe.inc"
 
 
-class Synth;
-class SynthWindow;
-
 // Frequency table for piano
 float keyboard_freqs[] =
 {
@@ -109,12 +107,11 @@ float keyboard_freqs[] =
 
 #define MAX_FREQS 16
 #define TOTALOSCILLATORS 1
-#define OSCILLATORHEIGHT 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 MARGIN yS(10)
 
 #define SINE 0
 #define SAWTOOTH 1