Revert to old Lock mode (still called Lock).

[ardour.git] / libs / ardour / utils.cc

diff --git a/libs/ardour/utils.cc b/libs/ardour/utils.cc
index 54943562cb906278ad9cb0475c62ff599597c16d..6d6511bb9f5f377c29d7cd4eb014fcdefe54e45f 100644 (file)
--- a/libs/ardour/utils.cc
+++ b/libs/ardour/utils.cc
@@ -423,11 +423,13 @@ 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;
        }
        fatal << string_compose (_("programming error: unknown edit mode string \"%1\""), str) << endmsg;
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
        return Slide;
 }
 
@@ -441,6 +443,9 @@ ARDOUR::edit_mode_to_string (EditMode mode)
        case Lock:
                return _("Lock");
 
+       case Ripple:
+               return _("Ripple");
+
        default:
        case Splice:
                return _("Splice");
@@ -463,7 +468,7 @@ ARDOUR::string_to_sync_source (string str)
        }
 
        fatal << string_compose (_("programming error: unknown sync source string \"%1\""), str) << endmsg;
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
        return Engine;
 }
 
@@ -572,7 +577,7 @@ ARDOUR::string_to_auto_state (std::string str)
        }
 
        fatal << string_compose (_("programming error: %1 %2"), "illegal AutoState string: ", str) << endmsg;
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
        return Touch;
 }
 
@@ -596,7 +601,7 @@ ARDOUR::auto_state_to_string (AutoState as)
        }
 
        fatal << string_compose (_("programming error: %1 %2"), "illegal AutoState type: ", as) << endmsg;
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
        return "";
 }
 
@@ -610,7 +615,7 @@ ARDOUR::string_to_auto_style (std::string str)
        }
 
        fatal << string_compose (_("programming error: %1 %2"), "illegal AutoStyle string: ", str) << endmsg;
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
        return Trim;
 }
 
@@ -629,7 +634,7 @@ ARDOUR::auto_style_to_string (AutoStyle as)
        }
 
        fatal << string_compose (_("programming error: %1 %2"), "illegal AutoStyle type: ", as) << endmsg;
-       /*NOTREACHED*/
+       abort(); /*NOTREACHED*/
        return "";
 }
 
@@ -664,7 +669,7 @@ ARDOUR::native_header_format_extension (HeaderFormat hf, const DataType& type)
         }
 
         fatal << string_compose (_("programming error: unknown native header format: %1"), hf);
-        /*NOTREACHED*/
+        abort(); /*NOTREACHED*/
         return ".wav";
 }