allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

fix conflicts after merge with master

Browse Source
This commit is contained in:
Paul Davis
2013-08-05 14:22:32 -04:00
parent 499b7fcfa9 38e4f7bd1b
commit 616f2a0370
116 changed files with 3621 additions and 1742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/capturing_processor.cc
View File

@@ -62,7 +62,7 @@ CapturingProcessor::configure_io (ChanCount in, ChanCount out)
}
bool
CapturingProcessor::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
CapturingProcessor::can_support_io_configuration (const ChanCount& in, ChanCount& out)
{
out = in;
return true;