_locations->changed.connect_same_thread (*this, boost::bind (&Session::locations_changed, this));
_locations->added.connect_same_thread (*this, boost::bind (&Session::locations_added, this, _1));
+
+
} catch (AudioEngine::PortRegistrationFailure& err) {
/* handle this one in a different way than all others, so that its clear what happened */
error << err.what() << endmsg;
ChanCount count(DataType::AUDIO, bus_profile->master_out_channels);
if (bus_profile->master_out_channels) {
- boost::shared_ptr<Route> r (new Route (*this, _("master"), Route::MasterOut, DataType::AUDIO));
+ boost::shared_ptr<Route> r (new Route (*this, _("Master"), Route::MasterOut, DataType::AUDIO));
if (r->init ()) {
return -1;
}
XMLTree tree;
std::string xml_path(_session_dir->root_path());
+ /* prevent concurrent saves from different threads */
+
+ Glib::Threads::Mutex::Lock lm (save_state_lock);
+
if (!_writable || (_state_of_the_state & CannotSave)) {
return 1;
}
if (node.name() != X_("Session")) {
fatal << _("programming error: Session: incorrect XML node sent to set_state()") << endmsg;
- return -1;
+ goto out;
}
if ((prop = node.property ("name")) != 0) {
if (_nominal_frame_rate != _current_frame_rate) {
boost::optional<int> r = AskAboutSampleRateMismatch (_nominal_frame_rate, _current_frame_rate);
if (r.get_value_or (0)) {
- return -1;
+ goto out;
}
}
}
goto out;
}
- Location* location;
-
- if ((location = _locations->auto_loop_location()) != 0) {
- set_auto_loop_location (location);
- }
-
- if ((location = _locations->auto_punch_location()) != 0) {
- set_auto_punch_location (location);
- }
-
- if ((location = _locations->session_range_location()) != 0) {
- delete _session_range_location;
- _session_range_location = location;
- }
+ locations_changed ();
if (_session_range_location) {
AudioFileSource::set_header_position_offset (_session_range_location->start());
StateReady (); /* EMIT SIGNAL */
+ delete state_tree;
+ state_tree = 0;
return 0;
out:
+ delete state_tree;
+ state_tree = 0;
return ret;
}
case -1:
default:
- warning << _("A sound file is missing. It will be replaced by silence.") << endmsg;
- source = SourceFactory::createSilent (*this, **niter, max_framecnt, _current_frame_rate);
+ switch (err.type) {
+
+ case DataType::AUDIO:
+ warning << _("A sound file is missing. It will be replaced by silence.") << endmsg;
+ source = SourceFactory::createSilent (*this, **niter, max_framecnt, _current_frame_rate);
+ break;
+
+ case DataType::MIDI:
+ warning << string_compose (_("A MIDI file is missing. %1 cannot currently recover from missing MIDI files"),
+ PROGRAM_NAME) << endmsg;
+ return -1;
+ break;
+ }
break;
}
}
return 0;
}
-void
-Session::auto_save()
-{
- save_state (_current_snapshot_name);
-}
-
static bool
state_file_filter (const string &str, void* /*arg*/)
{
void
Session::set_dirty ()
{
+ /* never mark session dirty during loading */
+
+ if (_state_of_the_state & Loading) {
+ return;
+ }
+
bool was_dirty = dirty();
_state_of_the_state = StateOfTheState (_state_of_the_state | Dirty);
case ControllableDescriptor::NamedRoute:
{
std::string str = desc.top_level_name();
- if (str == "master") {
+ if (str == "Master" || str == "master") {
r = _master_out;
} else if (str == "control" || str == "listen") {
r = _monitor_out;
return 0;
}
+ if (!Config->get_save_history() || Config->get_saved_history_depth() < 0 ||
+ (_history.undo_depth() == 0 && _history.redo_depth() == 0)) {
+ return 0;
+ }
+
if (snapshot_name.empty()) {
snapshot_name = _current_snapshot_name;
}
}
}
- if (!Config->get_save_history() || Config->get_saved_history_depth() < 0) {
- return 0;
- }
-
tree.set_root (&_history.get_state (Config->get_saved_history_depth()));
if (!tree.write (xml_path))
return !(found_sr && found_data_format); // zero if they are both found
}
+
+typedef std::vector<boost::shared_ptr<FileSource> > SeveralFileSources;
+typedef std::map<std::string,SeveralFileSources> SourcePathMap;
+
+int
+Session::bring_all_sources_into_session (boost::function<void(uint32_t,uint32_t,string)> callback)
+{
+ uint32_t total = 0;
+ uint32_t n = 0;
+ SourcePathMap source_path_map;
+ string new_path;
+ boost::shared_ptr<AudioFileSource> afs;
+ int ret = 0;
+
+ {
+
+ Glib::Threads::Mutex::Lock lm (source_lock);
+
+ cerr << " total sources = " << sources.size();
+
+ for (SourceMap::const_iterator i = sources.begin(); i != sources.end(); ++i) {
+ boost::shared_ptr<FileSource> fs = boost::dynamic_pointer_cast<FileSource> (i->second);
+
+ if (!fs) {
+ continue;
+ }
+
+ if (fs->within_session()) {
+ cerr << "skip " << fs->name() << endl;
+ continue;
+ }
+
+ if (source_path_map.find (fs->path()) != source_path_map.end()) {
+ source_path_map[fs->path()].push_back (fs);
+ } else {
+ SeveralFileSources v;
+ v.push_back (fs);
+ source_path_map.insert (make_pair (fs->path(), v));
+ }
+
+ total++;
+ }
+
+ cerr << " fsources = " << total << endl;
+
+ for (SourcePathMap::iterator i = source_path_map.begin(); i != source_path_map.end(); ++i) {
+
+ /* tell caller where we are */
+
+ string old_path = i->first;
+
+ callback (n, total, old_path);
+
+ cerr << old_path << endl;
+
+ new_path.clear ();
+
+ switch (i->second.front()->type()) {
+ case DataType::AUDIO:
+ new_path = new_audio_source_path_for_embedded (old_path);
+ break;
+
+ case DataType::MIDI:
+ break;
+ }
+
+ cerr << "Move " << old_path << " => " << new_path << endl;
+
+ if (!copy_file (old_path, new_path)) {
+ cerr << "failed !\n";
+ ret = -1;
+ }
+
+ /* make sure we stop looking in the external
+ dir/folder. Remember, this is an all-or-nothing
+ operations, it doesn't merge just some files.
+ */
+ remove_dir_from_search_path (Glib::path_get_dirname (old_path), i->second.front()->type());
+
+ for (SeveralFileSources::iterator f = i->second.begin(); f != i->second.end(); ++f) {
+ (*f)->set_path (new_path);
+ }
+ }
+ }
+
+ save_state ("", false, false);
+
+ return ret;
+}
projects / ardour.git / blobdiff