Allow -ve framepos handling in TempoMap::framepos_plus_beats()

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

diff --git a/libs/ardour/user_bundle.cc b/libs/ardour/user_bundle.cc
index de71a87d86b262943ad2ac9fe793247020a08570..dda0a6dce75ace1cdf4594496c824cf96ca6c951 100644 (file)
--- a/libs/ardour/user_bundle.cc
+++ b/libs/ardour/user_bundle.cc
@@ -1,5 +1,24 @@
+/*
+    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.
+
+*/
+
 #include "ardour/user_bundle.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include "pbd/compose.h"
 #include "pbd/error.h"
 #include "pbd/failed_constructor.h"
@@ -90,7 +109,7 @@ ARDOUR::UserBundle::get_state ()
        node->add_property ("name", name ());
 
        {
-               Glib::Mutex::Lock lm (_channel_mutex);
+               Glib::Threads::Mutex::Lock lm (_channel_mutex);
 
                for (std::vector<Channel>::iterator i = _channel.begin(); i != _channel.end(); ++i) {
                        XMLNode* c = new XMLNode ("Channel");