X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Felement_importer.cc;h=4f635f1693ccef28b51afc745a23a98e37e84f99;hb=01d57ff3e7bea307ab43d5521f232f947a24e10f;hp=af8dd770dadfbf9812a836ce3869327902b9d469;hpb=38382b792113cbf23881c1dca64e16c2d0207d45;p=ardour.git

diff --git a/libs/ardour/element_importer.cc b/libs/ardour/element_importer.cc
index af8dd770da..4f635f1693 100644
--- a/libs/ardour/element_importer.cc
+++ b/libs/ardour/element_importer.cc
@@ -18,23 +18,24 @@
 
 */
 
-#include <ardour/element_importer.h>
+#include "ardour/element_importer.h"
 
 #include <sstream>
 #include <iomanip>
 
-#include <pbd/convert.h>
-#include <ardour/session.h>
+#include "pbd/convert.h"
+#include "ardour/session.h"
 
 #include "i18n.h"
 
+using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
 
-sigc::signal <std::pair<bool, string>, string, string> ElementImporter::Rename;
-sigc::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) : 
+ElementImporter::ElementImporter (XMLTree const & source, ARDOUR::Session & session) :
   source (source),
   session(session),
   _queued (false),
@@ -51,7 +52,6 @@ ElementImporter::ElementImporter (XMLTree const & source, ARDOUR::Session & sess
 
 ElementImporter::~ElementImporter ()
 {
-	cancel_move ();
 }
 
 void
@@ -79,7 +79,7 @@ ElementImporter::cancel_move ()
 }
 
 string
-ElementImporter::smpte_to_string(SMPTE::Time & time) const
+ElementImporter::timecode_to_string(Timecode::Time & time) const
 {
 	std::ostringstream oss;
 	oss << std::setfill('0') << std::right <<
@@ -91,19 +91,19 @@ ElementImporter::smpte_to_string(SMPTE::Time & time) const
 	  time.seconds << ":" <<
 	  std::setw(2) <<
 	  time.frames;
-	
+
 	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