projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
various fixes to named selection mgmt and display, plus fixes for xfade mgmt and...
[ardour.git] / libs / ardour / route.cc
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index b204ad76dc5d51df46623b260e72822e193d0d01..a322c10068bf81fd9719441440baed3691e5dc1b 100644 (file)
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -24,6 +24,7 @@
 
 #include <sigc++/bind.h>
 #include <pbd/xml++.h>
+#include <pbd/enumwriter.h>
 
 #include <ardour/timestamps.h>
 #include <ardour/buffer.h>
@@ -345,7 +346,13 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
                                for (i = _redirects.begin(); i != _redirects.end(); ++i) {
                                        switch ((*i)->placement()) {
                                        case PreFader:
-                                               (*i)->run (bufs, nbufs, nframes, offset);
+                                               if (dsg == 0) {
+                                                       if (boost::dynamic_pointer_cast<Send>(*i) || boost::dynamic_pointer_cast<PortInsert>(*i)) {
+                                                               (*i)->silence (nframes, offset);
+                                                       }
+                                               } else {
+                                                       (*i)->run (bufs, nbufs, nframes, offset);
+                                               }
                                                break;
                                        case PostFader:
                                                post_fader_work = true;
@@ -516,7 +523,13 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
                                        case PreFader:
                                                break;
                                        case PostFader:
-                                               (*i)->run (bufs, nbufs, nframes, offset);
+                                               if (dsg == 0) {
+                                                       if (boost::dynamic_pointer_cast<Send>(*i) || boost::dynamic_pointer_cast<PortInsert>(*i)) {
+                                                               (*i)->silence (nframes, offset);
+                                                       }
+                                               } else {
+                                                       (*i)->run (bufs, nbufs, nframes, offset);
+                                               }
                                                break;
                                        }
                                }
@@ -817,7 +830,10 @@ Route::add_redirect (boost::shared_ptr<Redirect> redirect, void *src, uint32_t*
                        _peak_power.push_back(0);
                }
                while (_visible_peak_power.size() < potential_max_streams) {
-                       _visible_peak_power.push_back(0);
+                       _visible_peak_power.push_back(-INFINITY);
+               }
+               while (_max_peak_power.size() < potential_max_streams) {
+                       _max_peak_power.push_back(-INFINITY);
                }
 
                _redirects.push_back (redirect);
@@ -875,7 +891,10 @@ Route::add_redirects (const RedirectList& others, void *src, uint32_t* err_strea
                                _peak_power.push_back(0);
                        }
                        while (_visible_peak_power.size() < potential_max_streams) {
-                               _visible_peak_power.push_back(0);
+                               _visible_peak_power.push_back(-INFINITY);
+                       }
+                       while (_max_peak_power.size() < potential_max_streams) {
+                               _max_peak_power.push_back(-INFINITY);
                        }
 
                        _redirects.push_back (*i);
@@ -911,6 +930,10 @@ Route::clear_redirects (void *src)
 
        {
                Glib::RWLock::WriterLock lm (redirect_lock);
+               RedirectList::iterator i;
+               for (i = _redirects.begin(); i != _redirects.end(); ++i) {
+                       (*i)->drop_references ();
+               }
                _redirects.clear ();
        }
 
@@ -1007,6 +1030,8 @@ Route::remove_redirect (boost::shared_ptr<Redirect> redirect, void *src, uint32_
                reset_panner ();
        }
 
+       redirect->drop_references ();
+
        redirects_changed (src); /* EMIT SIGNAL */
        return 0;
 }
@@ -1339,8 +1364,7 @@ Route::state(bool full_state)
        char buf[32];
 
        if (_flags) {
-               snprintf (buf, sizeof (buf), "0x%x", _flags);
-               node->add_property("flags", buf);
+               node->add_property("flags", enum_2_string (_flags));
        }
        
        node->add_property("default-type", _default_type.to_string());
@@ -1499,28 +1523,26 @@ Route::_set_state (const XMLNode& node, bool call_base)
                return -1;
        }
 
