ardour/livetrax
13
0
Fork 0
Code

Remove unused code.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8083 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-11-25 00:03:14 +00:00
parent 8f2c07eedc
commit 49ce9ba634
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/io.h
View File

@ -196,7 +196,7 @@ class IO : public SessionObject, public Latent
static int parse_io_string (const std::string&, std::vector<std::string>& chns);
static int parse_gain_string (const std::string&, std::vector<std::string>& chns);
int ensure_ports (ChanCount, bool clear, bool lockit, void *src);
int ensure_ports (ChanCount, bool clear, void *src);
void check_bundles_connected ();
void check_bundles (std::vector<UserBundleInfo*>&, const PortSet&);

12
libs/ardour/io.cc
View File

@ -421,7 +421,7 @@ IO::ensure_ports_locked (ChanCount count, bool clear, void* /*src*/)
int
IO::ensure_ports (ChanCount count, bool clear, bool lockit, void* src)
IO::ensure_ports (ChanCount count, bool clear, void* src)
{
bool changed = false;
@ -433,12 +433,10 @@ IO::ensure_ports (ChanCount count, bool clear, bool lockit, void* src)
change.before = _ports.count ();
if (lockit) {
{
BLOCK_PROCESS_CALLBACK ();
Glib::Mutex::Lock im (io_lock);
changed = ensure_ports_locked (count, clear, src);
} else {
changed = ensure_ports_locked (count, clear, src);
}
if (changed) {
@ -455,7 +453,7 @@ IO::ensure_ports (ChanCount count, bool clear, bool lockit, void* src)
int
IO::ensure_io (ChanCount count, bool clear, void* src)
{
return ensure_ports (count, clear, true, src);
return ensure_ports (count, clear, src);
}
XMLNode&
@ -832,7 +830,7 @@ IO::create_ports (const XMLNode& node, int version)
get_port_counts (node, version, n, c);
if (ensure_ports (n, true, true, this)) {
if (ensure_ports (n, true, this)) {
error << string_compose(_("%1: cannot create I/O ports"), _name) << endmsg;
return -1;
}
@ -1007,7 +1005,7 @@ IO::set_ports (const string& str)
}
// FIXME: audio-only
if (ensure_ports (ChanCount(DataType::AUDIO, nports), true, true, this)) {
if (ensure_ports (ChanCount(DataType::AUDIO, nports), true, this)) {
return -1;
}