Don't report an error when the user cancels a time stretch operation.

[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 d98c557c3a3a8aff74e2842ba7812142f83715f1..9652a38f210c26bce6a084858811cb59d2219396 100644 (file)
--- a/gtk2_ardour/port_matrix_component.cc
+++ b/gtk2_ardour/port_matrix_component.cc
@@ -24,7 +24,8 @@
 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),
@@ -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 += 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) {
 
-               if (i->bundle == bc.bundle) {
+               if ((*i)->bundle == bc.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 {
-                       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) {
-                               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;
                        }