switch Evoral::Sequence debugging to use DEBUG_TRACE(); Sequence uses multiset<....

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

diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc
index 48bab25546dcf0d01785c27d4e26dbfe7bd829ad..f40cbafb2dca228e6a0e5c11d229e20e107db174 100644 (file)
--- a/libs/ardour/io.cc
+++ b/libs/ardour/io.cc
@@ -18,11 +18,12 @@
 
 #include <fstream>
 #include <algorithm>
+#include <cmath>
+
 #include <unistd.h>
 #include <locale.h>
 #include <errno.h>
 
-
 #include <glibmm.h>
 #include <glibmm/thread.h>
 
@@ -47,19 +48,7 @@
 
 #include "i18n.h"
 
-#include <cmath>
-
-/*
-  A bug in OS X's cmath that causes isnan() and isinf() to be
-  "undeclared". the following works around that
-*/
-
-#if defined(__APPLE__) && defined(__MACH__)
-extern "C" int isnan (double);
-extern "C" int isinf (double);
-#endif
-
-#define BLOCK_PROCESS_CALLBACK() Glib::Mutex::Lock em (_session.engine().process_lock())
+#define BLOCK_PROCESS_CALLBACK() Glib::Mutex::Lock em (AudioEngine::instance()->process_lock())
 
 using namespace std;
 using namespace ARDOUR;
@@ -394,7 +383,7 @@ IO::ensure_ports_locked (ChanCount count, bool clear, void* /*src*/)
 
                        catch (AudioEngine::PortRegistrationFailure& err) {
                                /* pass it on */
-                               throw AudioEngine::PortRegistrationFailure();
+                               throw;
                        }
 
                        _ports.add (port);
@@ -674,12 +663,12 @@ IO::find_possible_bundle (const string &desired_name)
                // see if it's a stereo connection e.g. "in 3+4"
 
                if (last_non_digit_pos > 1 && desired_name[last_non_digit_pos] == '+') {
-                       int left_bundle_number = 0;
                        string::size_type left_last_non_digit_pos;
 
                        left_last_non_digit_pos = desired_name.find_last_not_of(digits, last_non_digit_pos-1);
 
                        if (left_last_non_digit_pos != string::npos) {
+                               int left_bundle_number = 0;
                                stringstream s;
                                s << desired_name.substr(left_last_non_digit_pos, last_non_digit_pos-1);
                                s >> left_bundle_number;
@@ -748,8 +737,12 @@ IO::get_port_counts_2X (XMLNode const & node, int /*version*/, ChanCount& n, boo
 
                if ((prop = node.property ("inputs")) != 0 && _direction == Input) {
                        n_audio = count (prop->value().begin(), prop->value().end(), '{');
+               } else if ((prop = node.property ("input-connection")) != 0 && _direction == Input) {
+                       n_audio = 1;
                } else if ((prop = node.property ("outputs")) != 0 && _direction == Output) {
                        n_audio = count (prop->value().begin(), prop->value().end(), '{');
+               } else if ((prop = node.property ("output-connection")) != 0 && _direction == Output) {
+                       n_audio = 2;
                }
        }
 
@@ -876,12 +869,12 @@ IO::make_connections (const XMLNode& node, int version, bool in)
                                        if ((prop = cnode->property (X_("other"))) == 0) {
                                                continue;
                                        }
-
+                                        
                                        if (prop) {
                                                p->connect (prop->value());
                                        }
                                }
-                       }
+                       } 
                }
        }
 
@@ -1092,9 +1085,7 @@ IO::set_name (const string& requested_name)
 
        /* replace all colons in the name. i wish we didn't have to do this */
 
-       if (replace_all (name, ":", "-")) {
-               warning << _("you cannot use colons to name objects with I/O connections") << endmsg;
-       }
+       replace_all (name, ":", "-"); 
 
        for (PortSet::iterator i = _ports.begin(); i != _ports.end(); ++i) {
                string current_name = i->name();
@@ -1443,19 +1434,25 @@ IO::set_name_in_state (XMLNode& node, const string& new_name)
        }
 }
 
+bool
+IO::connected () const
+{
+        /* do we have any connections at all? */
+        
+        for (PortSet::const_iterator p = _ports.begin(); p != _ports.end(); ++p) {
+                if (p->connected()) {
+                        return true;
+                }
+        }
+        
+        return false;
+}
+
 bool
 IO::connected_to (boost::shared_ptr<const IO> other) const
 {
        if (!other) {
-               /* do we have any connections at all? */
-
-               for (PortSet::const_iterator p = _ports.begin(); p != _ports.end(); ++p) {
-                       if (p->connected()) {
-                               return true;
-                       }
-               }
-
-               return false;
+                return connected ();
        }
 
        assert (_direction != other->direction());
@@ -1556,3 +1553,15 @@ IO::port_by_name (const std::string& str) const
 
        return 0;
 }
+
+bool
+IO::physically_connected () const
+{
+       for (PortSet::const_iterator i = _ports.begin(); i != _ports.end(); ++i) {
+                if (i->physically_connected()) {
+                        return true;
+                }
+        }
+
+        return false;
+}