smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-31 19:07:43 +01:00
Code Issues Projects Releases Wiki Activity

manual fixes for various XML API changes in master, required after rebase on master

Browse source
This commit is contained in:
Paul Davis 2017-05-05 22:53:26 +01:00
parent 17e976b486
commit 69ef95cfcc
3 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/disk_reader.cc
View file

@ -132,7 +132,7 @@ XMLNode&
DiskReader::state (bool full)
{
XMLNode& node (DiskIOProcessor::state (full));
node.add_property(X_("type"), X_("diskreader"));
node.set_property(X_("type"), X_("diskreader"));
return node;
}

12
libs/ardour/disk_writer.cc
View file

@ -403,9 +403,9 @@ XMLNode&
DiskWriter::state (bool full)
{
XMLNode& node (DiskIOProcessor::state (full));
node.add_property(X_("type"), X_("diskwriter"));
node.add_property (X_("capture-alignment"), enum_2_string (_alignment_choice));
node.add_property (X_("record-safe"), (_record_safe ? X_("yes" : "no")));
node.set_property(X_("type"), X_("diskwriter"));
node.set_property (X_("capture-alignment"), enum_2_string (_alignment_choice));
node.set_property (X_("record-safe"), (_record_safe ? X_("yes" : "no")));
return node;
}
@ -418,15 +418,15 @@ DiskWriter::set_state (const XMLNode& node, int version)
return -1;
}
#if 0 // XXX DISK
if ((prop = node.property (X_("capture-alignment"))) != 0) {
if (!node.property (X_("capture-alignment"))) != 0) {
set_align_choice (AlignChoice (string_2_enum (prop->value(), _alignment_choice)), true);
} else {
set_align_choice (Automatic, true);
}
#endif
if ((prop = node.property ("record-safe")) != 0) {
_record_safe = PBD::string_is_affirmative (prop->value()) ? 1 : 0;
if (!node.get_property (X_("record-safe"), _record_safe)) {
_record_safe = false;
}
return 0;

18
libs/ardour/track.cc
View file

@ -78,11 +78,11 @@ Track::init ()
_disk_reader.reset (new DiskReader (_session, name(), dflags));
_disk_reader->set_block_size (_session.get_block_size ());
_disk_reader->set_route (shared_from_this());
_disk_reader->set_route (boost::dynamic_pointer_cast<Route> (shared_from_this()));
_disk_writer.reset (new DiskWriter (_session, name(), dflags));
_disk_writer->set_block_size (_session.get_block_size ());
_disk_writer->set_route (shared_from_this());
_disk_writer->set_route (boost::dynamic_pointer_cast<Route> (shared_from_this()));
use_new_playlist ();
@ -122,11 +122,11 @@ Track::state (bool full)
XMLNode& root (Route::state (full));
if (_playlists[DataType::AUDIO]) {
root.add_property (X_("audio-playlist"), _playlists[DataType::AUDIO]->id().to_s());
root.set_property (X_("audio-playlist"), _playlists[DataType::AUDIO]->id().to_s());
}
if (_playlists[DataType::MIDI]) {
root.add_property (X_("midi-playlist"), _playlists[DataType::MIDI]->id().to_s());
root.set_property (X_("midi-playlist"), _playlists[DataType::MIDI]->id().to_s());
}
root.add_child_nocopy (_monitoring_control->get_state ());
@ -154,12 +154,14 @@ Track::set_state (const XMLNode& node, int version)
}
}
if ((prop = node.property (X_("audio-playlist")))) {
find_and_use_playlist (DataType::AUDIO, PBD::ID (prop->value()));
std::string playlist_id;
if (node.get_property (X_("audio-playlist"), playlist_id)) {
find_and_use_playlist (DataType::AUDIO, PBD::ID (playlist_id));
}
if ((prop = node.property (X_("midi-playlist")))) {
find_and_use_playlist (DataType::MIDI, PBD::ID (prop->value()));
if (node.get_property (X_("midi-playlist"), playlist_id)) {
find_and_use_playlist (DataType::MIDI, PBD::ID (playlist_id));
}
XMLNodeList nlist = node.children();