expose more info from plugin-strip (for GUI display)

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

diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index 99115d5d6fbc3eb362abfce87d1f8b910b4a1beb..47746ffe312d0a1e018e9a5e46c65899d101a5dd 100644 (file)
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -56,6 +56,9 @@ AudioTrack::AudioTrack (Session& sess, string name, Route::Flag flag, TrackMode
 
 AudioTrack::~AudioTrack ()
 {
+       if (_freeze_record.playlist && !_session.deletion_in_progress()) {
+               _freeze_record.playlist->release();
+       }
 }
 
 boost::shared_ptr<Diskstream>
@@ -163,7 +166,7 @@ AudioTrack::deprecated_use_diskstream_connections ()
        diskstream->deprecated_io_node = 0;
 
        if ((prop = node.property ("gain")) != 0) {
-               _amp->set_gain (atof (prop->value().c_str()), this);
+               _amp->gain_control()->set_value (atof (prop->value().c_str()), PBD::Controllable::NoGroup);
        }
 
        if ((prop = node.property ("input-connection")) != 0) {
@@ -287,6 +290,7 @@ AudioTrack::set_state_part_two ()
                        boost::shared_ptr<Playlist> pl = _session.playlists->by_name (prop->value());
                        if (pl) {
                                _freeze_record.playlist = boost::dynamic_pointer_cast<AudioPlaylist> (pl);
+                               _freeze_record.playlist->use();
                        } else {
                                _freeze_record.playlist.reset ();
                                _freeze_record.state = NoFreeze;
@@ -374,9 +378,9 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
                bool        valid = false;
                const float mute  = _mute_control->list()->rt_safe_eval(transport_frame, valid);
                if (mute >= 0.5 && !muted()) {
-                       _mute_control->set_value(1.0);  // mute
+                       _mute_control->set_value_unchecked(1.0);  // mute
                } else if (mute < 0.5 && muted()) {
-                       _mute_control->set_value(0.0);  // unmute
+                       _mute_control->set_value_unchecked(0.0);  // unmute
                }
        }
 
@@ -621,9 +625,11 @@ AudioTrack::freeze_me (InterThreadInfo& itt)
        diskstream->use_playlist (boost::dynamic_pointer_cast<AudioPlaylist>(new_playlist));
        diskstream->set_record_enabled (false);
 
+       _freeze_record.playlist->use(); // prevent deletion
+
        /* reset stuff that has already been accounted for in the freeze process */
 
-       set_gain (GAIN_COEFF_UNITY, this);
+       set_gain (GAIN_COEFF_UNITY, Controllable::NoGroup);
        _amp->gain_control()->set_automation_state (Off);
        /* XXX need to use _main_outs _panner->set_automation_state (Off); */
 
@@ -635,6 +641,7 @@ void
 AudioTrack::unfreeze ()
 {
        if (_freeze_record.playlist) {
+               _freeze_record.playlist->release();
                audio_diskstream()->use_playlist (_freeze_record.playlist);
 
                {