diff options
author | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2018-09-13 14:05:47 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2018-09-13 14:05:47 -0400 |
commit | 9321f46c453b3df226f0abc8ced6415e1d3e842d (patch) | |
tree | f906186ba378d6bae64a43f994e1659bd45ba478 /gtk2_ardour | |
parent | 556cf7a21520c4b1bda14bce96ecc9919a946c9d (diff) |
Implement new Enclosed region equivalence mode
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index e086363a23..8cca0227f8 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -2138,7 +2138,6 @@ RCOptionEditor::RCOptionEditor () uint32_t hwcpus = hardware_concurrency (); BoolOption* bo; - BoolComboOption* bco; if (hwcpus > 1) { add_option (_("General"), new OptionEditorHeading (_("DSP CPU Utilization"))); @@ -2444,16 +2443,18 @@ RCOptionEditor::RCOptionEditor () add_option (_("Editor"), fadeshape); - bco = new BoolComboOption ( - "use-overlap-equivalency", - _("Regions in edit groups are edited together"), - _("whenever they overlap in time"), - _("only if they have identical length and position"), - sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_overlap_equivalency), - sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_overlap_equivalency) + ComboOption<RegionEquivalence> *eqv = new ComboOption<RegionEquivalence> ( + "region-equivalence", + _("Regions in active edit groups are edited together"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_region_equivalence), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_region_equivalence) ); - add_option (_("Editor"), bco); + eqv->add (Overlap, _("whenever they overlap in time")); + eqv->add (Enclosed, _("if either encloses the other")); + eqv->add (Exact, _("only if they have identical length, position and origin")); + + add_option (_("Editor"), eqv); ComboOption<LayerModel>* lm = new ComboOption<LayerModel> ( "layer-model", |