diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-23 11:28:45 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-08 15:24:15 -0400 |
| commit | c222acecaa38b1ef56754808f216dc1abecbd416 (patch) | |
| tree | cec009845a7ea1474fb3d2051f9333e62f881034 /gtk2_ardour/editor.h | |
| parent | 59b18de1d342deb59b167af03320e4697998826f (diff) | |
fix #5609 (import with 1 track per channel mis-associates tracks + channels)
when using ImportDistinctChannels, correctly name regions so that playlists for each channel/track
are also named differently, and thus reloaded properly when the session is reloaded.
Diffstat (limited to 'gtk2_ardour/editor.h')
| -rw-r--r-- | gtk2_ardour/editor.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 9533acbb52..12db349e39 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1215,13 +1215,17 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD bool idle_drop_paths (std::vector<std::string> paths, framepos_t frame, double ypos, bool copy); void drop_paths_part_two (const std::vector<std::string>& paths, framepos_t frame, double ypos, bool copy); - int import_sndfiles (std::vector<std::string> paths, Editing::ImportMode mode, ARDOUR::SrcQuality, framepos_t& pos, + int import_sndfiles (std::vector<std::string> paths, Editing::ImportDisposition, Editing::ImportMode mode, + ARDOUR::SrcQuality, framepos_t& pos, int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>&, bool); - int embed_sndfiles (std::vector<std::string> paths, bool multiple_files, bool& check_sample_rate, Editing::ImportMode mode, + int embed_sndfiles (std::vector<std::string> paths, bool multiple_files, bool& check_sample_rate, + Editing::ImportDisposition disposition, Editing::ImportMode mode, framepos_t& pos, int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>&); - int add_sources (std::vector<std::string> paths, ARDOUR::SourceList& sources, framepos_t& pos, Editing::ImportMode, + int add_sources (std::vector<std::string> paths, ARDOUR::SourceList& sources, framepos_t& pos, + Editing::ImportDisposition, Editing::ImportMode, int target_regions, int target_tracks, boost::shared_ptr<ARDOUR::Track>&, bool add_channel_suffix); + int finish_bringing_in_material (boost::shared_ptr<ARDOUR::Region> region, uint32_t, uint32_t, framepos_t& pos, Editing::ImportMode mode, boost::shared_ptr<ARDOUR::Track>& existing_track); |