many changes, large and small, related to smart mode editing, range/region selection...

[ardour.git] / libs / ardour / ardour / element_importer.h

diff --git a/libs/ardour/ardour/element_importer.h b/libs/ardour/ardour/element_importer.h
index d728a4b98997431973de1ea01ad96dd7cf9f0b65..8c25fd380d8f0654d3abc547b75ea2cf6eb02e88 100644 (file)
--- a/libs/ardour/ardour/element_importer.h
+++ b/libs/ardour/ardour/element_importer.h
@@ -24,7 +24,7 @@
 #include <string>
 #include <utility>
 
-#include <boost/signals2.hpp>
+#include "pbd/signals.h"
 #include "ardour/types.h"
 
 class XMLTree;
@@ -72,10 +72,10 @@ class ElementImporter
        bool broken () { return _broken; }
 
        /// Signal that requests for anew name
-       static boost::signals2::signal <std::pair<bool, std::string> (std::string, std::string)> Rename;
+       static PBD::Signal2<std::pair<bool, std::string>,std::string, std::string> Rename;
 
        /// Signal for ok/cancel prompting
-       static boost::signals2::signal <bool(std::string)> Prompt;
+       static PBD::Signal1<bool,std::string> Prompt;
 
   protected:
 
@@ -109,13 +109,13 @@ class ElementImporter
        std::string  name;
 
        /// The sample rate of the session from which we are importing
-       nframes_t sample_rate;
+       framecnt_t sample_rate;
 
        /// Converts timecode time to a string
        std::string timecode_to_string (Timecode::Time & time) const;
 
        /// Converts samples so that times match the sessions sample rate
-       nframes_t rate_convert_samples (nframes_t samples) const;
+       framecnt_t rate_convert_samples (framecnt_t samples) const;
 
        /// Converts samples so that times match the sessions sample rate (for straight use in XML)
        std::string rate_convert_samples (std::string const & samples) const;