zynaddsubfx

commit 19e1e85838d535bec82278b4c6d865700a57e0fc
parent 6eaa2d1137fbc4422ce97ed84383286bb4a147aa
Author: paulnasca <paulnasca>
Date:   Mon, 19 Jul 2004 17:39:56 +0000

*** empty log message ***

Diffstat:
M
ChangeLog
 | 
1
+
M
src/Synth/OscilGen.C
 | 
2
+-
M
src/UI/PADnoteUI.fl
 | 
7
+++----

3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -653,4 +653,5 @@
             - LANSAT PE INTERNET - VERSIUNEA (2.0.0pre1)
 --------------------------------------------------------------------------------------------------
 18 Iul 2004 - Corectata o mica eroare la afisare care facea ca la PADnoteUI sa fie trasate liniile in mod gresit
+19 Iul 2004 - Corectata doua mici erori (se incarca gresit parametrii filtrului de la OscilGen)
 
diff --git a/src/Synth/OscilGen.C b/src/Synth/OscilGen.C
@@ -1301,7 +1301,7 @@ void OscilGen::getfromXML(XMLwrapper *xml){
 
     Pfiltertype=xml->getpar127("filter_type",Pfiltertype);
     Pfilterpar1=xml->getpar127("filter_par1",Pfilterpar1);
-    Pfilterpar1=xml->getpar127("filter_par2",Pfilterpar2);
+    Pfilterpar2=xml->getpar127("filter_par2",Pfilterpar2);
     Pfilterbeforews=xml->getpar127("filter_before_wave_shaping",Pfilterbeforews);
 
     Psatype=xml->getpar127("spectrum_adjust_type",Psatype);
diff --git a/src/UI/PADnoteUI.fl b/src/UI/PADnoteUI.fl
@@ -99,8 +99,7 @@ fl_color(0,100,220);
 fl_line(ox+lx/2-rbw,oy,ox+lx/2-rbw,oy+ly-1);
 fl_line(ox+lx/2+rbw,oy,ox+lx/2+rbw,oy+ly-1);
 
-fl_line_style(0);} {selected
-    }
+fl_line_style(0);} {}
   }
   decl {Master *master;} {}
   decl {PADnoteParameters *pars;} {public
@@ -836,8 +835,8 @@ o->color(FL_GRAY);}
       }
       Fl_Button {} {
         label Close
-        callback {padnotewindow->hide();}
-        xywh {300 405 195 40} box THIN_UP_BOX
+        callback {padnotewindow->hide();} selected
+        xywh {300 405 195 40} box THIN_UP_BOX labelsize 20
       }
     }
   }