diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-17 18:24:23 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-17 18:24:23 +0000 |
| commit | f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe (patch) | |
| tree | 5214c580b9e6c17a499fa587660dbf949e892bf2 /gtk2_ardour/port_matrix_component.cc | |
| parent | da762129f19c28aff64f833b6ec09fba946faef6 (diff) | |
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash
git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/port_matrix_component.cc')
| -rw-r--r-- | gtk2_ardour/port_matrix_component.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/port_matrix_component.cc b/gtk2_ardour/port_matrix_component.cc index d98c557c3a..f728f7bd85 100644 --- a/gtk2_ardour/port_matrix_component.cc +++ b/gtk2_ardour/port_matrix_component.cc @@ -131,7 +131,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 += i->bundle->nchannels(); + s += (*i)->bundle->nchannels(); } } @@ -151,7 +151,7 @@ PortMatrixComponent::channel_to_position (ARDOUR::BundleChannel bc, boost::share 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 */ @@ -168,7 +168,7 @@ PortMatrixComponent::channel_to_position (ARDOUR::BundleChannel bc, boost::share if (_matrix->show_only_bundles()) { p += 1; } else { - p += i->bundle->nchannels (); + p += (*i)->bundle->nchannels (); } } @@ -187,16 +187,16 @@ PortMatrixComponent::position_to_channel (double p, double, boost::shared_ptr<co if (_matrix->show_only_bundles()) { if (p < 1) { - return ARDOUR::BundleChannel (j->bundle, -1); + return ARDOUR::BundleChannel ((*j)->bundle, -1); } else { p -= 1; } } else { - uint32_t const s = j->bundle->nchannels (); + uint32_t const s = (*j)->bundle->nchannels (); if (p < s) { - return ARDOUR::BundleChannel (j->bundle, p); + return ARDOUR::BundleChannel ((*j)->bundle, p); } else { p -= s; } |