-       if ((prop = node.property ("flags")) != 0) {
-               int x;
-               sscanf (prop->value().c_str(), "0x%x", &x);
-               _flags = Flag (x);
+       if ((prop = node.property (X_("flags"))) != 0) {
+               _flags = Flag (string_2_enum (prop->value(), _flags));
        } else {
                _flags = Flag (0);
        }
        
-       if ((prop = node.property ("default-type")) != 0) {
+       if ((prop = node.property (X_("default-type"))) != 0) {
                _default_type = DataType(prop->value());
                assert(_default_type != DataType::NIL);
        }
 
-       if ((prop = node.property ("phase-invert")) != 0) {
+       if ((prop = node.property (X_("phase-invert"))) != 0) {
                set_phase_invert(prop->value()=="yes"?true:false, this);
        }
 
-       if ((prop = node.property ("active")) != 0) {
+       if ((prop = node.property (X_("active"))) != 0) {
                set_active (prop->value() == "yes");
        }
 
-       if ((prop = node.property ("muted")) != 0) {
+       if ((prop = node.property (X_("muted"))) != 0) {
                bool yn = prop->value()=="yes"?true:false; 
 
                /* force reset of mute status */
@@ -1530,7 +1552,7 @@ Route::_set_state (const XMLNode& node, bool call_base)
                mute_gain = desired_mute_gain;
        }
 
-       if ((prop = node.property ("soloed")) != 0) {
+       if ((prop = node.property (X_("soloed"))) != 0) {
                bool yn = prop->value()=="yes"?true:false; 
 
                /* force reset of solo status */
@@ -1540,23 +1562,23 @@ Route::_set_state (const XMLNode& node, bool call_base)
                solo_gain = desired_solo_gain;
        }
 
-       if ((prop = node.property ("mute-affects-pre-fader")) != 0) {
+       if ((prop = node.property (X_("mute-affects-pre-fader"))) != 0) {
                _mute_affects_pre_fader = (prop->value()=="yes")?true:false;
        }
 
-       if ((prop = node.property ("mute-affects-post-fader")) != 0) {
+       if ((prop = node.property (X_("mute-affects-post-fader"))) != 0) {
                _mute_affects_post_fader = (prop->value()=="yes")?true:false;
        }
 
-       if ((prop = node.property ("mute-affects-control-outs")) != 0) {
+       if ((prop = node.property (X_("mute-affects-control-outs"))) != 0) {
                _mute_affects_control_outs = (prop->value()=="yes")?true:false;
        }
 
-       if ((prop = node.property ("mute-affects-main-outs")) != 0) {
+       if ((prop = node.property (X_("mute-affects-main-outs"))) != 0) {
                _mute_affects_main_outs = (prop->value()=="yes")?true:false;
        }
 
-       if ((prop = node.property ("edit-group")) != 0) {
+       if ((prop = node.property (X_("edit-group"))) != 0) {
                RouteGroup* edit_group = _session.edit_group_by_name(prop->value());
                if(edit_group == 0) {
                        error << string_compose(_("Route %1: unknown edit group \"%2 in saved state (ignored)"), _name, prop->value()) << endmsg;
@@ -1565,7 +1587,7 @@ Route::_set_state (const XMLNode& node, bool call_base)
                }
        }
 
-       if ((prop = node.property ("order-keys")) != 0) {
+       if ((prop = node.property (X_("order-keys"))) != 0) {
 
                long n;
 
@@ -1602,7 +1624,7 @@ Route::_set_state (const XMLNode& node, bool call_base)
                delete deferred_state;
        }
 
-       deferred_state = new XMLNode("deferred state");
+       deferred_state = new XMLNode(X_("deferred state"));
 
        /* set parent class properties before anything else */
 
@@ -1621,7 +1643,7 @@ Route::_set_state (const XMLNode& node, bool call_base)
 
                child = *niter;
                        
-               if (child->name() == "Send") {
+               if (child->name() == X_("Send")) {
 
 
                        if (!IO::ports_legal) {
@@ -1632,7 +1654,7 @@ Route::_set_state (const XMLNode& node, bool call_base)
                                add_redirect_from_xml (*child);
                        }
 
-               } else if (child->name() == "Insert") {
+               } else if (child->name() == X_("Insert")) {
                        
                        if (!IO::ports_legal) {
                                
@@ -1643,7 +1665,13 @@ Route::_set_state (const XMLNode& node, bool call_base)
                                add_redirect_from_xml (*child);
                        }
 
-               } else if (child->name() == "ControlOuts") {
+               } else if (child->name() == X_("Automation")) {
+                       
+                       if ((prop = child->property (X_("path"))) != 0)  {
+                               load_automation (prop->value());
+                       }
+
+               } else if (child->name() == X_("ControlOuts")) {
                        
                        string coutname = _name;
                        coutname += _("[control]");
@@ -1651,25 +1679,25 @@ Route::_set_state (const XMLNode& node, bool call_base)
                        _control_outs = new IO (_session, coutname);
                        _control_outs->set_state (**(child->children().begin()));
 
-               } else if (child->name() == "Comment") {
+               } else if (child->name() == X_("Comment")) {
 
                        /* XXX this is a terrible API design in libxml++ */
 
                        XMLNode *cmt = *(child->children().begin());
                        _comment = cmt->content();
 
-               } else if (child->name() == "extra") {
+               } else if (child->name() == X_("extra")) {
                        _extra_xml = new XMLNode (*child);
-               } else if (child->name() == "solo") {
+               } else if (child->name() == X_("solo")) {
                        _solo_control.set_state (*child);
                        _session.add_controllable (&_solo_control);
-               } else if (child->name() == "mute") {
+               } else if (child->name() == X_("mute")) {
                        _mute_control.set_state (*child);
                        _session.add_controllable (&_mute_control);
                }
        }
 
-       if ((prop = node.property ("mix-group")) != 0) {
+       if ((prop = node.property (X_("mix-group"))) != 0) {
                RouteGroup* mix_group = _session.mix_group_by_name(prop->value());
                if (mix_group == 0) {
                        error << string_compose(_("Route %1: unknown mix group \"%2 in saved state (ignored)"), _name, prop->value()) << endmsg;
Unnamed repository; edit this file 'description' to name the repository.