use a note tracker to resolve notes cut off during render by the end of the region

[ardour.git] / libs / pbd / malign.cc

diff --git a/libs/pbd/malign.cc b/libs/pbd/malign.cc
index e9695cd91c0e6fc32671004b56e118d66714b2b8..16c50ad294c803cbaae4c1ee58b098f48679deb9 100644 (file)
--- a/libs/pbd/malign.cc
+++ b/libs/pbd/malign.cc
@@ -1,21 +1,21 @@
 /*
-    Copyright (C) 2012 Paul Davis 
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
+ * Copyright (C) 2009-2016 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2015 Robin Gareus <robin@gareus.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include "libpbd-config.h"
 
@@ -25,7 +25,7 @@
 #include "pbd/malign.h"
 #include "pbd/error.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 
@@ -47,8 +47,6 @@ int cache_aligned_malloc (void** memptr, size_t size)
                return 0;
        }
 #else
-       std::string << string_compose (_("Memory allocation error: malloc (%1 * %2)"),
-                                        CPU_CACHE_ALIGN, size) << endmsg;
        if (((*memptr) = malloc (size)) == 0) {
                fatal << string_compose (_("Memory allocation error: malloc (%1 * %2) failed (%3)"),
                                         CPU_CACHE_ALIGN, size, strerror (errno)) << endmsg;
@@ -64,7 +62,7 @@ int cache_aligned_malloc (void** memptr, size_t size)
        }
 
        return 0;
-#endif 
+#endif
 }
 
 void cache_aligned_free (void* memptr)
@@ -103,7 +101,7 @@ int  aligned_malloc (void** memptr, size_t size, size_t alignment)
        }
 
        return 0;
-#endif 
+#endif
 }
 
 void aligned_free (void* memptr)
@@ -113,4 +111,4 @@ void aligned_free (void* memptr)
 #else
        free (memptr);
 #endif
-}
\ No newline at end of file
+}