zynaddsubfx

commit 80646f2d3b0815259e4d67c59dc293204e115283
parent df30ef9398844bafd1d8834f079116a4462fd0fb
Author: paulnasca <paulnasca>
Date:   Sun, 20 Jun 2004 11:09:25 +0000

*** empty log message ***

Diffstat:
M
ChangeLog
 | 
3
+++
M
src/Synth/OscilGen.C
 | 
8
++++----
M
src/UI/OscilGenUI.fl
 | 
5
++---
M
src/UI/PartUI.fl
 | 
5
+++--

4 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -586,5 +586,8 @@
 	    - Inceput sa scriu modulul de sinteza PADnote
 19 Iun 2004 - Adaugat modul liniar de controller bandwidth si modificat modul liniar la controllerul modulation wheel
 	    - Adaugata modulatia in frecventa la OsciGen
+20 Iun 2004 - Nu se mai deschide automat fereastra de instrumente daca a fost deschisa si s-a descarcat un instrument
+	    - Facute mici modificari la FM-ul de la Oscil
+
 
 
diff --git a/src/Synth/OscilGen.C b/src/Synth/OscilGen.C
@@ -417,18 +417,18 @@ void OscilGen::modulation(){
 
 
     REALTYPE modulationpar1=Pmodulationpar1/127.0,
-	     modulationpar2=Pmodulationpar2/127.0,
+	     modulationpar2=0.5-Pmodulationpar2/127.0,
 	     modulationpar3=Pmodulationpar3/127.0;
 
     switch(Pmodulation){
-        case 1:modulationpar1=(pow(2,modulationpar1*5.0)-1.0)/10.0;
+        case 1:modulationpar1=(pow(2,modulationpar1*5.0)-1.0)/100.0;
 	       modulationpar3=floor((pow(2,modulationpar3*5.0)-1.0));
 	       if (modulationpar3<0.9999) modulationpar3=-1.0;
 	    break;
-        case 2:modulationpar1=(pow(2,modulationpar1*5.0)-1.0)/10.0;
+        case 2:modulationpar1=(pow(2,modulationpar1*5.0)-1.0)/100.0;
 	       modulationpar3=1.0+floor((pow(2,modulationpar3*5.0)-1.0));
     	    break;
-	case 3:modulationpar1=(pow(2,modulationpar1*7.0)-1.0)/10.0;
+	case 3:modulationpar1=(pow(2,modulationpar1*7.0)-1.0)/100.0;
 	       modulationpar3=0.01+(pow(2,modulationpar3*16.0)-1.0)/10.0;
 	    break;
     };	
diff --git a/src/UI/OscilGenUI.fl b/src/UI/OscilGenUI.fl
@@ -284,8 +284,7 @@ delete(harmonic);} {}
 } 
 
 class OscilEditor {} {
-  Function {make_window()} {open
-  } {
+  Function {make_window()} {} {
     Fl_Window osceditUI {
       label {ADsynth Oscillator Editor}
       xywh {66 94 745 590} type Double hide
@@ -574,7 +573,7 @@ pthread_mutex_unlock(&master->mutex);
 
 oscildisplaygroup->redraw();
 basefuncdisplaygroup->redraw();
-oldosc->redraw();}
+oldosc->redraw();} selected
         tooltip {Use this Oscillator as base function} xywh {15 310 85 20} box THIN_UP_BOX labelfont 1 labelsize 12
       }
       Fl_Button {} {
diff --git a/src/UI/PartUI.fl b/src/UI/PartUI.fl
@@ -574,7 +574,7 @@ part->ctl.portamento.updowntimestretch=x;}
       }
       Fl_Check_Button {} {
         label {Exp BW}
-        callback {part->ctl.bandwidth.exponential=(int) o->value();} selected
+        callback {part->ctl.bandwidth.exponential=(int) o->value();}
         tooltip {Exponential BandWidth Controller} xywh {85 15 35 25} down_box DOWN_BOX labelsize 10 align 148
         code0 {o->value(part->ctl.bandwidth.exponential);}
       }
@@ -1014,7 +1014,8 @@ partgroup->show();
 end();
 
 
-if (config.ui.showinstrumentinfo!=0) instrumenteditwindow->show();} {}
+//if (config.ui.showinstrumentinfo!=0) instrumenteditwindow->show();} {selected
+    }
   }
   Function {showparameters(int kititem,int engine)} {} {
     code {if (engine==-1){//this is used if I want to clear the engine from the part