Merge with 2.0-ongoing R3082.
[ardour.git] / libs / ardour / audioregion.cc
index 91654643d93d7665b633307d34797a1b82c3a42f..5e0cd136ff17c40aa7eb691cbb4e393af543dbb4 100644 (file)
@@ -20,6 +20,7 @@
 #include <cmath>
 #include <climits>
 #include <cfloat>
+#include <algorithm>
 
 #include <set>
 
@@ -42,6 +43,7 @@
 #include <ardour/audiofilesource.h>
 #include <ardour/region_factory.h>
 #include <ardour/runtime_functions.h>
+#include <ardour/transient_detector.h>
 
 #include "i18n.h"
 #include <locale.h>
@@ -69,6 +71,7 @@ AudioRegion::init ()
        set_default_envelope ();
 
        listen_to_my_curves ();
+       listen_to_my_sources ();
 }
 
 /* constructor for use by derived types only */
@@ -112,16 +115,16 @@ AudioRegion::AudioRegion (boost::shared_ptr<AudioSource> src, nframes_t start, n
 }
 
 /* Basic AudioRegion constructor (many channels) */
-AudioRegion::AudioRegion (SourceList& srcs, nframes_t start, nframes_t length, const string& name, layer_t layer, Flag flags)
+AudioRegion::AudioRegion (const SourceList& srcs, nframes_t start, nframes_t length, const string& name, layer_t layer, Flag flags)
        : Region (srcs, start, length, name, DataType::AUDIO, layer, flags)
        , _fade_in (new AutomationList(Parameter(FadeInAutomation), 0.0, 2.0, 1.0))
        , _fade_out (new AutomationList(Parameter(FadeOutAutomation), 0.0, 2.0, 1.0))
        , _envelope (new AutomationList(Parameter(EnvelopeAutomation), 0.0, 2.0, 1.0))
 {
        init ();
+       listen_to_my_sources ();
 }
 
-
 /** Create a new AudioRegion, that is part of an existing one */
 AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> other, nframes_t offset, nframes_t length, const string& name, layer_t layer, Flag flags)
        : Region (other, offset, length, name, layer, flags)
@@ -172,6 +175,7 @@ AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> other, nframes_t
        _scale_amplitude = other->_scale_amplitude;
 
        assert(_type == DataType::AUDIO);
+       listen_to_my_sources ();
 }
 
 AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> other)
@@ -180,14 +184,14 @@ AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> other)
        , _fade_out (new AutomationList(Parameter(FadeOutAutomation), 0.0, 2.0, 1.0))
        , _envelope (new AutomationList(Parameter(EnvelopeAutomation), 0.0, 2.0, 1.0))
 {
+       assert(_type == DataType::AUDIO);
        _scale_amplitude = other->_scale_amplitude;
        _envelope = other->_envelope;
 
        set_default_fades ();
        
        listen_to_my_curves ();
-
-       assert(_type == DataType::AUDIO);
+       listen_to_my_sources ();
 }
 
 AudioRegion::AudioRegion (boost::shared_ptr<AudioSource> src, const XMLNode& node)
@@ -208,6 +212,7 @@ AudioRegion::AudioRegion (boost::shared_ptr<AudioSource> src, const XMLNode& nod
        }
 
        assert(_type == DataType::AUDIO);
+       listen_to_my_sources ();
 }
 
 AudioRegion::AudioRegion (SourceList& srcs, const XMLNode& node)
@@ -223,6 +228,7 @@ AudioRegion::AudioRegion (SourceList& srcs, const XMLNode& node)
        }
 
        assert(_type == DataType::AUDIO);
+       listen_to_my_sources ();
 }
 
 AudioRegion::~AudioRegion ()
@@ -230,59 +236,19 @@ AudioRegion::~AudioRegion ()
 }
 
 void
