zynaddsubfx

commit 3d3805c8088cd007d82c8132e465f34a5a400fb7
parent 12bbb35c2f866f0b2e2eb8f9e4ae82c2f61428c1
Author: fundamental <mark.d.mccurry@gmail.com>
Date:   Sat, 25 Oct 2014 22:37:30 -0400

Fix Fl_Oscilloscope Rebase

Diffstat:
M
src/UI/ADnoteUI.fl
 | 
1
+
M
src/UI/Fl_Oscilloscope.h
 | 
2
+-

2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/UI/ADnoteUI.fl b/src/UI/ADnoteUI.fl
@@ -808,6 +808,7 @@ delete(oscedit);
   Function {change_voice(int nvoice_)} {open
   } {
     code {nvoice = nvoice_;
+    loc = base+"voice"+to_s(nvoice)+"/";
 ADnoteVoiceParameters->rebase(base+"voice"+to_s(nvoice)+"/");} {selected
     }
   }
diff --git a/src/UI/Fl_Oscilloscope.h b/src/UI/Fl_Oscilloscope.h
@@ -13,7 +13,7 @@
 
 class Fl_Osc_Group;
 //Consider merging in Fl_OscilSpectrum
-class Fl_Oscilloscope : public Fl_Box, Fl_Osc_Widget
+class Fl_Oscilloscope : public Fl_Box, public Fl_Osc_Widget
 {
     public:
         Fl_Oscilloscope(int x,int y, int w, int h, const char *label=0)