ardour/livetrax
13
0
Fork 0
Code

T: always unconditionally copies imported files to the session

Browse Source
This commit is contained in:
Robin Gareus 2024-11-14 19:42:04 +01:00
parent 6d757c8c3c
commit 3d13b28a24
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
5 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/editor_canvas.cc
View File

@ -449,7 +449,7 @@ Editor::drop_paths_part_two (const vector<string>& paths, timepos_t const & p, d
InstrumentSelector is(InstrumentSelector::ForTrackDefault); // instantiation builds instrument-list and sets default. InstrumentSelector is(InstrumentSelector::ForTrackDefault); // instantiation builds instrument-list and sets default.
do_import (midi_paths, Editing::ImportDistinctFiles, ImportAsTrack, SrcBest, SMFFileAndTrackName, SMFTempoIgnore, pos, is.selected_instrument()); do_import (midi_paths, Editing::ImportDistinctFiles, ImportAsTrack, SrcBest, SMFFileAndTrackName, SMFTempoIgnore, pos, is.selected_instrument());
if (UIConfiguration::instance().get_only_copy_imported_files() || copy) { if (Profile->get_livetrax() || UIConfiguration::instance().get_only_copy_imported_files() || copy) {
do_import (audio_paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack, do_import (audio_paths, Editing::ImportDistinctFiles, Editing::ImportAsTrack,
SrcBest, SMFFileAndTrackName, SMFTempoIgnore, pos); SrcBest, SMFFileAndTrackName, SMFTempoIgnore, pos);
} else { } else {
@ -464,7 +464,7 @@ Editor::drop_paths_part_two (const vector<string>& paths, timepos_t const & p, d
do_import (midi_paths, Editing::ImportSerializeFiles, ImportToTrack, do_import (midi_paths, Editing::ImportSerializeFiles, ImportToTrack,
SrcBest, SMFFileAndTrackName, SMFTempoIgnore, pos, std::shared_ptr<ARDOUR::PluginInfo>(), tv->track ()); SrcBest, SMFFileAndTrackName, SMFTempoIgnore, pos, std::shared_ptr<ARDOUR::PluginInfo>(), tv->track ());
if (UIConfiguration::instance().get_only_copy_imported_files() || copy) { if (Profile->get_livetrax() || UIConfiguration::instance().get_only_copy_imported_files() || copy) {
do_import (audio_paths, Editing::ImportSerializeFiles, Editing::ImportToTrack, do_import (audio_paths, Editing::ImportSerializeFiles, Editing::ImportToTrack,
SrcBest, SMFFileAndTrackName, SMFTempoIgnore, pos, std::shared_ptr<PluginInfo>(), tv->track ()); SrcBest, SMFFileAndTrackName, SMFTempoIgnore, pos, std::shared_ptr<PluginInfo>(), tv->track ());
} else { } else {

2
gtk2_ardour/editor_canvas_events.cc
View File

@ -1355,7 +1355,7 @@ Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const& context,
* TODO: check if file is audio/midi, allow drops on same track-type only, * TODO: check if file is audio/midi, allow drops on same track-type only,
* currently: if audio is dropped on a midi-track, it is only added to the region-list * currently: if audio is dropped on a midi-track, it is only added to the region-list
*/ */
if (UIConfiguration::instance().get_only_copy_imported_files()) { if (Profile->get_livetrax() || UIConfiguration::instance().get_only_copy_imported_files()) {
context->drag_status(Gdk::ACTION_COPY, time); context->drag_status(Gdk::ACTION_COPY, time);
} else { } else {
if ((context->get_actions() & (Gdk::ACTION_COPY | Gdk::ACTION_LINK | Gdk::ACTION_MOVE)) == Gdk::ACTION_COPY) { if ((context->get_actions() & (Gdk::ACTION_COPY | Gdk::ACTION_LINK | Gdk::ACTION_MOVE)) == Gdk::ACTION_COPY) {

3
gtk2_ardour/editor_sources.cc
View File

@ -21,6 +21,7 @@
#include <string> #include <string>
#include "ardour/audiofilesource.h" #include "ardour/audiofilesource.h"
#include "ardour/profile.h"
#include "ardour/region_factory.h" #include "ardour/region_factory.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/session_directory.h" #include "ardour/session_directory.h"
@ -292,7 +293,7 @@ EditorSources::drag_data_received (const RefPtr<Gdk::DragContext>& context,
timepos_t pos; timepos_t pos;
bool copy = ((context->get_actions () & (Gdk::ACTION_COPY | Gdk::ACTION_LINK | Gdk::ACTION_MOVE)) == Gdk::ACTION_COPY); bool copy = ((context->get_actions () & (Gdk::ACTION_COPY | Gdk::ACTION_LINK | Gdk::ACTION_MOVE)) == Gdk::ACTION_COPY);
if (UIConfiguration::instance ().get_only_copy_imported_files () || copy) { if (Profile->get_livetrax() || UIConfiguration::instance ().get_only_copy_imported_files () || copy) {
_editor->do_import (paths, Editing::ImportDistinctFiles, Editing::ImportAsRegion, _editor->do_import (paths, Editing::ImportDistinctFiles, Editing::ImportAsRegion,
SrcBest, SMFFileAndTrackName, SMFTempoIgnore, pos); SrcBest, SMFFileAndTrackName, SMFTempoIgnore, pos);
} else { } else {

9
gtk2_ardour/livetrax_rc_option_editor.cc
View File

@ -981,15 +981,6 @@ RCOptionEditor::RCOptionEditor ()
add_option (_("General"), new OptionEditorHeading (_("Import"))); add_option (_("General"), new OptionEditorHeading (_("Import")));
add_option (_("General"),
new BoolOption (
"only-copy-imported-files",
_("Drag and drop import always copies files to session"),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_only_copy_imported_files),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_only_copy_imported_files)
));
add_option (_("General"), add_option (_("General"),
new DirectoryOption ( new DirectoryOption (
X_("freesound-dir"), X_("freesound-dir"),

4
gtk2_ardour/sfdb_ui.cc
View File

@ -1983,7 +1983,9 @@ SoundFileOmega::SoundFileOmega (string title, ARDOUR::Session* s,
options.attach (*l, 6, 7, 0, 1, FILL, SHRINK, 4, 0); options.attach (*l, 6, 7, 0, 1, FILL, SHRINK, 4, 0);
options.attach (src_combo, 7, 8, 0, 1, FILL, SHRINK, 2, 0); options.attach (src_combo, 7, 8, 0, 1, FILL, SHRINK, 2, 0);
#ifndef LIVETRAX
options.attach (copy_files_btn, 7, 8, 1, 2, FILL, SHRINK, 2, 0); options.attach (copy_files_btn, 7, 8, 1, 2, FILL, SHRINK, 2, 0);
#endif
str.clear (); str.clear ();
str.push_back (_("by track number")); str.push_back (_("by track number"));
@ -2272,7 +2274,7 @@ SoundFileOmega::do_something (int action)
_import_active = true; _import_active = true;
if (copy_files_btn.get_active()) { if (Profile->get_livetrax() || copy_files_btn.get_active()) {
PublicEditor::instance().do_import (paths, chns, mode, quality, mts, mtd, where, instrument, std::shared_ptr<Track>(), with_midi_markers); PublicEditor::instance().do_import (paths, chns, mode, quality, mts, mtd, where, instrument, std::shared_ptr<Track>(), with_midi_markers);
} else { } else {
PublicEditor::instance().do_embed (paths, chns, mode, where, instrument); PublicEditor::instance().do_embed (paths, chns, mode, where, instrument);