a few more if (_mmc) tests

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

diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc
index 9da9bf2a280ae81d378d8df17cb87ccc02e8da42..338705d633fee7884cea9f9163e17b011f1b4cf0 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;
@@ -122,6 +111,10 @@ IO::check_bundles_connected ()
        check_bundles (_bundles_connected, ports());
 }
 
+/** Check the bundles in list to see which are connected to a given PortSet,
+ *  and update list with those that are connected such that every port on every
+ *  bundle channel x is connected to port x in ports.
+ */
 void
 IO::check_bundles (std::vector<UserBundleInfo*>& list, const PortSet& ports)
 {
@@ -129,9 +122,9 @@ IO::check_bundles (std::vector<UserBundleInfo*>& list, const PortSet& ports)
 
        for (std::vector<UserBundleInfo*>::iterator i = list.begin(); i != list.end(); ++i) {
 
-               uint32_t const N = (*i)->bundle->nchannels ();
+               uint32_t const N = (*i)->bundle->nchannels().n_total();
 
-               if (_ports.num_ports (default_type()) < N) {
+               if (_ports.num_ports() < N) {
                        continue;
                }
 
@@ -394,7 +387,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);
@@ -748,8 +741,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;
                }
        }
 
@@ -778,7 +775,7 @@ IO::get_port_counts (const XMLNode& node, int version, ChanCount& n, boost::shar
        if ((prop = node.property ("connection")) != 0) {
 
                if ((c = find_possible_bundle (prop->value())) != 0) {
-                       n = ChanCount::max (n, ChanCount(c->type(), c->nchannels()));
+                       n = ChanCount::max (n, c->nchannels());
                }
                return 0;
        }
@@ -787,7 +784,7 @@ IO::get_port_counts (const XMLNode& node, int version, ChanCount& n, boost::shar
 
                if ((*iter)->name() == X_("Bundle")) {
                        if ((c = find_possible_bundle (prop->value())) != 0) {
-                               n = ChanCount::max (n, ChanCount(c->type(), c->nchannels()));
+                               n = ChanCount::max (n, c->nchannels());
                                return 0;
                        } else {
                                return -1;
@@ -876,12 +873,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 +1089,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();
@@ -1337,8 +1332,6 @@ IO::setup_bundle ()
 
        _bundle->suspend_signals ();
 
-       _bundle->set_type (default_type ());
-
        _bundle->remove_channels ();
 
        if (_direction == Input) {
@@ -1347,10 +1340,17 @@ IO::setup_bundle ()
                snprintf(buf, sizeof (buf), _("%s out"), _name.val().c_str());
        }
         _bundle->set_name (buf);
-       uint32_t const ni = _ports.num_ports();
-       for (uint32_t i = 0; i < ni; ++i) {
-               _bundle->add_channel (bundle_channel_name (i, ni));
-               _bundle->set_port (i, _session.engine().make_port_name_non_relative (_ports.port(i)->name()));
+
+       int c = 0;
+       for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
+
+               uint32_t const N = _ports.count().get (*i);
+               for (uint32_t j = 0; j < N; ++j) {
+                       _bundle->add_channel (bundle_channel_name (j, N, *i), *i);
+                       _bundle->set_port (c, _session.engine().make_port_name_non_relative (_ports.port(*i, j)->name()));
+                       ++c;
+               }
+
        }
 
        _bundle->resume_signals ();
@@ -1404,18 +1404,27 @@ IO::UserBundleInfo::UserBundleInfo (IO* io, boost::shared_ptr<UserBundle> b)
 }
 
 std::string
-IO::bundle_channel_name (uint32_t c, uint32_t n) const
+IO::bundle_channel_name (uint32_t c, uint32_t n, DataType t) const
 {
        char buf[32];
 
-       switch (n) {
-       case 1:
-               return _("mono");
-       case 2:
-               return c == 0 ? _("L") : _("R");
-       default:
+       if (t == DataType::AUDIO) {
+
+               switch (n) {
+               case 1:
+                       return _("mono");
+               case 2:
+                       return c == 0 ? _("L") : _("R");
+               default:
+                       snprintf (buf, sizeof(buf), _("%d"), (c + 1));
+                       return buf;
+               }
+
+       } else {
+
                snprintf (buf, sizeof(buf), _("%d"), (c + 1));
                return buf;
+
        }
 
        return "";
@@ -1562,3 +1571,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;
+}