Fix importing to a fixed-point format with resampling

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

diff --git a/libs/ardour/location_importer.cc b/libs/ardour/location_importer.cc
index 167461609615a69b28528a52abb3be315b868a8b..60b6161a4e18e556310f8072492f0d44f3396b8d 100644 (file)
--- a/libs/ardour/location_importer.cc
+++ b/libs/ardour/location_importer.cc
@@ -27,7 +27,7 @@
 #include "pbd/convert.h"
 #include "pbd/failed_constructor.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;
@@ -49,7 +49,7 @@ LocationImportHandler::LocationImportHandler (XMLTree const & source, Session &
        for (XMLNodeList::const_iterator it = locations.begin(); it != locations.end(); ++it) {
                try {
                        elements.push_back (ElementPtr ( new LocationImporter (source, session, *this, **it)));
-               } catch (failed_constructor err) {
+               } catch (failed_constructor const&) {
                        _dirty = true;
                }
        }
@@ -104,7 +104,7 @@ LocationImporter::~LocationImporter ()
 string
 LocationImporter::get_info () const
 {
-       nframes_t start, end;
+       samplepos_t start, end;
        Timecode::Time start_time, end_time;
 
        // Get sample positions