fix "import at file position" when copying or channel-splitting files on import.

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

diff --git a/libs/ardour/callback.cc b/libs/ardour/callback.cc
index 85449dac03139ff80c477f32ff2f50b0e4bbefe2..68427551911686bf99c4bb44679bae5cfd26c472 100644 (file)
--- a/libs/ardour/callback.cc
+++ b/libs/ardour/callback.cc
@@ -16,7 +16,6 @@
 #include "pbd/strsplit.h"
 #include "pbd/convert.h"
 
-#include "ardour/callback.h"
 #include "ardour/filesystem_paths.h"
 
 using namespace std;
@@ -53,7 +52,7 @@ watermark ()
 void
 block_mothership ()
 {
-        string hangup = Glib::build_filename (ARDOUR::user_config_directory().to_string(), OFF_THE_HOOK);
+        string hangup = Glib::build_filename (ARDOUR::user_config_directory(), OFF_THE_HOOK);
         int fd;
         if ((fd = ::open (hangup.c_str(), O_RDWR|O_CREAT, 0600)) >= 0) {
                 close (fd);
@@ -63,14 +62,14 @@ block_mothership ()
 void
 unblock_mothership ()
 {
-        string hangup = Glib::build_filename (ARDOUR::user_config_directory().to_string(), OFF_THE_HOOK);
+        string hangup = Glib::build_filename (ARDOUR::user_config_directory(), OFF_THE_HOOK);
         ::unlink (hangup.c_str());
 }
 
 bool
 mothership_blocked ()
 {
-        string hangup = Glib::build_filename (ARDOUR::user_config_directory().to_string(), OFF_THE_HOOK);
+        string hangup = Glib::build_filename (ARDOUR::user_config_directory(), OFF_THE_HOOK);
         return Glib::file_test (hangup, Glib::FILE_TEST_EXISTS);
 }