no pingbacks if running a development version

[ardour.git] / gtk2_ardour / export_channel_selector.cc

diff --git a/gtk2_ardour/export_channel_selector.cc b/gtk2_ardour/export_channel_selector.cc
index baef41e1ae30fc6f1d587355d6aedb81efaf83ad..17c54c79a85b735bd77284eb2d1ec242582442df 100644 (file)
--- a/gtk2_ardour/export_channel_selector.cc
+++ b/gtk2_ardour/export_channel_selector.cc
@@ -18,8 +18,6 @@
 
 */
 
-#include "export_channel_selector.h"
-
 #include <algorithm>
 
 #include "pbd/convert.h"
@@ -33,6 +31,9 @@
 
 #include <sstream>
 
+#include "export_channel_selector.h"
+#include "route_sorter.h"
+
 #include "i18n.h"
 
 using namespace std;
@@ -40,12 +41,6 @@ using namespace Glib;
 using namespace ARDOUR;
 using namespace PBD;
 
-struct EditorOrderRouteSorter {
-    bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
-           return a->order_key () < b->order_key ();
-    }
-};
-
 PortExportChannelSelector::PortExportChannelSelector (ARDOUR::Session * session, ProfileManagerPtr manager) :
   ExportChannelSelector (session, manager),
   channels_label (_("Channels:"), Gtk::ALIGN_LEFT),
@@ -108,7 +103,7 @@ PortExportChannelSelector::sync_with_manager ()
         * fill_route_list () -> update_channel_count () -> set_channel_count () -> update_config()
         * will call config->clear_channels(); and clear the config
         */
-       channel_view.set_config (0);
+       channel_view.set_config (ChannelConfigPtr ());
        fill_route_list ();
        channel_view.set_config (state->config);
 }
@@ -126,7 +121,7 @@ PortExportChannelSelector::fill_route_list ()
                channel_view.add_route (master);
        }
 
-       routes.sort (EditorOrderRouteSorter ());
+       routes.sort (Stripable::PresentationOrderSorter ());
 
        for (RouteList::iterator it = routes.begin(); it != routes.end(); ++it) {
                if ((*it)->is_master () || (*it)->is_monitor ()) {
@@ -700,7 +695,7 @@ TrackExportChannelSelector::add_track (boost::shared_ptr<Route> route)
        row[track_cols.selected] = false;
        row[track_cols.label] = route->name();
        row[track_cols.route] = route;
-       row[track_cols.order_key] = route->order_key();
+       row[track_cols.order_key] = route->presentation_info().order();
 }
 
 void