diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-07-01 09:46:18 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-07-01 09:46:18 -0400 |
| commit | 23e7cf10191270d70357ccf0ed9294f020c7b7ab (patch) | |
| tree | ddc1fc4d1914fe3de3de79c194c5dd859915bd2a /gtk2_ardour/editor.h | |
| parent | 4244ea65460b865f946551aace9b74191b26be4b (diff) | |
| parent | b660bc8ae92d19aedf0165815432b77a0c6170c4 (diff) | |
merge with master.
Manually resolved conflicts in import.cc and session.cc
Diffstat (limited to 'gtk2_ardour/editor.h')
| -rw-r--r-- | gtk2_ardour/editor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index dad59cd664..3013e36051 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1251,7 +1251,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD 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); + boost::shared_ptr<ARDOUR::Track>& existing_track, const std::string& new_track_name); boost::shared_ptr<ARDOUR::AudioTrack> get_nth_selected_audio_track (int nth) const; boost::shared_ptr<ARDOUR::MidiTrack> get_nth_selected_midi_track (int nth) const; |