diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2010-02-12 18:40:42 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-02-12 18:40:42 +0000 |
commit | fccd7d5103b897959b5f816aebd9613aee111433 (patch) | |
tree | a11fdd81d8f672eb912564127b54cbc581088aeb /libs/ardour/audioregion.cc | |
parent | a1e0dc13df3cdc7033c940f0f3311a2bd47d3b2e (diff) |
torben's latest fix for the MTC PiC (adjust catch factor)
git-svn-id: svn://localhost/ardour2/branches/3.0@6679 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audioregion.cc')
-rw-r--r-- | libs/ardour/audioregion.cc | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index c96f7119b8..d1e78cadd3 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -552,8 +552,6 @@ AudioRegion::state (bool full) char buf2[64]; LocaleGuard lg (X_("POSIX")); - node.add_property ("flags", enum_2_string (_flags)); - snprintf (buf, sizeof(buf), "%.12g", _scale_amplitude); node.add_property ("scale-gain", buf); @@ -646,38 +644,14 @@ AudioRegion::set_live_state (const XMLNode& node, int version, Change& what_chan Region::set_live_state (node, version, what_changed, false); cerr << "After region SLS, wc = " << what_changed << endl; - uint32_t old_flags = _flags; if ((prop = node.property ("flags")) != 0) { - _flags = Flag (string_2_enum (prop->value(), _flags)); - - //_flags = Flag (strtol (prop->value().c_str(), (char **) 0, 16)); - _flags = Flag (_flags & ~Region::LeftOfSplit); _flags = Flag (_flags & ~Region::RightOfSplit); } - /* leave this flag setting in place, no matter what */ - - if ((old_flags & DoNotSendPropertyChanges)) { - _flags = Flag (_flags | DoNotSendPropertyChanges); - } - /* find out if any flags changed that we signal about */ - if ((old_flags ^ _flags) & Muted) { - what_changed = Change (what_changed|MuteChanged); - cerr << _name << " mute changed\n"; - } - if ((old_flags ^ _flags) & Opaque) { - what_changed = Change (what_changed|OpacityChanged); - cerr << _name << " opacity changed\n"; - } - if ((old_flags ^ _flags) & Locked) { - what_changed = Change (what_changed|LockChanged); - cerr << _name << " lock changed\n"; - } - if ((prop = node.property ("scale-gain")) != 0) { float a = atof (prop->value().c_str()); if (a != _scale_amplitude) { |