*/
+
+#ifdef WAF_BUILD
+#include "libardour-config.h"
+#endif
+
#define __STDC_FORMAT_MACROS 1
#include <stdint.h>
#endif
#include <glibmm.h>
-
-#include <midi++/mmc.h>
-#include <midi++/port.h>
-#include <pbd/error.h>
-
#include <glibmm/thread.h>
-#include <pbd/pathscanner.h>
-#include <pbd/pthread_utils.h>
-#include <pbd/search_path.h>
-#include <pbd/stacktrace.h>
-#include <pbd/copyfile.h>
-
-#include <ardour/audioengine.h>
-#include <ardour/configuration.h>
-#include <ardour/session.h>
-#include <ardour/session_directory.h>
-#include <ardour/session_utils.h>
-#include <ardour/buffer.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/midi_diskstream.h>
-#include <ardour/utils.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/midi_playlist.h>
-#include <ardour/smf_source.h>
-#include <ardour/audiofilesource.h>
-#include <ardour/silentfilesource.h>
-#include <ardour/sndfilesource.h>
-#include <ardour/midi_source.h>
-#include <ardour/sndfile_helpers.h>
-#include <ardour/auditioner.h>
-#include <ardour/export.h>
-#include <ardour/io_processor.h>
-#include <ardour/send.h>
-#include <ardour/processor.h>
-#include <ardour/bundle.h>
-#include <ardour/slave.h>
-#include <ardour/tempo.h>
-#include <ardour/audio_track.h>
-#include <ardour/midi_track.h>
-#include <ardour/cycle_timer.h>
-#include <ardour/utils.h>
-#include <ardour/named_selection.h>
-#include <ardour/version.h>
-#include <ardour/location.h>
-#include <ardour/audioregion.h>
-#include <ardour/midi_region.h>
-#include <ardour/crossfade.h>
-#include <ardour/control_protocol_manager.h>
-#include <ardour/region_factory.h>
-#include <ardour/source_factory.h>
-#include <ardour/playlist_factory.h>
-#include <ardour/filename_extensions.h>
-#include <ardour/directory_names.h>
-#include <ardour/template_utils.h>
-
-#include <control_protocol/control_protocol.h>
+
+#include "midi++/mmc.h"
+#include "midi++/port.h"
+
+#include "pbd/error.h"
+#include "pbd/pathscanner.h"
+#include "pbd/pthread_utils.h"
+#include "pbd/search_path.h"
+#include "pbd/stacktrace.h"
+
+#include "ardour/audioengine.h"
+#include "ardour/configuration.h"
+#include "ardour/session.h"
+#include "ardour/session_directory.h"
+#include "ardour/session_utils.h"
+#include "ardour/session_state_utils.h"
+#include "ardour/session_metadata.h"
+#include "ardour/buffer.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/midi_diskstream.h"
+#include "ardour/utils.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/midi_playlist.h"
+#include "ardour/smf_source.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/silentfilesource.h"
+#include "ardour/sndfilesource.h"
+#include "ardour/midi_source.h"
+#include "ardour/sndfile_helpers.h"
+#include "ardour/auditioner.h"
+#include "ardour/io_processor.h"
+#include "ardour/send.h"
+#include "ardour/processor.h"
+#include "ardour/user_bundle.h"
+#include "ardour/slave.h"
+#include "ardour/tempo.h"
+#include "ardour/audio_track.h"
+#include "ardour/midi_track.h"
+#include "ardour/midi_patch_manager.h"
+#include "ardour/cycle_timer.h"
+#include "ardour/utils.h"
+#include "ardour/named_selection.h"
+#include "ardour/version.h"
+#include "ardour/location.h"
+#include "ardour/audioregion.h"
+#include "ardour/midi_region.h"
+#include "ardour/crossfade.h"
+#include "ardour/control_protocol_manager.h"
+#include "ardour/region_factory.h"
+#include "ardour/source_factory.h"
+#include "ardour/playlist_factory.h"
+#include "ardour/filename_extensions.h"
+#include "ardour/directory_names.h"
+#include "ardour/template_utils.h"
+#include "ardour/ticker.h"
+#include "ardour/route_group.h"
+
+#include "control_protocol/control_protocol.h"
#include "i18n.h"
#include <locale.h>
_name = _current_snapshot_name = snapshot_name;
+ set_history_depth (Config->get_history_depth());
+
_current_frame_rate = _engine.frame_rate ();
+ _nominal_frame_rate = _current_frame_rate;
+ _base_frame_rate = _current_frame_rate;
+
_tempo_map = new TempoMap (_current_frame_rate);
_tempo_map->StateChanged.connect (mem_fun (*this, &Session::tempo_map_changed));
+
+ _non_soloed_outs_muted = false;
+ _listen_cnt = 0;
g_atomic_int_set (&processing_prohibited, 0);
- insert_cnt = 0;
_transport_speed = 0;
_last_transport_speed = 0;
+ _target_transport_speed = 0;
auto_play_legal = false;
transport_sub_state = 0;
_transport_frame = 0;
- last_stop_frame = 0;
end_location = new Location (0, 0, _("end"), Location::Flags ((Location::IsMark|Location::IsEnd)));
start_location = new Location (0, 0, _("start"), Location::Flags ((Location::IsMark|Location::IsStart)));
- _end_location_is_free = true;
g_atomic_int_set (&_record_status, Disabled);
loop_changing = false;
play_loop = false;
+ have_looped = false;
_last_roll_location = 0;
_last_record_location = 0;
pending_locate_frame = 0;
pending_locate_roll = false;
pending_locate_flush = false;
- dstream_buffer_size = 0;
- state_tree = 0;
+ audio_dstream_buffer_size = 0;
+ midi_dstream_buffer_size = 0;
state_was_pending = false;
set_next_event ();
outbound_mtc_smpte_frame = 0;
next_quarter_frame_to_send = -1;
current_block_size = 0;
solo_update_disabled = false;
- currently_soloing = false;
_have_captured = false;
_worst_output_latency = 0;
_worst_input_latency = 0;
_worst_track_latency = 0;
- _state_of_the_state = StateOfTheState(CannotSave|InitialConnecting|Loading|Deletion);
+ _state_of_the_state = StateOfTheState(CannotSave|InitialConnecting|Loading);
+
_slave = 0;
- butler_mixdown_buffer = 0;
- butler_gain_buffer = 0;
- mmc = 0;
session_send_mmc = false;
session_send_mtc = false;
post_transport_work = PostTransportWork (0);
g_atomic_int_set (&butler_should_do_transport_work, 0);
- g_atomic_int_set (&butler_active, 0);
g_atomic_int_set (&_playback_load, 100);
g_atomic_int_set (&_capture_load, 100);
g_atomic_int_set (&_playback_load_min, 100);
g_atomic_int_set (&_capture_load_min, 100);
_play_range = false;
- waiting_to_start = false;
_exporting = false;
+ _exporting_realtime = false;
_gain_automation_buffer = 0;
_pan_automation_buffer = 0;
_npan_buffers = 0;
pending_abort = false;
destructive_index = 0;
- current_trans = 0;
first_file_data_format_reset = true;
first_file_header_format_reset = true;
butler_thread = (pthread_t) 0;
/* default short fade = 15ms */
- Crossfade::set_short_xfade_length ((nframes_t) floor (Config->get_short_xfade_seconds() * frame_rate()));
- SndFileSource::setup_standard_crossfades (frame_rate());
+ Crossfade::set_short_xfade_length ((nframes_t) floor (config.get_short_xfade_seconds() * frame_rate()));
+ SndFileSource::setup_standard_crossfades (*this, frame_rate());
last_mmc_step.tv_sec = 0;
last_mmc_step.tv_usec = 0;
waveforms for clicks.
*/
- click_data = 0;
- click_emphasis_data = 0;
click_length = 0;
click_emphasis_length = 0;
_clicking = false;
process_function = &Session::process_with_events;
- if (Config->get_use_video_sync()) {
+ if (config.get_use_video_sync()) {
waiting_for_sync_offset = true;
} else {
waiting_for_sync_offset = false;
}
- _current_frame_rate = 48000;
- _base_frame_rate = 48000;
-
last_smpte_when = 0;
_smpte_offset = 0;
_smpte_offset_negative = true;
/* slave stuff */
- average_slave_delta = 1800;
+ average_slave_delta = 1800; // !!! why 1800 ????
have_first_delta_accumulator = false;
delta_accumulator_cnt = 0;
slave_state = Stopped;
Controllable::Destroyed.connect (mem_fun (*this, &Session::remove_controllable));
- IO::MoreChannels.connect (mem_fun (*this, &Session::ensure_buffers));
+ IO::PortCountChanged.connect (mem_fun (*this, &Session::ensure_buffers));
/* stop IO objects from doing stuff until we're ready for them */
- IO::disable_panners ();
- IO::disable_ports ();
+ Delivery::disable_panners ();
IO::disable_connecting ();
}
return -1;
}
- /*if (start_midi_thread ()) {
+ if (start_midi_thread ()) {
return -1;
- }*/
+ }
// set_state() will call setup_raid_path(), but if it's a new session we need
// to call setup_raid_path() here.
+
if (state_tree) {
if (set_state (*state_tree->root())) {
return -1;
_state_of_the_state = StateOfTheState (_state_of_the_state|CannotSave|Loading);
- // set_auto_input (true);
+
_locations.changed.connect (mem_fun (this, &Session::locations_changed));
_locations.added.connect (mem_fun (this, &Session::locations_added));
setup_click_sounds (0);
/* handle this one in a different way than all others, so that its clear what happened */
catch (AudioEngine::PortRegistrationFailure& err) {
- error << _("Unable to create all required ports")
- << endmsg;
+ error << err.what() << endmsg;
return -1;
}
return -1;
}
- //send_full_time_code ();
+ BootMessage (_("Reset Remote Controls"));
+
+ send_full_time_code (0);
_engine.transport_locate (0);
deliver_mmc (MIDI::MachineControl::cmdMmcReset, 0);
deliver_mmc (MIDI::MachineControl::cmdLocate, 0);
+
+ MidiClockTicker::instance().set_session(*this);
+ MIDI::Name::MidiPatchManager::instance().set_session(*this);
+
+ /* initial program change will be delivered later; see ::config_changed() */
+
+ BootMessage (_("Reset Control Protocols"));
ControlProtocolManager::instance().set_session (*this);
- if (new_session) {
- _end_location_is_free = true;
- } else {
- _end_location_is_free = false;
+ config.set_end_marker_is_free (new_session);
+
+ _state_of_the_state = Clean;
+
+ DirtyChanged (); /* EMIT SIGNAL */
+
+ if (state_was_pending) {
+ save_state (_current_snapshot_name);
+ remove_pending_capture_state ();
+ state_was_pending = false;
}
+ BootMessage (_("Session loading complete"));
+
return 0;
}
SearchPath sound_search_path;
SearchPath midi_search_path;
- for (
- SearchPath::const_iterator i = search_path.begin();
- i != search_path.end();
- ++i
- )
- {
+ for (SearchPath::const_iterator i = search_path.begin(); i != search_path.end(); ++i) {
sp.path = (*i).to_string ();
sp.blocks = 0; // not needed
session_dirs.push_back (sp);
midi_search_path += sdir.midi_path ();
}
- // set the AudioFileSource and SMFSource search path
-
- AudioFileSource::set_search_path (sound_search_path.to_string ());
- SMFSource::set_search_path (midi_search_path.to_string ());
+ // set the search path for each data type
+ FileSource::set_search_path (DataType::AUDIO, sound_search_path.to_string ());
+ SMFSource::set_search_path (DataType::MIDI, midi_search_path.to_string ());
// reset the round-robin soundfile path thingie
-
last_rr_session_dir = session_dirs.begin();
}
-void
-Session::initialize_start_and_end_locations (nframes_t start, nframes_t end)
+int
+Session::ensure_subdirs ()
{
- start_location->set_end (start);
- _locations.add (start_location);
+ string dir;
- end_location->set_end (end);
- _locations.add (end_location);
-}
+ dir = session_directory().peak_path().to_string();
-bool
-Session::create_session_file ()
-{
- _state_of_the_state = Clean;
+ if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) {
+ error << string_compose(_("Session: cannot create session peakfile folder \"%1\" (%2)"), dir, strerror (errno)) << endmsg;
+ return -1;
+ }
+
+ dir = session_directory().sound_path().to_string();
+
+ if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) {
+ error << string_compose(_("Session: cannot create session sounds dir \"%1\" (%2)"), dir, strerror (errno)) << endmsg;
+ return -1;
+ }
+
+ dir = session_directory().midi_path().to_string();
- if (save_state (_current_snapshot_name)) {
- error << "Could not create new session file" << endmsg;
- return false;
+ if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) {
+ error << string_compose(_("Session: cannot create session midi dir \"%1\" (%2)"), dir, strerror (errno)) << endmsg;
+ return -1;
}
- return true;
+
+ dir = session_directory().dead_sound_path().to_string();
+
+ if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) {
+ error << string_compose(_("Session: cannot create session dead sounds folder \"%1\" (%2)"), dir, strerror (errno)) << endmsg;
+ return -1;
+ }
+
+ dir = session_directory().export_path().to_string();
+
+ if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) {
+ error << string_compose(_("Session: cannot create session export folder \"%1\" (%2)"), dir, strerror (errno)) << endmsg;
+ return -1;
+ }
+
+ dir = analysis_dir ();
+
+ if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) {
+ error << string_compose(_("Session: cannot create session analysis folder \"%1\" (%2)"), dir, strerror (errno)) << endmsg;
+ return -1;
+ }
+
+ return 0;
}
-bool
-Session::create_session_file_from_template (const string& template_path)
+int
+Session::create (bool& new_session, const string& mix_template, nframes_t initial_length)
{
- sys::path session_file_path(_session_dir->root_path());
- session_file_path /= _name + statefile_suffix;
+ if (g_mkdir_with_parents (_path.c_str(), 0755) < 0) {
+ error << string_compose(_("Session: cannot create session folder \"%1\" (%2)"), _path, strerror (errno)) << endmsg;
+ return -1;
+ }
+
+ if (ensure_subdirs ()) {
+ return -1;
+ }
+
+ /* check new_session so we don't overwrite an existing one */
+
+ if (!mix_template.empty()) {
+ std::string in_path = mix_template;
+
+ ifstream in(in_path.c_str());
+
+ if (in){
+ string out_path = _path;
+ out_path += _name;
+ out_path += statefile_suffix;
+
+ ofstream out(out_path.c_str());
+
+ if (out){
+ out << in.rdbuf();
+
+ // okay, session is set up. Treat like normal saved
+ // session from now on.
+
+ new_session = false;
+ return 0;
+
+ } else {
+ error << string_compose (_("Could not open %1 for writing mix template"), out_path)
+ << endmsg;
+ return -1;
+ }
+
+ } else {
+ error << string_compose (_("Could not open mix template %1 for reading"), in_path)
+ << endmsg;
+ return -1;
+ }
- if(!copy_file (template_path, session_file_path.to_string())) {
- error << string_compose (_("Could not use session template %1 to create new session."), template_path)
- << endmsg;
- return false;
}
- return true;
+
+ /* Instantiate metadata */
+
+ _metadata = new SessionMetadata ();
+
+ /* set initial start + end point */
+
+ start_location->set_end (0);
+ _locations.add (start_location);
+
+ end_location->set_end (initial_length);
+ _locations.add (end_location);
+
+ _state_of_the_state = Clean;
+
+ save_state ("");
+
+ return 0;
}
+
int
Session::load_diskstreams (const XMLNode& node)
{
void
Session::remove_pending_capture_state ()
{
- sys::path xml_path(_session_dir->root_path());
-
- xml_path /= _current_snapshot_name + pending_suffix;
+ sys::path pending_state_file_path(_session_dir->root_path());
+
+ pending_state_file_path /= legalize_for_path (_current_snapshot_name) + pending_suffix;
- unlink (xml_path.to_string().c_str());
+ try
+ {
+ sys::remove (pending_state_file_path);
+ }
+ catch(sys::filesystem_error& ex)
+ {
+ error << string_compose(_("Could remove pending capture state at path \"%1\" (%2)"),
+ pending_state_file_path.to_string(), ex.what()) << endmsg;
+ }
}
/** Rename a state file.
/* refuse to rename the current snapshot or the "main" one */
return;
}
-
- const string old_xml_path = _path + old_name + statefile_suffix;
- const string new_xml_path = _path + new_name + statefile_suffix;
- if (rename (old_xml_path.c_str(), new_xml_path.c_str()) != 0) {
- error << string_compose(_("could not rename snapshot %1 to %2"), old_name, new_name) << endmsg;
+ const string old_xml_filename = legalize_for_path (old_name) + statefile_suffix;
+ const string new_xml_filename = legalize_for_path (new_name) + statefile_suffix;
+
+ const sys::path old_xml_path = _session_dir->root_path() / old_xml_filename;
+ const sys::path new_xml_path = _session_dir->root_path() / new_xml_filename;
+
+ try
+ {
+ sys::rename (old_xml_path, new_xml_path);
+ }
+ catch (const sys::filesystem_error& err)
+ {
+ error << string_compose(_("could not rename snapshot %1 to %2 (%3)"),
+ old_name, new_name, err.what()) << endmsg;
}
}
Session::remove_state (string snapshot_name)
{
if (snapshot_name == _current_snapshot_name || snapshot_name == _name) {
- /* refuse to remove the current snapshot or the "main" one */
+ // refuse to remove the current snapshot or the "main" one
return;
}
-
- const string xml_path = _path + snapshot_name + statefile_suffix;
- /* make a backup copy of the state file */
- const string bak_path = xml_path + ".bak";
- if (g_file_test (xml_path.c_str(), G_FILE_TEST_EXISTS)) {
- copy_file (xml_path, bak_path);
+ sys::path xml_path(_session_dir->root_path());
+
+ xml_path /= legalize_for_path (snapshot_name) + statefile_suffix;
+
+ if (!create_backup_file (xml_path)) {
+ // don't remove it if a backup can't be made
+ // create_backup_file will log the error.
+ return;
}
- /* and delete it */
- unlink (xml_path.c_str());
+ // and delete it
+ sys::remove (xml_path);
}
int
Session::save_state (string snapshot_name, bool pending)
{
XMLTree tree;
- string xml_path;
- string bak_path;
+ sys::path xml_path(_session_dir->root_path());
if (_state_of_the_state & CannotSave) {
return 1;
if (!pending) {
/* proper save: use statefile_suffix (.ardour in English) */
- xml_path = _path;
- xml_path += snapshot_name;
- xml_path += statefile_suffix;
+
+ xml_path /= legalize_for_path (snapshot_name) + statefile_suffix;
/* make a backup copy of the old file */
- bak_path = xml_path;
- bak_path += ".bak";
-
- if (g_file_test (xml_path.c_str(), G_FILE_TEST_EXISTS)) {
- copy_file (xml_path, bak_path);
+
+ if (sys::exists(xml_path) && !create_backup_file (xml_path)) {
+ // create_backup_file will log the error
+ return -1;
}
} else {
/* pending save: use pending_suffix (.pending in English) */
- xml_path = _path;
- xml_path += snapshot_name;
- xml_path += pending_suffix;
-
+ xml_path /= legalize_for_path (snapshot_name) + pending_suffix;
}
- string tmp_path;
+ sys::path tmp_path(_session_dir->root_path());
- tmp_path = _path;
- tmp_path += snapshot_name;
- tmp_path += ".tmp";
+ tmp_path /= legalize_for_path (snapshot_name) + temp_suffix;
- // cerr << "actually writing state to " << xml_path << endl;
+ // cerr << "actually writing state to " << xml_path.to_string() << endl;
- if (!tree.write (tmp_path)) {
- error << string_compose (_("state could not be saved to %1"), tmp_path) << endmsg;
- unlink (tmp_path.c_str());
+ if (!tree.write (tmp_path.to_string())) {
+ error << string_compose (_("state could not be saved to %1"), tmp_path.to_string()) << endmsg;
+ sys::remove (tmp_path);
return -1;
} else {
- if (rename (tmp_path.c_str(), xml_path.c_str()) != 0) {
- error << string_compose (_("could not rename temporary session file %1 to %2"), tmp_path, xml_path) << endmsg;
- unlink (tmp_path.c_str());
+ if (rename (tmp_path.to_string().c_str(), xml_path.to_string().c_str()) != 0) {
+ error << string_compose (_("could not rename temporary session file %1 to %2"),
+ tmp_path.to_string(), xml_path.to_string()) << endmsg;
+ sys::remove (tmp_path);
return -1;
}
}
bool was_dirty = dirty();
_state_of_the_state = StateOfTheState (_state_of_the_state & ~Dirty);
-
+
if (was_dirty) {
DirtyChanged (); /* EMIT SIGNAL */
}
int
Session::load_state (string snapshot_name)
{
- if (state_tree) {
- delete state_tree;
- state_tree = 0;
- }
+ delete state_tree;
+ state_tree = 0;
state_was_pending = false;
/* check for leftover pending state from a crashed capture attempt */
sys::path xmlpath(_session_dir->root_path());
- xmlpath /= snapshot_name + pending_suffix;
+ xmlpath /= legalize_for_path (snapshot_name) + pending_suffix;
if (sys::exists (xmlpath)) {
if (!state_was_pending) {
xmlpath = _session_dir->root_path();
- xmlpath /= snapshot_name + statefile_suffix;
+ xmlpath /= legalize_for_path (snapshot_name) + statefile_suffix;
}
if (!sys::exists (xmlpath)) {
}
const XMLProperty* prop;
- bool is_old = false;
+ bool is_old = false; // session is _very_ old (pre-2.0)
if ((prop = root.property ("version")) == 0) {
/* no version implies very old version of Ardour */
sys::path backup_path(_session_dir->root_path());
- backup_path /= snapshot_name + "-1" + statefile_suffix;
+ backup_path /= legalize_for_path (snapshot_name) + "-1" + statefile_suffix;
+
+ // only create a backup once
+ if (sys::exists (backup_path)) {
+ return 0;
+ }
info << string_compose (_("Copying old session file %1 to %2\nUse %2 with Ardour versions before 2.0 from now on"),
xmlpath.to_string(), backup_path.to_string())
<< endmsg;
- copy_file (xmlpath.to_string(), backup_path.to_string());
-
- /* if it fails, don't worry. right? */
+ try
+ {
+ sys::copy_file (xmlpath, backup_path);
+ }
+ catch(sys::filesystem_error& ex)
+ {
+ error << string_compose (_("Unable to make backup of state file %1 (%2)"),
+ xmlpath.to_string(), ex.what())
+ << endmsg;
+ return -1;
+ }
}
return 0;
int
Session::load_options (const XMLNode& node)
{
- XMLNode* child;
- XMLProperty* prop;
LocaleGuard lg (X_("POSIX"));
- Config->set_variables (node, ConfigVariableBase::Session);
+ config.set_variables (node);
- if ((child = find_named_node (node, "end-marker-is-free")) != 0) {
- if ((prop = child->property ("val")) != 0) {
- _end_location_is_free = (prop->value() == "yes");
- }
- }
-
- return 0;
-}
-
-bool
-Session::save_config_options_predicate (ConfigVariableBase::Owner owner) const
-{
- const ConfigVariableBase::Owner modified_by_session_or_user = (ConfigVariableBase::Owner)
- (ConfigVariableBase::Session|ConfigVariableBase::Interface);
-
- return owner & modified_by_session_or_user;
-}
-
-XMLNode&
-Session::get_options () const
-{
- XMLNode* child;
- LocaleGuard lg (X_("POSIX"));
-
- XMLNode& option_root = Config->get_variables (mem_fun (*this, &Session::save_config_options_predicate));
+ /* now reset MIDI ports because the session can have its own
+ MIDI configuration.
+ */
- child = option_root.add_child ("end-marker-is-free");
- child->add_property ("val", _end_location_is_free ? "yes" : "no");
+ setup_midi ();
- return option_root;
+ return 0;
}
XMLNode&
// store libardour version, just in case
char buf[16];
- snprintf(buf, sizeof(buf)-1, "%d.%d.%d",
- libardour_major_version, libardour_minor_version, libardour_micro_version);
+ snprintf(buf, sizeof(buf), "%d.%d.%d", libardour3_major_version, libardour3_minor_version, libardour3_micro_version);
node->add_property("version", string(buf));
/* store configuration settings */
if (full_state) {
- /* store the name */
node->add_property ("name", _name);
+ snprintf (buf, sizeof (buf), "%" PRId32, _nominal_frame_rate);
+ node->add_property ("sample-rate", buf);
if (session_dirs.size() > 1) {
/* various options */
- node->add_child_nocopy (get_options());
+ node->add_child_nocopy (config.get_variables ());
+
+ node->add_child_nocopy (_metadata->get_state());
child = node->add_child ("Sources");
for (SourceMap::iterator siter = sources.begin(); siter != sources.end(); ++siter) {
- /* Don't save information about AudioFileSources that are empty */
+ /* Don't save information about non-destructive file sources that are empty */
+ /* FIXME: MIDI breaks if this is made FileSource like it should be... */
boost::shared_ptr<AudioFileSource> fs;
-
if ((fs = boost::dynamic_pointer_cast<AudioFileSource> (siter->second)) != 0) {
-
- /* Don't save sources that are empty, unless they're destructive (which are OK
- if they are empty, because we will re-use them every time.)
- */
-
if (!fs->destructive()) {
- if (fs->length() == 0) {
+ if (fs->length(fs->timeline_position()) == 0) {
continue;
}
}
node->add_child_nocopy (loc.get_state());
}
- child = node->add_child ("Connections");
+ child = node->add_child ("Bundles");
{
- Glib::Mutex::Lock lm (bundle_lock);
- for (BundleList::iterator i = _bundles.begin(); i != _bundles.end(); ++i) {
- if (!(*i)->dynamic()) {
- child->add_child_nocopy ((*i)->get_state());
+ boost::shared_ptr<BundleList> bundles = _bundles.reader ();
+ for (BundleList::iterator i = bundles->begin(); i != bundles->end(); ++i) {
+ boost::shared_ptr<UserBundle> b = boost::dynamic_pointer_cast<UserBundle> (*i);
+ if (b) {
+ child->add_child_nocopy (b->get_state());
}
}
}
}
- child = node->add_child ("EditGroups");
- for (list<RouteGroup *>::iterator i = edit_groups.begin(); i != edit_groups.end(); ++i) {
- child->add_child_nocopy ((*i)->get_state());
- }
-
- child = node->add_child ("MixGroups");
- for (list<RouteGroup *>::iterator i = mix_groups.begin(); i != mix_groups.end(); ++i) {
+ child = node->add_child ("RouteGroups");
+ for (list<RouteGroup *>::iterator i = _route_groups.begin(); i != _route_groups.end(); ++i) {
child->add_child_nocopy ((*i)->get_state());
}
_name = prop->value ();
}
- setup_raid_path(_path);
+ if ((prop = node.property (X_("sample-rate"))) != 0) {
+
+ _nominal_frame_rate = atoi (prop->value());
+
+ if (_nominal_frame_rate != _current_frame_rate) {
+ if (AskAboutSampleRateMismatch (_nominal_frame_rate, _current_frame_rate)) {
+ return -1;
+ }
+ }
+ }
+
+ setup_raid_path(_session_dir->root_path().to_string());
if ((prop = node.property (X_("id-counter"))) != 0) {
uint64_t x;
}
- IO::disable_ports ();
IO::disable_connecting ();
/* Object loading order:
- MIDI Control
Path
- extra
+ Extra
Options/Config
+ MIDI Control // relies on data from Options/Config
+ Metadata
Locations
Sources
AudioRegions
AudioDiskstreams
Connections
Routes
- EditGroups
+ RouteGroups
MixGroups
Click
ControlProtocols
*/
- if (use_config_midi_ports ()) {
- }
-
- if ((child = find_named_node (node, "extra")) != 0) {
+ if ((child = find_named_node (node, "Extra")) != 0) {
_extra_xml = new XMLNode (*child);
}
error << _("Session: XML state has no options section") << endmsg;
}
+ if (use_config_midi_ports ()) {
+ }
+
+ if ((child = find_named_node (node, "Metadata")) == 0) {
+ warning << _("Session: XML state has no metadata section (2.0 session?)") << endmsg;
+ } else if (_metadata->set_state (*child)) {
+ goto out;
+ }
+
if ((child = find_named_node (node, "Locations")) == 0) {
error << _("Session: XML state has no locations section") << endmsg;
goto out;
goto out;
}
- if ((child = find_named_node (node, "Connections")) == 0) {
- error << _("Session: XML state has no connections section") << endmsg;
- goto out;
- } else if (load_bundles (*child)) {
- goto out;
- }
-
- if ((child = find_named_node (node, "EditGroups")) == 0) {
- error << _("Session: XML state has no edit groups section") << endmsg;
- goto out;
- } else if (load_edit_groups (*child)) {
- goto out;
+ if ((child = find_named_node (node, "Bundles")) == 0) {
+ warning << _("Session: XML state has no bundles section (2.0 session?)") << endmsg;
+ //goto out;
+ } else {
+ /* We can't load Bundles yet as they need to be able
+ to convert from port names to Port objects, which can't happen until
+ later */
+ _bundle_xml_node = new XMLNode (*child);
}
-
- if ((child = find_named_node (node, "MixGroups")) == 0) {
- error << _("Session: XML state has no mix groups section") << endmsg;
+
+ if ((child = find_named_node (node, "RouteGroups")) == 0) {
+ error << _("Session: XML state has no route groups section") << endmsg;
goto out;
- } else if (load_mix_groups (*child)) {
+ } else if (load_route_groups (*child)) {
goto out;
}
} else if (_click_io) {
_click_io->set_state (*child);
}
-
+
if ((child = find_named_node (node, "ControlProtocols")) != 0) {
ControlProtocolManager::instance().set_protocol_states (*child);
}
StateReady (); /* EMIT SIGNAL */
- _state_of_the_state = Clean;
-
- if (state_was_pending) {
- save_state (_current_snapshot_name);
- remove_pending_capture_state ();
- state_was_pending = false;
- }
-
return 0;
out:
boost::shared_ptr<Route> route (XMLRouteFactory (**niter));
if (route == 0) {
- error << _("Session: cannot create Route from XML description.") << endmsg;
+ error << _("Session: cannot create Route from XML description.") << endmsg;
return -1;
}
+ BootMessage (string_compose (_("Loaded track/bus %1"), route->name()));
+
new_routes.push_back (route);
}
- add_routes (new_routes);
+ add_routes (new_routes, false);
return 0;
}
DataType type = DataType::AUDIO;
const XMLProperty* prop = node.property("default-type");
- if (prop)
+
+ if (prop) {
type = DataType(prop->value());
+ }
assert(type != DataType::NIL);
for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
if ((region = XMLRegionFactory (**niter, false)) == 0) {
- error << _("Session: cannot create Region from XML description.") << endmsg;
+ error << _("Session: cannot create Region from XML description.");
+ const XMLProperty *name = (**niter).property("name");
+
+ if (name) {
+ error << " " << string_compose (_("Can not load state for region '%1'"), name->value());
+ }
+
+ error << endmsg;
}
}
boost::shared_ptr<Source> source;
boost::shared_ptr<AudioSource> as;
SourceList sources;
+ SourceList master_sources;
uint32_t nchans = 1;
char buf[128];
sources.push_back (as);
}
}
-
+
+ for (uint32_t n = 0; n < nchans; ++n) {
+ snprintf (buf, sizeof(buf), X_("master-source-%d"), n);
+ if ((prop = node.property (buf)) != 0) {
+
+ PBD::ID id2 (prop->value());
+
+ if ((source = source_by_id (id2)) == 0) {
+ error << string_compose(_("Session: XMLNode describing a AudioRegion references an unknown source id =%1"), id2) << endmsg;
+ return boost::shared_ptr<AudioRegion>();
+ }
+
+ as = boost::dynamic_pointer_cast<AudioSource>(source);
+ if (!as) {
+ error << string_compose(_("Session: XMLNode describing a AudioRegion references a non-audio source id =%1"), id2) << endmsg;
+ return boost::shared_ptr<AudioRegion>();
+ }
+ master_sources.push_back (as);
+ }
+ }
+
try {
boost::shared_ptr<AudioRegion> region (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (sources, node)));
}
}
+ if (!master_sources.empty()) {
+ if (master_sources.size() != nchans) {
+ error << _("Session: XMLNode describing an AudioRegion is missing some master sources; ignored") << endmsg;
+ } else {
+ region->set_master_sources (master_sources);
+ }
+ }
+
return region;
}
char buf[PATH_MAX+1];
uint32_t n;
SessionDirectory sdir(get_best_session_directory_for_new_source());
- string sound_dir = ((type == DataType::AUDIO)
- ? sdir.sound_path().to_string()
- : sdir.midi_path().to_string());
+ sys::path source_dir = ((type == DataType::AUDIO)
+ ? sdir.sound_path() : sdir.midi_path());
string ext = ((type == DataType::AUDIO) ? ".wav" : ".mid");
for (n = 0; n < 999999; ++n) {
if (identifier.length()) {
- snprintf (buf, sizeof(buf), "%s/%s%s%" PRIu32 "%s", sound_dir.c_str(), name.c_str(),
+ snprintf (buf, sizeof(buf), "%s%s%" PRIu32 "%s", name.c_str(),
identifier.c_str(), n, ext.c_str());
} else {
- snprintf (buf, sizeof(buf), "%s/%s-%" PRIu32 "%s", sound_dir.c_str(), name.c_str(),
+ snprintf (buf, sizeof(buf), "%s-%" PRIu32 "%s", name.c_str(),
n, ext.c_str());
}
- if (!Glib::file_test (buf, Glib::FILE_TEST_EXISTS)) {
- return buf;
+ sys::path source_path = source_dir / buf;
+
+ if (!sys::exists (source_path)) {
+ return source_path.to_string();
}
}
set_dirty();
for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-
try {
if ((source = XMLSourceFactory (**niter)) == 0) {
error << _("Session: cannot create Source from XML description.") << endmsg;
}
- }
-
- catch (non_existent_source& err) {
+ } catch (MissingSource& err) {
warning << _("A sound file is missing. It will be replaced by silence.") << endmsg;
source = SourceFactory::createSilent (*this, **niter, max_frames, _current_frame_rate);
}
}
try {
- return SourceFactory::create (*this, node);
+ /* note: do peak building in another thread when loading session state */
+ return SourceFactory::create (*this, node, true);
}
catch (failed_constructor& err) {
Session::save_template (string template_name)
{
XMLTree tree;
- string xml_path, bak_path, template_path;
if (_state_of_the_state & CannotSave) {
return -1;
return 0;
}
+int
+Session::rename_template (string old_name, string new_name)
+{
+ sys::path old_path (user_template_directory());
+ old_path /= old_name + template_suffix;
+
+ sys::path new_path(user_template_directory());
+ new_path /= new_name + template_suffix;
+
+ if (sys::exists (new_path)) {
+ warning << string_compose(_("Template \"%1\" already exists - template not renamed"),
+ new_path.to_string()) << endmsg;
+ return -1;
+ }
+
+ try {
+ sys::rename (old_path, new_path);
+ return 0;
+ } catch (...) {
+ return -1;
+ }
+}
+
+int
+Session::delete_template (string name)
+{
+ sys::path path = user_template_directory();
+ path /= name + template_suffix;
+
+ try {
+ sys::remove (path);
+ return 0;
+ } catch (...) {
+ return -1;
+ }
+}
+
void
Session::refresh_disk_space ()
{
string
Session::automation_dir () const
{
- string res = _path;
- res += "automation/";
- return res;
+ return Glib::build_filename (_path, "automation");
+}
+
+string
+Session::analysis_dir () const
+{
+ return Glib::build_filename (_path, "analysis");
}
int
-Session::load_bundles (const XMLNode& node)
+Session::load_bundles (XMLNode const & node)
{
- XMLNodeList nlist = node.children();
- XMLNodeConstIterator niter;
+ XMLNodeList nlist = node.children();
+ XMLNodeConstIterator niter;
- set_dirty();
+ set_dirty();
- for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
- if ((*niter)->name() == "InputConnection") {
- add_bundle (new ARDOUR::InputBundle (**niter));
- } else if ((*niter)->name() == "OutputConnection") {
- add_bundle (new ARDOUR::OutputBundle (**niter));
- } else {
- error << string_compose(_("Unknown node \"%1\" found in Connections list from state file"), (*niter)->name()) << endmsg;
- return -1;
- }
- }
+ for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
+ if ((*niter)->name() == "InputBundle") {
+ add_bundle (boost::shared_ptr<UserBundle> (new UserBundle (**niter, true)));
+ } else if ((*niter)->name() == "OutputBundle") {
+ add_bundle (boost::shared_ptr<UserBundle> (new UserBundle (**niter, false)));
+ } else {
+ error << string_compose(_("Unknown node \"%1\" found in Bundles list from state file"), (*niter)->name()) << endmsg;
+ return -1;
+ }
+ }
return 0;
}
int
-Session::load_edit_groups (const XMLNode& node)
-{
- return load_route_groups (node, true);
-}
-
-int
-Session::load_mix_groups (const XMLNode& node)
-{
- return load_route_groups (node, false);
-}
-
-int
-Session::load_route_groups (const XMLNode& node, bool edit)
+Session::load_route_groups (const XMLNode& node)
{
XMLNodeList nlist = node.children();
XMLNodeConstIterator niter;
- RouteGroup* rg;
- set_dirty();
+ set_dirty ();
for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
if ((*niter)->name() == "RouteGroup") {
- if (edit) {
- rg = add_edit_group ("");
- rg->set_state (**niter);
- } else {
- rg = add_mix_group ("");
- rg->set_state (**niter);
- }
+ RouteGroup* rg = new RouteGroup (*this, "");
+ add_route_group (rg);
+ rg->set_state (**niter);
}
}
return 0;
}
+void
+Session::auto_save()
+{
+ save_state (_current_snapshot_name);
+}
+
static bool
state_file_filter (const string &str, void *arg)
{
}
void
-Session::auto_save()
+Session::add_route_group (RouteGroup* g)
{
- save_state (_current_snapshot_name);
-}
-
-RouteGroup *
-Session::add_edit_group (string name)
-{
- RouteGroup* rg = new RouteGroup (*this, name);
- edit_groups.push_back (rg);
- edit_group_added (rg); /* EMIT SIGNAL */
- set_dirty();
- return rg;
-}
-
-RouteGroup *
-Session::add_mix_group (string name)
-{
- RouteGroup* rg = new RouteGroup (*this, name, RouteGroup::Relative);
- mix_groups.push_back (rg);
- mix_group_added (rg); /* EMIT SIGNAL */
- set_dirty();
- return rg;
-}
-
-void
-Session::remove_edit_group (RouteGroup& rg)
-{
- list<RouteGroup*>::iterator i;
-
- if ((i = find (edit_groups.begin(), edit_groups.end(), &rg)) != edit_groups.end()) {
- (*i)->apply (&Route::drop_edit_group, this);
- edit_groups.erase (i);
- edit_group_removed (); /* EMIT SIGNAL */
- }
-
- delete &rg;
+ _route_groups.push_back (g);
+ route_group_added (g); /* EMIT SIGNAL */
+ set_dirty ();
}
void
-Session::remove_mix_group (RouteGroup& rg)
+Session::remove_route_group (RouteGroup& rg)
{
list<RouteGroup*>::iterator i;
- if ((i = find (mix_groups.begin(), mix_groups.end(), &rg)) != mix_groups.end()) {
- (*i)->apply (&Route::drop_mix_group, this);
- mix_groups.erase (i);
- mix_group_removed (); /* EMIT SIGNAL */
+ if ((i = find (_route_groups.begin(), _route_groups.end(), &rg)) != _route_groups.end()) {
+ (*i)->apply (&Route::drop_route_group, this);
+ _route_groups.erase (i);
+ route_group_removed (); /* EMIT SIGNAL */
}
delete &rg;
}
-RouteGroup *
-Session::mix_group_by_name (string name)
-{
- list<RouteGroup *>::iterator i;
-
- for (i = mix_groups.begin(); i != mix_groups.end(); ++i) {
- if ((*i)->name() == name) {
- return* i;
- }
- }
- return 0;
-}
RouteGroup *
-Session::edit_group_by_name (string name)
+Session::route_group_by_name (string name)
{
list<RouteGroup *>::iterator i;
- for (i = edit_groups.begin(); i != edit_groups.end(); ++i) {
+ for (i = _route_groups.begin(); i != _route_groups.end(); ++i) {
if ((*i)->name() == name) {
return* i;
}
}
void
-Session::begin_reversible_command (const string& name)
+Session::begin_reversible_command(const string& name)
{
- current_trans = new UndoTransaction;
- current_trans->set_name (name);
+ UndoTransaction* trans = new UndoTransaction();
+ trans->set_name(name);
+ if (!_current_trans.empty()) {
+ _current_trans.top()->add_command(trans);
+ }
+ _current_trans.push(trans);
}
void
-Session::commit_reversible_command (Command *cmd)
+Session::commit_reversible_command(Command *cmd)
{
+ assert(!_current_trans.empty());
struct timeval now;
if (cmd) {
- current_trans->add_command (cmd);
+ _current_trans.top()->add_command(cmd);
+ }
+
+ if (_current_trans.top()->empty()) {
+ _current_trans.pop();
+ return;
}
- gettimeofday (&now, 0);
- current_trans->set_timestamp (now);
+ gettimeofday(&now, 0);
+ _current_trans.top()->set_timestamp(now);
- _history.add (current_trans);
+ _history.add(_current_trans.top());
+ _current_trans.pop();
}
Session::GlobalRouteBooleanState
set_global_route_boolean (s, &Route::set_record_enable, src);
}
-#if 0
-UndoAction
-Session::global_mute_memento (void* src)
-{
- return sigc::bind (mem_fun (*this, &Session::set_global_mute), get_global_route_boolean (&Route::muted), src);
-}
-
-UndoAction
-Session::global_metering_memento (void* src)
-{
- return sigc::bind (mem_fun (*this, &Session::set_global_route_metering), get_global_route_metering (), src);
-}
-
-UndoAction
-Session::global_solo_memento (void* src)
-{
- return sigc::bind (mem_fun (*this, &Session::set_global_solo), get_global_route_boolean (&Route::soloed), src);
-}
-
-UndoAction
-Session::global_record_enable_memento (void* src)
-{
- return sigc::bind (mem_fun (*this, &Session::set_global_record_enable), get_global_route_boolean (&Route::record_enabled), src);
-}
-#endif
-
static bool
accept_all_non_peak_files (const string& path, void *arg)
{
XMLProperty* prop;
+ if ((prop = (*niter)->property (X_("type"))) == 0) {
+ continue;
+ }
+
+ DataType type (prop->value());
+
if ((prop = (*niter)->property (X_("name"))) == 0) {
continue;
}
/* external file, ignore */
continue;
}
+
+ Glib::ustring found_path;
+ bool is_new;
+ uint16_t chan;
- sys::path source_path = _session_dir->sound_path ();
-
- source_path /= prop->value ();
-
- result.insert (source_path.to_string ());
+ if (FileSource::find (type, prop->value(), true, is_new, chan, found_path)) {
+ result.insert (found_path);
+ }
}
return 0;
}
this_snapshot_path = _path;
- this_snapshot_path += _current_snapshot_name;
+ this_snapshot_path += legalize_for_path (_current_snapshot_name);
this_snapshot_path += statefile_suffix;
for (vector<string*>::iterator i = state_files->begin(); i != state_files->end(); ++i) {
int ret = -1;
_state_of_the_state = (StateOfTheState) (_state_of_the_state | InCleanup);
+
/* step 1: consider deleting all unused playlists */
capture files.
*/
- if (!i->second->used() && i->second->length() > 0) {
+ if (!i->second->used() && i->second->length(i->second->timeline_position()) > 0) {
dead_sources.push_back (i->second);
i->second->GoingAway();
}
*/
for (SourceMap::iterator i = sources.begin(); i != sources.end(); ++i) {
- boost::shared_ptr<AudioFileSource> fs;
+ boost::shared_ptr<FileSource> fs;
- if ((fs = boost::dynamic_pointer_cast<AudioFileSource> (i->second)) != 0) {
+ if ((fs = boost::dynamic_pointer_cast<FileSource> (i->second)) != 0) {
all_sources.insert (fs->path());
}
}
newpath += dead_sound_dir_name;
if (g_mkdir_with_parents (newpath.c_str(), 0755) < 0) {
- error << string_compose(_("Session: cannot create session peakfile dir \"%1\" (%2)"), newpath, strerror (errno)) << endmsg;
+ error << string_compose(_("Session: cannot create session peakfile folder \"%1\" (%2)"), newpath, strerror (errno)) << endmsg;
return -1;
}
out:
_state_of_the_state = (StateOfTheState) (_state_of_the_state & ~InCleanup);
+
return ret;
}
_state_of_the_state = StateOfTheState (_state_of_the_state | Dirty);
+
if (!was_dirty) {
DirtyChanged(); /* EMIT SIGNAL */
}
_state_of_the_state = Clean;
+
if (was_dirty) {
DirtyChanged(); /* EMIT SIGNAL */
}
_state_of_the_state = StateOfTheState (_state_of_the_state | Deletion);
}
+void
+Session::clear_deletion_in_progress ()
+{
+ _state_of_the_state = StateOfTheState (_state_of_the_state & (~Deletion));
+}
+
void
Session::add_controllable (boost::shared_ptr<Controllable> c)
{
}
void
-Session::add_instant_xml (XMLNode& node)
+Session::add_instant_xml (XMLNode& node, bool write_to_config)
{
Stateful::add_instant_xml (node, _path);
- Config->add_instant_xml (node);
+ if (write_to_config) {
+ Config->add_instant_xml (node);
+ }
}
XMLNode*
int
Session::save_history (string snapshot_name)
{
- XMLTree tree;
- string xml_path;
- string bak_path;
-
- tree.set_root (&_history.get_state (Config->get_saved_history_depth()));
-
- if (snapshot_name.empty()) {
- snapshot_name = _current_snapshot_name;
- }
+ XMLTree tree;
+
+ if (snapshot_name.empty()) {
+ snapshot_name = _current_snapshot_name;
+ }
+
+ const string history_filename = legalize_for_path (snapshot_name) + history_suffix;
+ const string backup_filename = history_filename + backup_suffix;
+ const sys::path xml_path = _session_dir->root_path() / history_filename;
+ const sys::path backup_path = _session_dir->root_path() / backup_filename;
- xml_path = _path + snapshot_name + ".history";
+ if (sys::exists (xml_path)) {
+ try
+ {
+ sys::rename (xml_path, backup_path);
+ }
+ catch (const sys::filesystem_error& err)
+ {
+ error << _("could not backup old history file, current history not saved") << endmsg;
+ return -1;
+ }
+ }
- bak_path = xml_path + ".bak";
- if ((access (xml_path.c_str(), F_OK) == 0) &&
- (rename (xml_path.c_str(), bak_path.c_str())))
- {
- error << _("could not backup old history file, current history not saved.") << endmsg;
- return -1;
- }
+ if (!Config->get_save_history() || Config->get_saved_history_depth() < 0) {
+ return 0;
+ }
- if (!tree.write (xml_path))
- {
- error << string_compose (_("history could not be saved to %1"), xml_path) << endmsg;
+ tree.set_root (&_history.get_state (Config->get_saved_history_depth()));
- /* don't leave a corrupt file lying around if it is
- * possible to fix.
- */
+ if (!tree.write (xml_path.to_string()))
+ {
+ error << string_compose (_("history could not be saved to %1"), xml_path.to_string()) << endmsg;
- if (unlink (xml_path.c_str())) {
- error << string_compose (_("could not remove corrupt history file %1"), xml_path) << endmsg;
- } else {
- if (rename (bak_path.c_str(), xml_path.c_str()))
+ try
{
- error << string_compose (_("could not restore history file from backup %1"), bak_path) << endmsg;
+ sys::remove (xml_path);
+ sys::rename (backup_path, xml_path);
+ }
+ catch (const sys::filesystem_error& err)
+ {
+ error << string_compose (_("could not restore history file from backup %1 (%2)"),
+ backup_path.to_string(), err.what()) << endmsg;
}
- }
- return -1;
- }
+ return -1;
+ }
- return 0;
+ return 0;
}
int
Session::restore_history (string snapshot_name)
{
- XMLTree tree;
- string xmlpath;
-
- if (snapshot_name.empty()) {
- snapshot_name = _current_snapshot_name;
- }
+ XMLTree tree;
- /* read xml */
- xmlpath = _path + snapshot_name + ".history";
- cerr << string_compose(_("Loading history from '%1'."), xmlpath) << endmsg;
+ if (snapshot_name.empty()) {
+ snapshot_name = _current_snapshot_name;
+ }
+
+ const string xml_filename = legalize_for_path (snapshot_name) + history_suffix;
+ const sys::path xml_path = _session_dir->root_path() / xml_filename;
+
+ cerr << "Loading history from " << xml_path.to_string() << endmsg;
- if (access (xmlpath.c_str(), F_OK)) {
- info << string_compose (_("%1: no history file \"%2\" for this session."), _name, xmlpath) << endmsg;
- return 1;
- }
+ if (!sys::exists (xml_path)) {
+ info << string_compose (_("%1: no history file \"%2\" for this session."),
+ _name, xml_path.to_string()) << endmsg;
+ return 1;
+ }
- if (!tree.read (xmlpath)) {
- error << string_compose (_("Could not understand session history file \"%1\""), xmlpath) << endmsg;
- return -1;
- }
+ if (!tree.read (xml_path.to_string())) {
+ error << string_compose (_("Could not understand session history file \"%1\""),
+ xml_path.to_string()) << endmsg;
+ return -1;
+ }
- /* replace history */
- _history.clear();
+ // replace history
+ _history.clear();
for (XMLNodeConstIterator it = tree.root()->children().begin(); it != tree.root()->children().end(); it++) {
struct timeval tv;
ut->set_name(t->property("name")->value());
- stringstream ss(t->property("tv_sec")->value());
+ stringstream ss(t->property("tv-sec")->value());
ss >> tv.tv_sec;
- ss.str(t->property("tv_usec")->value());
+ ss.str(t->property("tv-usec")->value());
ss >> tv.tv_usec;
ut->set_timestamp(tv);
for (XMLNodeConstIterator child_it = t->children().begin();
- child_it != t->children().end();
- child_it++)
+ child_it != t->children().end(); child_it++)
{
XMLNode *n = *child_it;
Command *c;
if (n->name() == "MementoCommand" ||
- n->name() == "MementoUndoCommand" ||
- n->name() == "MementoRedoCommand") {
+ n->name() == "MementoUndoCommand" ||
+ n->name() == "MementoRedoCommand") {
if ((c = memento_command_factory(n))) {
ut->add_command(c);
ut->add_command (c);
}
+ } else if (n->name() == "DeltaCommand") {
+ PBD::ID id(n->property("midi-source")->value());
+ boost::shared_ptr<MidiSource> midi_source =
+ boost::dynamic_pointer_cast<MidiSource, Source>(source_by_id(id));
+ if(midi_source) {
+ ut->add_command(new MidiModel::DeltaCommand(midi_source->model(), *n));
+ } else {
+ error << "FIXME: Failed to downcast MidiSource for DeltaCommand" << endmsg;
+ }
} else {
-
error << string_compose(_("Couldn't figure out how to make a Command out of a %1 XMLNode."), n->name()) << endmsg;
}
}
}
void
-Session::config_changed (const char* parameter_name)
+Session::config_changed (std::string p, bool ours)
{
-#define PARAM_IS(x) (!strcmp (parameter_name, (x)))
-
- if (PARAM_IS ("seamless-loop")) {
+ if (ours) {
+ set_dirty ();
+ }
+
+ if (p == "seamless-loop") {
- } else if (PARAM_IS ("rf-speed")) {
+ } else if (p == "rf-speed") {
- } else if (PARAM_IS ("auto-loop")) {
+ } else if (p == "auto-loop") {
+
+ } else if (p == "auto-input") {
- } else if (PARAM_IS ("auto-input")) {
-
if (Config->get_monitoring_model() == HardwareMonitoring && transport_rolling()) {
/* auto-input only makes a difference if we're rolling */
for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
if ((*i)->record_enabled ()) {
- (*i)->monitor_input (!Config->get_auto_input());
+ (*i)->monitor_input (!config.get_auto_input());
}
}
}
- } else if (PARAM_IS ("punch-in")) {
+ } else if (p == "punch-in") {
Location* location;
if ((location = _locations.auto_punch_location()) != 0) {
- if (Config->get_punch_in ()) {
+ if (config.get_punch_in ()) {
replace_event (Event::PunchIn, location->start());
} else {
remove_event (location->start(), Event::PunchIn);
}
}
- } else if (PARAM_IS ("punch-out")) {
+ } else if (p == "punch-out") {
Location* location;
if ((location = _locations.auto_punch_location()) != 0) {
- if (Config->get_punch_out()) {
+ if (config.get_punch_out()) {
replace_event (Event::PunchOut, location->end());
} else {
clear_events (Event::PunchOut);
}
}
- } else if (PARAM_IS ("edit-mode")) {
+ } else if (p == "edit-mode") {
Glib::Mutex::Lock lm (playlist_lock);
(*i)->set_edit_mode (Config->get_edit_mode ());
}
- } else if (PARAM_IS ("use-video-sync")) {
+ } else if (p == "use-video-sync") {
- waiting_for_sync_offset = Config->get_use_video_sync();
+ waiting_for_sync_offset = config.get_use_video_sync();
- } else if (PARAM_IS ("mmc-control")) {
+ } else if (p == "mmc-control") {
//poke_midi_thread ();
- } else if (PARAM_IS ("mmc-device-id") || PARAM_IS ("mmc-receive-id")) {
+ } else if (p == "mmc-device-id" || p == "mmc-receive-id") {
if (mmc) {
mmc->set_receive_device_id (Config->get_mmc_receive_device_id());
}
- } else if (PARAM_IS ("mmc-send-id")) {
+ } else if (p == "mmc-send-id") {
if (mmc) {
mmc->set_send_device_id (Config->get_mmc_send_device_id());
}
- } else if (PARAM_IS ("midi-control")) {
+ } else if (p == "midi-control") {
//poke_midi_thread ();
- } else if (PARAM_IS ("raid-path")) {
+ } else if (p == "raid-path") {
- setup_raid_path (Config->get_raid_path());
+ setup_raid_path (config.get_raid_path());
- } else if (PARAM_IS ("smpte-format")) {
+ } else if (p == "smpte-format") {
sync_time_vars ();
- } else if (PARAM_IS ("video-pullup")) {
+ } else if (p == "video-pullup") {
sync_time_vars ();
- } else if (PARAM_IS ("seamless-loop")) {
+ } else if (p == "seamless-loop") {
if (play_loop && transport_rolling()) {
// to reset diskstreams etc
request_play_loop (true);
}
- } else if (PARAM_IS ("rf-speed")) {
+ } else if (p == "rf-speed") {
cumulative_rf_motion = 0;
reset_rf_scale (0);
- } else if (PARAM_IS ("click-sound")) {
+ } else if (p == "click-sound") {
setup_click_sounds (1);
- } else if (PARAM_IS ("click-emphasis-sound")) {
+ } else if (p == "click-emphasis-sound") {
setup_click_sounds (-1);
- } else if (PARAM_IS ("clicking")) {
+ } else if (p == "clicking") {
if (Config->get_clicking()) {
if (_click_io && click_data) { // don't require emphasis data
_clicking = false;
}
- } else if (PARAM_IS ("send-mtc")) {
+ } else if (p == "send-mtc") {
/* only set the internal flag if we have
a port.
session_send_mtc = false;
}
- } else if (PARAM_IS ("send-mmc")) {
+ } else if (p == "send-mmc") {
/* only set the internal flag if we have
a port.
session_send_mmc = false;
}
- } else if (PARAM_IS ("midi-feedback")) {
+ } else if (p == "midi-feedback") {
/* only set the internal flag if we have
a port.
session_midi_feedback = Config->get_midi_feedback();
}
- } else if (PARAM_IS ("jack-time-master")) {
+ } else if (p == "jack-time-master") {
engine().reset_timebase ();
- } else if (PARAM_IS ("native-file-header-format")) {
+ } else if (p == "native-file-header-format") {
if (!first_file_header_format_reset) {
reset_native_file_format ();
first_file_header_format_reset = false;
- } else if (PARAM_IS ("native-file-data-format")) {
+ } else if (p == "native-file-data-format") {
if (!first_file_data_format_reset) {
reset_native_file_format ();
first_file_data_format_reset = false;
- } else if (PARAM_IS ("slave-source")) {
- set_slave_source (Config->get_slave_source());
- } else if (PARAM_IS ("remote-model")) {
+ } else if (p == "slave-source") {
+ set_slave_source (Config->get_slave_source());
+ } else if (p == "remote-model") {
set_remote_control_ids ();
- } else if (PARAM_IS ("denormal-model")) {
+ } else if (p == "denormal-model") {
setup_fpu ();
+ } else if (p == "history-depth") {
+ set_history_depth (Config->get_history_depth());
+ } else if (p == "sync-all-route-ordering") {
+ sync_order_keys ("session");
+ } else if (p == "initial-program-change") {
+
+ if (_mmc_port && Config->get_initial_program_change() >= 0) {
+ MIDI::byte buf[2];
+
+ buf[0] = MIDI::program; // channel zero by default
+ buf[1] = (Config->get_initial_program_change() & 0x7f);
+
+ _mmc_port->midimsg (buf, sizeof (buf), 0);
+ }
+ } else if (p == "initial-program-change") {
+
+ if (_mmc_port && Config->get_initial_program_change() >= 0) {
+ MIDI::byte* buf = new MIDI::byte[2];
+
+ buf[0] = MIDI::program; // channel zero by default
+ buf[1] = (Config->get_initial_program_change() & 0x7f);
+ // deliver_midi (_mmc_port, buf, 2);
+ }
+ } else if (p == "solo-mute-override") {
+ // catch_up_on_solo_mute_override ();
+ } else if (p == "listen-position") {
+ listen_position_changed ();
+ } else if (p == "solo-control-is-listen-control") {
+ solo_control_mode_changed ();
}
+
set_dirty ();
-
-#undef PARAM_IS
+}
+void
+Session::set_history_depth (uint32_t d)
+{
+ _history.set_depth (d);
}