Mixbus enforces output port count

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

diff --git a/libs/ardour/element_importer.cc b/libs/ardour/element_importer.cc
index 3e7c2c9a91db9639ece995444afcac6625e0e21e..4f635f1693ccef28b51afc745a23a98e37e84f99 100644 (file)
--- a/libs/ardour/element_importer.cc
+++ b/libs/ardour/element_importer.cc
@@ -32,8 +32,8 @@ using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
 
-boost::signals2::signal <std::pair<bool, string> (string, string)> ElementImporter::Rename;
-boost::signals2::signal <bool (string)> ElementImporter::Prompt;
+Signal2<std::pair<bool, string>,string, string> ElementImporter::Rename;
+Signal1 <bool,string> ElementImporter::Prompt;
 
 ElementImporter::ElementImporter (XMLTree const & source, ARDOUR::Session & session) :
   source (source),
@@ -95,15 +95,15 @@ ElementImporter::timecode_to_string(Timecode::Time & time) const
        return oss.str();
 }
 
-nframes_t
-ElementImporter::rate_convert_samples (nframes_t samples) const
+framecnt_t
+ElementImporter::rate_convert_samples (framecnt_t samples) const
 {
        if (sample_rate == session.frame_rate()) {
                return samples;
        }
 
        // +0.5 for proper rounding
-       return static_cast<nframes_t> (samples * (static_cast<double> (session.nominal_frame_rate()) / sample_rate) + 0.5);
+       return static_cast<framecnt_t> (samples * (static_cast<double> (session.nominal_frame_rate()) / sample_rate) + 0.5);
 }
 
 string