Fix unit-test data (XML attributes changed)

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

diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index 742eb9c7788a8a6b3259bc9fe76432fa176ac78a..5a51a77ebc73d9671c8f151669ca3b4c491c8c94 100644 (file)
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -42,9 +42,10 @@
 #include "ardour/session.h"
 #include "ardour/session_playlists.h"
 #include "ardour/source.h"
+#include "ardour/types_convert.h"
 #include "ardour/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -82,12 +83,14 @@ AudioTrack::set_diskstream (boost::shared_ptr<Diskstream> ds)
        Track::set_diskstream (ds);
 
        _diskstream->set_track (this);
+#ifdef XXX_OLD_DESTRUCTIVE_API_XXX
        if (Profile->get_trx()) {
                _diskstream->set_destructive (false);
        } else {
                _diskstream->set_destructive (_mode == Destructive);
        }
        _diskstream->set_non_layered (_mode == NonLayered);
+#endif
 
        if (audio_diskstream()->deprecated_io_node) {
 
@@ -110,6 +113,7 @@ AudioTrack::audio_diskstream() const
        return boost::dynamic_pointer_cast<AudioDiskstream>(_diskstream);
 }
 
+#ifdef XXX_OLD_DESTRUCTIVE_API_XXX
 int
 AudioTrack::set_mode (TrackMode m)
 {
@@ -149,6 +153,7 @@ AudioTrack::can_use_mode (TrackMode m, bool& bounce_required)
                return false;
        }
 }
+#endif
 
 int
 AudioTrack::deprecated_use_diskstream_connections ()
@@ -159,38 +164,39 @@ AudioTrack::deprecated_use_diskstream_connections ()
                return 0;
        }
 
-       XMLProperty const * prop;
        XMLNode& node (*diskstream->deprecated_io_node);
 
        /* don't do this more than once. */
 
        diskstream->deprecated_io_node = 0;
 
-       if ((prop = node.property ("gain")) != 0) {
-               _amp->gain_control()->set_value (atof (prop->value().c_str()), PBD::Controllable::NoGroup);
+       float val;
+       if (node.get_property ("gain", val)) {
+               _amp->gain_control()->set_value (val, PBD::Controllable::NoGroup);
        }
 
-       if ((prop = node.property ("input-connection")) != 0) {
-               boost::shared_ptr<Bundle> c = _session.bundle_by_name (prop->value());
+       std::string str;
+       if (node.get_property ("input-connection", str)) {
+               boost::shared_ptr<Bundle> c = _session.bundle_by_name (str);
 
                if (c == 0) {
-                       error << string_compose(_("Unknown bundle \"%1\" listed for input of %2"), prop->value(), _name) << endmsg;
+                       error << string_compose(_("Unknown bundle \"%1\" listed for input of %2"), str, _name) << endmsg;
 
                        if ((c = _session.bundle_by_name (_("in 1"))) == 0) {
                                error << _("No input bundles available as a replacement")
                                << endmsg;
                                return -1;
                        } else {
-                               info << string_compose (_("Bundle %1 was not available - \"in 1\" used instead"), prop->value())
+                               info << string_compose (_("Bundle %1 was not available - \"in 1\" used instead"), str)
                               << endmsg;
                        }
                }
 
                _input->connect_ports_to_bundle (c, true, this);
 
-       } else if ((prop = node.property ("inputs")) != 0) {
-               if (_input->set_ports (prop->value())) {
-                       error << string_compose(_("improper input channel list in XML node (%1)"), prop->value()) << endmsg;
+       } else if (node.get_property ("inputs", str)) {
+               if (_input->set_ports (str)) {
+                       error << string_compose(_("improper input channel list in XML node (%1)"), str) << endmsg;
                        return -1;
                }
        }
@@ -201,11 +207,7 @@ AudioTrack::deprecated_use_diskstream_connections ()
 int
 AudioTrack::set_state (const XMLNode& node, int version)
 {
-       XMLProperty const * prop;
-
-       if ((prop = node.property (X_("mode"))) != 0) {
-               _mode = TrackMode (string_2_enum (prop->value(), _mode));
-       } else {
+       if (!node.get_property (X_("mode"), _mode)) {
                _mode = Normal;
        }
 
@@ -237,19 +239,17 @@ AudioTrack::state (bool full_state)
 {
        XMLNode& root (Track::state(full_state));
        XMLNode* freeze_node;
-       char buf[64];
 
        if (_freeze_record.playlist) {
                XMLNode* inode;
 
                freeze_node = new XMLNode (X_("freeze-info"));
-               freeze_node->add_property ("playlist", _freeze_record.playlist->name());
-               freeze_node->add_property ("state", enum_2_string (_freeze_record.state));
+               freeze_node->set_property ("playlist", _freeze_record.playlist->name());
+               freeze_node->set_property ("state", _freeze_record.state);
 
                for (vector<FreezeRecordProcessorInfo*>::iterator i = _freeze_record.processor_info.begin(); i != _freeze_record.processor_info.end(); ++i) {
                        inode = new XMLNode (X_("processor"));
-                       (*i)->id.print (buf, sizeof (buf));
-                       inode->add_property (X_("id"), buf);
+                       inode->set_property (X_ ("id"), (*i)->id.to_s ());
                        inode->add_child_copy ((*i)->state);
 
                        freeze_node->add_child_nocopy (*inode);
@@ -258,7 +258,7 @@ AudioTrack::state (bool full_state)
                root.add_child_nocopy (*freeze_node);
        }
 
-       root.add_property (X_("mode"), enum_2_string (_mode));
+       root.set_property (X_("mode"), _mode);
 
        return root;
 }
@@ -268,7 +268,6 @@ AudioTrack::set_state_part_two ()
 {
        XMLNode* fnode;
        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.
@@ -299,9 +298,7 @@ AudioTrack::set_state_part_two ()
                        }
                }
 
-               if ((prop = fnode->property (X_("state"))) != 0) {
-                       _freeze_record.state = FreezeState (string_2_enum (prop->value(), _freeze_record.state));
-               }
+               fnode->get_property (X_("state"), _freeze_record.state);
 
                XMLNodeConstIterator citer;
                XMLNodeList clist = fnode->children();
@@ -383,7 +380,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_control->monitoring_choice() & MonitorInput) || _diskstream->record_enabled())) {
-               _meter->run (bufs, start_frame, end_frame, nframes, true);
+               _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) {
@@ -394,12 +391,7 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
 
        process_output_buffers (bufs, start_frame, end_frame, nframes, declick, (!diskstream->record_enabled() && _session.transport_rolling()));
 
-       for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
-               boost::shared_ptr<Delivery> d = boost::dynamic_pointer_cast<Delivery> (*i);
-               if (d) {
-                       d->flush_buffers (nframes);
-               }
-       }
+       flush_processor_buffers_locked (nframes);
 
        need_butler = diskstream->commit (playback_distance);