diff options
| author | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2014-07-01 19:10:47 +0100 |
|---|---|---|
| committer | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2014-07-01 19:10:47 +0100 |
| commit | e5e12acc5698090f2c0c614385e457cc0b46fbb0 (patch) | |
| tree | 3f4f28baba25f4e276d669d98ff485f7c51aa0b1 /libs/ardour/utils.cc | |
| parent | 23e7cf10191270d70357ccf0ed9294f020c7b7ab (diff) | |
| parent | da65f3778c66dd2935709445c9a5dbd225296439 (diff) | |
Merge branch 'ripple-mode-cc' into cairocanvas
Fix up merge conflicts in
gtk2_ardour/editor_mouse.cc
gtk2_ardour/editor_ops.cc
Also fix up compile errors.
Diffstat (limited to 'libs/ardour/utils.cc')
| -rw-r--r-- | libs/ardour/utils.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libs/ardour/utils.cc b/libs/ardour/utils.cc index 54943562cb..9c0aea885b 100644 --- a/libs/ardour/utils.cc +++ b/libs/ardour/utils.cc @@ -423,6 +423,8 @@ ARDOUR::string_to_edit_mode (string str) return Splice; } else if (str == _("Slide")) { return Slide; + } else if (str == _("Ripple")) { + return Ripple; } else if (str == _("Lock")) { return Lock; } @@ -441,6 +443,9 @@ ARDOUR::edit_mode_to_string (EditMode mode) case Lock: return _("Lock"); + case Ripple: + return _("Ripple"); + default: case Splice: return _("Splice"); |