add skeleton for i18n support

[ardour.git] / libs / evoral / src / ControlList.cpp

diff --git a/libs/evoral/src/ControlList.cpp b/libs/evoral/src/ControlList.cpp
index f88bda323e8c42835335680bc76d06e883efada1..6e428144a99cf88b98b5c6cd951d7e2627f79ca5 100644 (file)
--- a/libs/evoral/src/ControlList.cpp
+++ b/libs/evoral/src/ControlList.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Evoral.
- * Copyright (C) 2008 Dave Robillard <http://drobilla.net>
+ * Copyright (C) 2008 David Robillard <http://drobilla.net>
  * Copyright (C) 2000-2008 Paul Davis
  *
  * Evoral is free software; you can redistribute it and/or modify it under the
@@ -282,7 +282,7 @@ ControlList::merge_nascent (double when)
                                 
                         } else {
                                 
-                                /* find the range that overaps with nascent events,
+                                /* find the range that overlaps with nascent events,
                                    and insert the contents of nascent events.
                                 */
                                 
@@ -331,8 +331,14 @@ ControlList::merge_nascent (double when)
                                                 }
                                         }
                                 }
-                                
-                                assert (range_begin != _events.end());
+
+                               /* Now:
+                                  range_begin is the first event on our list after the first nascent event
+                                  range_end   is the first event on our list after the last  nascent event
+
+                                  range_begin may be equal to _events.end() iff the last event on our list
+                                  was at the same time as the first nascent event.
+                               */
                                 
                                 if (range_begin != _events.begin()) {
                                         /* clamp point before */
@@ -359,7 +365,7 @@ ControlList::merge_nascent (double when)
                 nascent.clear ();
 
                 if (writing()) {
-                        nascent.push_back (new NascentInfo (false));
+                        nascent.push_back (new NascentInfo ());
                 }
         }