Use a static string variable for dll path.

[ardour.git] / libs / ardour / audioregion.cc

diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
index 9694e2430b14b9c9ae314f94ad0031bcfdc7a75d..0909140f91be8db7e0500c6fd23141706002af02 100644 (file)
--- a/libs/ardour/audioregion.cc
+++ b/libs/ardour/audioregion.cc
@@ -409,14 +409,22 @@ AudioRegion::set_envelope_active (bool yn)
        }
 }
 
+/** @param buf Buffer to put peak data in.
+ *  @param npeaks Number of peaks to read (ie the number of PeakDatas in buf)
+ *  @param offset Start position, as an offset from the start of this region's source.
+ *  @param cnt Number of samples to read.
+ *  @param chan_n Channel.
+ *  @param frames_per_pixel Number of samples to use to generate one peak value.
+ */
+ 
 ARDOUR::framecnt_t
-AudioRegion::read_peaks (PeakData *buf, framecnt_t npeaks, framecnt_t offset, framecnt_t cnt, uint32_t chan_n, double samples_per_unit) const
+AudioRegion::read_peaks (PeakData *buf, framecnt_t npeaks, framecnt_t offset, framecnt_t cnt, uint32_t chan_n, double frames_per_pixel) const
 {
        if (chan_n >= _sources.size()) {
                return 0;
        }
 
-       if (audio_source(chan_n)->read_peaks (buf, npeaks, offset, cnt, samples_per_unit)) {
+       if (audio_source(chan_n)->read_peaks (buf, npeaks, offset, cnt, frames_per_pixel)) {
                return 0;
        } else {
                if (_scale_amplitude != 1.0f) {
@@ -754,17 +762,24 @@ AudioRegion::read_from_sources (SourceList const & srcs, framecnt_t limit, Sampl
 }
 
 XMLNode&
-AudioRegion::state ()
+AudioRegion::get_basic_state ()
 {
        XMLNode& node (Region::state ());
-       XMLNode *child;
        char buf[64];
        LocaleGuard lg (X_("POSIX"));
 
        snprintf (buf, sizeof (buf), "%u", (uint32_t) _sources.size());
        node.add_property ("channels", buf);
 
-       Stateful::add_properties (node);
+       return node;
+}
+
+XMLNode&
+AudioRegion::state ()
+{
+       XMLNode& node (get_basic_state());
+       XMLNode *child;
+       LocaleGuard lg (X_("POSIX"));
 
        child = node.add_child ("Envelope");
 
@@ -796,7 +811,7 @@ AudioRegion::state ()
        }
 
        if (_inverse_fade_in) {
-               child = node.add_child (X_("InvFadeIn"));
+               child = node.add_child (X_("InverseFadeIn"));
                child->add_child_nocopy (_inverse_fade_in->get_state ());
        }
 
@@ -809,7 +824,7 @@ AudioRegion::state ()
        }
 
        if (_inverse_fade_out) {
-               child = node.add_child (X_("InvFadeOut"));
+               child = node.add_child (X_("InverseFadeOut"));
                child->add_child_nocopy (_inverse_fade_out->get_state ());
        }
 
@@ -908,12 +923,12 @@ AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_
                                }
                        }
        
-               } else if (child->name() == "InvFadeIn") {
+               } else if (child->name() == "InverseFadeIn") {
                        XMLNode* grandchild = child->child ("AutomationList");
                        if (grandchild) {
                                _inverse_fade_in->set_state (*grandchild, version);
                        }
-               } else if (child->name() == "InvFadeOut") {
+               } else if (child->name() == "InverseFadeOut") {
                        XMLNode* grandchild = child->child ("AutomationList");
                        if (grandchild) {
                                _inverse_fade_out->set_state (*grandchild, version);
@@ -1845,22 +1860,3 @@ AudioRegion::verify_xfade_bounds (framecnt_t len, bool start)
                
 }
 
-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, (framecnt_t) npeaks, (framepos_t) start, (framecnt_t) cnt, n_chan,samples_per_unit);
-}
-
-uint32_t region_length_from_c (void *arg)
-{
-
-       return ((AudioRegion *) arg)->length();
-}
-
-uint32_t sourcefile_length_from_c (void *arg, double zoom_factor)
-{
-       return ( (AudioRegion *) arg)->audio_source()->available_peaks (zoom_factor) ;
-}
-
-} /* extern "C" */