X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudioregion.cc;h=d2cf279d3ec677ebba3111b513721542803fd781;hb=bcd511aa3fec59e1527c8b7ab80dabda4db1a6f9;hp=6b118faa514f57e5f0df9821cb2ff10ffe2a7a57;hpb=b09ab546542040b1d468c9925c60bda2dfd80da8;p=ardour.git diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index 6b118faa51..d2cf279d3e 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -31,6 +31,7 @@ #include #include +#include #include #include @@ -38,7 +39,8 @@ #include #include #include -#include +#include +#include #include "i18n.h" #include @@ -48,49 +50,40 @@ using namespace ARDOUR; /* a Session will reset these to its chosen defaults by calling AudioRegion::set_default_fade() */ -Change AudioRegion::FadeInChanged = ARDOUR::new_change(); -Change AudioRegion::FadeOutChanged = ARDOUR::new_change(); -Change AudioRegion::FadeInActiveChanged = ARDOUR::new_change(); -Change AudioRegion::FadeOutActiveChanged = ARDOUR::new_change(); +Change AudioRegion::FadeInChanged = ARDOUR::new_change(); +Change AudioRegion::FadeOutChanged = ARDOUR::new_change(); +Change AudioRegion::FadeInActiveChanged = ARDOUR::new_change(); +Change AudioRegion::FadeOutActiveChanged = ARDOUR::new_change(); Change AudioRegion::EnvelopeActiveChanged = ARDOUR::new_change(); Change AudioRegion::ScaleAmplitudeChanged = ARDOUR::new_change(); -Change AudioRegion::EnvelopeChanged = ARDOUR::new_change(); +Change AudioRegion::EnvelopeChanged = ARDOUR::new_change(); -AudioRegionState::AudioRegionState (string why) - : RegionState (why), - _fade_in (0.0, 2.0, 1.0, false), - _fade_out (0.0, 2.0, 1.0, false), - _envelope (0.0, 2.0, 1.0, false) -{ -} - -AudioRegion::AudioRegion (AudioSource& src, jack_nframes_t start, jack_nframes_t length, bool announce) - : Region (start, length, PBD::basename_nosuffix(src.name()), 0, Region::Flag(Region::DefaultFlags|Region::External)), +AudioRegion::AudioRegion (boost::shared_ptr src, nframes_t start, nframes_t length) + : Region (start, length, PBD::basename_nosuffix(src->name()), 0, Region::Flag(Region::DefaultFlags|Region::External)), _fade_in (0.0, 2.0, 1.0, false), _fade_out (0.0, 2.0, 1.0, false), _envelope (0.0, 2.0, 1.0, false) { /* basic AudioRegion constructor */ - sources.push_back (&src); - master_sources.push_back (&src); - src.GoingAway.connect (mem_fun (*this, &AudioRegion::source_deleted)); + sources.push_back (src); + master_sources.push_back (src); + src->GoingAway.connect (mem_fun (*this, &AudioRegion::source_deleted)); + + boost::shared_ptr afs = boost::dynamic_pointer_cast (src); + if (afs) { + afs->HeaderPositionOffsetChanged.connect (mem_fun (*this, &AudioRegion::source_offset_changed)); + } _scale_amplitude = 1.0; set_default_fades (); set_default_envelope (); - save_state ("initial state"); - _envelope.StateChanged.connect (mem_fun (*this, &AudioRegion::envelope_changed)); - - if (announce) { - CheckNewRegion (this); /* EMIT SIGNAL */ - } } -AudioRegion::AudioRegion (AudioSource& src, jack_nframes_t start, jack_nframes_t length, const string& name, layer_t layer, Flag flags, bool announce) +AudioRegion::AudioRegion (boost::shared_ptr src, nframes_t start, nframes_t length, const string& name, layer_t layer, Flag flags) : Region (start, length, name, layer, flags), _fade_in (0.0, 2.0, 1.0, false), _fade_out (0.0, 2.0, 1.0, false), @@ -98,24 +91,24 @@ AudioRegion::AudioRegion (AudioSource& src, jack_nframes_t start, jack_nframes_t { /* basic AudioRegion constructor */ - sources.push_back (&src); - master_sources.push_back (&src); - src.GoingAway.connect (mem_fun (*this, &AudioRegion::source_deleted)); + sources.push_back (src); + master_sources.push_back (src); + src->GoingAway.connect (mem_fun (*this, &AudioRegion::source_deleted)); + + boost::shared_ptr afs = boost::dynamic_pointer_cast (src); + if (afs) { + afs->HeaderPositionOffsetChanged.connect (mem_fun (*this, &AudioRegion::source_offset_changed)); + } _scale_amplitude = 1.0; set_default_fades (); set_default_envelope (); - save_state ("initial state"); _envelope.StateChanged.connect (mem_fun (*this, &AudioRegion::envelope_changed)); - - if (announce) { - CheckNewRegion (this); /* EMIT SIGNAL */ - } } -AudioRegion::AudioRegion (SourceList& srcs, jack_nframes_t start, jack_nframes_t length, const string& name, layer_t layer, Flag flags, bool announce) +AudioRegion::AudioRegion (SourceList& srcs, nframes_t start, nframes_t length, const string& name, layer_t layer, Flag flags) : Region (start, length, name, layer, flags), _fade_in (0.0, 2.0, 1.0, false), _fade_out (0.0, 2.0, 1.0, false), @@ -127,39 +120,49 @@ AudioRegion::AudioRegion (SourceList& srcs, jack_nframes_t start, jack_nframes_t sources.push_back (*i); master_sources.push_back (*i); (*i)->GoingAway.connect (mem_fun (*this, &AudioRegion::source_deleted)); + + boost::shared_ptr afs = boost::dynamic_pointer_cast ((*i)); + if (afs) { + afs->HeaderPositionOffsetChanged.connect (mem_fun (*this, &AudioRegion::source_offset_changed)); + } } _scale_amplitude = 1.0; set_default_fades (); set_default_envelope (); - save_state ("initial state"); _envelope.StateChanged.connect (mem_fun (*this, &AudioRegion::envelope_changed)); - - if (announce) { - CheckNewRegion (this); /* EMIT SIGNAL */ - } } -AudioRegion::AudioRegion (const AudioRegion& other, jack_nframes_t offset, jack_nframes_t length, const string& name, layer_t layer, Flag flags, bool announce) +AudioRegion::AudioRegion (boost::shared_ptr other, nframes_t offset, nframes_t length, const string& name, layer_t layer, Flag flags) : Region (other, offset, length, name, layer, flags), - _fade_in (other._fade_in), - _fade_out (other._fade_out), - _envelope (other._envelope, (double) offset, (double) offset + length) + _fade_in (other->_fade_in), + _fade_out (other->_fade_out), + _envelope (other->_envelope, (double) offset, (double) offset + length) { /* create a new AudioRegion, that is part of an existing one */ - set unique_srcs; + set > unique_srcs; - for (SourceList::const_iterator i= other.sources.begin(); i != other.sources.end(); ++i) { + for (SourceList::const_iterator i= other->sources.begin(); i != other->sources.end(); ++i) { sources.push_back (*i); (*i)->GoingAway.connect (mem_fun (*this, &AudioRegion::source_deleted)); - unique_srcs.insert (*i); + + pair >::iterator,bool> result; + + result = unique_srcs.insert (*i); + + if (result.second) { + boost::shared_ptr afs = boost::dynamic_pointer_cast (*i); + if (afs) { + afs->HeaderPositionOffsetChanged.connect (mem_fun (*this, &AudioRegion::source_offset_changed)); + } + } } - for (SourceList::const_iterator i = other.master_sources.begin(); i != other.master_sources.end(); ++i) { + for (SourceList::const_iterator i = other->master_sources.begin(); i != other->master_sources.end(); ++i) { if (unique_srcs.find (*i) == unique_srcs.end()) { (*i)->GoingAway.connect (mem_fun (*this, &AudioRegion::source_deleted)); } @@ -175,7 +178,7 @@ AudioRegion::AudioRegion (const AudioRegion& other, jack_nframes_t offset, jack_ if (_fade_in.back()->when >= _length) { set_default_fade_in (); } else { - _fade_in_disabled = other._fade_in_disabled; + _fade_in_disabled = other->_fade_in_disabled; } set_default_fade_out (); _flags = Flag (_flags & ~Region::LeftOfSplit); @@ -185,68 +188,72 @@ AudioRegion::AudioRegion (const AudioRegion& other, jack_nframes_t offset, jack_ if (_fade_out.back()->when >= _length) { set_default_fade_out (); } else { - _fade_out_disabled = other._fade_out_disabled; + _fade_out_disabled = other->_fade_out_disabled; } set_default_fade_in (); _flags = Flag (_flags & ~Region::RightOfSplit); } - _scale_amplitude = other._scale_amplitude; - - save_state ("initial state"); + _scale_amplitude = other->_scale_amplitude; _envelope.StateChanged.connect (mem_fun (*this, &AudioRegion::envelope_changed)); - - if (announce) { - CheckNewRegion (this); /* EMIT SIGNAL */ - } } -AudioRegion::AudioRegion (const AudioRegion &other) +AudioRegion::AudioRegion (boost::shared_ptr other) : Region (other), - _fade_in (other._fade_in), - _fade_out (other._fade_out), - _envelope (other._envelope) + _fade_in (other->_fade_in), + _fade_out (other->_fade_out), + _envelope (other->_envelope) { /* Pure copy constructor */ - set unique_srcs; + set > unique_srcs; - for (SourceList::const_iterator i = other.sources.begin(); i != other.sources.end(); ++i) { + for (SourceList::const_iterator i = other->sources.begin(); i != other->sources.end(); ++i) { sources.push_back (*i); (*i)->GoingAway.connect (mem_fun (*this, &AudioRegion::source_deleted)); - unique_srcs.insert (*i); + pair >::iterator,bool> result; + + result = unique_srcs.insert (*i); + + if (result.second) { + boost::shared_ptr afs = boost::dynamic_pointer_cast (*i); + if (afs) { + afs->HeaderPositionOffsetChanged.connect (mem_fun (*this, &AudioRegion::source_offset_changed)); + } + } } - for (SourceList::const_iterator i = other.master_sources.begin(); i != other.master_sources.end(); ++i) { + for (SourceList::const_iterator i = other->master_sources.begin(); i != other->master_sources.end(); ++i) { master_sources.push_back (*i); if (unique_srcs.find (*i) == unique_srcs.end()) { (*i)->GoingAway.connect (mem_fun (*this, &AudioRegion::source_deleted)); } } - _scale_amplitude = other._scale_amplitude; - _envelope = other._envelope; + _scale_amplitude = other->_scale_amplitude; + _envelope = other->_envelope; _fade_in_disabled = 0; _fade_out_disabled = 0; - save_state ("initial state"); - _envelope.StateChanged.connect (mem_fun (*this, &AudioRegion::envelope_changed)); - - /* NOTE: no CheckNewRegion signal emitted here. This is the copy constructor */ } -AudioRegion::AudioRegion (AudioSource& src, const XMLNode& node) +AudioRegion::AudioRegion (boost::shared_ptr src, const XMLNode& node) : Region (node), _fade_in (0.0, 2.0, 1.0, false), _fade_out (0.0, 2.0, 1.0, false), _envelope (0.0, 2.0, 1.0, false) { - sources.push_back (&src); - master_sources.push_back (&src); - src.GoingAway.connect (mem_fun (*this, &AudioRegion::source_deleted)); + sources.push_back (src); + master_sources.push_back (src); + src->GoingAway.connect (mem_fun (*this, &AudioRegion::source_deleted)); + + boost::shared_ptr afs = boost::dynamic_pointer_cast (src); + if (afs) { + afs->HeaderPositionOffsetChanged.connect (mem_fun (*this, &AudioRegion::source_offset_changed)); + } set_default_fades (); @@ -254,11 +261,7 @@ AudioRegion::AudioRegion (AudioSource& src, const XMLNode& node) throw failed_constructor(); } - save_state ("initial state"); - _envelope.StateChanged.connect (mem_fun (*this, &AudioRegion::envelope_changed)); - - CheckNewRegion (this); /* EMIT SIGNAL */ } AudioRegion::AudioRegion (SourceList& srcs, const XMLNode& node) @@ -267,14 +270,21 @@ AudioRegion::AudioRegion (SourceList& srcs, const XMLNode& node) _fade_out (0.0, 2.0, 1.0, false), _envelope (0.0, 2.0, 1.0, false) { - /* basic AudioRegion constructor */ - - set unique_srcs; + set > unique_srcs; for (SourceList::iterator i=srcs.begin(); i != srcs.end(); ++i) { sources.push_back (*i); (*i)->GoingAway.connect (mem_fun (*this, &AudioRegion::source_deleted)); - unique_srcs.insert (*i); + pair >::iterator,bool> result; + + result = unique_srcs.insert (*i); + + if (result.second) { + boost::shared_ptr afs = boost::dynamic_pointer_cast (*i); + if (afs) { + afs->HeaderPositionOffsetChanged.connect (mem_fun (*this, &AudioRegion::source_offset_changed)); + } + } } for (SourceList::iterator i = srcs.begin(); i != srcs.end(); ++i) { @@ -291,103 +301,22 @@ AudioRegion::AudioRegion (SourceList& srcs, const XMLNode& node) throw failed_constructor(); } - save_state ("initial state"); - _envelope.StateChanged.connect (mem_fun (*this, &AudioRegion::envelope_changed)); - - CheckNewRegion (this); /* EMIT SIGNAL */ } AudioRegion::~AudioRegion () { - GoingAway (this); + notify_callbacks (); + GoingAway (); /* EMIT SIGNAL */ } -StateManager::State* -AudioRegion::state_factory (std::string why) const -{ - AudioRegionState* state = new AudioRegionState (why); - - Region::store_state (*state); - - state->_fade_in = _fade_in; - state->_fade_out = _fade_out; - state->_envelope = _envelope; - state->_scale_amplitude = _scale_amplitude; - state->_fade_in_disabled = _fade_in_disabled; - state->_fade_out_disabled = _fade_out_disabled; - - return state; -} - -Change -AudioRegion::restore_state (StateManager::State& sstate) +bool +AudioRegion::verify_length (nframes_t len) { - AudioRegionState* state = dynamic_cast (&sstate); - - Change what_changed = Region::restore_and_return_flags (*state); - - if (_flags != Flag (state->_flags)) { - - uint32_t old_flags = _flags; - - _flags = Flag (state->_flags); - - if ((old_flags ^ state->_flags) & EnvelopeActive) { - what_changed = Change (what_changed|EnvelopeActiveChanged); - } - } - - if (!(_fade_in == state->_fade_in)) { - _fade_in = state->_fade_in; - what_changed = Change (what_changed|FadeInChanged); - } - - if (!(_fade_out == state->_fade_out)) { - _fade_out = state->_fade_out; - what_changed = Change (what_changed|FadeOutChanged); - } - - if (_scale_amplitude != state->_scale_amplitude) { - _scale_amplitude = state->_scale_amplitude; - what_changed = Change (what_changed|ScaleAmplitudeChanged); - } - - if (_fade_in_disabled != state->_fade_in_disabled) { - if (_fade_in_disabled == 0 && state->_fade_in_disabled) { - set_fade_in_active (false); - } if (_fade_in_disabled && state->_fade_in_disabled == 0) { - set_fade_in_active (true); - } - _fade_in_disabled = state->_fade_in_disabled; - } - - if (_fade_out_disabled != state->_fade_out_disabled) { - if (_fade_out_disabled == 0 && state->_fade_out_disabled) { - set_fade_out_active (false); - } if (_fade_out_disabled && state->_fade_out_disabled == 0) { - set_fade_out_active (true); - } - _fade_out_disabled = state->_fade_out_disabled; + if (boost::dynamic_pointer_cast(source())) { + return true; } - /* XXX need a way to test stored state versus current for envelopes */ - - _envelope = state->_envelope; - what_changed = Change (what_changed); - - return what_changed; -} - -UndoAction -AudioRegion::get_memento() const -{ - return sigc::bind (mem_fun (*(const_cast (this)), &StateManager::use_state), _current_state_id); -} - -bool -AudioRegion::verify_length (jack_nframes_t len) -{ for (uint32_t n=0; n < sources.size(); ++n) { if (_start > sources[n]->length() - len) { return false; @@ -397,8 +326,12 @@ AudioRegion::verify_length (jack_nframes_t len) } bool -AudioRegion::verify_start_and_length (jack_nframes_t new_start, jack_nframes_t new_length) +AudioRegion::verify_start_and_length (nframes_t new_start, nframes_t new_length) { + if (boost::dynamic_pointer_cast(source())) { + return true; + } + for (uint32_t n=0; n < sources.size(); ++n) { if (new_length > sources[n]->length() - new_start) { return false; @@ -407,8 +340,12 @@ AudioRegion::verify_start_and_length (jack_nframes_t new_start, jack_nframes_t n return true; } bool -AudioRegion::verify_start (jack_nframes_t pos) +AudioRegion::verify_start (nframes_t pos) { + if (boost::dynamic_pointer_cast(source())) { + return true; + } + for (uint32_t n=0; n < sources.size(); ++n) { if (pos > sources[n]->length() - _length) { return false; @@ -418,8 +355,12 @@ AudioRegion::verify_start (jack_nframes_t pos) } bool -AudioRegion::verify_start_mutable (jack_nframes_t& new_start) +AudioRegion::verify_start_mutable (nframes_t& new_start) { + if (boost::dynamic_pointer_cast(source())) { + return true; + } + for (uint32_t n=0; n < sources.size(); ++n) { if (new_start > sources[n]->length() - _length) { new_start = sources[n]->length() - _length; @@ -439,16 +380,12 @@ AudioRegion::set_envelope_active (bool yn) snprintf (buf, sizeof (buf), "envelope off"); _flags = Flag (_flags & ~EnvelopeActive); } - if (!_frozen) { - save_state (buf); - } send_change (EnvelopeActiveChanged); - } } -jack_nframes_t -AudioRegion::read_peaks (PeakData *buf, jack_nframes_t npeaks, jack_nframes_t offset, jack_nframes_t cnt, uint32_t chan_n, double samples_per_unit) const +nframes_t +AudioRegion::read_peaks (PeakData *buf, nframes_t npeaks, nframes_t offset, nframes_t cnt, uint32_t chan_n, double samples_per_unit) const { if (chan_n >= sources.size()) { return 0; @@ -458,7 +395,7 @@ AudioRegion::read_peaks (PeakData *buf, jack_nframes_t npeaks, jack_nframes_t of return 0; } else { if (_scale_amplitude != 1.0) { - for (jack_nframes_t n = 0; n < npeaks; ++n) { + for (nframes_t n = 0; n < npeaks; ++n) { buf[n].max *= _scale_amplitude; buf[n].min *= _scale_amplitude; } @@ -467,30 +404,30 @@ AudioRegion::read_peaks (PeakData *buf, jack_nframes_t npeaks, jack_nframes_t of } } -jack_nframes_t -AudioRegion::read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, char * workbuf, jack_nframes_t position, - jack_nframes_t cnt, - uint32_t chan_n, jack_nframes_t read_frames, jack_nframes_t skip_frames) const +nframes_t +AudioRegion::read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nframes_t position, + nframes_t cnt, + uint32_t chan_n, nframes_t read_frames, nframes_t skip_frames) const { - return _read_at (sources, buf, mixdown_buffer, gain_buffer, workbuf, position, cnt, chan_n, read_frames, skip_frames); + return _read_at (sources, buf, mixdown_buffer, gain_buffer, position, cnt, chan_n, read_frames, skip_frames); } -jack_nframes_t -AudioRegion::master_read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, char * workbuf, jack_nframes_t position, - jack_nframes_t cnt, uint32_t chan_n) const +nframes_t +AudioRegion::master_read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nframes_t position, + nframes_t cnt, uint32_t chan_n) const { - return _read_at (master_sources, buf, mixdown_buffer, gain_buffer, workbuf, position, cnt, chan_n, 0, 0); + return _read_at (master_sources, buf, mixdown_buffer, gain_buffer, position, cnt, chan_n, 0, 0); } -jack_nframes_t -AudioRegion::_read_at (const SourceList& srcs, Sample *buf, Sample *mixdown_buffer, float *gain_buffer, char * workbuf, - jack_nframes_t position, jack_nframes_t cnt, - uint32_t chan_n, jack_nframes_t read_frames, jack_nframes_t skip_frames) const +nframes_t +AudioRegion::_read_at (const SourceList& srcs, Sample *buf, Sample *mixdown_buffer, float *gain_buffer, + nframes_t position, nframes_t cnt, + uint32_t chan_n, nframes_t read_frames, nframes_t skip_frames) const { - jack_nframes_t internal_offset; - jack_nframes_t buf_offset; - jack_nframes_t to_read; - + nframes_t internal_offset; + nframes_t buf_offset; + nframes_t to_read; + /* precondition: caller has verified that we cover the desired section */ if (chan_n >= sources.size()) { @@ -509,7 +446,6 @@ AudioRegion::_read_at (const SourceList& srcs, Sample *buf, Sample *mixdown_buff if (internal_offset >= _length) { return 0; /* read nothing */ } - if ((to_read = min (cnt, _length - internal_offset)) == 0) { return 0; /* read nothing */ @@ -528,7 +464,7 @@ AudioRegion::_read_at (const SourceList& srcs, Sample *buf, Sample *mixdown_buff _read_data_count = 0; - if (srcs[chan_n]->read (mixdown_buffer, _start + internal_offset, to_read, workbuf) != to_read) { + if (srcs[chan_n]->read (mixdown_buffer, _start + internal_offset, to_read) != to_read) { return 0; /* "read nothing" */ } @@ -538,19 +474,19 @@ AudioRegion::_read_at (const SourceList& srcs, Sample *buf, Sample *mixdown_buff if (_flags & FadeIn) { - jack_nframes_t fade_in_length = (jack_nframes_t) _fade_in.back()->when; + nframes_t fade_in_length = (nframes_t) _fade_in.back()->when; /* see if this read is within the fade in */ if (internal_offset < fade_in_length) { - jack_nframes_t limit; + nframes_t limit; limit = min (to_read, fade_in_length - internal_offset); _fade_in.get_vector (internal_offset, internal_offset+limit, gain_buffer, limit); - for (jack_nframes_t n = 0; n < limit; ++n) { + for (nframes_t n = 0; n < limit; ++n) { mixdown_buffer[n] *= gain_buffer[n]; } } @@ -560,9 +496,6 @@ AudioRegion::_read_at (const SourceList& srcs, Sample *buf, Sample *mixdown_buff if (_flags & FadeOut) { - - - /* see if some part of this read is within the fade out */ /* ................. >| REGION @@ -582,20 +515,20 @@ AudioRegion::_read_at (const SourceList& srcs, Sample *buf, Sample *mixdown_buff */ - jack_nframes_t fade_out_length = (jack_nframes_t) _fade_out.back()->when; - jack_nframes_t fade_interval_start = max(internal_offset, _length-fade_out_length); - jack_nframes_t fade_interval_end = min(internal_offset + to_read, _length); + nframes_t fade_out_length = (nframes_t) _fade_out.back()->when; + nframes_t fade_interval_start = max(internal_offset, _length-fade_out_length); + nframes_t fade_interval_end = min(internal_offset + to_read, _length); if (fade_interval_end > fade_interval_start) { /* (part of the) the fade out is in this buffer */ - jack_nframes_t limit = fade_interval_end - fade_interval_start; - jack_nframes_t curve_offset = fade_interval_start - (_length-fade_out_length); - jack_nframes_t fade_offset = fade_interval_start - internal_offset; + nframes_t limit = fade_interval_end - fade_interval_start; + nframes_t curve_offset = fade_interval_start - (_length-fade_out_length); + nframes_t fade_offset = fade_interval_start - internal_offset; _fade_out.get_vector (curve_offset,curve_offset+limit, gain_buffer, limit); - for (jack_nframes_t n = 0, m = fade_offset; n < limit; ++n, ++m) { + for (nframes_t n = 0, m = fade_offset; n < limit; ++n, ++m) { mixdown_buffer[m] *= gain_buffer[n]; } } @@ -608,11 +541,11 @@ AudioRegion::_read_at (const SourceList& srcs, Sample *buf, Sample *mixdown_buff _envelope.get_vector (internal_offset, internal_offset + to_read, gain_buffer, to_read); if (_scale_amplitude != 1.0f) { - for (jack_nframes_t n = 0; n < to_read; ++n) { + for (nframes_t n = 0; n < to_read; ++n) { mixdown_buffer[n] *= gain_buffer[n] * _scale_amplitude; } } else { - for (jack_nframes_t n = 0; n < to_read; ++n) { + for (nframes_t n = 0; n < to_read; ++n) { mixdown_buffer[n] *= gain_buffer[n]; } } @@ -627,7 +560,7 @@ AudioRegion::_read_at (const SourceList& srcs, Sample *buf, Sample *mixdown_buff buf += buf_offset; - for (jack_nframes_t n = 0; n < to_read; ++n) { + for (nframes_t n = 0; n < to_read; ++n) { buf[n] += mixdown_buffer[n]; } } @@ -635,12 +568,6 @@ AudioRegion::_read_at (const SourceList& srcs, Sample *buf, Sample *mixdown_buff return to_read; } -XMLNode& -AudioRegion::get_state () -{ - return state (true); -} - XMLNode& AudioRegion::state (bool full) { @@ -652,12 +579,12 @@ AudioRegion::state (bool full) snprintf (buf, sizeof (buf), "0x%x", (int) _flags); node.add_property ("flags", buf); - snprintf (buf, sizeof(buf), "%f", _scale_amplitude); + snprintf (buf, sizeof(buf), "%.12g", _scale_amplitude); node.add_property ("scale-gain", buf); for (uint32_t n=0; n < sources.size(); ++n) { snprintf (buf2, sizeof(buf2), "source-%d", n); - snprintf (buf, sizeof(buf), "%" PRIu64, sources[n]->id()); + sources[n]->id().print (buf, sizeof (buf)); node.add_property (buf2, buf); } @@ -673,6 +600,8 @@ AudioRegion::state (bool full) } else { _fade_in.store_state (*child); } + + child->add_property (X_("active"), _fade_in_disabled ? X_("no") : X_("yes")); child = node.add_child (X_("FadeOut")); @@ -681,6 +610,8 @@ AudioRegion::state (bool full) } else { _fade_out.store_state (*child); } + + child->add_property (X_("active"), _fade_out_disabled ? X_("no") : X_("yes")); } child = node.add_child ("Envelope"); @@ -703,6 +634,7 @@ AudioRegion::state (bool full) } else { _envelope.store_state (*child); } + } else { child->add_property ("default", "yes"); } @@ -715,14 +647,16 @@ AudioRegion::state (bool full) } int -AudioRegion::set_state (const XMLNode& node) +AudioRegion::set_live_state (const XMLNode& node, Change& what_changed, bool send) { const XMLNodeList& nlist = node.children(); const XMLProperty *prop; LocaleGuard lg (X_("POSIX")); - Region::set_state (node); + Region::set_live_state (node, what_changed, false); + uint32_t old_flags = _flags; + if ((prop = node.property ("flags")) != 0) { _flags = Flag (strtol (prop->value().c_str(), (char **) 0, 16)); @@ -730,6 +664,16 @@ AudioRegion::set_state (const XMLNode& node) _flags = Flag (_flags & ~Region::RightOfSplit); } + if ((old_flags ^ _flags) & Muted) { + what_changed = Change (what_changed|MuteChanged); + } + if ((old_flags ^ _flags) & Opaque) { + what_changed = Change (what_changed|OpacityChanged); + } + if ((old_flags ^ _flags) & Locked) { + what_changed = Change (what_changed|LockChanged); + } + if ((prop = node.property ("scale-gain")) != 0) { _scale_amplitude = atof (prop->value().c_str()); } else { @@ -765,7 +709,6 @@ AudioRegion::set_state (const XMLNode& node) if ((prop = child->property ("default")) != 0 || (prop = child->property ("steepness")) != 0) { set_default_fade_in (); } else { - _fade_in.load_state (*child); } @@ -781,23 +724,38 @@ AudioRegion::set_state (const XMLNode& node) } } + if (send) { + send_change (what_changed); + } + return 0; } +int +AudioRegion::set_state (const XMLNode& node) +{ + /* Region::set_state() calls the virtual set_live_state(), + which will get us back to AudioRegion::set_live_state() + to handle the relevant stuff. + */ + + return Region::set_state (node); +} + void AudioRegion::set_fade_in_shape (FadeShape shape) { - set_fade_in (shape, (jack_nframes_t) _fade_in.back()->when); + set_fade_in (shape, (nframes_t) _fade_in.back()->when); } void AudioRegion::set_fade_out_shape (FadeShape shape) { - set_fade_out (shape, (jack_nframes_t) _fade_out.back()->when); + set_fade_out (shape, (nframes_t) _fade_out.back()->when); } void -AudioRegion::set_fade_in (FadeShape shape, jack_nframes_t len) +AudioRegion::set_fade_in (FadeShape shape, nframes_t len) { _fade_in.freeze (); _fade_in.clear (); @@ -853,15 +811,11 @@ AudioRegion::set_fade_in (FadeShape shape, jack_nframes_t len) _fade_in.thaw (); _fade_in_shape = shape; - if (!_frozen) { - save_state (_("fade in change")); - } - send_change (FadeInChanged); } void -AudioRegion::set_fade_out (FadeShape shape, jack_nframes_t len) +AudioRegion::set_fade_out (FadeShape shape, nframes_t len) { _fade_out.freeze (); _fade_out.clear (); @@ -915,44 +869,27 @@ AudioRegion::set_fade_out (FadeShape shape, jack_nframes_t len) _fade_out.thaw (); _fade_out_shape = shape; - if (!_frozen) { - save_state (_("fade in change")); - } - send_change (FadeOutChanged); } void -AudioRegion::set_fade_in_length (jack_nframes_t len) +AudioRegion::set_fade_in_length (nframes_t len) { bool changed = _fade_in.extend_to (len); if (changed) { _flags = Flag (_flags & ~DefaultFadeIn); - - if (!_frozen) { - char buf[64]; - snprintf (buf, sizeof (buf), "fade in length changed to %u", len); - save_state (buf); - } - send_change (FadeInChanged); } } void -AudioRegion::set_fade_out_length (jack_nframes_t len) +AudioRegion::set_fade_out_length (nframes_t len) { bool changed = _fade_out.extend_to (len); if (changed) { _flags = Flag (_flags & ~DefaultFadeOut); - - if (!_frozen) { - char buf[64]; - snprintf (buf, sizeof (buf), "fade out length changed to %u", len); - save_state (buf); - } } send_change (FadeOutChanged); @@ -1086,45 +1023,10 @@ AudioRegion::separate_by_channel (Session& session, vector& v) con } void -AudioRegion::source_deleted (Source* ignored) -{ - delete this; -} - -void -AudioRegion::lock_sources () -{ - SourceList::iterator i; - set unique_srcs; - - for (i = sources.begin(); i != sources.end(); ++i) { - unique_srcs.insert (*i); - (*i)->use (); - } - - for (i = master_sources.begin(); i != master_sources.end(); ++i) { - if (unique_srcs.find (*i) == unique_srcs.end()) { - (*i)->use (); - } - } -} - -void -AudioRegion::unlock_sources () +AudioRegion::source_deleted () { - SourceList::iterator i; - set unique_srcs; - - for (i = sources.begin(); i != sources.end(); ++i) { - unique_srcs.insert (*i); - (*i)->release (); - } - - for (i = master_sources.begin(); i != master_sources.end(); ++i) { - if (unique_srcs.find (*i) == unique_srcs.end()) { - (*i)->release (); - } - } + sources.clear (); + drop_references (); } vector @@ -1141,24 +1043,23 @@ AudioRegion::master_source_names () } bool -AudioRegion::region_list_equivalent (const AudioRegion& other) const +AudioRegion::source_equivalent (boost::shared_ptr o) const { - return size_equivalent (other) && source_equivalent (other) && _name == other._name; -} + boost::shared_ptr other = boost::dynamic_pointer_cast(o); + + if (!other) + return false; -bool -AudioRegion::source_equivalent (const AudioRegion& other) const -{ SourceList::const_iterator i; SourceList::const_iterator io; - for (i = sources.begin(), io = other.sources.begin(); i != sources.end() && io != other.sources.end(); ++i, ++io) { + for (i = sources.begin(), io = other->sources.begin(); i != sources.end() && io != other->sources.end(); ++i, ++io) { if ((*i)->id() != (*io)->id()) { return false; } } - for (i = master_sources.begin(), io = other.master_sources.begin(); i != master_sources.end() && io != other.master_sources.end(); ++i, ++io) { + for (i = master_sources.begin(), io = other->master_sources.begin(); i != master_sources.end() && io != other->master_sources.end(); ++i, ++io) { if ((*i)->id() != (*io)->id()) { return false; } @@ -1167,38 +1068,18 @@ AudioRegion::source_equivalent (const AudioRegion& other) const return true; } -bool -AudioRegion::overlap_equivalent (const AudioRegion& other) const -{ - return coverage (other.first_frame(), other.last_frame()) != OverlapNone; -} - -bool -AudioRegion::equivalent (const AudioRegion& other) const -{ - return _start == other._start && - _position == other._position && - _length == other._length; -} - -bool -AudioRegion::size_equivalent (const AudioRegion& other) const -{ - return _start == other._start && - _length == other._length; -} - int AudioRegion::apply (AudioFilter& filter) { - return filter.run (*this); + boost::shared_ptr ar = boost::dynamic_pointer_cast (shared_from_this()); + return filter.run (ar); } int AudioRegion::exportme (Session& session, AudioExportSpecification& spec) { - const jack_nframes_t blocksize = 4096; - jack_nframes_t to_read; + const nframes_t blocksize = 4096; + nframes_t to_read; int status = -1; spec.channels = sources.size(); @@ -1219,7 +1100,7 @@ AudioRegion::exportme (Session& session, AudioExportSpecification& spec) if (spec.channels == 1) { - if (sources.front()->read (spec.dataF, _start + spec.pos, to_read, 0) != to_read) { + if (sources.front()->read (spec.dataF, _start + spec.pos, to_read) != to_read) { goto out; } @@ -1229,11 +1110,11 @@ AudioRegion::exportme (Session& session, AudioExportSpecification& spec) for (uint32_t chan = 0; chan < spec.channels; ++chan) { - if (sources[chan]->read (buf, _start + spec.pos, to_read, 0) != to_read) { + if (sources[chan]->read (buf, _start + spec.pos, to_read) != to_read) { goto out; } - for (jack_nframes_t x = 0; x < to_read; ++x) { + for (nframes_t x = 0; x < to_read; ++x) { spec.dataF[chan+(x*spec.channels)] = buf[x]; } } @@ -1258,13 +1139,18 @@ AudioRegion::exportme (Session& session, AudioExportSpecification& spec) return status; } -Region* +boost::shared_ptr AudioRegion::get_parent() { - Region* r = 0; + boost::shared_ptr r; if (_playlist) { - r = _playlist->session().find_whole_file_parent (*this); + boost::shared_ptr ar; + boost::shared_ptr grrr2 = boost::dynamic_pointer_cast (shared_from_this()); + + if (grrr2 && (ar = _playlist->session().find_whole_file_parent (grrr2))) { + return boost::static_pointer_cast (ar); + } } return r; @@ -1289,12 +1175,11 @@ AudioRegion::set_scale_amplitude (gain_t g) void AudioRegion::normalize_to (float target_dB) { - const jack_nframes_t blocksize = 256 * 1048; + const nframes_t blocksize = 64 * 1024; Sample buf[blocksize]; - char workbuf[blocksize * 4]; - jack_nframes_t fpos; - jack_nframes_t fend; - jack_nframes_t to_read; + nframes_t fpos; + nframes_t fend; + nframes_t to_read; double maxamp = 0; gain_t target = dB_to_coefficient (target_dB); @@ -1320,7 +1205,7 @@ AudioRegion::normalize_to (float target_dB) /* read it in */ - if (source (n).read (buf, fpos, to_read, workbuf) != to_read) { + if (source (n)->read (buf, fpos, to_read) != to_read) { return; } @@ -1344,12 +1229,6 @@ AudioRegion::normalize_to (float target_dB) _scale_amplitude = target/maxamp; - if (!_frozen) { - char buf[64]; - snprintf (buf, sizeof (buf), _("normalized to %.2fdB"), target_dB); - save_state (buf); - } - /* tell the diskstream we're in */ if (_playlist) { @@ -1364,7 +1243,6 @@ AudioRegion::normalize_to (float target_dB) void AudioRegion::envelope_changed (Change ignored) { - save_state (_("envelope change")); send_change (EnvelopeChanged); } @@ -1410,14 +1288,23 @@ AudioRegion::speed_mismatch (float sr) const float fsr = sources.front()->sample_rate(); - return fsr == sr; + return fsr != sr; +} + +void +AudioRegion::source_offset_changed () +{ + if (boost::dynamic_pointer_cast(sources.front())) { + set_start (source()->natural_position(), this); + set_position (source()->natural_position(), this); + } } extern "C" { int region_read_peaks_from_c (void *arg, uint32_t npeaks, uint32_t start, uint32_t cnt, intptr_t data, uint32_t n_chan, double samples_per_unit) { - return ((AudioRegion *) arg)->read_peaks ((PeakData *) data, (jack_nframes_t) npeaks, (jack_nframes_t) start, (jack_nframes_t) cnt, n_chan,samples_per_unit); + return ((AudioRegion *) arg)->read_peaks ((PeakData *) data, (nframes_t) npeaks, (nframes_t) start, (nframes_t) cnt, n_chan,samples_per_unit); } uint32_t region_length_from_c (void *arg) @@ -1428,7 +1315,7 @@ uint32_t region_length_from_c (void *arg) uint32_t sourcefile_length_from_c (void *arg, double zoom_factor) { - return ( (AudioRegion *) arg)->source().available_peaks (zoom_factor) ; + return ( (AudioRegion *) arg)->source()->available_peaks (zoom_factor) ; } } /* extern "C" */