final tweaks for #4489

[ardour.git] / gtk2_ardour / export_channel_selector.h

diff --git a/gtk2_ardour/export_channel_selector.h b/gtk2_ardour/export_channel_selector.h
index 63af76e77d73376c4721e37fada1cb6835282c9c..511ccd5b784eeb26f3d3383add501ae8a7c36220 100644 (file)
--- a/gtk2_ardour/export_channel_selector.h
+++ b/gtk2_ardour/export_channel_selector.h
@@ -129,8 +129,8 @@ class PortExportChannelSelector : public ExportChannelSelector
                  public:
                        Channel (RouteCols & cols) { cols.add (port); cols.add (label); }
 
-                       Gtk::TreeModelColumn<ARDOUR::AudioPort *>  port;
-                       Gtk::TreeModelColumn<std::string>        label;
+                       Gtk::TreeModelColumn<boost::weak_ptr<ARDOUR::AudioPort> > port;
+                       Gtk::TreeModelColumn<std::string> label;
                };
                std::list<Channel> channels;
 
@@ -144,11 +144,11 @@ class PortExportChannelSelector : public ExportChannelSelector
                class PortCols : public Gtk::TreeModel::ColumnRecord
                {
                  public:
-                       PortCols () { add (selected); add(port); add(label); }
+                       PortCols () { add(selected); add(port); add(label); }
 
-                       Gtk::TreeModelColumn<bool>                  selected;  // not used ATM
-                       Gtk::TreeModelColumn<ARDOUR::AudioPort *>   port;
-                       Gtk::TreeModelColumn<std::string>         label;
+                       Gtk::TreeModelColumn<bool> selected;  // not used ATM
+                       Gtk::TreeModelColumn<boost::weak_ptr<ARDOUR::AudioPort> > port;
+                       Gtk::TreeModelColumn<std::string> label;
                };
                PortCols port_cols;
        };
@@ -230,23 +230,23 @@ class TrackExportChannelSelector : public ExportChannelSelector
 {
   public:
        TrackExportChannelSelector (ARDOUR::Session * session, ProfileManagerPtr manager);
-       
+
        virtual void sync_with_manager ();
-       
+
   private:
 
        void fill_list();
-       void add_track(ARDOUR::IO * io);
+       void add_track(ARDOUR::Route * route);
        void update_config();
-       
+
        ChannelConfigList configs;
-       
+
        struct TrackCols : public Gtk::TreeModelColumnRecord
        {
          public:
-               Gtk::TreeModelColumn<ARDOUR::IO *>  track;
-               Gtk::TreeModelColumn<std::string>   label;
-               Gtk::TreeModelColumn<bool>          selected;
+               Gtk::TreeModelColumn<ARDOUR::Route *> track;
+               Gtk::TreeModelColumn<std::string>     label;
+               Gtk::TreeModelColumn<bool>            selected;
 
                TrackCols () { add (track); add(label); add(selected); }
        };
@@ -256,7 +256,7 @@ class TrackExportChannelSelector : public ExportChannelSelector
        Gtk::TreeView                track_view;
 
        Gtk::ScrolledWindow          track_scroller;
-       
+
 };
 
 #endif /* __export_channel_selector_h__ */