ardour/livetrax
13
0
Fork 0
Code

consistent count/n_total API

Browse Source
This commit is contained in:
Robin Gareus 2016-04-08 18:16:19 +02:00
parent 752662051a
commit e27096b054
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/ardour/chan_mapping.h
View File

@ -88,7 +88,9 @@ public:
*/
bool is_monotonic () const;
uint32_t count () const;
uint32_t n_total () const;
ChanCount count () const;
XMLNode* state(const std::string& name) const;

16
libs/ardour/chan_mapping.cc
View File

@ -219,8 +219,9 @@ ChanMapping::is_identity (ChanCount offset) const
}
uint32_t
ChanMapping::count () const
ChanMapping::n_total () const
{
// fast version of count().n_total();
uint32_t rv = 0;
const Mappings& mp (mappings());
for (Mappings::const_iterator tm = mp.begin(); tm != mp.end(); ++tm) {
@ -229,6 +230,19 @@ ChanMapping::count () const
return rv;
}
ChanCount
ChanMapping::count () const
{
ChanCount rv;
const Mappings& mp (mappings());
for (Mappings::const_iterator tm = mp.begin(); tm != mp.end(); ++tm) {
rv.set (tm->first, tm->second.size ());
}
return rv;
}
} // namespace ARDOUR
std::ostream& operator<<(std::ostream& o, const ARDOUR::ChanMapping& cm)

2
libs/ardour/plugin_insert.cc
View File

@ -1073,7 +1073,7 @@ PluginInsert::check_inplace ()
{
bool inplace_ok = !_plugins.front()->inplace_broken ();
if (_thru_map.count () > 0) {
if (_thru_map.n_total () > 0) {
// TODO once midi-bypass is part of the mapping, ignore it
inplace_ok = false;
}