projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix indentation.
[ardour.git]
/
gtk2_ardour
/
port_matrix_component.cc
diff --git
a/gtk2_ardour/port_matrix_component.cc
b/gtk2_ardour/port_matrix_component.cc
index 9652a38f210c26bce6a084858811cb59d2219396..b2425dcef45ddd9e768dd1154bf57b518e70a9c1 100644
(file)
--- a/
gtk2_ardour/port_matrix_component.cc
+++ b/
gtk2_ardour/port_matrix_component.cc
@@
-41,7
+41,7
@@
PortMatrixComponent::PortMatrixComponent (PortMatrix* m, PortMatrixBody* b)
PortMatrixComponent::~PortMatrixComponent ()
{
if (_pixmap) {
PortMatrixComponent::~PortMatrixComponent ()
{
if (_pixmap) {
- g
dk_pixmap
_unref (_pixmap);
+ g
_object
_unref (_pixmap);
}
}
}
}
@@
-74,7
+74,7
@@
PortMatrixComponent::get_pixmap (GdkDrawable *drawable)
/* make a pixmap of the right size */
if (_pixmap) {
/* make a pixmap of the right size */
if (_pixmap) {
- g
dk_pixmap
_unref (_pixmap);
+ g
_object
_unref (_pixmap);
}
_pixmap = gdk_pixmap_new (drawable, _width, _height, -1);
}
_pixmap = gdk_pixmap_new (drawable, _width, _height, -1);
@@
-132,7
+132,7
@@
PortMatrixComponent::group_size (boost::shared_ptr<const PortGroup> g) const
s = bundles.size();
} else {
for (PortGroup::BundleList::const_iterator i = bundles.begin(); i != bundles.end(); ++i) {
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()
);
}
}
}
}
@@
-169,7
+169,7
@@
PortMatrixComponent::channel_to_position (ARDOUR::BundleChannel bc, boost::share
if (_matrix->show_only_bundles()) {
p += 1;
} else {
if (_matrix->show_only_bundles()) {
p += 1;
} else {
- p +=
(*i)->bundle->nchannels (
);
+ p +=
_matrix->count_of_our_type ((*i)->bundle->nchannels()
);
}
}
}
}
@@
-195,7
+195,7
@@
PortMatrixComponent::position_to_channel (double p, double, boost::shared_ptr<co
} else {
} 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 {
if (p < s) {
return ARDOUR::BundleChannel ((*j)->bundle, p);
} else {