diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-10-28 17:04:09 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-10-28 17:04:09 +0000 |
| commit | 7bdcc127e3e42bd76b997b56ecd938b1127d790b (patch) | |
| tree | f1e9856094ee5a54cc28957508f2b693fbcd043a /gtk2_ardour/export_channel_selector.h | |
| parent | f65e3f287b48fef6d4fdb8c4456c0eada4c4431c (diff) | |
Use shared_ptr for Port in the AudioEngine; improves thread-safety of the audio engine's port list as a writer cannot destroy a port in one thread while the port list is being iterated in another.
git-svn-id: svn://localhost/ardour2/branches/3.0@10327 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/export_channel_selector.h')
| -rw-r--r-- | gtk2_ardour/export_channel_selector.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/export_channel_selector.h b/gtk2_ardour/export_channel_selector.h index dda449d931..511ccd5b78 100644 --- 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; }; |