enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

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

diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index 3ed7e9387e9d6f5c96426a3d8e30595140bb0468..8f83c19161ca6d843dcbb6b5cfa61872e532dceb 100644 (file)
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -19,7 +19,6 @@
 
 #include <boost/scoped_array.hpp>
 
-#include "pbd/boost_debug.h"
 #include "pbd/enumwriter.h"
 #include "pbd/error.h"
 
@@ -30,9 +29,11 @@
 #include "ardour/audio_diskstream.h"
 #include "ardour/audio_track.h"
 #include "ardour/audioplaylist.h"
+#include "ardour/boost_debug.h"
 #include "ardour/buffer_set.h"
 #include "ardour/delivery.h"
 #include "ardour/meter.h"
+#include "ardour/monitor_control.h"
 #include "ardour/playlist_factory.h"
 #include "ardour/processor.h"
 #include "ardour/profile.h"
@@ -43,19 +44,22 @@
 #include "ardour/source.h"
 #include "ardour/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-AudioTrack::AudioTrack (Session& sess, string name, Route::Flag flag, TrackMode mode)
-       : Track (sess, name, flag, mode)
+AudioTrack::AudioTrack (Session& sess, string name, TrackMode mode)
+       : Track (sess, name, PresentationInfo::AudioTrack, mode)
 {
 }
 
 AudioTrack::~AudioTrack ()
 {
+       if (_freeze_record.playlist && !_session.deletion_in_progress()) {
+               _freeze_record.playlist->release();
+       }
 }
 
 boost::shared_ptr<Diskstream>
@@ -155,7 +159,7 @@ AudioTrack::deprecated_use_diskstream_connections ()
                return 0;
        }
 
-       const XMLProperty* prop;
+       XMLProperty const * prop;
        XMLNode& node (*diskstream->deprecated_io_node);
 
        /* don't do this more than once. */
@@ -163,7 +167,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) {
@@ -197,7 +201,7 @@ AudioTrack::deprecated_use_diskstream_connections ()
 int
 AudioTrack::set_state (const XMLNode& node, int version)
 {
-       const XMLProperty *prop;
+       XMLProperty const * prop;
 
        if ((prop = node.property (X_("mode"))) != 0) {
                _mode = TrackMode (string_2_enum (prop->value(), _mode));
@@ -263,8 +267,8 @@ void
 AudioTrack::set_state_part_two ()
 {
        XMLNode* fnode;
-       XMLProperty* prop;
-       LocaleGuard lg (X_("C"));
+       XMLProperty const * prop;
+       LocaleGuard lg;
 
        /* This is called after all session state has been restored but before
           have been made ports and connections are established.
@@ -287,6 +291,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;
@@ -345,7 +350,7 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
 
        if (!_active) {
                silence (nframes);
-               if (_meter_point == MeterInput && (_monitoring & MonitorInput || _diskstream->record_enabled())) {
+               if (_meter_point == MeterInput && ((_monitoring_control->monitoring_choice() & MonitorInput) || _diskstream->record_enabled())) {
                        _meter->reset();
                }
                return 0;
@@ -370,16 +375,6 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
                return dret;
        }
 
-       if (_mute_control->list() && _mute_control->automation_playback()) {
-               bool        valid = false;
-               const float mute  = _mute_control->list()->rt_safe_eval(transport_frame, valid);
-               if (mute >= 0.5 && !muted()) {
-                       _mute_control->set_value_unchecked(1.0);  // mute
-               } else if (mute < 0.5 && muted()) {
-                       _mute_control->set_value_unchecked(0.0);  // unmute
-               }
-       }
-
        _silent = false;
        _amp->apply_gain_automation(false);
 
@@ -387,8 +382,8 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
 
        fill_buffers_with_input (bufs, _input, nframes);
 
-       if (_meter_point == MeterInput && (_monitoring & MonitorInput || _diskstream->record_enabled())) {
-               _meter->run (bufs, start_frame, end_frame, nframes, true);
+       if (_meter_point == MeterInput && ((_monitoring_control->monitoring_choice() & MonitorInput) || _diskstream->record_enabled())) {
+               _meter->run (bufs, start_frame, end_frame, 1.0 /*speed()*/, nframes, true);
        }
 
        if ((dret = diskstream->process (bufs, transport_frame, nframes, playback_distance, (monitoring_state() == MonitoringDisk))) != 0) {
@@ -621,10 +616,13 @@ 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);
-       _amp->gain_control()->set_automation_state (Off);
+       gain_control()->set_value (GAIN_COEFF_UNITY, Controllable::NoGroup);
+       gain_control()->set_automation_state (Off);
+
        /* XXX need to use _main_outs _panner->set_automation_state (Off); */
 
        _freeze_record.state = Frozen;
@@ -635,6 +633,7 @@ void
 AudioTrack::unfreeze ()
 {
        if (_freeze_record.playlist) {
+               _freeze_record.playlist->release();
                audio_diskstream()->use_playlist (_freeze_record.playlist);
 
                {