Consistent AU factory Preset IDs

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

diff --git a/libs/ardour/audio_region_importer.cc b/libs/ardour/audio_region_importer.cc
index 53367a35a443282d752ee5b99546b06b27ae97a5..1fc2537af1b19793b9e88c7d36c99f0a3db556bb 100644 (file)
--- a/libs/ardour/audio_region_importer.cc
+++ b/libs/ardour/audio_region_importer.cc
@@ -33,7 +33,7 @@
 #include "ardour/region_factory.h"
 #include "ardour/session_directory.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;
@@ -62,7 +62,7 @@ AudioRegionImportHandler::create_regions_from_children (XMLNode const & node, El
                if (!(*it)->name().compare ("Region") && (!type || type->value() == "audio") ) {
                        try {
                                list.push_back (ElementPtr ( new AudioRegionImporter (source, session, *this, **it)));
-                       } catch (failed_constructor err) {
+                       } catch (failed_constructor const&) {
                                set_dirty();
                        }
                }
@@ -127,7 +127,7 @@ AudioRegionImporter::~AudioRegionImporter ()
 string
 AudioRegionImporter::get_info () const
 {
-       framecnt_t length, position;
+       samplecnt_t length, position;
        Timecode::Time length_time, position_time;
        std::ostringstream oss;
 
@@ -236,7 +236,7 @@ AudioRegionImporter::parse_source_xml ()
        char buf[128];
        std::string source_dir(get_sound_dir (source));
        XMLNode * source_node;
-       XMLProperty *prop;
+       XMLProperty const * prop;
 
        // Get XML for sources
        if (!(source_node = source.root()->child (X_("Sources")))) {