fix crash when copy'ing latent plugins

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

diff --git a/libs/ardour/session_butler.cc b/libs/ardour/session_butler.cc
index 1d235b051aad98888c70b9b35a15c59a2893ac1e..259a3a1d3d6d55c42aa3a5d0bc189624d35f3b52 100644 (file)
--- a/libs/ardour/session_butler.cc
+++ b/libs/ardour/session_butler.cc
@@ -17,16 +17,6 @@
 
 */
 
-#include <algorithm>
-#include <string>
-#include <cmath>
-#include <cerrno>
-#include <unistd.h>
-#include <fcntl.h>
-#include <poll.h>
-
-#include <glibmm/threads.h>
-
 #include "pbd/error.h"
 #include "pbd/pthread_utils.h"
 #include "pbd/stacktrace.h"
@@ -38,26 +28,12 @@
 #include "ardour/track.h"
 #include "ardour/types.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-/* XXX put this in the right place */
-
-static inline uint32_t next_power_of_two (uint32_t n)
-{
-       --n;
-       n |= n >> 16;
-       n |= n >> 8;
-       n |= n >> 4;
-       n |= n >> 2;
-       n |= n >> 1;
-       ++n;
-       return n;
-}
-
 /*---------------------------------------------------------------------------
  BUTLER THREAD
  ---------------------------------------------------------------------------*/