diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-12-06 19:56:33 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-12-06 19:56:33 +0000 |
| commit | 9884773eea9764b6dacd3ade6a1d49cf389fe398 (patch) | |
| tree | b46b3e936a09bf40954c6b3f00ebc7f59f632723 /gtk2_ardour/export_channel_selector.h | |
| parent | 27bfb0f9e2db321d9596912ed95ccb6bcd00bc57 (diff) | |
various fixes for exporting, including correct handling of errors during export which previously would hang when using jack1 because jack_set_freewheel() was called from inside a process() callback; use shared_ptr<Route> in parts of export code that weren't using them before; fix up generation of export filenames so that Glib::build_filename() is used and non-existent folders are ignored
git-svn-id: svn://localhost/ardour2/branches/3.0@13610 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/export_channel_selector.h')
| -rw-r--r-- | gtk2_ardour/export_channel_selector.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/export_channel_selector.h b/gtk2_ardour/export_channel_selector.h index 4cb9902ed0..79e943a569 100644 --- a/gtk2_ardour/export_channel_selector.h +++ b/gtk2_ardour/export_channel_selector.h @@ -235,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; @@ -243,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; |