projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
session prefs editor gets renamed as session properties
[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 0bb8d496e7c3c1955fcbb1a88208ba459d7183fd..440376d1fa0fdcb003b4d004def9bc89c07944a7 100644
(file)
--- a/
gtk2_ardour/port_matrix_component.cc
+++ b/
gtk2_ardour/port_matrix_component.cc
@@
-24,7
+24,8
@@
using namespace std;
/** Constructor.
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 (PortMatrix* m, PortMatrixBody* b)
: _matrix (m),
@@
-40,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);
}
}
}
}
@@
-73,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);
@@
-131,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 +=
(*i)
->bundle->nchannels();
}
}
}
}
@@
-151,7
+152,7
@@
PortMatrixComponent::channel_to_position (ARDOUR::BundleChannel bc, boost::share
for (PortGroup::BundleList::const_iterator i = bundles.begin(); i != bundles.end(); ++i) {
for (PortGroup::BundleList::const_iterator i = bundles.begin(); i != bundles.end(); ++i) {
- if (
i
->bundle == bc.bundle) {
+ if (
(*i)
->bundle == bc.bundle) {
/* found the bundle */
/* found the bundle */
@@
-168,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 +=
(*i)
->bundle->nchannels ();
}
}
}
}
@@
-187,16
+188,16
@@
PortMatrixComponent::position_to_channel (double p, double, boost::shared_ptr<co
if (_matrix->show_only_bundles()) {
if (p < 1) {
if (_matrix->show_only_bundles()) {
if (p < 1) {
- return ARDOUR::BundleChannel (
j->bundle, 0
);
+ return ARDOUR::BundleChannel (
(*j)->bundle, -1
);
} else {
p -= 1;
}
} else {
} else {
p -= 1;
}
} else {
- uint32_t const s =
j
->bundle->nchannels ();
+ uint32_t const s =
(*j)
->bundle->nchannels ();
if (p < s) {
if (p < s) {
- return ARDOUR::BundleChannel (
j
->bundle, p);
+ return ARDOUR::BundleChannel (
(*j)
->bundle, p);
} else {
p -= s;
}
} else {
p -= s;
}
@@
-205,5
+206,5
@@
PortMatrixComponent::position_to_channel (double p, double, boost::shared_ptr<co
}
}
- return ARDOUR::BundleChannel (boost::shared_ptr<ARDOUR::Bundle> (),
0
);
+ return ARDOUR::BundleChannel (boost::shared_ptr<ARDOUR::Bundle> (),
-1
);
}
}