diff options
| author | Len Ovens <len@ovenwerks.net> | 2017-07-24 07:07:39 -0700 |
|---|---|---|
| committer | Len Ovens <len@ovenwerks.net> | 2017-07-24 10:21:31 -0700 |
| commit | 3ab4a1d1475db9fb8a65fdb8e885b530b742dfc1 (patch) | |
| tree | eebc5f49f482705a856de00ce2707a89f81b07c3 /libs | |
| parent | f3e0fcbb7e33fdaa54aaead2985b4ca7eed6fa57 (diff) | |
OSC: add use groups to GUI
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/surfaces/osc/osc_gui.cc | 11 | ||||
| -rw-r--r-- | libs/surfaces/osc/osc_gui.h | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/libs/surfaces/osc/osc_gui.cc b/libs/surfaces/osc/osc_gui.cc index a78b9d2c5f..57fe2aa682 100644 --- a/libs/surfaces/osc/osc_gui.cc +++ b/libs/surfaces/osc/osc_gui.cc @@ -272,6 +272,12 @@ OSC_GUI::OSC_GUI (OSC& p) sttable->attach (hidden_tracks, 1, 2, stn, stn+1, AttachOptions(FILL|EXPAND), AttachOptions(0), 0, 0); ++stn; + label = manage (new Gtk::Label(_("Use Groups:"))); + label->set_alignment(1, .5); + sttable->attach (*label, 0, 1, stn, stn+1, AttachOptions(FILL|EXPAND), AttachOptions(0)); + sttable->attach (usegroups, 1, 2, stn, stn+1, AttachOptions(FILL|EXPAND), AttachOptions(0), 0, 0); + ++stn; + sttable->show_all (); append_page (*sttable, _("Default Strip Types")); @@ -402,6 +408,7 @@ OSC_GUI::OSC_GUI (OSC& p) monitor_type.signal_clicked().connect (sigc::mem_fun (*this, &OSC_GUI::set_bitsets)); selected_tracks.signal_clicked().connect (sigc::mem_fun (*this, &OSC_GUI::set_bitsets)); hidden_tracks.signal_clicked().connect (sigc::mem_fun (*this, &OSC_GUI::set_bitsets)); + usegroups.signal_clicked().connect (sigc::mem_fun (*this, &OSC_GUI::set_bitsets)); strip_buttons_button.signal_clicked().connect (sigc::mem_fun (*this, &OSC_GUI::set_bitsets)); strip_control_button.signal_clicked().connect (sigc::mem_fun (*this, &OSC_GUI::set_bitsets)); ssid_as_path.signal_clicked().connect (sigc::mem_fun (*this, &OSC_GUI::set_bitsets)); @@ -644,6 +651,7 @@ OSC_GUI::reshow_values () audio_auxes.set_active(def_strip & 128); selected_tracks.set_active(def_strip & 256); hidden_tracks.set_active(def_strip & 512); + usegroups.set_active(def_strip & 1024); def_feedback = cp.get_defaultfeedback(); strip_buttons_button.set_active(def_feedback & 1); strip_control_button.set_active(def_feedback & 2); @@ -752,6 +760,9 @@ OSC_GUI::calculate_strip_types () if (hidden_tracks.get_active()) { stvalue += 512; } + if (usegroups.get_active()) { + stvalue += 1024; + } current_strip_types.set_text(string_compose("%1", stvalue)); } diff --git a/libs/surfaces/osc/osc_gui.h b/libs/surfaces/osc/osc_gui.h index e66bd01b8a..7ea1efd7fe 100644 --- a/libs/surfaces/osc/osc_gui.h +++ b/libs/surfaces/osc/osc_gui.h @@ -94,6 +94,7 @@ private: Gtk::CheckButton monitor_type; Gtk::CheckButton selected_tracks; Gtk::CheckButton hidden_tracks; + Gtk::CheckButton usegroups; int stvalue; // feedback calculator uint32_t def_feedback; |