smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

dd import_markers option (2/4)

Browse source
This commit is contained in:
Robin Gareus 2022-11-22 01:45:42 +01:00
parent 4f4b931ccc
commit 4e77bbdd96
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/editor.h
View file

@ -1458,6 +1458,7 @@ private:
boost::shared_ptr<ARDOUR::Track>& track, boost::shared_ptr<ARDOUR::Track>& track,
std::string const& pgroup_id, std::string const& pgroup_id,
bool replace, bool replace,
bool with_markers,
boost::shared_ptr<ARDOUR::PluginInfo> instrument = boost::shared_ptr<ARDOUR::PluginInfo>()); boost::shared_ptr<ARDOUR::PluginInfo> instrument = boost::shared_ptr<ARDOUR::PluginInfo>());
int embed_sndfiles (std::vector<std::string> paths, int embed_sndfiles (std::vector<std::string> paths,

10
gtk2_ardour/editor_audio_import.cc
View file

@ -439,7 +439,7 @@ Editor::do_import (vector<string> paths,
if (!cancel) { if (!cancel) {
ipw.show (); 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(); import_status.clear();
} }
@ -485,7 +485,7 @@ Editor::do_import (vector<string> paths,
track = get_nth_selected_audio_track (nth++); 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(); import_status.clear();
break; break;
@ -494,7 +494,7 @@ Editor::do_import (vector<string> paths,
to_import.clear (); to_import.clear ();
to_import.push_back (*a); 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(); import_status.clear();
break; break;
@ -503,7 +503,7 @@ Editor::do_import (vector<string> paths,
to_import.clear (); to_import.clear ();
to_import.push_back (*a); 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(); import_status.clear();
break; break;
@ -611,6 +611,7 @@ Editor::import_sndfiles (vector<string> paths,
boost::shared_ptr<Track>& track, boost::shared_ptr<Track>& track,
std::string const& pgroup_id, std::string const& pgroup_id,
bool replace, bool replace,
bool with_markers,
ARDOUR::PluginInfoPtr instrument) ARDOUR::PluginInfoPtr instrument)
{ {
/* skip periodic saves while importing */ /* skip periodic saves while importing */
@ -622,6 +623,7 @@ Editor::import_sndfiles (vector<string> paths,
import_status.quality = quality; import_status.quality = quality;
import_status.replace_existing_source = replace; import_status.replace_existing_source = replace;
import_status.split_midi_channels = (disposition == Editing::ImportDistinctChannels); import_status.split_midi_channels = (disposition == Editing::ImportDistinctChannels);
import_status.import_markers = with_markers;
import_status.mode = mode; import_status.mode = mode;
import_status.pos = pos; import_status.pos = pos;

2
gtk2_ardour/editor_videotimeline.cc
View file

@ -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 (); std::string const& gid = ARDOUR::Playlist::generate_pgroup_id ();
Temporal::timepos_t pos (n); 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(); import_status.clear();
if (ok && track) { if (ok && track) {