interpolation.cc/.h: Spline-Bugfixes: Crash bug at tempos close to 0, wrong calculati...

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

diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc
index a17ab1036f24ca1f00a3ff00df887f046114243c..93bdc333f134413a67faf1ab5e2b91ca3c4beb72 100644 (file)
--- a/libs/ardour/audio_playlist.cc
+++ b/libs/ardour/audio_playlist.cc
@@ -23,14 +23,14 @@
 
 #include <sigc++/bind.h>
 
-#include <ardour/types.h>
-#include <ardour/configuration.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/audioregion.h>
-#include <ardour/crossfade.h>
-#include <ardour/crossfade_compare.h>
-#include <ardour/session.h>
-#include <pbd/enumwriter.h>
+#include "ardour/types.h"
+#include "ardour/configuration.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/audioregion.h"
+#include "ardour/crossfade.h"
+#include "ardour/crossfade_compare.h"
+#include "ardour/session.h"
+#include "pbd/enumwriter.h"
 
 #include "i18n.h"
 
@@ -147,7 +147,7 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nf
           its OK to block (for short intervals).
        */
 
-       Glib::Mutex::Lock rm (region_lock);
+       Glib::RecMutex::Lock rm (region_lock);
 
        end =  start + cnt - 1;
        read_frames = 0;
@@ -368,7 +368,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
        }
 
 
-       if (!Config->get_auto_xfade()) {
+       if (!_session.config.get_auto_xfade()) {
                return;
        }
 
@@ -450,19 +450,19 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
                                 *   [---- bottom -------------------] 
                                 */
 
-                               if (Config->get_xfade_model() == FullCrossfade) {
+                               if (_session.config.get_xfade_model() == FullCrossfade) {
                                        touched_regions = regions_touched (top->first_frame(), bottom->last_frame());
                                        if (touched_regions->size() <= 2) {
-                                               xfade = boost::shared_ptr<Crossfade> (new Crossfade (region, other, Config->get_xfade_model(), Config->get_xfades_active()));
+                                               xfade = boost::shared_ptr<Crossfade> (new Crossfade (region, other, _session.config.get_xfade_model(), _session.config.get_xfades_active()));
                                                add_crossfade (xfade);
                                        }
                                } else {
 
                                        touched_regions = regions_touched (top->first_frame(), 
-                                                                          top->first_frame() + min ((nframes_t)Config->get_short_xfade_seconds() * _session.frame_rate(), 
+                                                                          top->first_frame() + min ((nframes_t)_session.config.get_short_xfade_seconds() * _session.frame_rate(), 
                                                                                                     top->length()));
                                        if (touched_regions->size() <= 2) {
-                                               xfade = boost::shared_ptr<Crossfade> (new Crossfade (region, other, Config->get_xfade_model(), Config->get_xfades_active()));
+                                               xfade = boost::shared_ptr<Crossfade> (new Crossfade (region, other, _session.config.get_xfade_model(), _session.config.get_xfades_active()));
                                                add_crossfade (xfade);
                                        }
                                }
@@ -474,28 +474,28 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
                                 *                { ==== bottom ============ } 
                                 */ 
 
-                               if (Config->get_xfade_model() == FullCrossfade) {
+                               if (_session.config.get_xfade_model() == FullCrossfade) {
 
                                        touched_regions = regions_touched (bottom->first_frame(), top->last_frame());
                                        if (touched_regions->size() <= 2) {
                                                xfade = boost::shared_ptr<Crossfade> (new Crossfade (region, other, 
-                                                                                                    Config->get_xfade_model(), Config->get_xfades_active()));
+                                                                                                    _session.config.get_xfade_model(), _session.config.get_xfades_active()));
                                                add_crossfade (xfade);
                                        }
 
                                } else {
                                        touched_regions = regions_touched (bottom->first_frame(), 
-                                                                          bottom->first_frame() + min ((nframes_t)Config->get_short_xfade_seconds() * _session.frame_rate(), 
+                                                                          bottom->first_frame() + min ((nframes_t)_session.config.get_short_xfade_seconds() * _session.frame_rate(), 
                                                                                                        bottom->length()));
                                        if (touched_regions->size() <= 2) {
-                                               xfade = boost::shared_ptr<Crossfade> (new Crossfade (region, other, Config->get_xfade_model(), Config->get_xfades_active()));
+                                               xfade = boost::shared_ptr<Crossfade> (new Crossfade (region, other, _session.config.get_xfade_model(), _session.config.get_xfades_active()));
                                                add_crossfade (xfade);
                                        }
                                }
                                break;
                        default:
                                xfade = boost::shared_ptr<Crossfade> (new Crossfade (region, other, 
-                                                                                    Config->get_xfade_model(), Config->get_xfades_active()));
+                                                                                    _session.config.get_xfade_model(), _session.config.get_xfades_active()));
                                add_crossfade (xfade);
                        }
                }
@@ -729,7 +729,7 @@ AudioPlaylist::destroy_region (boost::shared_ptr<Region> region)
 }
 
 void
-AudioPlaylist::crossfade_changed (Change ignored)
+AudioPlaylist::crossfade_changed (Change)
 {
        if (in_flush || in_set_state) {
                return;
@@ -786,3 +786,11 @@ AudioPlaylist::crossfades_at (nframes_t frame, Crossfades& clist)
        }
 }
 
+void
+AudioPlaylist::foreach_crossfade (sigc::slot<void, boost::shared_ptr<Crossfade> > s)
+{
+       RegionLock rl (this, false);
+       for (Crossfades::iterator i = _crossfades.begin(); i != _crossfades.end(); ++i) {
+               s (*i);
+       }
+}