using namespace std;
/** Constructor.
- * @param p Port matrix that we're in.
+ * @param m Port matrix that we're in.
+ * @param b Port matrix body that we're in.
*/
PortMatrixComponent::PortMatrixComponent (PortMatrix* m, PortMatrixBody* b)
: _matrix (m),
PortMatrixComponent::~PortMatrixComponent ()
{
if (_pixmap) {
- gdk_pixmap_unref (_pixmap);
+ g_object_unref (_pixmap);
}
}
/* make a pixmap of the right size */
if (_pixmap) {
- gdk_pixmap_unref (_pixmap);
+ g_object_unref (_pixmap);
}
_pixmap = gdk_pixmap_new (drawable, _width, _height, -1);
s = bundles.size();
} else {
for (PortGroup::BundleList::const_iterator i = bundles.begin(); i != bundles.end(); ++i) {
- s += (*i)->bundle->nchannels();
+ s += _matrix->count_of_our_type ((*i)->bundle->nchannels());
}
}
if (_matrix->show_only_bundles()) {
p += 1;
} else {
- p += (*i)->bundle->nchannels ();
+ p += _matrix->count_of_our_type ((*i)->bundle->nchannels());
}
}
} else {
- uint32_t const s = (*j)->bundle->nchannels ();
+ uint32_t const s = _matrix->count_of_our_type ((*j)->bundle->nchannels());
if (p < s) {
return ARDOUR::BundleChannel ((*j)->bundle, p);
} else {