diff options
author | Carl Hetherington <carl@carlh.net> | 2010-06-28 00:34:09 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2010-06-28 00:34:09 +0000 |
commit | c5bbca0cf560014e14d0d5863fb824952cb4908f (patch) | |
tree | 23a9399dfd1a70a5ed587d55475546cf671e78b9 /gtk2_ardour | |
parent | 37978aa21437b9bb308efeb9828fbe4a06077cee (diff) |
Add an EnumProperty for enumerated properties and hence make Region::position_lock_style a stateful property.
git-svn-id: svn://localhost/ardour2/branches/3.0@7306 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/editor.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/editor_ops.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/editor_regions.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 0b6929e86c..3181ea0728 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -1756,8 +1756,8 @@ Editor::add_region_context_items (StreamView* sv, boost::shared_ptr<Region> regi items.push_back (CheckMenuElem (_("Glue to Bars and Beats"))); CheckMenuItem* bbt_glue_item = static_cast<CheckMenuItem*>(&items.back()); - switch (region_to_check->positional_lock_style()) { - case Region::MusicTime: + switch (region_to_check->position_lock_style()) { + case MusicTime: bbt_glue_item->set_active (true); break; default: diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index b267bcd37b..2747632968 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -4944,7 +4944,7 @@ Editor::toggle_region_lock_style () for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { (*i)->region()->clear_history (); - Region::PositionLockStyle const ns = (*i)->region()->positional_lock_style() == Region::AudioTime ? Region::MusicTime : Region::AudioTime; + PositionLockStyle const ns = (*i)->region()->position_lock_style() == AudioTime ? MusicTime : AudioTime; (*i)->region()->set_position_lock_style (ns); _session->add_command (new StatefulDiffCommand ((*i)->region())); } diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc index ab6ce76567..58a6a0e129 100644 --- a/gtk2_ardour/editor_regions.cc +++ b/gtk2_ardour/editor_regions.cc @@ -803,7 +803,7 @@ EditorRegions::populate_row (boost::shared_ptr<Region> region, TreeModel::Row co row[_columns.locked] = region->locked(); - if (region->positional_lock_style() == Region::MusicTime) { + if (region->position_lock_style() == MusicTime) { row[_columns.glued] = true; } else { row[_columns.glued] = false; |