LTC slave fix fps detection with 29.97000 option

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

diff --git a/libs/ardour/user_bundle.cc b/libs/ardour/user_bundle.cc
index b6c38e0eedf8b35084455fc233434bae719be992..2655d6bc7d817d516e78aa832a1eddf6515be304 100644 (file)
--- a/libs/ardour/user_bundle.cc
+++ b/libs/ardour/user_bundle.cc
@@ -1,13 +1,9 @@
-#include <cassert>
-#include "pbd/failed_constructor.h"
-#include "pbd/compose.h"
-#include "pbd/xml++.h"
 #include "ardour/user_bundle.h"
-#include "ardour/port_set.h"
-#include "ardour/io.h"
-#include "ardour/session.h"
-#include "ardour/audioengine.h"
 #include "i18n.h"
+#include "pbd/compose.h"
+#include "pbd/error.h"
+#include "pbd/failed_constructor.h"
+#include "pbd/xml++.h"
 
 ARDOUR::UserBundle::UserBundle (std::string const & n)
        : Bundle (n)
@@ -94,7 +90,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");