summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/ardour/io.h3
-rw-r--r--libs/ardour/io.cc16
2 files changed, 9 insertions, 10 deletions
diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h
index 5d64fae580..da0b88e5fe 100644
--- a/libs/ardour/ardour/io.h
+++ b/libs/ardour/ardour/io.h
@@ -205,7 +205,6 @@ class IO : public SessionObject, public Latent
void bundle_changed (Bundle::Change);
-
int get_port_counts (const XMLNode& node, int version, ChanCount& n, boost::shared_ptr<Bundle>& c);
int get_port_counts_2X (const XMLNode& node, int version, ChanCount& n, boost::shared_ptr<Bundle>& c);
int create_ports (const XMLNode&, int version);
@@ -219,7 +218,7 @@ class IO : public SessionObject, public Latent
std::string build_legal_port_name (DataType type);
int32_t find_port_hole (const char* base);
- void setup_bundles ();
+ void setup_bundle ();
std::string bundle_channel_name (uint32_t, uint32_t) const;
};
diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc
index 7c92ab87cd..c645894591 100644
--- a/libs/ardour/io.cc
+++ b/libs/ardour/io.cc
@@ -81,7 +81,7 @@ IO::IO (Session& s, const string& name, Direction dir, DataType default_type)
{
_active = true;
pending_state_node = 0;
- setup_bundles ();
+ setup_bundle ();
}
IO::IO (Session& s, const XMLNode& node, DataType dt)
@@ -93,7 +93,7 @@ IO::IO (Session& s, const XMLNode& node, DataType dt)
pending_state_node = 0;
set_state (node, Stateful::loading_state_version);
- setup_bundles ();
+ setup_bundle ();
}
IO::~IO ()
@@ -260,7 +260,7 @@ IO::remove_port (Port* port, void* src)
}
if (change & ConfigurationChanged) {
- setup_bundles ();
+ setup_bundle ();
}
if (change != NoChange) {
@@ -324,7 +324,7 @@ IO::add_port (string destination, void* src, DataType type)
// pan_changed (src); /* EMIT SIGNAL */
changed (ConfigurationChanged, src); /* EMIT SIGNAL */
- setup_bundles ();
+ setup_bundle ();
_session.set_dirty ();
return 0;
@@ -439,7 +439,7 @@ IO::ensure_ports (ChanCount count, bool clear, bool lockit, void* src)
if (changed) {
this->changed (ConfigurationChanged, src); /* EMIT SIGNAL */
- setup_bundles ();
+ setup_bundle ();
_session.set_dirty ();
}
@@ -1105,7 +1105,7 @@ IO::set_name (const string& requested_name)
bool const r = SessionObject::set_name (name);
- setup_bundles ();
+ setup_bundle ();
return r;
}
@@ -1322,11 +1322,11 @@ IO::midi(uint32_t n) const
}
/**
- * Setup bundles that describe our inputs and outputs. Also creates bundles if necessary.
+ * Setup a bundle that describe our inputs or outputs. Also creates the bundle if necessary.
*/
void
-IO::setup_bundles ()
+IO::setup_bundle ()
{
char buf[32];