Make import GUI report if you are importing a file of a name that

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

diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index f81ef9de4dea364dba22b01acb58b0c88eff8529..e9b16b137c55cda01718dd1e96738c08f09769b9 100644 (file)
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -41,7 +41,6 @@ using namespace PBD;
 
 Track::Track (Session& sess, string name, Route::Flag flag, TrackMode mode, DataType default_type)
        : Route (sess, name, 1, -1, -1, -1, flag, default_type)
-       , _diskstream (0)
        ,  _rec_enable_control (*this)
 {
        _declickable = true;
@@ -51,9 +50,8 @@ Track::Track (Session& sess, string name, Route::Flag flag, TrackMode mode, Data
 }
 
 Track::Track (Session& sess, const XMLNode& node, DataType default_type)
-       : Route (sess, "to be renamed", 0, 0, -1, -1, Route::Flag(0), default_type)
-       , _diskstream (0)
-       , _rec_enable_control (*this)
+       : Route (sess, node),
+         _rec_enable_control (*this)
 {
        _freeze_record.state = NoFreeze;
        _declickable = true;
@@ -63,7 +61,7 @@ Track::Track (Session& sess, const XMLNode& node, DataType default_type)
 Track::~Track ()
 {
        if (_diskstream) {
-               _diskstream->unref();
+               _diskstream->drop_references ();
        }
 }
 
@@ -89,11 +87,11 @@ void
 Track::toggle_monitor_input ()
 {
        for (vector<Port*>::iterator i = _inputs.begin(); i != _inputs.end(); ++i) {
-               (*i)->request_monitor_input(!(*i)->monitoring_input());
+               (*i)->ensure_monitor_input(!(*i)->monitoring_input());
        }
 }
 
-jack_nframes_t
+nframes_t
 Track::update_total_latency ()
 {
        _own_latency = 0;
@@ -124,7 +122,7 @@ Track::freeze_state() const
 }
 
 Track::RecEnableControllable::RecEnableControllable (Track& s)
-       : track (s)
+       : Controllable (X_("recenable")), track (s)
 {
 }
 
@@ -172,12 +170,6 @@ Track::set_record_enable (bool yn, void *src)
                return;
        }
 
-       // Do not set rec enabled if the track can't record.
-       if (yn && !can_record()) {
-               error << string_compose( _("Can not arm track '%1'. Check the input connections"), name() ) << endmsg;
-               return;
-       }
-
        /* keep track of the meter point as it was before we rec-enabled */
        if (!_diskstream->record_enabled()) {
                _saved_meter_point = _meter_point;
@@ -194,18 +186,6 @@ Track::set_record_enable (bool yn, void *src)
        _rec_enable_control.Changed ();
 }
 
-void
-Track::set_mode (TrackMode m)
-{
-       if (_diskstream) {
-               if (_mode != m) {
-                       _mode = m;
-                       _diskstream->set_destructive (m == Destructive);
-                       ModeChanged();
-               }
-       }
-}
-
 int
 Track::set_name (string str, void *src)
 {
@@ -224,13 +204,12 @@ Track::set_name (string str, void *src)
 
        if ((ret = IO::set_name (str, src)) == 0) {
                _session.save_state ("");
-                _session.save_history();
        }
        return ret;
 }
 
 void
-Track::set_latency_delay (jack_nframes_t longest_session_latency)
+Track::set_latency_delay (nframes_t longest_session_latency)
 {
        Route::set_latency_delay (longest_session_latency);
        _diskstream->set_roll_delay (_roll_delay);