diff options
Diffstat (limited to 'libs/surfaces/osc/osc_gui.cc')
| -rw-r--r-- | libs/surfaces/osc/osc_gui.cc | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/libs/surfaces/osc/osc_gui.cc b/libs/surfaces/osc/osc_gui.cc index 4f976302f5..306baa95c4 100644 --- a/libs/surfaces/osc/osc_gui.cc +++ b/libs/surfaces/osc/osc_gui.cc @@ -266,11 +266,14 @@ OSC_GUI::OSC_GUI (OSC& p) fbtable->set_col_spacings (6); fbtable->set_border_width (12); - // show our url label = manage (new Gtk::Label(_("Select Desired Types of Feedback"))); fbtable->attach (*label, 0, 2, fn, fn+1, AttachOptions(FILL|EXPAND), AttachOptions(0)); ++fn; + feedback_enable.add (*manage (new Label (_("Enable Feedback")))); + fbtable->attach (feedback_enable, 0, 2, fn, fn+1, AttachOptions(FILL|EXPAND), AttachOptions(0)); + ++fn; + label = manage (new Gtk::Label(_("Feedback Value:"))); label->set_alignment(1, .5); fbtable->attach (*label, 0, 1, fn, fn+1, AttachOptions(FILL|EXPAND), AttachOptions(0), 0, 15); @@ -369,6 +372,7 @@ OSC_GUI::OSC_GUI (OSC& p) // set strips and feedback from loaded default values reshow_values (); // connect signals + feedback_enable.signal_clicked().connect (sigc::mem_fun (*this, &OSC_GUI::toggle_feedback_enable)); audio_tracks.signal_clicked().connect (sigc::mem_fun (*this, &OSC_GUI::set_bitsets)); midi_tracks.signal_clicked().connect (sigc::mem_fun (*this, &OSC_GUI::set_bitsets)); audio_buses.signal_clicked().connect (sigc::mem_fun (*this, &OSC_GUI::set_bitsets)); @@ -601,6 +605,8 @@ OSC_GUI::reshow_values () //hp_gui.set_active (false); // we don't have this yet (Mixbus wants) select_fb.set_active(def_feedback & 8192); + feedback_enable.set_active (cp.get_feedback ()); + calculate_strip_types (); calculate_feedback (); } @@ -694,6 +700,12 @@ OSC_GUI::calculate_strip_types () } void +OSC_GUI::toggle_feedback_enable () +{ + cp.set_feedback (feedback_enable.get_active ()); +} + +void OSC_GUI::set_bitsets () { if (preset_busy) { |