Fix playhead smoothing when auditioning.

[ardour.git] / gtk2_ardour / port_matrix.cc

diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc
index 84349d8236e29c5267c444d8d37d363245bbed5a..23e9acaf62279e9b964a991dea8f8fb9416e86c3 100644 (file)
--- a/gtk2_ardour/port_matrix.cc
+++ b/gtk2_ardour/port_matrix.cc
@@ -37,7 +37,7 @@
 #include "port_matrix_body.h"
 #include "port_matrix_component.h"
 #include "ardour_dialog.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include "gui_thread.h"
 #include "utils.h"
 
@@ -159,7 +159,7 @@ PortMatrix::init ()
        _session->engine().PortRegisteredOrUnregistered.connect (_session_connections, invalidator (*this), boost::bind (&PortMatrix::setup_global_ports, this), gui_context());
 
        /* watch for route order keys changing, which changes the order of things in our global ports list(s) */
-       Stripable::PresentationInfoChange.connect (_session_connections, invalidator (*this), boost::bind (&PortMatrix::setup_global_ports_proxy, this), gui_context());
+       PresentationInfo::Change.connect (_session_connections, invalidator (*this), boost::bind (&PortMatrix::setup_global_ports_proxy, this), gui_context());
 
        /* Part 3: other stuff */
 
@@ -483,12 +483,12 @@ PortMatrix::popup_menu (BundleChannel column, BundleChannel row, uint32_t t)
                                                );
 
                                        if (bc[dim].bundle->nchannels().n_total() > 1) {
-                                                for (uint32_t i = 0; i < bc[dim].bundle->nchannels().n_total(); ++i) {
-                                                        if (should_show (bc[dim].bundle->channel_type(i))) {
-                                                                add_remove_option (sub, w, i);
-                                                        }
-                                                }
-                                        }
+                                               for (uint32_t i = 0; i < bc[dim].bundle->nchannels().n_total(); ++i) {
+                                                       if (should_show (bc[dim].bundle->channel_type(i))) {
+                                                               add_remove_option (sub, w, i);
+                                                       }
+                                               }
+                                       }
                                }
                        }