-AudioRegion::listen_to_my_curves ()
-{
-       _envelope->StateChanged.connect (mem_fun (*this, &AudioRegion::envelope_changed));
-       _fade_in->StateChanged.connect (mem_fun (*this, &AudioRegion::fade_in_changed));
-       _fade_out->StateChanged.connect (mem_fun (*this, &AudioRegion::fade_out_changed));
-}
-
-bool
-AudioRegion::verify_length (nframes_t len)
-{
-       boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(source());
-
-       if (afs && afs->destructive()) {
-               return true;
-       } else {
-               return Region::verify_length(len);
-       }
-}
-
-bool
-AudioRegion::verify_start_and_length (nframes_t new_start, nframes_t new_length)
+AudioRegion::listen_to_my_sources ()
 {
-       boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(source());
-
-       if (afs && afs->destructive()) {
-               return true;
-       } else {
-               return Region::verify_start_and_length(new_start, new_length);
-       }
-}
-
-bool
-AudioRegion::verify_start (nframes_t pos)
-{
-       boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(source());
-
-       if (afs && afs->destructive()) {
-               return true;
-       } else {
-               return Region::verify_start(pos);
+       for (SourceList::const_iterator i = _sources.begin(); i != _sources.end(); ++i) {
+               (*i)->AnalysisChanged.connect (mem_fun (*this, &AudioRegion::invalidate_transients));
        }
 }
 
-bool
-AudioRegion::verify_start_mutable (nframes_t& new_start)
+void
+AudioRegion::listen_to_my_curves ()
 {
-       boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(source());
-
-       if (afs && afs->destructive()) {
-               return true;
-       } else {
-               return Region::verify_start_mutable(new_start);
-       }
+       _envelope->StateChanged.connect (mem_fun (*this, &AudioRegion::envelope_changed));
+       _fade_in->StateChanged.connect (mem_fun (*this, &AudioRegion::fade_in_changed));
+       _fade_out->StateChanged.connect (mem_fun (*this, &AudioRegion::fade_out_changed));
 }
 
 void
@@ -321,30 +287,42 @@ AudioRegion::read_peaks (PeakData *buf, nframes_t npeaks, nframes_t offset, nfra
        }
 }
 
-ARDOUR::nframes_t
-AudioRegion::read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nframes_t position, nframes_t cnt, uint32_t chan_n) const
+nframes64_t
+AudioRegion::read (Sample* buf, nframes64_t position, nframes64_t cnt, int channel) const
 {
-       return _read_at (_sources, buf, mixdown_buffer, gain_buffer, position, cnt, chan_n);
+       /* raw read, no fades, no gain, nada */
+       return _read_at (_sources, buf, 0, 0, _position + position, cnt, channel, 0, 0, true);
 }
 
-ARDOUR::nframes_t
+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
+{
+       /* regular diskstream/butler read complete with fades etc */
+       return _read_at (_sources, buf, mixdown_buffer, gain_buffer, position, cnt, chan_n, read_frames, skip_frames, false);
+}
+
+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, position, cnt, chan_n);
+       return _read_at (_master_sources, buf, mixdown_buffer, gain_buffer, position, cnt, chan_n, 0, 0);
 }
 
