fix gtk errors caused by using non-escaped paths in a column used as a tooltip (which...

[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 e7b2dc11ee0a0785667187e41dd3163b6d3a8caf..79e943a569e5b4d7d0b66c147aaa00ae490ab0db 100644 (file)
--- a/gtk2_ardour/export_channel_selector.h
+++ b/gtk2_ardour/export_channel_selector.h
@@ -24,7 +24,6 @@
 #include <list>
 
 #include "ardour/export_profile_manager.h"
-#include "ardour/export_channel.h"
 
 #include <gtkmm.h>
 #include <sigc++/signal.h>
@@ -129,8 +128,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 +143,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;
        };
@@ -236,7 +235,7 @@ class TrackExportChannelSelector : public ExportChannelSelector
   private:
 
        void fill_list();
-       void add_track(ARDOUR::Route * route);
+        void add_track (boost::shared_ptr<ARDOUR::Route> route);
        void update_config();
 
        ChannelConfigList configs;
@@ -244,11 +243,11 @@ class TrackExportChannelSelector : public ExportChannelSelector
        struct TrackCols : public Gtk::TreeModelColumnRecord
        {
          public:
-               Gtk::TreeModelColumn<ARDOUR::Route *> track;
+               Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> > route;
                Gtk::TreeModelColumn<std::string>     label;
                Gtk::TreeModelColumn<bool>            selected;
 
-               TrackCols () { add (track); add(label); add(selected); }
+               TrackCols () { add (route); add(label); add(selected); }
        };
        TrackCols                    track_cols;
 
@@ -256,7 +255,7 @@ class TrackExportChannelSelector : public ExportChannelSelector
        Gtk::TreeView                track_view;
 
        Gtk::ScrolledWindow          track_scroller;
-       
+
 };
 
 #endif /* __export_channel_selector_h__ */