zynaddsubfx

commit 8a7f4a21335e326b316a0fc08529c149836cdcbf
parent f96d22a15aa71504059dbbbc093a7e3bae110e0f
Author: paulnasca <paulnasca>
Date:   Sun,  1 Aug 2004 21:01:55 +0000

*** empty log message ***

Diffstat:
M
ChangeLog
 | 
2
+-
M
src/Params/PADnoteParameters.C
 | 
4
++++
M
src/UI/PADnoteUI.fl
 | 
13
++++++++-----

3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -673,5 +673,5 @@
 31 Iul 2004 - Eliminate complet stergerile in plus de la UI din destructorele obiecte
             - LANSAT PE INTERNET - VERSIUNEA (2.0.0pre2)
 --------------------------------------------------------------------------------------------------
-
+01 Aug 2004 - Adaugat un nou tip de OvertonesPosition la PADsynth
 
diff --git a/src/Params/PADnoteParameters.C b/src/Params/PADnoteParameters.C
@@ -300,6 +300,10 @@ REALTYPE PADnoteParameters::getNhr(int n){
 	case 5:
 	    result=n0+sin(n0*par2*par2*PI*0.999)*sqrt(par1)*2.0+1.0;
 	    break;
+	case 6:
+	    tmp=pow(par2*2.0,2.0)+0.1;
+	    result=n0*pow(1.0+par1*pow(n0*0.8,tmp),tmp)+1.0;
+	    break;
 	default:
 	    result=n;
 	    break;
diff --git a/src/UI/PADnoteUI.fl b/src/UI/PADnoteUI.fl
@@ -178,7 +178,7 @@ class PADnoteUI {} {
   Function {make_window()} {} {
     Fl_Window padnotewindow {
       label {PAD synth Parameters}
-      xywh {184 106 535 450} type Double hide
+      xywh {184 106 535 450} type Double visible
     } {
       Fl_Tabs {} {
         callback {if (o->value()!=harmonicstructuregroup) applybutton->hide();
@@ -186,7 +186,7 @@ class PADnoteUI {} {
         xywh {0 0 535 395}
       } {
         Fl_Group harmonicstructuregroup {
-          label {Harmonic Structure}
+          label {Harmonic Structure} selected
           xywh {0 20 535 375} box ENGRAVED_BOX
         } {
           Fl_Group {} {
@@ -404,7 +404,7 @@ cbwidget->do_callback();}
               label OvertonesPosition
               callback {pars->Phrpos.type=o->value();
 overtonepos->redraw();
-cbwidget->do_callback();} open
+cbwidget->do_callback();}
               xywh {325 310 80 20} down_box BORDER_BOX labelsize 10 align 5 textsize 12
               code0 {o->value(pars->Phrpos.type);}
             } {
@@ -432,6 +432,10 @@ cbwidget->do_callback();} open
                 label Sine
                 xywh {110 110 100 20} labelfont 1 labelsize 12
               }
+              menuitem {} {
+                label Power
+                xywh {120 120 100 20} labelfont 1 labelsize 12
+              }
             }
             Fl_Dial {} {
               label Par1
@@ -863,8 +867,7 @@ make_window();} {}
 delete(resui);
 
 padnotewindow->hide();
-delete(padnotewindow);} {selected
-    }
+delete(padnotewindow);} {}
   }
   decl {PADnoteParameters *pars;} {public
   }