allow to query export profile type

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

diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
index 22c1758ef1618bf0e3437826a27cd8ad062eec94..391dcfb2d381bb6802688607b05d3a63b119d143 100644 (file)
--- a/libs/ardour/audioregion.cc
+++ b/libs/ardour/audioregion.cc
@@ -55,7 +55,7 @@
 #include "ardour/coreaudiosource.h"
 #endif // HAVE_COREAUDIO
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include <locale.h>
 
 using namespace std;
@@ -279,8 +279,8 @@ AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> other)
        assert (_sources.size() == _master_sources.size());
 }
 
-AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> other, framecnt_t offset)
-       : Region (other, offset)
+AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> other, framecnt_t offset, const int32_t sub_num)
+       : Region (other, offset, sub_num)
        , AUDIOREGION_COPY_STATE (other)
          /* As far as I can see, the _envelope's times are relative to region position, and have nothing
             to do with sources (and hence _start).  So when we copy the envelope, we just use the supplied offset.
@@ -771,7 +771,7 @@ AudioRegion::get_basic_state ()
 {
        XMLNode& node (Region::state ());
        char buf[64];
-       LocaleGuard lg (X_("C"));
+       LocaleGuard lg;
 
        snprintf (buf, sizeof (buf), "%u", (uint32_t) _sources.size());
        node.add_property ("channels", buf);
@@ -784,7 +784,7 @@ AudioRegion::state ()
 {
        XMLNode& node (get_basic_state());
        XMLNode *child;
-       LocaleGuard lg (X_("C"));
+       LocaleGuard lg;
 
        child = node.add_child ("Envelope");
 
@@ -840,8 +840,8 @@ int
 AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_changed, bool send)
 {
        const XMLNodeList& nlist = node.children();
-       const XMLProperty *prop;
-       LocaleGuard lg (X_("C"));
+       XMLProperty const * prop;
+       LocaleGuard lg;
        boost::shared_ptr<Playlist> the_playlist (_playlist.lock());
 
        suspend_property_changes ();
@@ -871,7 +871,7 @@ AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_
 
        for (XMLNodeConstIterator niter = nlist.begin(); niter != nlist.end(); ++niter) {
                XMLNode *child;
-               XMLProperty *prop;
+               XMLProperty const * prop;
 
                child = (*niter);