Fix a problem where VST automation data wasn't getting written (if the adjustments...

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

diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index 33a5ba8f370a7f8376f7bc338ad61623fcd11e87..99115d5d6fbc3eb362abfce87d1f8b910b4a1beb 100644 (file)
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -35,6 +35,7 @@
 #include "ardour/meter.h"
 #include "ardour/playlist_factory.h"
 #include "ardour/processor.h"
+#include "ardour/profile.h"
 #include "ardour/region.h"
 #include "ardour/region_factory.h"
 #include "ardour/session.h"
@@ -62,7 +63,7 @@ AudioTrack::create_diskstream ()
 {
        AudioDiskstream::Flag dflags = AudioDiskstream::Flag (AudioDiskstream::Recordable);
 
-       if (_mode == Destructive) {
+       if (_mode == Destructive && !Profile->get_trx()) {
                dflags = AudioDiskstream::Flag (dflags | AudioDiskstream::Destructive);
        } else if (_mode == NonLayered){
                dflags = AudioDiskstream::Flag(dflags | AudioDiskstream::NonLayered);
@@ -77,7 +78,11 @@ AudioTrack::set_diskstream (boost::shared_ptr<Diskstream> ds)
        Track::set_diskstream (ds);
 
        _diskstream->set_track (this);
-       _diskstream->set_destructive (_mode == Destructive);
+       if (Profile->get_trx()) {
+               _diskstream->set_destructive (false);
+       } else {
+               _diskstream->set_destructive (_mode == Destructive);
+       }
        _diskstream->set_non_layered (_mode == NonLayered);
 
        if (audio_diskstream()->deprecated_io_node) {
@@ -106,7 +111,7 @@ AudioTrack::set_mode (TrackMode m)
 {
        if (m != _mode) {
 
-               if (_diskstream->set_destructive (m == Destructive)) {
+               if (!Profile->get_trx() && _diskstream->set_destructive (m == Destructive)) {
                        return -1;
                }
 
@@ -129,8 +134,15 @@ AudioTrack::can_use_mode (TrackMode m, bool& bounce_required)
                return true;
 
        case Destructive:
+               if (Profile->get_trx()) {
+                       return false;
+               } else {
+                       return _diskstream->can_become_destructive (bounce_required);
+               }
+               break;
+
        default:
-               return _diskstream->can_become_destructive (bounce_required);
+               return false;
        }
 }
 
@@ -187,16 +199,24 @@ AudioTrack::set_state (const XMLNode& node, int version)
 {
        const XMLProperty *prop;
 
-       if (Track::set_state (node, version)) {
-               return -1;
-       }
-
        if ((prop = node.property (X_("mode"))) != 0) {
                _mode = TrackMode (string_2_enum (prop->value(), _mode));
        } else {
                _mode = Normal;
        }
 
+       if (Profile->get_trx() && _mode == Destructive) {
+               /* Tracks does not support destructive tracks and trying to
+                  handle it as a normal track would be wrong.
+               */
+               error << string_compose (_("%1: this session uses destructive tracks, which are not supported"), PROGRAM_NAME) << endmsg;
+               return -1;
+       }
+
+       if (Track::set_state (node, version)) {
+               return -1;
+       }
+
        pending_state = const_cast<XMLNode*> (&node);
 
        if (_session.state_of_the_state() & Session::Loading) {
@@ -309,7 +329,7 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
        if (!lm.locked()) {
                boost::shared_ptr<AudioDiskstream> diskstream = audio_diskstream();
                framecnt_t playback_distance = diskstream->calculate_playback_distance(nframes);
-               if (can_internal_playback_seek(llabs(playback_distance))) {
+               if (can_internal_playback_seek(::llabs(playback_distance))) {
                        /* TODO should declick */
                        internal_playback_seek(playback_distance);
                }
@@ -335,7 +355,7 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
 
        int dret;
        framecnt_t playback_distance;
-       
+
        if ((nframes = check_initial_delay (nframes, transport_frame)) == 0) {
 
                /* need to do this so that the diskstream sets its
@@ -366,7 +386,7 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
        BufferSet& bufs = _session.get_route_buffers (n_process_buffers ());
 
        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);
        }
@@ -466,12 +486,12 @@ AudioTrack::bounceable (boost::shared_ptr<Processor> endpoint, bool include_endp
                /* does the output from the last considered processor match the
                 * input to this one?
                 */
-               
+
                if (naudio != (*r)->input_streams().n_audio()) {
                        return false;
                }
 
-               /* we're including the endpoint - if we just hit it, 
+               /* we're including the endpoint - if we just hit it,
                   then stop.
                */
 
@@ -479,7 +499,7 @@ AudioTrack::bounceable (boost::shared_ptr<Processor> endpoint, bool include_endp
                        return true;
                }
 
-               /* save outputs of this processor to test against inputs 
+               /* save outputs of this processor to test against inputs
                   of the next one.
                */
 
@@ -571,7 +591,7 @@ AudioTrack::freeze_me (InterThreadInfo& itt)
                                        (*r)->deactivate ();
                                }
                        }
-                       
+
                        _session.set_dirty ();
                }
        }