-ARDOUR::nframes_t
+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) const
+                      nframes_t position, nframes_t cnt, 
+                      uint32_t chan_n, 
+                      nframes_t read_frames, 
+                      nframes_t skip_frames,
+                      bool raw) const
 {
-       // cerr << _name << "._read_at(" << position << ") - " << _position << endl;
-
        nframes_t internal_offset;
        nframes_t buf_offset;
        nframes_t to_read;
 
-       if (muted()) {
+       if (muted() && !raw) {
                return 0; /* read nothing */
        }
 
@@ -367,24 +345,27 @@ AudioRegion::_read_at (const SourceList& srcs, Sample *buf, Sample *mixdown_buff
                return 0; /* read nothing */
        }
 
-       if (opaque()) {
+       if (opaque() || raw) {
                /* overwrite whatever is there */
                mixdown_buffer = buf + buf_offset;
        } else {
                mixdown_buffer += buf_offset;
        }
 
-       _read_data_count = 0;
+       if (!raw) {
+               _read_data_count = 0;
+       }
 
        if (chan_n < n_channels()) {
-               
+
                boost::shared_ptr<AudioSource> src = audio_source(chan_n);
                if (src->read (mixdown_buffer, _start + internal_offset, to_read) != to_read) {
-
                        return 0; /* "read nothing" */
                }
-
-               _read_data_count += src->read_data_count();
+               
+               if (!raw) {
+                       _read_data_count += src->read_data_count();
+               }
 
        } else {
                
@@ -396,37 +377,41 @@ AudioRegion::_read_at (const SourceList& srcs, Sample *buf, Sample *mixdown_buff
 
                /* no fades required */
 
-               goto merge;
+               if (!raw) {
+                       goto merge;
+               }
        }
 
        /* fade in */
 
-       if (_flags & FadeIn) {
-
-               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) {
-               
-                       nframes_t limit;
-
-                       limit = min (to_read, fade_in_length - internal_offset);
-
-                       _fade_in->curve().get_vector (internal_offset, internal_offset+limit, gain_buffer, limit);
-
-                       for (nframes_t n = 0; n < limit; ++n) {
-                               mixdown_buffer[n] *= gain_buffer[n];
+       if (!raw) {
+       
+               if (_flags & FadeIn) {
+                       
+                       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) {
+                               
+                               nframes_t limit;
+                               
+                               limit = min (to_read, fade_in_length - internal_offset);
+                               
+                               _fade_in->curve().get_vector (internal_offset, internal_offset+limit, gain_buffer, limit);
+                               
+                               for (nframes_t n = 0; n < limit; ++n) {
+                                       mixdown_buffer[n] *= gain_buffer[n];
+                               }
                        }
                }
-       }
-       
-       /* fade out */
-
-       if (_flags & FadeOut) {
-       
-               /* see if some part of this read is within the fade out */
-
+               
+               /* fade out */
+               
+               if (_flags & FadeOut) {
+                       
+                       /* see if some part of this read is within the fade out */
+                       
                /* .................        >|            REGION
                                            _length
                                            
@@ -437,65 +422,66 @@ AudioRegion::_read_at (const SourceList& srcs, Sample *buf, Sample *mixdown_buff
                         |--------------|
                         ^internal_offset
                                        ^internal_offset + to_read
-
-                  we need the intersection of [internal_offset,internal_offset+to_read] with
-                  [_length - fade_out_length, _length]
-
+                                      
+                                      we need the intersection of [internal_offset,internal_offset+to_read] with
+                                      [_length - fade_out_length, _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 */
+                       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);
                        
-                       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->curve().get_vector (curve_offset,curve_offset+limit, gain_buffer, limit);
-
-                       for (nframes_t n = 0, m = fade_offset; n < limit; ++n, ++m) {
-                               mixdown_buffer[m] *= gain_buffer[n];
-                       }
-               } 
-
-       }
-
-       /* Regular gain curves */
-
-       if (envelope_active())  {
-               _envelope->curve().get_vector (internal_offset, internal_offset + to_read, gain_buffer, to_read);
+                       if (fade_interval_end > fade_interval_start) {
+                               /* (part of the) the fade out is  in this buffer */
+                               
+                               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->curve().get_vector (curve_offset,curve_offset+limit, gain_buffer, limit);
+                               
+                               for (nframes_t n = 0, m = fade_offset; n < limit; ++n, ++m) {
+                                       mixdown_buffer[m] *= gain_buffer[n];
+                               }
+                       } 
+                       
+               }
                
-               if (_scale_amplitude != 1.0f) {
-                       for (nframes_t n = 0; n < to_read; ++n) {
-                               mixdown_buffer[n] *= gain_buffer[n] * _scale_amplitude;
+               /* Regular gain curves */
+               
+               if (envelope_active())  {
+                       _envelope->curve().get_vector (internal_offset, internal_offset + to_read, gain_buffer, to_read);
+                       
+                       if (_scale_amplitude != 1.0f) {
+                               for (nframes_t n = 0; n < to_read; ++n) {
+                                       mixdown_buffer[n] *= gain_buffer[n] * _scale_amplitude;
+                               }
+                       } else {
+                               for (nframes_t n = 0; n < to_read; ++n) {
+                                       mixdown_buffer[n] *= gain_buffer[n];
+                               }
                        }
-               } else {
+               } else if (_scale_amplitude != 1.0f) {
+                       Session::apply_gain_to_buffer (mixdown_buffer, to_read, _scale_amplitude);
+               }
+       
+         merge:
+               
+               if (!opaque()) {
+                       
+                       /* gack. the things we do for users.
+                        */
+                       
+                       buf += buf_offset;
+                       
                        for (nframes_t n = 0; n < to_read; ++n) {
-                               mixdown_buffer[n] *= gain_buffer[n];
+                               buf[n] += mixdown_buffer[n];
                        }
-               }
-       } else if (_scale_amplitude != 1.0f) {
-               apply_gain_to_buffer (mixdown_buffer, to_read, _scale_amplitude);
+               } 
        }
 
-  merge:
-
-       if (!opaque()) {
-
-               /* gack. the things we do for users.
-                */
-
-               buf += buf_offset;
-               
-               for (nframes_t n = 0; n < to_read; ++n) {
-                       buf[n] += mixdown_buffer[n];
-               }
-       } 
-       
        return to_read;
 }
        
@@ -596,7 +582,7 @@ AudioRegion::set_live_state (const XMLNode& node, Change& what_changed, bool sen
        Region::set_live_state (node, what_changed, false);
 
        uint32_t old_flags = _flags;
-               
+
        if ((prop = node.property ("flags")) != 0) {
                _flags = Flag (string_2_enum (prop->value(), _flags));
 
@@ -647,17 +633,44 @@ AudioRegion::set_live_state (const XMLNode& node, Change& what_changed, bool sen
                        
                        _fade_in->clear ();
                        
-                       if ((prop = child->property ("default")) != 0 || (prop = child->property ("steepness")) != 0 || _fade_in->set_state (*child)) {
+                       if ((prop = child->property ("default")) != 0 || (prop = child->property ("steepness")) != 0) {
                                set_default_fade_in ();
-                       } 
+                       } else {
+                               XMLNode* grandchild = child->child ("AutomationList");
+                               if (grandchild) {
+                                       _fade_in->set_state (*grandchild);
+                               }
+                       }
+
+                       if ((prop = child->property ("active")) != 0) {
+                               if (prop->value() == "yes") {
+                                       set_fade_in_active (true);
+                               } else {
+                                       set_fade_in_active (true);
+                               }
+                       }
 
                } else if (child->name() == "FadeOut") {
                        
                        _fade_out->clear ();
 
-                       if ((prop = child->property ("default")) != 0 || (prop = child->property ("steepness")) != 0 || _fade_out->set_state (*child)) {
+                       if ((prop = child->property ("default")) != 0 || (prop = child->property ("steepness")) != 0) {
                                set_default_fade_out ();
-                       } 
+                       } else {
+                               XMLNode* grandchild = child->child ("AutomationList");
+                               if (grandchild) {
+                                       _fade_out->set_state (*grandchild);
+                               } 
+                       }
+
+                       if ((prop = child->property ("active")) != 0) {
+                               if (prop->value() == "yes") {
+                                       set_fade_out_active (true);
+                               } else {
+                                       set_fade_out_active (false);
+                               }
+                       }
+
                } 
        }
 
@@ -812,6 +825,10 @@ AudioRegion::set_fade_out (FadeShape shape, nframes_t len)
 void
 AudioRegion::set_fade_in_length (nframes_t len)
 {
+       if (len > _length) {
+               len = _length - 1;
+       }
+
        bool changed = _fade_in->extend_to (len);
 
        if (changed) {
@@ -823,13 +840,16 @@ AudioRegion::set_fade_in_length (nframes_t len)
 void
 AudioRegion::set_fade_out_length (nframes_t len)
 {
+       if (len > _length) {
+               len = _length - 1;
+       }
+
        bool changed =  _fade_out->extend_to (len);
 
        if (changed) {
                _flags = Flag (_flags & ~DefaultFadeOut);
+               send_change (FadeOutChanged);
        }
-
-       send_change (FadeOutChanged);
 }
 
 void
@@ -1002,7 +1022,7 @@ AudioRegion::read_raw_internal (Sample* buf, nframes_t pos, nframes_t cnt) const
 
 
 int
-AudioRegion::exportme (Session& session, AudioExportSpecification& spec)
+AudioRegion::exportme (Session& session, ARDOUR::ExportSpecification& spec)
 {
        const nframes_t blocksize = 4096;
        nframes_t to_read;
@@ -1238,6 +1258,123 @@ AudioRegion::audio_source (uint32_t n) const
        return boost::dynamic_pointer_cast<AudioSource>(source(n));
 }
 
+int
+AudioRegion::get_transients (AnalysisFeatureList& results, bool force_new)
+{
+       boost::shared_ptr<Playlist> pl = playlist();
+
+       if (!pl) {
+               return -1;
+       }
+
+       if (_valid_transients && !force_new) {
+               results = _transients;
+               return 0;
+       }
+
+       SourceList::iterator s;
+       
+       for (s = _sources.begin() ; s != _sources.end(); ++s) {
+               if (!(*s)->has_been_analysed()) {
+                       cerr << "For " << name() << " source " << (*s)->name() << " has not been analyzed\n";
+                       break;
+               }
+       }
+       
+       if (s == _sources.end()) {
+               /* all sources are analyzed, merge data from each one */
+
+               for (s = _sources.begin() ; s != _sources.end(); ++s) {
+
+                       /* find the set of transients within the bounds of this region */
+
+                       AnalysisFeatureList::iterator low = lower_bound ((*s)->transients.begin(),
+                                                                        (*s)->transients.end(),
+                                                                        _start);
+
+                       AnalysisFeatureList::iterator high = upper_bound ((*s)->transients.begin(),
+                                                                         (*s)->transients.end(),
+                                                                         _start + _length);
+                                                                        
+                       /* and add them */
+
+                       results.insert (results.end(), low, high);
+               }
+
+               TransientDetector::cleanup_transients (results, pl->session().frame_rate(), 3.0);
+               
+               /* translate all transients to current position */
+
+               for (AnalysisFeatureList::iterator x = results.begin(); x != results.end(); ++x) {
+                       (*x) -= _start;
+                       (*x) += _position;
+               }
+
+               _transients = results;
+               _valid_transients = true;
+
+               return 0;
+       }
+
+       cerr << "startup analysis of " << _name << endl;
+
+       TransientDetector t (pl->session().frame_rate());
+       bool existing_results = !results.empty();
+
+       _transients.clear ();
+       _valid_transients = false;
+
+       for (uint32_t i = 0; i < n_channels(); ++i) {
+
+               AnalysisFeatureList these_results;
+
+               t.reset ();
+
+               cerr << "working on channel " << i << endl;
+
+               if (t.run ("", this, i, these_results)) {
+                       return -1;
+               }
+
+               cerr << "done\n";
+
+               /* translate all transients to give absolute position */
+               
+               for (AnalysisFeatureList::iterator i = these_results.begin(); i != these_results.end(); ++i) {
+                       (*i) += _position;
+               }
+
+               /* merge */
+               
+               _transients.insert (_transients.end(), these_results.begin(), these_results.end());
+       }
+       
+       if (!results.empty()) {
+               if (existing_results) {
+                       
+                       /* merge our transients into the existing ones, then clean up
+                          those.
+                       */
+
+                       results.insert (results.end(), _transients.begin(), _transients.end());
+                       TransientDetector::cleanup_transients (results, pl->session().frame_rate(), 3.0);
+               }
+
+               /* make sure ours are clean too */
+
+               TransientDetector::cleanup_transients (_transients, pl->session().frame_rate(), 3.0);
+
+       } else {
+
+               TransientDetector::cleanup_transients (_transients, pl->session().frame_rate(), 3.0);
+               results = _transients;
+       }
+
+       _valid_transients = true;
+
+       return 0;
+}
+
 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)