#include "ardour/file_source.h"
#include "ardour/filter.h"
#include "ardour/playlist.h"
+#include "ardour/playlist_source.h"
#include "ardour/profile.h"
#include "ardour/region.h"
#include "ardour/region_factory.h"
PBD::PropertyDescriptor<float> stretch;
PBD::PropertyDescriptor<float> shift;
PBD::PropertyDescriptor<PositionLockStyle> position_lock_style;
+ PBD::PropertyDescriptor<uint64_t> layering_index;
}
}
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));
+ Properties::layering_index.property_id = g_quark_from_static_string (X_("layering-index"));
+ DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for layering_index = %1\n", Properties::layering_index.property_id));
}
void
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);
+ add_property (_layering_index);
}
#define REGION_DEFAULT_STATE(s,l) \
- _muted (Properties::muted, false) \
+ _sync_marked (Properties::sync_marked, false) \
+ , _left_of_split (Properties::left_of_split, false) \
+ , _right_of_split (Properties::right_of_split, 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)) \
+ , _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)
+ , _position_lock_style (Properties::position_lock_style, _type == DataType::AUDIO ? AudioTime : MusicTime) \
+ , _layering_index (Properties::layering_index, 0)
#define REGION_COPY_STATE(other) \
- _muted (Properties::muted, other->_muted) \
+ _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) \
+ , _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) \
+ , _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)
+ , _position_lock_style (Properties::position_lock_style, other->_position_lock_style) \
+ , _layering_index (Properties::layering_index, other->_layering_index)
/* derived-from-derived constructor (no sources in constructor) */
Region::Region (Session& s, framepos_t start, framecnt_t length, const string& name, DataType type)
, _last_length (length)
, _last_position (0)
, _first_edit (EditChangesNothing)
- , _read_data_count(0)
- , _last_layer_op(0)
- , _pending_explicit_relayer (false)
+ , _layer (0)
{
register_properties ();
, _last_length (0)
, _last_position (0)
, _first_edit (EditChangesNothing)
- , _read_data_count(0)
- , _last_layer_op (0)
- , _pending_explicit_relayer (false)
+ , _layer (0)
{
register_properties ();
, _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)
-
+ , _layer (other->_layer)
{
register_properties ();
, _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)
-
+ , _layer (other->_layer)
{
register_properties ();
, _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)
+ , _layer (other->_layer)
{
register_properties ();
boost::shared_ptr<Playlist> pl (playlist());
- if (!pl) {
- return;
- }
-
_position_lock_style = ps;
if (_position_lock_style == MusicTime) {
- _session.tempo_map().bbt_time (_position, _bbt_time);
+ _session.bbt_time (_position, _bbt_time);
}
send_change (Properties::position_lock_style);
-
}
}
void
-Region::update_position_after_tempo_map_change ()
+Region::update_after_tempo_map_change ()
{
boost::shared_ptr<Playlist> pl (playlist());
void
Region::set_position_internal (framepos_t pos, bool allow_bbt_recompute)
{
+ /* We emit a change of Properties::position even if the position hasn't changed
+ (see Region::set_position), so we must always set this up so that
+ e.g. Playlist::notify_region_moved doesn't use an out-of-date last_position.
+ */
+ _last_position = _position;
+
if (_position != pos) {
- _last_position = _position;
_position = pos;
/* check that the new _position wouldn't make the current
}
}
-void
-Region::set_position_on_top (framepos_t pos)
-{
- if (locked()) {
- return;
- }
-
- if (_position != pos) {
- set_position_internal (pos, true);
- }
-
- boost::shared_ptr<Playlist> pl (playlist());
-
- if (pl) {
- pl->raise_region_to_top (shared_from_this ());
- }
-
- /* 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::recompute_position_from_lock_style ()
{
if (_position_lock_style == MusicTime) {
- _session.tempo_map().bbt_time (_position, _bbt_time);
+ _session.bbt_time (_position, _bbt_time);
}
}
}
if (new_endpoint > _position) {
- trim_to_internal (_position, new_endpoint - _position +1);
+ trim_to_internal (_position, new_endpoint - _position);
if (reset_fade) {
_left_of_split = true;
}
void
Region::set_layer (layer_t l)
{
- if (_layer != l) {
- _layer = l;
-
- send_change (Properties::layer);
- }
+ _layer = l;
}
XMLNode&
add_properties (*node);
- _id.print (buf, sizeof (buf));
+ id().print (buf, sizeof (buf));
node->add_property ("id", buf);
node->add_property ("type", _type.to_string());
node->add_property (buf2, buf);
}
- if (max_source_level() > 0) {
+ /* Only store nested sources for the whole-file region that acts
+ as the parent/root of all regions using it.
+ */
+
+ if (_whole_file && max_source_level() > 0) {
XMLNode* nested_node = new XMLNode (X_("NestedSource"));
Region::_set_state (const XMLNode& node, int /*version*/, PropertyChange& what_changed, bool send)
{
const XMLProperty* prop;
- const XMLNodeList& nlist = node.children();
Stateful::save_extra_xml (node);
what_changed = set_values (node);
- if ((prop = node.property (X_("id")))) {
- _id = prop->value();
- }
+ set_id (node);
if (_position_lock_style == MusicTime) {
if ((prop = node.property ("bbt-position")) == 0) {
Stateful::send_change (what_changed);
- if (!Stateful::frozen()) {
+ if (!Stateful::property_changes_suspended()) {
/* Try and send a shared_pointer unless this is part of the constructor.
If so, do nothing.
}
}
-void
-Region::set_last_layer_op (uint64_t when)
-{
- _last_layer_op = when;
-}
-
bool
Region::overlap_equivalent (boost::shared_ptr<const Region> other) const
{
if (*i == source) {
return true;
}
- }
- return false;
-}
-bool
-Region::uses_source_path (const std::string& path) const
-{
- for (SourceList::const_iterator i = _sources.begin(); i != _sources.end(); ++i) {
- boost::shared_ptr<const FileSource> fs = boost::dynamic_pointer_cast<const FileSource> (*i);
- if (fs) {
- if (fs->path() == path) {
- return true;
- }
- }
+ boost::shared_ptr<PlaylistSource> ps = boost::dynamic_pointer_cast<PlaylistSource> (*i);
+
+ if (ps) {
+ if (ps->playlist()->uses_source (source)) {
+ return true;
+ }
+ }
}
+
return false;
}
{
return max_source_level() > 0;
}
+
+void
+Region::post_set (const PropertyChange& pc)
+{
+ if (pc.contains (Properties::position)) {
+ recompute_position_from_lock_style ();
+ }
+}
+
projects / ardour.git / blobdiff