NO-OP: re-order code, add comments

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

diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
index bf4c5c6910d498a464000dc13127b4c8b92a1d80..cf014aca84132e270296f5c17141314923dee3dd 100644 (file)
--- a/libs/ardour/audioregion.cc
+++ b/libs/ardour/audioregion.cc
@@ -279,13 +279,13 @@ 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, const int32_t sub_num)
-       : Region (other, offset, sub_num)
+AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> other, MusicFrame offset)
+       : Region (other, offset)
        , 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.
          */
-       , _envelope (Properties::envelope, boost::shared_ptr<AutomationList> (new AutomationList (*other->_envelope.val(), offset, other->_length)))
+       , _envelope (Properties::envelope, boost::shared_ptr<AutomationList> (new AutomationList (*other->_envelope.val(), offset.frame, other->_length)))
        , _automatable (other->session())
        , _fade_in_suspended (0)
        , _fade_out_suspended (0)
@@ -770,11 +770,9 @@ XMLNode&
 AudioRegion::get_basic_state ()
 {
        XMLNode& node (Region::state ());
-       char buf[64];
        LocaleGuard lg;
 
-       snprintf (buf, sizeof (buf), "%u", (uint32_t) _sources.size());
-       node.add_property ("channels", buf);
+       node.set_property ("channels", (uint32_t)_sources.size());
 
        return node;
 }
@@ -802,7 +800,7 @@ AudioRegion::state ()
        }
 
        if (default_env) {
-               child->add_property ("default", "yes");
+               child->set_property ("default", "yes");
        } else {
                child->add_child_nocopy (_envelope->get_state ());
        }
@@ -810,7 +808,7 @@ AudioRegion::state ()
        child = node.add_child (X_("FadeIn"));
 
        if (_default_fade_in) {
-               child->add_property ("default", "yes");
+               child->set_property ("default", "yes");
        } else {
                child->add_child_nocopy (_fade_in->get_state ());
        }
@@ -823,7 +821,7 @@ AudioRegion::state ()
        child = node.add_child (X_("FadeOut"));
 
        if (_default_fade_out) {
-               child->add_property ("default", "yes");
+               child->set_property ("default", "yes");
        } else {
                child->add_child_nocopy (_fade_out->get_state ());
        }
@@ -840,7 +838,6 @@ int
 AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_changed, bool send)
 {
        const XMLNodeList& nlist = node.children();
-       XMLProperty const * prop;
        LocaleGuard lg;
        boost::shared_ptr<Playlist> the_playlist (_playlist.lock());
 
@@ -857,10 +854,10 @@ AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_
 
        Region::_set_state (node, version, what_changed, false);
 
-       if ((prop = node.property ("scale-gain")) != 0) {
-               float a = atof (prop->value().c_str());
-               if (a != _scale_amplitude) {
-                       _scale_amplitude = a;
+       float val;
+       if (node.get_property ("scale-gain", val)) {
+               if (val != _scale_amplitude) {
+                       _scale_amplitude = val;
                        what_changed.add (Properties::scale_amplitude);
                }
        }
@@ -890,7 +887,8 @@ AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_
 
                        _fade_in->clear ();
 
-                       if (((prop = child->property ("default")) != 0 && string_is_affirmative (prop->value())) || (prop = child->property ("steepness")) != 0) {
+                       bool is_default;
+                       if ((child->get_property ("default", is_default) && is_default) || (prop = child->property ("steepness")) != 0) {
                                set_default_fade_in ();
                        } else {
                                XMLNode* grandchild = child->child ("AutomationList");
@@ -899,19 +897,17 @@ AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_
                                }
                        }
 
-                       if ((prop = child->property ("active")) != 0) {
-                               if (string_is_affirmative (prop->value())) {
-                                       set_fade_in_active (true);
-                               } else {
-                                       set_fade_in_active (false);
-                               }
+                       bool is_active;
+                       if (child->get_property ("active", is_active)) {
+                               set_fade_in_active (is_active);
                        }
 
                } else if (child->name() == "FadeOut") {
 
                        _fade_out->clear ();
 
-                       if (((prop = child->property ("default")) != 0 && (string_is_affirmative (prop->value()))) || (prop = child->property ("steepness")) != 0) {
+                       bool is_default;
+                       if ((child->get_property ("default", is_default) && is_default) || (prop = child->property ("steepness")) != 0) {
                                set_default_fade_out ();
                        } else {
                                XMLNode* grandchild = child->child ("AutomationList");
@@ -920,12 +916,9 @@ AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_
                                }
                        }
 
-                       if ((prop = child->property ("active")) != 0) {
-                               if (string_is_affirmative (prop->value())) {
-                                       set_fade_out_active (true);
-                               } else {
-                                       set_fade_out_active (false);
-                               }
+                       bool is_active;
+                       if (child->get_property ("active", is_active)) {
+                               set_fade_out_active (is_active);
                        }
 
                } else if ( (child->name() == "InverseFadeIn") || (child->name() == "InvFadeIn")  ) {
@@ -1095,7 +1088,7 @@ AudioRegion::set_fade_out (boost::shared_ptr<AutomationList> f)
        _fade_out->thaw ();
        _default_fade_out = false;
 
-       send_change (PropertyChange (Properties::fade_in));
+       send_change (PropertyChange (Properties::fade_out));
 }
 
 void