Tempo ramps - fix messed up meter section state, audio-locked tempos ignore the bbt...

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

diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index f5d5207cc65a46eaf6321a1466abbaabb222e067..579b0064bc2b09d18485ee6dabe138d634566e22 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,6 +29,7 @@
 #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"
@@ -158,7 +158,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. */
@@ -200,7 +200,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));
@@ -266,8 +266,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.
@@ -629,7 +629,7 @@ AudioTrack::freeze_me (InterThreadInfo& itt)
 
        /* 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); */