for (uint32_t j = 0; j < C; ++j) {
Gdk::Color c = (*i)->has_colour ? (*i)->colour : get_a_bundle_colour (N);
+
ARDOUR::BundleChannel bc (
(*i)->bundle,
(*i)->bundle->type_channel_to_overall (_matrix->type (), j)
);
+
render_channel_name (cr, background_colour (), c, x, 0, bc);
x += grid_spacing();
}
}
/** @param bc Channel.
- * @param groups List of groups.
+ * @param group Group.
* @return Position of bc in groups in grid units, taking show_only_bundles into account.
*/
uint32_t
if (_matrix->show_only_bundles()) {
return p;
} else {
- return p + bc.channel;
+ return p + bc.bundle->overall_channel_to_type (_matrix->type (), bc.channel);
}
}
} else {
- uint32_t const s = _matrix->count_of_our_type_min_1 ((*j)->bundle->nchannels());
+ ARDOUR::ChanCount const N = (*j)->bundle->nchannels ();
+
+ uint32_t const s = _matrix->count_of_our_type_min_1 (N);
if (p < s) {
- return ARDOUR::BundleChannel ((*j)->bundle, (*j)->bundle->type_channel_to_overall (_matrix->type (), p));
+ if (p < _matrix->count_of_our_type (N)) {
+ return ARDOUR::BundleChannel ((*j)->bundle, (*j)->bundle->type_channel_to_overall (_matrix->type (), p));
+ } else {
+ return ARDOUR::BundleChannel (boost::shared_ptr<ARDOUR::Bundle> (), -1);
+ }
} else {
p -= s;
}
bool connected_to (boost::shared_ptr<Bundle>, AudioEngine &);
bool has_same_ports (boost::shared_ptr<Bundle>) const;
uint32_t type_channel_to_overall (DataType, uint32_t) const;
+ uint32_t overall_channel_to_type (DataType, uint32_t) const;
void set_name (std::string const &);
*
* If t == MIDI and c == 0, then we would return 2, as 2 is the index of the
* 0th MIDI channel.
+ *
+ * If t == NIL, we just return c.
*/
uint32_t
Bundle::type_channel_to_overall (DataType t, uint32_t c) const
{
+ if (t == DataType::NIL) {
+ return c;
+ }
+
Glib::Mutex::Lock lm (_channel_mutex);
vector<Channel>::const_iterator i = _channel.begin ();
/* NOTREACHED */
return -1;
}
+
+/** Perform the reverse of type_channel_to_overall */
+uint32_t
+Bundle::overall_channel_to_type (DataType t, uint32_t c) const
+{
+ if (t == DataType::NIL) {
+ return c;
+ }
+
+ Glib::Mutex::Lock lm (_channel_mutex);
+
+ uint32_t s = 0;
+
+ vector<Channel>::const_iterator i = _channel.begin ();
+ for (uint32_t j = 0; j < c; ++j) {
+ if (i->type == t) {
+ ++s;
+ }
+ ++i;
+ }
+
+ return s;
+}