From 4e77bbdd961e2cbfc9bf7b73f1e4b2bcbb28f95c Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Tue, 22 Nov 2022 01:45:42 +0100
Subject: [PATCH] dd import_markers option (2/4)

---
 gtk2_ardour/editor.h                |  1 +
 gtk2_ardour/editor_audio_import.cc  | 10 ++++++----
 gtk2_ardour/editor_videotimeline.cc |  2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index fa247fca8b..712f8860e1 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -1458,6 +1458,7 @@ private:
 	                     boost::shared_ptr<ARDOUR::Track>&     track,
 	                     std::string const&                    pgroup_id,
 	                     bool                                  replace,
+	                     bool                                  with_markers,
 	                     boost::shared_ptr<ARDOUR::PluginInfo> instrument = boost::shared_ptr<ARDOUR::PluginInfo>());
 
 	int embed_sndfiles (std::vector<std::string>              paths,
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index 647f7fc8d5..4fb04f8b79 100644
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -439,7 +439,7 @@ Editor::do_import (vector<string>           paths,
 
 		if (!cancel) {
 			ipw.show ();
-			import_sndfiles (paths, disposition, mode, quality, pos, 1, 1, track, pgroup_id, false, instrument);
+			import_sndfiles (paths, disposition, mode, quality, pos, 1, 1, track, pgroup_id, false, with_markers, instrument);
 			import_status.clear();
 		}
 
@@ -485,7 +485,7 @@ Editor::do_import (vector<string>           paths,
 					track = get_nth_selected_audio_track (nth++);
 				}
 
-				import_sndfiles (to_import, disposition, mode, quality, pos, 1, -1, track, pgroup_id, replace, instrument);
+				import_sndfiles (to_import, disposition, mode, quality, pos, 1, -1, track, pgroup_id, replace, with_markers, instrument);
 				import_status.clear();
 				break;
 
@@ -494,7 +494,7 @@ Editor::do_import (vector<string>           paths,
 				to_import.clear ();
 				to_import.push_back (*a);
 
-				import_sndfiles (to_import, disposition, mode, quality, pos, -1, -1, track, pgroup_id, replace, instrument);
+				import_sndfiles (to_import, disposition, mode, quality, pos, -1, -1, track, pgroup_id, replace, with_markers, instrument);
 				import_status.clear();
 				break;
 
@@ -503,7 +503,7 @@ Editor::do_import (vector<string>           paths,
 				to_import.clear ();
 				to_import.push_back (*a);
 
-				import_sndfiles (to_import, disposition, mode, quality, pos, 1, 1, track, pgroup_id, replace, instrument);
+				import_sndfiles (to_import, disposition, mode, quality, pos, 1, 1, track, pgroup_id, replace, with_markers, instrument);
 				import_status.clear();
 				break;
 
@@ -611,6 +611,7 @@ Editor::import_sndfiles (vector<string>            paths,
                          boost::shared_ptr<Track>& track,
                          std::string const&        pgroup_id,
                          bool                      replace,
+                         bool                      with_markers,
                          ARDOUR::PluginInfoPtr     instrument)
 {
 	/* skip periodic saves while importing */
@@ -622,6 +623,7 @@ Editor::import_sndfiles (vector<string>            paths,
 	import_status.quality = quality;
 	import_status.replace_existing_source = replace;
 	import_status.split_midi_channels = (disposition == Editing::ImportDistinctChannels);
+	import_status.import_markers = with_markers;
 
 	import_status.mode = mode;
 	import_status.pos = pos;
diff --git a/gtk2_ardour/editor_videotimeline.cc b/gtk2_ardour/editor_videotimeline.cc
index 36dd5d338c..875009b60e 100644
--- a/gtk2_ardour/editor_videotimeline.cc
+++ b/gtk2_ardour/editor_videotimeline.cc
@@ -99,7 +99,7 @@ Editor::embed_audio_from_video (std::string path, samplepos_t n, bool lock_posit
 	std::string const& gid = ARDOUR::Playlist::generate_pgroup_id ();
 	Temporal::timepos_t pos (n);
 
-	bool ok = import_sndfiles (paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, ARDOUR::SrcBest, pos, 1, 1, track, gid, false) == 0;
+	bool ok = import_sndfiles (paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, ARDOUR::SrcBest, pos, 1, 1, track, gid, false, false) == 0;
 	import_status.clear();
 
 	if (ok && track) {