extensive changes to PresentationInfo API

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

diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index 254a3d7c6e994232c4524d7a3c82e81032b493e2..1b544bfb57f0a9dd19d046816d0158423ec65f17 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"
@@ -49,8 +50,8 @@ 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)
 {
 }
 
@@ -349,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;
@@ -391,7 +392,7 @@ 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())) {
+       if (_meter_point == MeterInput && ((_monitoring_control->monitoring_choice() & MonitorInput) || _diskstream->record_enabled())) {
                _meter->run (bufs, start_frame, end_frame, nframes, true);
        }
 
@@ -629,8 +630,9 @@ AudioTrack::freeze_me (InterThreadInfo& itt)
 
        /* reset stuff that has already been accounted for in the freeze process */
 
-       set_gain (GAIN_COEFF_UNITY, Controllable::NoGroup);
-       _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;