diff options
| author | Robin Gareus <robin@gareus.org> | 2016-01-24 01:11:15 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2016-01-24 03:21:24 +0100 |
| commit | 470255effaab8f691b74a717857dc1ff71f32af3 (patch) | |
| tree | 618b9a20bd15785d96c8f79c95c1ae13d0fed9f4 /libs | |
| parent | 9bcd01c0a1da9d1f29de82c9b393a98c7ed9e8c1 (diff) | |
add wrapper for ChanMapping::get()
The boolean "valid" is implicit, get() returns -1 (really UINT32_MAX)
This simplifies upcoming lua bindings
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/chan_mapping.h | 1 | ||||
| -rw-r--r-- | libs/ardour/chan_mapping.cc | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libs/ardour/ardour/chan_mapping.h b/libs/ardour/ardour/chan_mapping.h index ebb7be402a..7b9f81976d 100644 --- a/libs/ardour/ardour/chan_mapping.h +++ b/libs/ardour/ardour/chan_mapping.h @@ -40,6 +40,7 @@ public: ChanMapping(ARDOUR::ChanCount identity); uint32_t get(DataType t, uint32_t from, bool* valid); + uint32_t get(DataType t, uint32_t from) { return get (t, from, NULL); } void set(DataType t, uint32_t from, uint32_t to); void offset_from(DataType t, int32_t delta); void offset_to(DataType t, int32_t delta); diff --git a/libs/ardour/chan_mapping.cc b/libs/ardour/chan_mapping.cc index 5c5bb17de6..57734803d2 100644 --- a/libs/ardour/chan_mapping.cc +++ b/libs/ardour/chan_mapping.cc @@ -45,15 +45,15 @@ ChanMapping::get(DataType t, uint32_t from, bool* valid) { Mappings::iterator tm = _mappings.find(t); if (tm == _mappings.end()) { - *valid = false; + if (valid) { *valid = false; } return -1; } TypeMapping::iterator m = tm->second.find(from); if (m == tm->second.end()) { - *valid = false; + if (valid) { *valid = false; } return -1; } - *valid = true; + if (valid) { *valid = true; } return m->second; } |