Add support (in our MSVC projects) for using 'boost::atomic'

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

diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index 45e4bce9b09886bedd55c19ece87e4aaf89ac628..4f22892b5ab2594549ed6eb1788ef0980589dc87 100644 (file)
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -61,8 +61,6 @@ Track::Track (Session& sess, string name, PresentationInfo::Flag flag, TrackMode
        , _alignment_choice (Automatic)
 {
        _freeze_record.state = NoFreeze;
-       _declickable = true;
-
 }
 
 Track::~Track ()
@@ -91,17 +89,17 @@ Track::init ()
 
        if (_mode == Destructive && !Profile->get_trx()) {
                dflags = DiskIOProcessor::Flag (dflags | DiskIOProcessor::Destructive);
-       } else if (_mode == NonLayered){
-               dflags = DiskIOProcessor::Flag(dflags | DiskIOProcessor::NonLayered);
        }
 
        _disk_reader.reset (new DiskReader (_session, name(), dflags));
        _disk_reader->set_block_size (_session.get_block_size ());
        _disk_reader->set_route (boost::dynamic_pointer_cast<Route> (shared_from_this()));
+       _disk_reader->set_owner (this);
 
        _disk_writer.reset (new DiskWriter (_session, name(), dflags));
        _disk_writer->set_block_size (_session.get_block_size ());
        _disk_writer->set_route (boost::dynamic_pointer_cast<Route> (shared_from_this()));
+       _disk_writer->set_owner (this);
 
        set_align_choice_from_io ();
 
@@ -139,15 +137,9 @@ Track::input_changed ()
 }
 
 XMLNode&
-Track::get_state ()
+Track::state (bool save_template)
 {
-       return state (true);
-}
-
-XMLNode&
-Track::state (bool full)
-{
-       XMLNode& root (Route::state (full));
+       XMLNode& root (Route::state (save_template));
 
        if (_playlists[DataType::AUDIO]) {
                root.set_property (X_("audio-playlist"), _playlists[DataType::AUDIO]->id().to_s());
@@ -245,12 +237,6 @@ Track::set_state (const XMLNode& node, int version)
        return 0;
 }
 
-XMLNode&
-Track::get_template ()
-{
-       return state (false);
-}
-
 Track::FreezeRecord::~FreezeRecord ()
 {
        for (vector<FreezeRecordProcessorInfo*>::iterator i = processor_info.begin(); i != processor_info.end(); ++i) {
@@ -264,6 +250,12 @@ Track::freeze_state() const
        return _freeze_record.state;
 }
 
+bool
+Track::declick_in_progress () const
+{
+       return _disk_reader->declick_in_progress ();
+}
+
 bool
 Track::can_record()
 {
@@ -530,20 +522,6 @@ void
 Track::non_realtime_locate (samplepos_t p)
 {
        Route::non_realtime_locate (p);
-
-       if (!is_private_route()) {
-               /* don't waste i/o cycles and butler calls
-                  for private tracks (e.g.auditioner)
-               */
-               _disk_reader->non_realtime_locate (p);
-               _disk_writer->non_realtime_locate (p);
-       }
-}
-
-void
-Track::non_realtime_speed_change ()
-{
-       _disk_reader->non_realtime_speed_change ();
 }
 
 int
@@ -558,44 +536,12 @@ Track::get_captured_samples (uint32_t n) const
        return _disk_writer->get_captured_samples (n);
 }
 
-int
-Track::set_loop (Location* l)
-{
-       if (_disk_reader->set_loop (l)) {
-               return -1;
-       }
-       return _disk_writer->set_loop (l);
-}
-
 void
 Track::transport_looped (samplepos_t p)
 {
        return _disk_writer->transport_looped (p);
 }
 
-bool
-Track::realtime_speed_change ()
-{
-       if (_disk_reader->realtime_speed_change ()) {
-               return -1;
-       }
-       return _disk_writer->realtime_speed_change ();
-}
-
-void
-Track::realtime_handle_transport_stopped ()
-{
-       Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK);
-
-       if (!lm.locked ()) {
-               return;
-       }
-
-       for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
-               (*i)->realtime_handle_transport_stopped ();
-       }
-}
-
 void
 Track::transport_stopped_wallclock (struct tm & n, time_t t, bool g)
 {
@@ -839,29 +785,6 @@ Track::adjust_capture_buffering ()
         }
 }
 
-
-void
-Track::maybe_declick (BufferSet& bufs, samplecnt_t nframes, int declick)
-{
-        /* never declick if there is an internal generator - we just want it to
-           keep generating sound without interruption.
-
-          ditto if we are monitoring inputs.
-        */
-
-       if (_have_internal_generator || (_monitoring_control->monitoring_choice() == MonitorInput)) {
-                return;
-        }
-
-        if (!declick) {
-               declick = _pending_declick;
-       }
-
-       if (declick != 0) {
-               Amp::declick (bufs, nframes, declick);
-       }
-}
-
 void
 Track::monitoring_changed (bool, Controllable::GroupControlDisposition)
 {
@@ -1035,9 +958,9 @@ Track::use_captured_midi_sources (SourceList& srcs, CaptureInfos const & capture
                        continue; /* XXX is this OK? */
                }
 
-               // cerr << "add new region, buffer position = " << buffer_position << " @ " << (*ci)->start << endl;
+               cerr << "add new region, len = " << (*ci)->samples << " @ " << (*ci)->start << endl;
 
-               pl->add_region (midi_region, (*ci)->start + preroll_off, _disk_writer->non_layered());
+               pl->add_region (midi_region, (*ci)->start + preroll_off, 1, _session.config.get_layered_record_mode ());
        }
 
        pl->thaw ();
@@ -1139,7 +1062,7 @@ Track::use_captured_audio_sources (SourceList& srcs, CaptureInfos const & captur
                        continue; /* XXX is this OK? */
                }
 
-               pl->add_region (region, (*ci)->start + preroll_off, 1, _disk_writer->non_layered());
+               pl->add_region (region, (*ci)->start + preroll_off, 1, _session.config.get_layered_record_mode());
                pl->set_layer (region, DBL_MAX);
 
                buffer_position += (*ci)->samples;