when calculating average slave/master delta, use absolute value.

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

diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index c9f581add2b03678376f7654d3c567f2213a0153..6f8d49d532eddb46d854c4511e1ba0c794b301d5 100644 (file)
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -60,6 +60,7 @@ Track::Track (Session& sess, string name, PresentationInfo::Flag flag, TrackMode
 {
        _freeze_record.state = NoFreeze;
         _declickable = true;
+
 }
 
 Track::~Track ()
@@ -100,12 +101,7 @@ Track::init ()
         _disk_writer->set_block_size (_session.get_block_size ());
         _disk_writer->set_route (boost::dynamic_pointer_cast<Route> (shared_from_this()));
 
-        use_new_playlist ();
-
-        /* ordering here is important, and needs to be generally maintained */
-
-        add_processor (_disk_writer, PreFader);
-        add_processor (_disk_reader, PreFader);
+        use_new_playlist (data_type());
 
         boost::shared_ptr<Route> rp (boost::dynamic_pointer_cast<Route> (shared_from_this()));
        boost::shared_ptr<Track> rt = boost::dynamic_pointer_cast<Track> (rp);
@@ -224,6 +220,7 @@ Track::set_state (const XMLNode& node, int version)
                _saved_meter_point = _meter_point;
        }
 
+
        AlignChoice ac;
 
        if (node.get_property (X_("alignment-choice"), ac)) {
@@ -559,39 +556,6 @@ Track::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
        return 0;
 }
 
-int
-Track::silent_roll (pframes_t nframes, framepos_t /*start_frame*/, framepos_t /*end_frame*/, bool& need_butler)
-{
-       Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK);
-       if (!lm.locked()) {
-               // XXX DISK reader needs to seek ahead the correct distance ?? OR DOES IT ?
-               //framecnt_t playback_distance = _disk_reader->calculate_playback_distance(nframes);
-               //if (can_internal_playback_seek(playback_distance)) {
-               // internal_playback_seek(playback_distance);
-               //}
-               return 0;
-       }
-
-       if (n_outputs().n_total() == 0 && _processors.empty()) {
-               return 0;
-       }
-
-       if (!_active) {
-               silence (nframes);
-               return 0;
-       }
-
-       _silent = true;
-       _amp->apply_gain_automation(false);
-
-       silence (nframes);
-       flush_processor_buffers_locked (nframes);
-
-       //BufferSet& bufs (_session.get_route_buffers (n_process_buffers(), true));
-       // XXXX DISKWRITER/READER ADVANCE, SET need_butler
-       return 0;
-}
-
 boost::shared_ptr<Playlist>
 Track::playlist ()
 {
@@ -689,12 +653,6 @@ Track::seek (framepos_t p, bool complete_refill)
        return _disk_writer->seek (p, complete_refill);
 }
 
-bool
-Track::hidden () const
-{
-       return _disk_writer->hidden () || _disk_reader->hidden();
-}
-
 int
 Track::can_internal_playback_seek (framecnt_t p)
 {
@@ -712,9 +670,9 @@ Track::non_realtime_locate (framepos_t p)
 {
        Route::non_realtime_locate (p);
 
-       if (!hidden()) {
+       if (!is_private_route()) {
                /* don't waste i/o cycles and butler calls
-                  for hidden (secret) tracks
+                  for private tracks (e.g.auditioner)
                */
                _disk_reader->non_realtime_locate (p);
                _disk_writer->non_realtime_locate (p);
@@ -904,10 +862,10 @@ Track::use_copy_playlist ()
 }
 
 int
-Track::use_new_playlist ()
+Track::use_new_playlist (DataType dt)
 {
        string newname;
-       boost::shared_ptr<Playlist> playlist = _playlists[data_type()];
+       boost::shared_ptr<Playlist> playlist = _playlists[dt];
 
        if (playlist) {
                newname = Playlist::bump_name (playlist->name(), _session);
@@ -915,13 +873,13 @@ Track::use_new_playlist ()
                newname = Playlist::bump_name (_name, _session);
        }
 
-       playlist = PlaylistFactory::create (data_type(), _session, newname, hidden());
+       playlist = PlaylistFactory::create (dt, _session, newname, is_private_route());
 
        if (!playlist) {
                return -1;
        }
 
-       return use_playlist (data_type(), playlist);
+       return use_playlist (dt, playlist);
 }
 
 void
@@ -1256,6 +1214,8 @@ Track::set_processor_state (XMLNode const & node, XMLProperty const* prop, Proce
                return true;
        }
 
+       cerr << name() << " looking for state for track procs, DR = " << _disk_reader << endl;
+
        if (prop->value() == "diskreader") {
                if (_disk_reader) {
                        _disk_reader->set_state (node, Stateful::current_state_version);
@@ -1512,3 +1472,5 @@ Track::use_captured_audio_sources (SourceList& srcs, CaptureInfos const & captur
        pl->set_capture_insertion_in_progress (false);
        _session.add_command (new StatefulDiffCommand (pl));
 }
+
+