Make sure every imported file is copied to the session path
This commit is contained in:
parent
43b94f7aa7
commit
81a343ff7f
@ -682,6 +682,9 @@ ARDOUR_UI::startup ()
|
|||||||
exit (1);
|
exit (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (_session && nsm) {
|
||||||
|
_session->set_nsm_state( true );
|
||||||
|
}
|
||||||
use_config ();
|
use_config ();
|
||||||
|
|
||||||
goto_editor_window ();
|
goto_editor_window ();
|
||||||
|
@ -1339,8 +1339,9 @@ SoundFileOmega::reset_options ()
|
|||||||
src_combo.set_sensitive (false);
|
src_combo.set_sensitive (false);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* We must copy MIDI files or those from Freesound */
|
/* We must copy MIDI files or those from Freesound
|
||||||
bool const must_copy = have_a_midi_file || notebook.get_current_page() == 2;
|
* or any file if we are under nsm control */
|
||||||
|
bool const must_copy = _session->get_nsm_state() || have_a_midi_file || notebook.get_current_page() == 2;
|
||||||
|
|
||||||
if (Config->get_only_copy_imported_files()) {
|
if (Config->get_only_copy_imported_files()) {
|
||||||
|
|
||||||
|
@ -392,6 +392,8 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
|
|||||||
void rename_state (std::string old_name, std::string new_name);
|
void rename_state (std::string old_name, std::string new_name);
|
||||||
void remove_pending_capture_state ();
|
void remove_pending_capture_state ();
|
||||||
int rename (const std::string&);
|
int rename (const std::string&);
|
||||||
|
bool get_nsm_state () const { return _under_nsm_control; }
|
||||||
|
void set_nsm_state (bool state) { _under_nsm_control = state; }
|
||||||
|
|
||||||
PBD::Signal1<void,std::string> StateSaved;
|
PBD::Signal1<void,std::string> StateSaved;
|
||||||
PBD::Signal0<void> StateReady;
|
PBD::Signal0<void> StateReady;
|
||||||
@ -925,6 +927,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
|
|||||||
uint32_t _solo_isolated_cnt;
|
uint32_t _solo_isolated_cnt;
|
||||||
bool _writable;
|
bool _writable;
|
||||||
bool _was_seamless;
|
bool _was_seamless;
|
||||||
|
bool _under_nsm_control;
|
||||||
|
|
||||||
void initialize_latencies ();
|
void initialize_latencies ();
|
||||||
void set_worst_io_latencies ();
|
void set_worst_io_latencies ();
|
||||||
|
@ -133,6 +133,7 @@ Session::Session (AudioEngine &eng,
|
|||||||
: _engine (eng)
|
: _engine (eng)
|
||||||
, _target_transport_speed (0.0)
|
, _target_transport_speed (0.0)
|
||||||
, _requested_return_frame (-1)
|
, _requested_return_frame (-1)
|
||||||
|
, _under_nsm_control (false)
|
||||||
, _session_dir (new SessionDirectory(fullpath))
|
, _session_dir (new SessionDirectory(fullpath))
|
||||||
, state_tree (0)
|
, state_tree (0)
|
||||||
, _state_of_the_state (Clean)
|
, _state_of_the_state (Clean)
|
||||||
|
Loading…
Reference in New Issue
Block a user