X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fregion.cc;h=53c36ed5b5d7c1b4aef8f3115f9a43adce343f7f;hb=c3821a78162fe6d89455ab5ed4e925bafec2a845;hp=21721a484a5825da26cd8cd6dcc6eb8143b15292;hpb=fccd7d5103b897959b5f816aebd9613aee111433;p=ardour.git diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index 21721a484a..53c36ed5b5 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -23,21 +23,22 @@ #include #include - #include #include "pbd/xml++.h" #include "pbd/stacktrace.h" #include "pbd/enumwriter.h" #include "ardour/debug.h" -#include "ardour/region.h" +#include "ardour/file_source.h" +#include "ardour/filter.h" #include "ardour/playlist.h" +#include "ardour/profile.h" +#include "ardour/region.h" +#include "ardour/region_factory.h" #include "ardour/session.h" #include "ardour/source.h" +#include "ardour/source_factory.h" #include "ardour/tempo.h" -#include "ardour/region_factory.h" -#include "ardour/filter.h" -#include "ardour/profile.h" #include "ardour/utils.h" #include "i18n.h" @@ -46,160 +47,258 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -Change Region::FadeChanged = PBD::new_change (); -Change Region::SyncOffsetChanged = PBD::new_change (); -Change Region::MuteChanged = PBD::new_change (); -Change Region::OpacityChanged = PBD::new_change (); -Change Region::LockChanged = PBD::new_change (); -Change Region::LayerChanged = PBD::new_change (); -Change Region::HiddenChanged = PBD::new_change (); +namespace ARDOUR { + namespace Properties { + PBD::PropertyDescriptor muted; + PBD::PropertyDescriptor opaque; + PBD::PropertyDescriptor locked; + PBD::PropertyDescriptor automatic; + PBD::PropertyDescriptor whole_file; + PBD::PropertyDescriptor import; + PBD::PropertyDescriptor external; + PBD::PropertyDescriptor sync_marked; + PBD::PropertyDescriptor left_of_split; + PBD::PropertyDescriptor right_of_split; + PBD::PropertyDescriptor hidden; + PBD::PropertyDescriptor position_locked; + PBD::PropertyDescriptor valid_transients; + PBD::PropertyDescriptor start; + PBD::PropertyDescriptor length; + PBD::PropertyDescriptor position; + PBD::PropertyDescriptor sync_position; + PBD::PropertyDescriptor layer; + PBD::PropertyDescriptor ancestral_start; + PBD::PropertyDescriptor ancestral_length; + PBD::PropertyDescriptor stretch; + PBD::PropertyDescriptor shift; + PBD::PropertyDescriptor position_lock_style; + } +} + +PBD::Signal2,const PropertyChange&> Region::RegionPropertyChanged; -PBD::Signal1 > Region::RegionPropertyChanged; +void +Region::make_property_quarks () +{ + Properties::muted.property_id = g_quark_from_static_string (X_("muted")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for muted = %1\n", Properties::muted.property_id)); + Properties::opaque.property_id = g_quark_from_static_string (X_("opaque")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for opaque = %1\n", Properties::opaque.property_id)); + Properties::locked.property_id = g_quark_from_static_string (X_("locked")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for locked = %1\n", Properties::locked.property_id)); + Properties::automatic.property_id = g_quark_from_static_string (X_("automatic")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for automatic = %1\n", Properties::automatic.property_id)); + Properties::whole_file.property_id = g_quark_from_static_string (X_("whole-file")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for whole-file = %1\n", Properties::whole_file.property_id)); + Properties::import.property_id = g_quark_from_static_string (X_("import")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for import = %1\n", Properties::import.property_id)); + Properties::external.property_id = g_quark_from_static_string (X_("external")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for external = %1\n", Properties::external.property_id)); + Properties::sync_marked.property_id = g_quark_from_static_string (X_("sync-marked")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for sync-marked = %1\n", Properties::sync_marked.property_id)); + Properties::left_of_split.property_id = g_quark_from_static_string (X_("left-of-split")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for left-of-split = %1\n", Properties::left_of_split.property_id)); + Properties::right_of_split.property_id = g_quark_from_static_string (X_("right-of-split")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for right-of-split = %1\n", Properties::right_of_split.property_id)); + Properties::hidden.property_id = g_quark_from_static_string (X_("hidden")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for hidden = %1\n", Properties::hidden.property_id)); + Properties::position_locked.property_id = g_quark_from_static_string (X_("position-locked")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for position-locked = %1\n", Properties::position_locked.property_id)); + Properties::valid_transients.property_id = g_quark_from_static_string (X_("valid-transients")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for valid-transients = %1\n", Properties::valid_transients.property_id)); + Properties::start.property_id = g_quark_from_static_string (X_("start")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for start = %1\n", Properties::start.property_id)); + Properties::length.property_id = g_quark_from_static_string (X_("length")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for length = %1\n", Properties::length.property_id)); + Properties::position.property_id = g_quark_from_static_string (X_("position")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for position = %1\n", Properties::position.property_id)); + Properties::sync_position.property_id = g_quark_from_static_string (X_("sync-position")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for sync-position = %1\n", Properties::sync_position.property_id)); + Properties::layer.property_id = g_quark_from_static_string (X_("layer")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for layer = %1\n", Properties::layer.property_id)); + Properties::ancestral_start.property_id = g_quark_from_static_string (X_("ancestral-start")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for ancestral-start = %1\n", Properties::ancestral_start.property_id)); + Properties::ancestral_length.property_id = g_quark_from_static_string (X_("ancestral-length")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for ancestral-length = %1\n", Properties::ancestral_length.property_id)); + Properties::stretch.property_id = g_quark_from_static_string (X_("stretch")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for stretch = %1\n", Properties::stretch.property_id)); + Properties::shift.property_id = g_quark_from_static_string (X_("shift")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for shift = %1\n", Properties::shift.property_id)); + Properties::position_lock_style.property_id = g_quark_from_static_string (X_("positional-lock-style")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for position_lock_style = %1\n", Properties::position_lock_style.property_id)); +} void -Region::register_states () +Region::register_properties () { _xml_node_name = X_("Region"); - add_state (_flags); - add_state (_start); - add_state (_length); - add_state (_position); - add_state (_sync_position); - add_state (_layer); - add_state (_ancestral_start); - add_state (_ancestral_length); - add_state (_stretch); - add_state (_shift); -} + + add_property (_muted); + add_property (_opaque); + add_property (_locked); + add_property (_automatic); + add_property (_whole_file); + add_property (_import); + add_property (_external); + add_property (_sync_marked); + add_property (_left_of_split); + add_property (_right_of_split); + add_property (_hidden); + add_property (_position_locked); + add_property (_valid_transients); + add_property (_start); + add_property (_length); + add_property (_position); + add_property (_sync_position); + add_property (_layer); + add_property (_ancestral_start); + add_property (_ancestral_length); + add_property (_stretch); + add_property (_shift); + add_property (_position_lock_style); +} + +#define REGION_DEFAULT_STATE(s,l) \ + _muted (Properties::muted, false) \ + , _opaque (Properties::opaque, true) \ + , _locked (Properties::locked, false) \ + , _automatic (Properties::automatic, false) \ + , _whole_file (Properties::whole_file, false) \ + , _import (Properties::import, false) \ + , _external (Properties::external, false) \ + , _sync_marked (Properties::sync_marked, false) \ + , _left_of_split (Properties::left_of_split, false) \ + , _right_of_split (Properties::right_of_split, false) \ + , _hidden (Properties::hidden, false) \ + , _position_locked (Properties::position_locked, false) \ + , _valid_transients (Properties::valid_transients, false) \ + , _start (Properties::start, (s)) \ + , _length (Properties::length, (l)) \ + , _position (Properties::position, 0) \ + , _sync_position (Properties::sync_position, (s)) \ + , _layer (Properties::layer, 0) \ + , _ancestral_start (Properties::ancestral_start, (s)) \ + , _ancestral_length (Properties::ancestral_length, (l)) \ + , _stretch (Properties::stretch, 1.0) \ + , _shift (Properties::shift, 1.0) \ + , _position_lock_style (Properties::position_lock_style, _type == DataType::AUDIO ? AudioTime : MusicTime) + +#define REGION_COPY_STATE(other) \ + _muted (Properties::muted, other->_muted) \ + , _opaque (Properties::opaque, other->_opaque) \ + , _locked (Properties::locked, other->_locked) \ + , _automatic (Properties::automatic, other->_automatic) \ + , _whole_file (Properties::whole_file, other->_whole_file) \ + , _import (Properties::import, other->_import) \ + , _external (Properties::external, other->_external) \ + , _sync_marked (Properties::sync_marked, other->_sync_marked) \ + , _left_of_split (Properties::left_of_split, other->_left_of_split) \ + , _right_of_split (Properties::right_of_split, other->_right_of_split) \ + , _hidden (Properties::hidden, other->_hidden) \ + , _position_locked (Properties::position_locked, other->_position_locked) \ + , _valid_transients (Properties::valid_transients, other->_valid_transients) \ + , _start(Properties::start, other->_start) \ + , _length(Properties::length, other->_length) \ + , _position(Properties::position, other->_position) \ + , _sync_position(Properties::sync_position, other->_sync_position) \ + , _layer (Properties::layer, other->_layer) \ + , _ancestral_start (Properties::ancestral_start, other->_ancestral_start) \ + , _ancestral_length (Properties::ancestral_length, other->_ancestral_length) \ + , _stretch (Properties::stretch, other->_stretch) \ + , _shift (Properties::shift, other->_shift) \ + , _position_lock_style (Properties::position_lock_style, other->_position_lock_style) /* derived-from-derived constructor (no sources in constructor) */ -Region::Region (Session& s, nframes_t start, nframes_t length, const string& name, DataType type, layer_t layer, Region::Flag flags) +Region::Region (Session& s, framepos_t start, framecnt_t length, const string& name, DataType type) : SessionObject(s, name) , _type(type) - , _flags (X_("flags"), FlagsChanged, Flag (flags|DoNotSendPropertyChanges)) - , _start (X_("start"), StartChanged, start) - , _length (X_("length"), LengthChanged, length) - , _position (X_("position"), PositionChanged, 0) + , REGION_DEFAULT_STATE(start,length) + , _last_length (length) , _last_position (0) - , _positional_lock_style(AudioTime) - , _sync_position (X_("sync-position"), SyncOffsetChanged, _start) - , _layer (X_("layer"), LayerChanged, layer) - , _first_edit(EditChangesNothing) - , _frozen(0) - , _ancestral_start (X_("ancestral-start"), Change (0), 0) - , _ancestral_length (X_("ancestral-length"), Change (0), 0) - , _stretch (X_("stretch"), Change (0), 1.0) - , _shift (X_("shift"), Change (0), 1.0) + , _first_edit (EditChangesNothing) , _read_data_count(0) - , _pending_changed(Change (0)) , _last_layer_op(0) , _pending_explicit_relayer (false) { - register_states (); - + register_properties (); + /* no sources at this point */ } -/** Basic Region constructor (single source) */ -Region::Region (boost::shared_ptr src, nframes_t start, nframes_t length, const string& name, DataType type, layer_t layer, Region::Flag flags) - : SessionObject(src->session(), name) - , _type(type) - , _flags (X_("flags"), FlagsChanged, Flag (flags|DoNotSendPropertyChanges)) - , _start (X_("start"), StartChanged, start) - , _length (X_("length"), LengthChanged, length) - , _position (X_("position"), PositionChanged, 0) - , _last_position(0) - , _positional_lock_style(AudioTime) - , _sync_position (X_("sync-position"), SyncOffsetChanged, _start) - , _layer (X_("layer"), LayerChanged, layer) - , _first_edit(EditChangesNothing) - , _frozen(0) - , _ancestral_start (X_("ancestral-start"), Change (0), 0) - , _ancestral_length (X_("ancestral-length"), Change (0), 0) - , _stretch (X_("stretch"), Change (0), 1.0) - , _shift (X_("shift"), Change (0), 1.0) - , _valid_transients(false) +/** Basic Region constructor (many sources) */ +Region::Region (const SourceList& srcs) + : SessionObject(srcs.front()->session(), "toBeRenamed") + , _type (srcs.front()->type()) + , REGION_DEFAULT_STATE(0,0) + , _last_length (0) + , _last_position (0) + , _first_edit (EditChangesNothing) , _read_data_count(0) - , _pending_changed(Change (0)) - , _last_layer_op(0) + , _last_layer_op (0) , _pending_explicit_relayer (false) { - register_states (); + register_properties (); - _sources.push_back (src); - _master_sources.push_back (src); + _type = srcs.front()->type(); - src->DropReferences.connect_same_thread (*this, boost::bind (&Region::source_deleted, this, boost::weak_ptr(src))); + use_sources (srcs); assert(_sources.size() > 0); - _positional_lock_style = AudioTime; + assert (_type == srcs.front()->type()); } -/** Basic Region constructor (many sources) */ -Region::Region (const SourceList& srcs, nframes_t start, nframes_t length, const string& name, DataType type, layer_t layer, Region::Flag flags) - : SessionObject(srcs.front()->session(), name) - , _type(type) - , _flags (X_("flags"), FlagsChanged, Flag (flags|DoNotSendPropertyChanges)) - , _start (X_("start"), StartChanged, start) - , _length (X_("length"), LengthChanged, length) - , _position (X_("position"), PositionChanged, 0) - , _last_position(0) - , _positional_lock_style(AudioTime) - , _sync_position (X_("sync-position"), SyncOffsetChanged, _start) - , _layer (X_("layer"), LayerChanged, layer) - , _first_edit(EditChangesNothing) - , _frozen(0) - , _ancestral_start (X_("ancestral-start"), Change (0), 0) - , _ancestral_length (X_("ancestral-length"), Change (0), 0) - , _stretch (X_("stretch"), Change (0), 1.0) - , _shift (X_("shift"), Change (0), 1.0) +/** Create a new Region from an existing one */ +Region::Region (boost::shared_ptr other) + : SessionObject(other->session(), other->name()) + , _type (other->data_type()) + , REGION_COPY_STATE (other) + , _last_length (other->_last_length) + , _last_position(other->_last_position) \ + , _first_edit (EditChangesNothing) , _read_data_count(0) - , _pending_changed(Change (0)) - , _last_layer_op(0) + , _last_layer_op (0) , _pending_explicit_relayer (false) + { - register_states (); + register_properties (); - use_sources (srcs); - assert(_sources.size() > 0); -} + /* override state that may have been incorrectly inherited from the other region + */ -/** Create a new Region from part of an existing one */ -Region::Region (boost::shared_ptr other, nframes_t offset, nframes_t length, const string& name, layer_t layer, Flag flags) - : SessionObject(other->session(), name) - , _type (other->data_type()) - , _flags (X_("flags"), FlagsChanged, Flag (flags | DoNotSendPropertyChanges)) - , _start (X_("start"), StartChanged, 0) - , _length (X_("length"), LengthChanged, 0) - , _position (X_("position"), PositionChanged, 0) - , _sync_position (X_("sync-position"), SyncOffsetChanged, 0) - , _layer (X_("layer"), LayerChanged, 0) - , _ancestral_start (X_("ancestral-start"), Change (0), 0) - , _ancestral_length (X_("ancestral-length"), Change (0), 0) - , _stretch (X_("stretch"), Change (0), 1.0) - , _shift (X_("shift"), Change (0), 1.0) - , _pending_explicit_relayer (false) + _position = 0; + _locked = false; + _whole_file = false; + _hidden = false; -{ - register_states (); + use_sources (other->_sources); - _start = other->_start + offset; - copy_stuff (other, offset, length, name, layer, flags); + _position_lock_style = other->_position_lock_style; + _first_edit = other->_first_edit; - /* if the other region had a distinct sync point - set, then continue to use it as best we can. - otherwise, reset sync point back to start. - */ + _start = 0; // It seems strange _start is not inherited here? - if (other->flags() & SyncMarked) { - if (other->_sync_position < _start) { - _flags = Flag (_flags & ~SyncMarked); - _sync_position = _start; + /* sync pos is relative to start of file. our start-in-file is now zero, + so set our sync position to whatever the the difference between + _start and _sync_pos was in the other region. + + result is that our new sync pos points to the same point in our source(s) + as the sync in the other region did in its source(s). + + since we start at zero in our source(s), it is not possible to use a sync point that + is before the start. reset it to _start if that was true in the other region. + */ + + if (other->sync_marked()) { + if (other->_start < other->_sync_position) { + /* sync pos was after the start point of the other region */ + _sync_position = other->_sync_position - other->_start; } else { - _sync_position = other->_sync_position; + /* sync pos was before the start point of the other region. not possible here. */ + _sync_marked = false; + _sync_position = _start; } } else { - _flags = Flag (_flags & ~SyncMarked); + _sync_marked = false; _sync_position = _start; } @@ -209,58 +308,59 @@ Region::Region (boost::shared_ptr other, nframes_t offset, nframes */ if (_sync_position < _start || _sync_position >= _start + _length) { - _flags = Flag (_flags & ~SyncMarked); + _sync_marked = false; _sync_position = _start; } } + + assert (_type == other->data_type()); } -Region::Region (boost::shared_ptr other, nframes_t length, const string& name, layer_t layer, Flag flags) - : SessionObject(other->session(), name) +/** Create a new Region from part of an existing one. + + the start within \a other is given by \a offset + (i.e. relative to the start of \a other's sources, the start is \a offset + \a other.start() +*/ +Region::Region (boost::shared_ptr other, frameoffset_t offset) + : SessionObject(other->session(), other->name()) , _type (other->data_type()) - , _flags (X_("flags"), FlagsChanged, Flag (flags|DoNotSendPropertyChanges)) - , _start (X_("start"), StartChanged, 0) - , _length (X_("length"), LengthChanged, 0) - , _position (X_("position"), PositionChanged, 0) - , _sync_position (X_("sync-position"), SyncOffsetChanged, 0) - , _layer (X_("layer"), LayerChanged, 0) - , _ancestral_start (X_("ancestral-start"), Change (0), 0) - , _ancestral_length (X_("ancestral-length"), Change (0), 0) - , _stretch (X_("stretch"), Change (0), 1.0) - , _shift (X_("shift"), Change (0), 1.0) + , REGION_COPY_STATE (other) + , _last_length (other->_last_length) + , _last_position(other->_last_position) \ + , _first_edit (EditChangesNothing) + , _read_data_count(0) + , _last_layer_op (0) , _pending_explicit_relayer (false) -{ - register_states (); - - /* create a new Region exactly like another but starting at 0 in its sources */ - _start = 0; - copy_stuff (other, 0, length, name, layer, flags); +{ + register_properties (); - _flags = Flag (_flags | DoNotSendPropertyChanges); + /* override state that may have been incorrectly inherited from the other region + */ - /* sync pos is relative to start of file. our start-in-file is now zero, - so set our sync position to whatever the the difference between - _start and _sync_pos was in the other region. + _position = 0; + _locked = false; + _whole_file = false; + _hidden = false; - result is that our new sync pos points to the same point in our source(s) - as the sync in the other region did in its source(s). + use_sources (other->_sources); - since we start at zero in our source(s), it is not possible to use a sync point that - is before the start. reset it to _start if that was true in the other region. + _start = other->_start + offset; + + /* if the other region had a distinct sync point + set, then continue to use it as best we can. + otherwise, reset sync point back to start. */ - - if (other->flags() & SyncMarked) { - if (other->_start < other->_sync_position) { - /* sync pos was after the start point of the other region */ - _sync_position = other->_sync_position - other->_start; - } else { - /* sync pos was before the start point of the other region. not possible here. */ - _flags = Flag (_flags & ~SyncMarked); + + if (other->sync_marked()) { + if (other->_sync_position < _start) { + _sync_marked = false; _sync_position = _start; + } else { + _sync_position = other->_sync_position; } } else { - _flags = Flag (_flags & ~SyncMarked); + _sync_marked = false; _sync_position = _start; } @@ -270,45 +370,30 @@ Region::Region (boost::shared_ptr other, nframes_t length, const s */ if (_sync_position < _start || _sync_position >= _start + _length) { - _flags = Flag (_flags & ~SyncMarked); + _sync_marked = false; _sync_position = _start; } } - /* reset a couple of things that copy_stuff() gets wrong in this particular case */ - - _positional_lock_style = other->_positional_lock_style; - _first_edit = other->_first_edit; + assert (_type == other->data_type()); } -/** Pure copy constructor */ -Region::Region (boost::shared_ptr other) - : SessionObject(other->session(), other->name()) - , _type(other->data_type()) - , _flags (other->_flags) - , _start(other->_start) - , _length(other->_length) - , _position(other->_position) - , _last_position(other->_last_position) - , _positional_lock_style(other->_positional_lock_style) - , _sync_position(other->_sync_position) - , _layer(other->_layer) - , _first_edit(EditChangesID) - , _frozen(0) - , _ancestral_start (other->_ancestral_start) - , _ancestral_length (other->_ancestral_length) - , _stretch (other->_stretch) - , _shift (other->_shift) - , _valid_transients(false) - , _read_data_count(0) - , _pending_changed(Change(0)) - , _last_layer_op(other->_last_layer_op) +/** Create a copy of @param other but with different sources. Used by filters */ +Region::Region (boost::shared_ptr other, const SourceList& srcs) + : SessionObject (other->session(), other->name()) + , _type (srcs.front()->type()) + , REGION_COPY_STATE (other) + , _last_length (other->_last_length) + , _last_position (other->_last_position) + , _first_edit (EditChangesID) + , _read_data_count (0) + , _last_layer_op (other->_last_layer_op) , _pending_explicit_relayer (false) { - register_states (); + register_properties (); - _flags = Flag (_flags & ~ (Locked | PositionLocked)); - _flags = Flag (_flags | DoNotSendPropertyChanges); + _locked = false; + _position_locked = false; other->_first_edit = EditChangesName; @@ -318,108 +403,14 @@ Region::Region (boost::shared_ptr other) _extra_xml = 0; } - use_sources (other->_sources); - assert(_sources.size() > 0); -} - -Region::Region (const SourceList& srcs, const XMLNode& node) - : SessionObject(srcs.front()->session(), X_("error: XML did not reset this")) - , _type(DataType::NIL) // to be loaded from XML - , _flags (X_("flags"), FlagsChanged, Flag (DoNotSendPropertyChanges)) - , _start (X_("start"), StartChanged, 0) - , _length (X_("length"), LengthChanged, 0) - , _position (X_("position"), PositionChanged, 0) - , _last_position(0) - , _positional_lock_style(AudioTime) - , _sync_position (X_("sync-position"), SyncOffsetChanged, _start) - , _layer (X_("layer"), LayerChanged, 0) - , _first_edit(EditChangesNothing) - , _frozen(0) - , _ancestral_start (X_("ancestral-start"), Change (0), 0) - , _ancestral_length (X_("ancestral-length"), Change (0), 0) - , _stretch (X_("stretch"), Change (0), 1.0) - , _shift (X_("shift"), Change (0), 1.0) - , _read_data_count(0) - , _pending_changed(Change(0)) - , _last_layer_op(0) - , _pending_explicit_relayer (false) -{ - register_states (); - use_sources (srcs); - - if (set_state (node, Stateful::loading_state_version)) { - throw failed_constructor(); - } - - assert(_type != DataType::NIL); - assert(_sources.size() > 0); -} - -Region::Region (boost::shared_ptr src, const XMLNode& node) - : SessionObject(src->session(), X_("error: XML did not reset this")) - , _type(DataType::NIL) - , _flags (X_("flags"), FlagsChanged, Flag (DoNotSendPropertyChanges)) - , _start (X_("start"), StartChanged, 0) - , _length (X_("length"), LengthChanged, 0) - , _position (X_("position"), PositionChanged, 0) - , _last_position(0) - , _positional_lock_style(AudioTime) - , _sync_position (X_("sync-position"), SyncOffsetChanged, _start) - , _layer (X_("layer"), LayerChanged, 0) - , _first_edit(EditChangesNothing) - , _frozen(0) - , _ancestral_start (X_("ancestral-start"), Change (0), 0) - , _ancestral_length (X_("ancestral-length"), Change (0), 0) - , _stretch (X_("stretch"), Change (0), 1.0) - , _shift (X_("shift"), Change (0), 1.0) - , _read_data_count(0) - , _pending_changed(Change(0)) - , _last_layer_op(0) - , _pending_explicit_relayer (false) -{ - register_states (); - - _sources.push_back (src); - - if (set_state (node, Stateful::loading_state_version)) { - throw failed_constructor(); - } - - assert(_type != DataType::NIL); assert(_sources.size() > 0); } Region::~Region () { DEBUG_TRACE (DEBUG::Destruction, string_compose ("Region %1 destructor @ %2\n", _name, this)); -} - -void -Region::copy_stuff (boost::shared_ptr other, nframes_t /*offset*/, nframes_t length, const string& name, layer_t layer, Flag flags) -{ - _frozen = 0; - _pending_changed = Change (0); - _read_data_count = 0; - _valid_transients = false; - - _length = length; - _last_length = length; - _sync_position = other->_sync_position; - _ancestral_start = other->_ancestral_start; - _ancestral_length = other->_ancestral_length; - _stretch = other->_stretch; - _shift = other->_shift; - _name = name; - _last_position = 0; - _position = 0; - _layer = layer; - _flags = Flag (flags & ~(Locked|WholeFile|Hidden)); - _first_edit = EditChangesNothing; - _last_layer_op = 0; - _positional_lock_style = AudioTime; - - use_sources (other->_sources); + drop_sources (); } void @@ -434,17 +425,18 @@ Region::set_name (const std::string& str) if (_name != str) { SessionObject::set_name(str); // EMIT SIGNAL NameChanged() assert(_name == str); - send_change (ARDOUR::NameChanged); + + send_change (Properties::name); } return true; } void -Region::set_length (nframes_t len, void */*src*/) +Region::set_length (framecnt_t len, void */*src*/) { //cerr << "Region::set_length() len = " << len << endl; - if (_flags & Locked) { + if (locked()) { return; } @@ -454,7 +446,7 @@ Region::set_length (nframes_t len, void */*src*/) length impossible. */ - if (max_frames - len < _position) { + if (max_framepos - len < _position) { return; } @@ -464,25 +456,30 @@ Region::set_length (nframes_t len, void */*src*/) _last_length = _length; - _length = len; - - _flags = Region::Flag (_flags & ~WholeFile); - + set_length_internal (len); + _whole_file = false; first_edit (); maybe_uncopy (); invalidate_transients (); - if (!_frozen) { + if (!property_changes_suspended()) { recompute_at_end (); } - send_change (LengthChanged); + send_change (Properties::length); } } +void +Region::set_length_internal (framecnt_t len) +{ + _length = len; +} + void Region::maybe_uncopy () { + /* this does nothing but marked a semantic moment once upon a time */ } void @@ -492,10 +489,11 @@ Region::first_edit () if (_first_edit != EditChangesNothing && pl) { - _name = _session.new_region_name (_name); + _name = RegionFactory::new_region_name (_name); _first_edit = EditChangesNothing; - send_change (ARDOUR::NameChanged); + send_change (Properties::name); + RegionFactory::CheckNewRegion (shared_from_this()); } } @@ -537,7 +535,7 @@ Region::move_to_natural_position (void *src) } void -Region::special_set_position (nframes_t pos) +Region::special_set_position (framepos_t pos) { /* this is used when creating a whole file region as a way to store its "natural" or "captured" position. @@ -550,18 +548,23 @@ Region::special_set_position (nframes_t pos) void Region::set_position_lock_style (PositionLockStyle ps) { - boost::shared_ptr pl (playlist()); + if (_position_lock_style != ps) { - if (!pl) { - return; - } - - _positional_lock_style = ps; + boost::shared_ptr pl (playlist()); + + if (!pl) { + return; + } + + _position_lock_style = ps; + + if (_position_lock_style == MusicTime) { + _session.tempo_map().bbt_time (_position, _bbt_time); + } - if (_positional_lock_style == MusicTime) { - _session.tempo_map().bbt_time (_position, _bbt_time); + send_change (Properties::position_lock_style); + } - } void @@ -569,27 +572,38 @@ Region::update_position_after_tempo_map_change () { boost::shared_ptr pl (playlist()); - if (!pl || _positional_lock_style != MusicTime) { + if (!pl || _position_lock_style != MusicTime) { return; } TempoMap& map (_session.tempo_map()); - nframes_t pos = map.frame_time (_bbt_time); + framepos_t pos = map.frame_time (_bbt_time); set_position_internal (pos, false); + + /* do this even if the position is the same. this helps out + a GUI that has moved its representation already. + */ + send_change (Properties::position); } void -Region::set_position (nframes_t pos, void* /*src*/) +Region::set_position (framepos_t pos, void* /*src*/) { if (!can_move()) { return; } set_position_internal (pos, true); + + /* do this even if the position is the same. this helps out + a GUI that has moved its representation already. + */ + send_change (Properties::position); + } void -Region::set_position_internal (nframes_t pos, bool allow_bbt_recompute) +Region::set_position_internal (framepos_t pos, bool allow_bbt_recompute) { if (_position != pos) { _last_position = _position; @@ -601,35 +615,28 @@ Region::set_position_internal (nframes_t pos, bool allow_bbt_recompute) XXX is this the right thing to do? */ - if (max_frames - _length < _position) { + if (max_framepos - _length < _position) { _last_length = _length; - _length = max_frames - _position; + _length = max_framepos - _position; } if (allow_bbt_recompute) { recompute_position_from_lock_style (); } - invalidate_transients (); + //invalidate_transients (); } - - /* do this even if the position is the same. this helps out - a GUI that has moved its representation already. - */ - - send_change (PositionChanged); } void -Region::set_position_on_top (nframes_t pos, void* /*src*/) +Region::set_position_on_top (framepos_t pos, void* /*src*/) { - if (_flags & Locked) { + if (locked()) { return; } if (_position != pos) { - _last_position = _position; - _position = pos; + set_position_internal (pos, true); } boost::shared_ptr pl (playlist()); @@ -641,22 +648,21 @@ Region::set_position_on_top (nframes_t pos, void* /*src*/) /* do this even if the position is the same. this helps out a GUI that has moved its representation already. */ - - send_change (PositionChanged); + send_change (Properties::position); } void Region::recompute_position_from_lock_style () { - if (_positional_lock_style == MusicTime) { + if (_position_lock_style == MusicTime) { _session.tempo_map().bbt_time (_position, _bbt_time); } } void -Region::nudge_position (nframes64_t n, void* /*src*/) +Region::nudge_position (frameoffset_t n, void* /*src*/) { - if (_flags & Locked) { + if (locked()) { return; } @@ -664,27 +670,29 @@ Region::nudge_position (nframes64_t n, void* /*src*/) return; } - _last_position = _position; + framepos_t new_position = _position; if (n > 0) { - if (_position > max_frames - n) { - _position = max_frames; + if (_position > max_framepos - n) { + new_position = max_framepos; } else { - _position += n; + new_position += n; } } else { - if (_position < (nframes_t) -n) { - _position = 0; + if (_position < -n) { + new_position = 0; } else { - _position += n; + new_position += n; } } - send_change (PositionChanged); + set_position_internal (new_position, true); + + send_change (Properties::position); } void -Region::set_ancestral_data (nframes64_t s, nframes64_t l, float st, float sh) +Region::set_ancestral_data (framepos_t s, framecnt_t l, float st, float sh) { _ancestral_length = l; _ancestral_start = s; @@ -693,9 +701,9 @@ Region::set_ancestral_data (nframes64_t s, nframes64_t l, float st, float sh) } void -Region::set_start (nframes_t pos, void* /*src*/) +Region::set_start (framepos_t pos, void* /*src*/) { - if (_flags & (Locked|PositionLocked)) { + if (locked() || position_locked()) { return; } /* This just sets the start, nothing else. It effectively shifts @@ -710,33 +718,27 @@ Region::set_start (nframes_t pos, void* /*src*/) } _start = pos; - _flags = Region::Flag (_flags & ~WholeFile); + _whole_file = false; first_edit (); invalidate_transients (); - send_change (StartChanged); + send_change (Properties::start); } } void -Region::trim_start (nframes_t new_position, void */*src*/) +Region::trim_start (framepos_t new_position, void */*src*/) { - if (_flags & (Locked|PositionLocked)) { + if (locked() || position_locked()) { return; } - nframes_t new_start; - int32_t start_shift; - - if (new_position > _position) { - start_shift = new_position - _position; - } else { - start_shift = -(_position - new_position); - } + framepos_t new_start; + frameoffset_t const start_shift = new_position - _position; if (start_shift > 0) { - if (_start > max_frames - start_shift) { - new_start = max_frames; + if (_start > max_framepos - start_shift) { + new_start = max_framepos; } else { new_start = _start + start_shift; } @@ -747,11 +749,12 @@ Region::trim_start (nframes_t new_position, void */*src*/) } else if (start_shift < 0) { - if (_start < (nframes_t) -start_shift) { + if (_start < -start_shift) { new_start = 0; } else { new_start = _start + start_shift; } + } else { return; } @@ -761,21 +764,39 @@ Region::trim_start (nframes_t new_position, void */*src*/) } _start = new_start; - _flags = Region::Flag (_flags & ~WholeFile); + _whole_file = false; first_edit (); - send_change (StartChanged); + send_change (Properties::start); +} + +void +Region::trim_front (framepos_t new_position, void *src) +{ + modify_front (new_position, false, src); +} + +void +Region::cut_front (framepos_t new_position, void *src) +{ + modify_front (new_position, true, src); +} + +void +Region::cut_end (framepos_t new_endpoint, void *src) +{ + modify_end (new_endpoint, true, src); } void -Region::trim_front (nframes_t new_position, void *src) +Region::modify_front (framepos_t new_position, bool reset_fade, void *src) { - if (_flags & Locked) { + if (locked()) { return; } - nframes_t end = last_frame(); - nframes_t source_zero; + framepos_t end = last_frame(); + framepos_t source_zero; if (_position > _start) { source_zero = _position - _start; @@ -784,93 +805,109 @@ Region::trim_front (nframes_t new_position, void *src) } if (new_position < end) { /* can't trim it zero or negative length */ + + framecnt_t newlen = 0; + framepos_t delta = 0; - nframes_t newlen; - - /* can't trim it back passed where source position zero is located */ - - new_position = max (new_position, source_zero); - - + if (!can_trim_start_before_source_start ()) { + /* can't trim it back past where source position zero is located */ + new_position = max (new_position, source_zero); + } + if (new_position > _position) { newlen = _length - (new_position - _position); + delta = -1 * (new_position - _position); } else { newlen = _length + (_position - new_position); + delta = _position - new_position; } - + trim_to_internal (new_position, newlen, src); - if (!_frozen) { + + if (reset_fade) { + _right_of_split = true; + } + + if (!property_changes_suspended()) { recompute_at_start (); } + + if (_transients.size() > 0){ + adjust_transients(delta); + } } } -/** @param new_endpoint New region end point, such that, for example, - * a region at 0 of length 10 has an endpoint of 9. - */ - void -Region::trim_end (nframes_t new_endpoint, void */*src*/) +Region::modify_end (framepos_t new_endpoint, bool reset_fade, void* /*src*/) { - if (_flags & Locked) { + if (locked()) { return; } if (new_endpoint > _position) { - trim_to_internal (_position, new_endpoint - _position + 1, this); - if (!_frozen) { + trim_to_internal (_position, new_endpoint - _position +1, this); + if (reset_fade) { + _left_of_split = true; + } + if (!property_changes_suspended()) { recompute_at_end (); } } } +/** @param new_endpoint New region end point, such that, for example, + * a region at 0 of length 10 has an endpoint of 9. + */ + +void +Region::trim_end (framepos_t new_endpoint, void* src) +{ + modify_end (new_endpoint, false, src); +} + void -Region::trim_to (nframes_t position, nframes_t length, void *src) +Region::trim_to (framepos_t position, framecnt_t length, void *src) { - if (_flags & Locked) { + if (locked()) { return; } trim_to_internal (position, length, src); - if (!_frozen) { + if (!property_changes_suspended()) { recompute_at_start (); recompute_at_end (); } } void -Region::trim_to_internal (nframes_t position, nframes_t length, void */*src*/) +Region::trim_to_internal (framepos_t position, framecnt_t length, void */*src*/) { - int32_t start_shift; - nframes_t new_start; + framepos_t new_start; - if (_flags & Locked) { + if (locked()) { return; } - if (position > _position) { - start_shift = position - _position; - } else { - start_shift = -(_position - position); - } + frameoffset_t const start_shift = position - _position; if (start_shift > 0) { - if (_start > max_frames - start_shift) { - new_start = max_frames; + if (_start > max_framepos - start_shift) { + new_start = max_framepos; } else { new_start = _start + start_shift; } - } else if (start_shift < 0) { - if (_start < (nframes_t) -start_shift) { + if (_start < -start_shift && !can_trim_start_before_source_start ()) { new_start = 0; } else { new_start = _start + start_shift; } + } else { new_start = _start; } @@ -879,34 +916,49 @@ Region::trim_to_internal (nframes_t position, nframes_t length, void */*src*/) return; } - Change what_changed = Change (0); + PropertyChange what_changed; if (_start != new_start) { _start = new_start; - what_changed = Change (what_changed|StartChanged); - } - if (_length != length) { - if (!_frozen) { - _last_length = _length; - } - _length = length; - what_changed = Change (what_changed|LengthChanged); + what_changed.add (Properties::start); } + + /* Set position before length, otherwise for MIDI regions this bad thing happens: + * 1. we call set_length_internal; length in beats is computed using the region's current + * (soon-to-be old) position + * 2. we call set_position_internal; position is set and length in frames re-computed using + * length in beats from (1) but at the new position, which is wrong if the region + * straddles a tempo/meter change. + */ + if (_position != position) { - if (!_frozen) { + if (!property_changes_suspended()) { _last_position = _position; } - _position = position; - what_changed = Change (what_changed|PositionChanged); + set_position_internal (position, true); + what_changed.add (Properties::position); + } + + if (_length != length) { + if (!property_changes_suspended()) { + _last_length = _length; + } + set_length_internal (length); + what_changed.add (Properties::length); } - _flags = Region::Flag (_flags & ~WholeFile); + _whole_file = false; + + PropertyChange start_and_length; - if (what_changed & (StartChanged|LengthChanged)) { + start_and_length.add (Properties::start); + start_and_length.add (Properties::length); + + if (what_changed.contains (start_and_length)) { first_edit (); } - if (what_changed) { + if (!what_changed.empty()) { send_change (what_changed); } } @@ -915,29 +967,31 @@ void Region::set_hidden (bool yn) { if (hidden() != yn) { + _hidden = yn; + send_change (Properties::hidden); + } +} - if (yn) { - _flags = Flag (_flags|Hidden); - } else { - _flags = Flag (_flags & ~Hidden); - } +void +Region::set_whole_file (bool yn) +{ + _whole_file = yn; + /* no change signal */ +} - send_change (HiddenChanged); - } +void +Region::set_automatic (bool yn) +{ + _automatic = yn; + /* no change signal */ } void Region::set_muted (bool yn) { if (muted() != yn) { - - if (yn) { - _flags = Flag (_flags|Muted); - } else { - _flags = Flag (_flags & ~Muted); - } - - send_change (MuteChanged); + _muted = yn; + send_change (Properties::muted); } } @@ -945,12 +999,8 @@ void Region::set_opaque (bool yn) { if (opaque() != yn) { - if (yn) { - _flags = Flag (_flags|Opaque); - } else { - _flags = Flag (_flags & ~Opaque); - } - send_change (OpacityChanged); + _opaque = yn; + send_change (Properties::opaque); } } @@ -958,12 +1008,8 @@ void Region::set_locked (bool yn) { if (locked() != yn) { - if (yn) { - _flags = Flag (_flags|Locked); - } else { - _flags = Flag (_flags & ~Locked); - } - send_change (LockChanged); + _locked = yn; + send_change (Properties::locked); } } @@ -971,51 +1017,49 @@ void Region::set_position_locked (bool yn) { if (position_locked() != yn) { - if (yn) { - _flags = Flag (_flags|PositionLocked); - } else { - _flags = Flag (_flags & ~PositionLocked); - } - send_change (LockChanged); + _position_locked = yn; + send_change (Properties::locked); } } +/** Set the region's sync point. + * @param absolute_pos Session time. + */ void -Region::set_sync_position (nframes_t absolute_pos) +Region::set_sync_position (framepos_t absolute_pos) { - nframes_t const file_pos = _start + (absolute_pos - _position); + /* position within our file */ + framepos_t const file_pos = _start + (absolute_pos - _position); if (file_pos != _sync_position) { - + _sync_marked = true; _sync_position = file_pos; - _flags = Flag (_flags|SyncMarked); - - if (!_frozen) { + if (!property_changes_suspended()) { maybe_uncopy (); } - send_change (SyncOffsetChanged); + + send_change (Properties::sync_position); } } void Region::clear_sync_position () { - if (_flags & SyncMarked) { - _flags = Flag (_flags & ~SyncMarked); - - if (!_frozen) { + if (sync_marked()) { + _sync_marked = false; + if (!property_changes_suspended()) { maybe_uncopy (); } - send_change (SyncOffsetChanged); + + send_change (Properties::sync_position); } } -nframes_t +/* @return the sync point relative the first frame of the region */ +frameoffset_t Region::sync_offset (int& dir) const { - /* returns the sync point relative the first frame of the region */ - - if (_flags & SyncMarked) { + if (sync_marked()) { if (_sync_position > _start) { dir = 1; return _sync_position - _start; @@ -1029,11 +1073,11 @@ Region::sync_offset (int& dir) const } } -nframes_t -Region::adjust_to_sync (nframes_t pos) const +framepos_t +Region::adjust_to_sync (framepos_t pos) const { int sync_dir; - nframes_t offset = sync_offset (sync_dir); + frameoffset_t offset = sync_offset (sync_dir); // cerr << "adjusting pos = " << pos << " to sync at " << _sync_position << " offset = " << offset << " with dir = " << sync_dir << endl; @@ -1044,7 +1088,7 @@ Region::adjust_to_sync (nframes_t pos) const pos = 0; } } else { - if (max_frames - pos > offset) { + if (max_framepos - pos > offset) { pos += offset; } } @@ -1052,13 +1096,15 @@ Region::adjust_to_sync (nframes_t pos) const return pos; } -nframes_t +/** @return Sync position in session time */ +framepos_t Region::sync_position() const { - if (_flags & SyncMarked) { - return _sync_position; + if (sync_marked()) { + return _position - _start + _sync_position; } else { - return _start; + /* if sync has not been marked, use the start of the region */ + return _position; } } @@ -1105,18 +1151,20 @@ Region::set_layer (layer_t l) if (_layer != l) { _layer = l; - send_change (LayerChanged); + send_change (Properties::layer); } } XMLNode& -Region::state (bool /*full_state*/) +Region::state () { XMLNode *node = new XMLNode ("Region"); char buf[64]; + char buf2[64]; + LocaleGuard lg (X_("POSIX")); const char* fe = NULL; - add_states (*node); + add_properties (*node); _id.print (buf, sizeof (buf)); node->add_property ("id", buf); @@ -1141,58 +1189,97 @@ Region::state (bool /*full_state*/) /* note: flags are stored by derived classes */ - if (_positional_lock_style != AudioTime) { - node->add_property ("positional-lock-style", enum_2_string (_positional_lock_style)); + if (_position_lock_style != AudioTime) { stringstream str; str << _bbt_time; node->add_property ("bbt-position", str.str()); } + for (uint32_t n=0; n < _sources.size(); ++n) { + snprintf (buf2, sizeof(buf2), "source-%d", n); + _sources[n]->id().print (buf, sizeof(buf)); + node->add_property (buf2, buf); + } + + for (uint32_t n=0; n < _master_sources.size(); ++n) { + snprintf (buf2, sizeof(buf2), "master-source-%d", n); + _master_sources[n]->id().print (buf, sizeof (buf)); + node->add_property (buf2, buf); + } + + if (max_source_level() > 0) { + + XMLNode* nested_node = new XMLNode (X_("NestedSource")); + + /* region is compound - get its playlist and + store that before we list the region that + needs it ... + */ + + for (SourceList::const_iterator s = _sources.begin(); s != _sources.end(); ++s) { + nested_node->add_child_nocopy ((*s)->get_state ()); + } + + if (nested_node) { + node->add_child_nocopy (*nested_node); + } + } + + if (_extra_xml) { + node->add_child_copy (*_extra_xml); + } + return *node; } XMLNode& Region::get_state () { - return state (true); + return state (); } int -Region::set_live_state (const XMLNode& node, int /*version*/, Change& what_changed, bool send) +Region::set_state (const XMLNode& node, int version) +{ + PropertyChange what_changed; + return _set_state (node, version, what_changed, true); +} + +int +Region::_set_state (const XMLNode& node, int /*version*/, PropertyChange& what_changed, bool send) { + const XMLProperty* prop; const XMLNodeList& nlist = node.children(); - const XMLProperty *prop; - /* this is responsible for setting those aspects of Region state - that are mutable after construction. - */ + for (XMLNodeConstIterator niter = nlist.begin(); niter != nlist.end(); ++niter) { - if ((prop = node.property ("type")) == 0) { - _type = DataType::AUDIO; - } else { - _type = DataType(prop->value()); - } - - if ((prop = node.property ("positional-lock-style")) != 0) { - _positional_lock_style = PositionLockStyle (string_2_enum (prop->value(), _positional_lock_style)); - - if (_positional_lock_style == MusicTime) { - if ((prop = node.property ("bbt-position")) == 0) { - /* missing BBT info, revert to audio time locking */ - _positional_lock_style = AudioTime; - } else { - if (sscanf (prop->value().c_str(), "%d|%d|%d", - &_bbt_time.bars, - &_bbt_time.beats, - &_bbt_time.ticks) != 3) { - _positional_lock_style = AudioTime; - } - } + XMLNode *child = (*niter); + + if (child->name () == "Extra") { + delete _extra_xml; + _extra_xml = new XMLNode (*child); } + } + + what_changed = set_values (node); + if ((prop = node.property (X_("id")))) { + _id = prop->value(); } - /* XXX FIRST EDIT !!! */ + if (_position_lock_style == MusicTime) { + if ((prop = node.property ("bbt-position")) == 0) { + /* missing BBT info, revert to audio time locking */ + _position_lock_style = AudioTime; + } else { + if (sscanf (prop->value().c_str(), "%d|%d|%d", + &_bbt_time.bars, + &_bbt_time.beats, + &_bbt_time.ticks) != 3) { + _position_lock_style = AudioTime; + } + } + } /* fix problems with old sessions corrupted by impossible values for _stretch or _shift @@ -1205,143 +1292,62 @@ Region::set_live_state (const XMLNode& node, int /*version*/, Change& what_chang _shift = 1.0f; } - /* note: derived classes set flags */ - - for (XMLNodeConstIterator niter = nlist.begin(); niter != nlist.end(); ++niter) { - - XMLNode *child; - - child = (*niter); - - if (child->name () == "Extra") { - delete _extra_xml; - _extra_xml = new XMLNode (*child); - break; - } - } - if (send) { - cerr << _name << ": final change to be sent: " << hex << what_changed << dec << endl; send_change (what_changed); } - - return 0; -} - -int -Region::set_state (const XMLNode& node, int version) -{ - const XMLProperty *prop; - - /* ID is not allowed to change, ever */ - - if ((prop = node.property ("id"))) { - _id = prop->value(); - } - - _first_edit = EditChangesNothing; - - uint32_t old_flags = _flags; - - Change what_changed = set_state_using_states (node); - - /* leave this flag setting in place, no matter what */ - - if ((old_flags & DoNotSendPropertyChanges)) { - _flags = Flag (_flags | DoNotSendPropertyChanges); - } - - 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"; + + /* Quick fix for 2.x sessions when region is muted */ + if ((prop = node.property (X_("flags")))) { + if (string::npos != prop->value().find("Muted")){ + set_muted (true); + } } - - set_live_state (node, version, what_changed, true); + return 0; } void -Region::freeze () +Region::suspend_property_changes () { - _frozen++; + Stateful::suspend_property_changes (); _last_length = _length; _last_position = _position; } void -Region::thaw () +Region::mid_thaw (const PropertyChange& what_changed) { - Change what_changed = Change (0); - - { - Glib::Mutex::Lock lm (_lock); - - if (_frozen && --_frozen > 0) { - return; - } - - if (_pending_changed) { - what_changed = _pending_changed; - _pending_changed = Change (0); - } - } - - if (what_changed == Change (0)) { - return; - } - - if (what_changed & LengthChanged) { - if (what_changed & PositionChanged) { + if (what_changed.contains (Properties::length)) { + if (what_changed.contains (Properties::position)) { recompute_at_start (); } recompute_at_end (); } - - send_change (what_changed); } void -Region::send_change (Change what_changed) +Region::send_change (const PropertyChange& what_changed) { - - { - Glib::Mutex::Lock lm (_lock); - if (_frozen) { - _pending_changed = Change (_pending_changed|what_changed); - return; - } + if (what_changed.empty()) { + return; } - cerr << _name << " actually sends " << hex << what_changed << dec << " @" << get_microseconds() << endl; - StateChanged (what_changed); - cerr << _name << " done with " << hex << what_changed << dec << " @" << get_microseconds() << endl; - - if (!(_flags & DoNotSendPropertyChanges)) { + Stateful::send_change (what_changed); + if (!Stateful::frozen()) { + /* Try and send a shared_pointer unless this is part of the constructor. If so, do nothing. */ try { boost::shared_ptr rptr = shared_from_this(); - cerr << _name << " actually sends prop change " << hex << what_changed << dec << " @ " << get_microseconds() << endl; - RegionPropertyChanged (rptr); - cerr << _name << " done with prop change @ " << get_microseconds() << endl; - + RegionPropertyChanged (rptr, what_changed); } catch (...) { /* no shared_ptr available, relax; */ } } - } void @@ -1380,7 +1386,7 @@ Region::region_list_equivalent (boost::shared_ptr other) const void Region::source_deleted (boost::weak_ptr) { - _sources.clear (); + drop_sources (); if (!_session.deletion_in_progress()) { /* this is a very special case: at least one of the region's @@ -1411,8 +1417,16 @@ Region::master_source_names () void Region::set_master_sources (const SourceList& srcs) { + for (SourceList::const_iterator i = _master_sources.begin (); i != _master_sources.end(); ++i) { + (*i)->dec_use_count (); + } + _master_sources = srcs; assert (_sources.size() == _master_sources.size()); + + for (SourceList::const_iterator i = _master_sources.begin (); i != _master_sources.end(); ++i) { + (*i)->inc_use_count (); + } } bool @@ -1420,6 +1434,11 @@ Region::source_equivalent (boost::shared_ptr other) const { if (!other) return false; + + if ((_sources.size() != other->_sources.size()) || + (_master_sources.size() != other->_master_sources.size())) { + return false; + } SourceList::const_iterator i; SourceList::const_iterator io; @@ -1439,6 +1458,27 @@ Region::source_equivalent (boost::shared_ptr other) const return true; } +std::string +Region::source_string () const +{ + //string res = itos(_sources.size()); + + stringstream res; + res << _sources.size() << ":"; + + SourceList::const_iterator i; + + for (i = _sources.begin(); i != _sources.end(); ++i) { + res << (*i)->id() << ":"; + } + + for (i = _master_sources.begin(); i != _master_sources.end(); ++i) { + res << (*i)->id() << ":"; + } + + return res.str(); +} + bool Region::uses_source (boost::shared_ptr source) const { @@ -1450,23 +1490,38 @@ Region::uses_source (boost::shared_ptr source) const return false; } -sframes_t +bool +Region::uses_source_path (const std::string& path) const +{ + for (SourceList::const_iterator i = _sources.begin(); i != _sources.end(); ++i) { + boost::shared_ptr fs = boost::dynamic_pointer_cast (*i); + if (fs) { + if (fs->path() == path) { + return true; + } + } + } + return false; +} + +framecnt_t Region::source_length(uint32_t n) const { - return _sources[n]->length(_position - _start); + assert (n < _sources.size()); + return _sources[n]->length (_position - _start); } bool -Region::verify_length (nframes_t len) +Region::verify_length (framecnt_t len) { if (source() && (source()->destructive() || source()->length_mutable())) { return true; } - nframes_t maxlen = 0; + framecnt_t maxlen = 0; - for (uint32_t n=0; n < _sources.size(); ++n) { - maxlen = max (maxlen, (nframes_t)source_length(n) - _start); + for (uint32_t n = 0; n < _sources.size(); ++n) { + maxlen = max (maxlen, source_length(n) - _start); } len = min (len, maxlen); @@ -1475,16 +1530,16 @@ Region::verify_length (nframes_t len) } bool -Region::verify_start_and_length (nframes_t new_start, nframes_t& new_length) +Region::verify_start_and_length (framepos_t new_start, framecnt_t& new_length) { if (source() && (source()->destructive() || source()->length_mutable())) { return true; } - nframes_t maxlen = 0; + framecnt_t maxlen = 0; - for (uint32_t n=0; n < _sources.size(); ++n) { - maxlen = max (maxlen, (nframes_t)source_length(n) - new_start); + for (uint32_t n = 0; n < _sources.size(); ++n) { + maxlen = max (maxlen, source_length(n) - new_start); } new_length = min (new_length, maxlen); @@ -1493,13 +1548,13 @@ Region::verify_start_and_length (nframes_t new_start, nframes_t& new_length) } bool -Region::verify_start (nframes_t pos) +Region::verify_start (framepos_t pos) { if (source() && (source()->destructive() || source()->length_mutable())) { return true; } - for (uint32_t n=0; n < _sources.size(); ++n) { + for (uint32_t n = 0; n < _sources.size(); ++n) { if (pos > source_length(n) - _length) { return false; } @@ -1508,13 +1563,13 @@ Region::verify_start (nframes_t pos) } bool -Region::verify_start_mutable (nframes_t& new_start) +Region::verify_start_mutable (framepos_t& new_start) { if (source() && (source()->destructive() || source()->length_mutable())) { return true; } - for (uint32_t n=0; n < _sources.size(); ++n) { + for (uint32_t n = 0; n < _sources.size(); ++n) { if (new_start > source_length(n) - _length) { new_start = source_length(n) - _length; } @@ -1540,9 +1595,9 @@ Region::get_parent() const } int -Region::apply (Filter& filter) +Region::apply (Filter& filter, Progress* progress) { - return filter.run (shared_from_this()); + return filter.run (shared_from_this(), progress); } @@ -1551,8 +1606,25 @@ Region::invalidate_transients () { _valid_transients = false; _transients.clear (); + + send_change (PropertyChange (Properties::valid_transients)); } +void +Region::drop_sources () +{ + for (SourceList::const_iterator i = _sources.begin (); i != _sources.end(); ++i) { + (*i)->dec_use_count (); + } + + _sources.clear (); + + for (SourceList::const_iterator i = _master_sources.begin (); i != _master_sources.end(); ++i) { + (*i)->dec_use_count (); + } + + _master_sources.clear (); +} void Region::use_sources (SourceList const & s) @@ -1560,16 +1632,63 @@ Region::use_sources (SourceList const & s) set > unique_srcs; for (SourceList::const_iterator i = s.begin (); i != s.end(); ++i) { - _sources.push_back (*i); - (*i)->DropReferences.connect_same_thread (*this, boost::bind (&Region::source_deleted, this, boost::weak_ptr(*i))); - unique_srcs.insert (*i); - } - for (SourceList::const_iterator i = s.begin (); i != s.end(); ++i) { + _sources.push_back (*i); + (*i)->inc_use_count (); _master_sources.push_back (*i); - if (unique_srcs.find (*i) == unique_srcs.end()) { + (*i)->inc_use_count (); + + /* connect only once to DropReferences, even if sources are replicated + */ + + if (unique_srcs.find (*i) == unique_srcs.end ()) { + unique_srcs.insert (*i); (*i)->DropReferences.connect_same_thread (*this, boost::bind (&Region::source_deleted, this, boost::weak_ptr(*i))); } } } +Trimmable::CanTrim +Region::can_trim () const +{ + CanTrim ct = CanTrim (0); + + if (locked()) { + return ct; + } + + /* if not locked, we can always move the front later, and the end earlier + */ + + ct = CanTrim (ct | FrontTrimLater | EndTrimEarlier); + + if (start() != 0 || can_trim_start_before_source_start ()) { + ct = CanTrim (ct | FrontTrimEarlier); + } + + if (!_sources.empty()) { + if ((start() + length()) < _sources.front()->length (0)) { + ct = CanTrim (ct | EndTrimLater); + } + } + + return ct; +} + +uint32_t +Region::max_source_level () const +{ + uint32_t lvl = 0; + + for (SourceList::const_iterator i = _sources.begin(); i != _sources.end(); ++i) { + lvl = max (lvl, (*i)->level()); + } + + return lvl; +} + +bool +Region::is_compound () const +{ + return max_source_level() > 0; +}