summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libs/ardour/ardour/lv2_plugin.h2
-rw-r--r--libs/ardour/audio_track.cc4
-rw-r--r--libs/ardour/audio_track_importer.cc8
-rw-r--r--libs/ardour/configuration.cc2
-rw-r--r--libs/ardour/io.cc2
-rw-r--r--libs/ardour/ladspa_plugin.cc4
-rw-r--r--libs/ardour/lv2_plugin.cc4
-rw-r--r--libs/ardour/midi_model.cc6
-rw-r--r--libs/ardour/midi_track.cc4
-rw-r--r--libs/ardour/panner.cc2
-rw-r--r--libs/ardour/plugin_insert.cc4
-rw-r--r--libs/ardour/processor.cc2
-rw-r--r--libs/ardour/region.cc2
-rw-r--r--libs/ardour/route.cc11
-rw-r--r--libs/ardour/session_state.cc4
15 files changed, 30 insertions, 31 deletions
diff --git a/libs/ardour/ardour/lv2_plugin.h b/libs/ardour/ardour/lv2_plugin.h
index bfc2be3ff1..3ec2def947 100644
--- a/libs/ardour/ardour/lv2_plugin.h
+++ b/libs/ardour/ardour/lv2_plugin.h
@@ -97,7 +97,7 @@ class LV2Plugin : public ARDOUR::Plugin
int connect_and_run (BufferSet& bufs, uint32_t& in, uint32_t& out, nframes_t nframes, nframes_t offset);
std::string describe_parameter (Evoral::Parameter);
- std::string state_node_name() const { return "lv2"; }
+ std::string state_node_name() const { return "LV2"; }
void print_parameter (uint32_t, char*, uint32_t len) const;
bool parameter_is_audio(uint32_t) const;
diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index 9154747152..104815b9dc 100644
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -319,7 +319,7 @@ AudioTrack::state(bool full_state)
/* Alignment: act as a proxy for the diskstream */
- XMLNode* align_node = new XMLNode (X_("alignment"));
+ XMLNode* align_node = new XMLNode (X_("Alignment"));
AlignStyle as = _diskstream->alignment_style ();
align_node->add_property (X_("style"), enum_2_string (as));
root.add_child_nocopy (*align_node);
@@ -402,7 +402,7 @@ AudioTrack::set_state_part_two ()
/* Alignment: act as a proxy for the diskstream */
- if ((fnode = find_named_node (*pending_state, X_("alignment"))) != 0) {
+ if ((fnode = find_named_node (*pending_state, X_("Alignment"))) != 0) {
if ((prop = fnode->property (X_("style"))) != 0) {
diff --git a/libs/ardour/audio_track_importer.cc b/libs/ardour/audio_track_importer.cc
index 32b90e00dc..997acde3cd 100644
--- a/libs/ardour/audio_track_importer.cc
+++ b/libs/ardour/audio_track_importer.cc
@@ -90,18 +90,18 @@ AudioTrackImporter::AudioTrackImporter (XMLTree const & source,
throw failed_constructor();
}
- XMLNodeList const & controllables = node.children ("controllable");
+ XMLNodeList const & controllables = node.children ("Controllable");
for (XMLNodeList::const_iterator it = controllables.begin(); it != controllables.end(); ++it) {
parse_controllable (**it);
}
- XMLNode * remote_control = xml_track.child ("remote_control");
+ XMLNode * remote_control = xml_track.child ("RemoteControl");
if (remote_control && (prop = remote_control->property ("id"))) {
uint32_t control_id = session.ntracks() + session.nbusses() + 1;
prop->set_value (to_string (control_id, std::dec));
}
- xml_track.remove_nodes_and_delete ("extra");
+ xml_track.remove_nodes_and_delete ("Extra");
}
AudioTrackImporter::~AudioTrackImporter ()
@@ -196,7 +196,7 @@ AudioTrackImporter::parse_io ()
return false;
}
- XMLNodeList const & controllables = io->children ("controllable");
+ XMLNodeList const & controllables = io->children ("Controllable");
for (XMLNodeList::const_iterator it = controllables.begin(); it != controllables.end(); ++it) {
parse_controllable (**it);
}
diff --git a/libs/ardour/configuration.cc b/libs/ardour/configuration.cc
index 56dfd99f02..1a78848a34 100644
--- a/libs/ardour/configuration.cc
+++ b/libs/ardour/configuration.cc
@@ -297,7 +297,7 @@ Configuration::set_state (const XMLNode& root)
set_variables (*node, ConfigVariableBase::Config);
- } else if (node->name() == "extra") {
+ } else if (node->name() == "Extra") {
_extra_xml = new XMLNode (*node);
} else if (node->name() == ControlProtocolManager::state_node_name) {
diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc
index 40313fad2e..5e5f630ecb 100644
--- a/libs/ardour/io.cc
+++ b/libs/ardour/io.cc
@@ -1417,7 +1417,7 @@ IO::set_state (const XMLNode& node)
set_automation_state (*(*iter), Evoral::Parameter(GainAutomation));
}
- if ((*iter)->name() == X_("controllable")) {
+ if ((*iter)->name() == X_("Controllable")) {
if ((prop = (*iter)->property("name")) != 0 && prop->value() == "gaincontrol") {
_gain_control->set_state (**iter);
}
diff --git a/libs/ardour/ladspa_plugin.cc b/libs/ardour/ladspa_plugin.cc
index ea8b431481..e7cdcc274d 100644
--- a/libs/ardour/ladspa_plugin.cc
+++ b/libs/ardour/ladspa_plugin.cc
@@ -349,7 +349,7 @@ LadspaPlugin::get_state()
if (LADSPA_IS_PORT_INPUT(port_descriptor (i)) &&
LADSPA_IS_PORT_CONTROL(port_descriptor (i))){
- child = new XMLNode("port");
+ child = new XMLNode("Port");
snprintf(buf, sizeof(buf), "%u", i);
child->add_property("number", string(buf));
snprintf(buf, sizeof(buf), "%+f", _shadow_data[i]);
@@ -384,7 +384,7 @@ LadspaPlugin::set_state(const XMLNode& node)
return -1;
}
- nodes = node.children ("port");
+ nodes = node.children ("Port");
for(iter = nodes.begin(); iter != nodes.end(); ++iter){
diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc
index 03e3ea5bc2..ca24e94299 100644
--- a/libs/ardour/lv2_plugin.cc
+++ b/libs/ardour/lv2_plugin.cc
@@ -259,7 +259,7 @@ LV2Plugin::get_state()
for (uint32_t i = 0; i < parameter_count(); ++i){
if (parameter_is_input(i) && parameter_is_control(i)) {
- child = new XMLNode("port");
+ child = new XMLNode("Port");
snprintf(buf, sizeof(buf), "%u", i);
child->add_property("number", string(buf));
child->add_property("symbol", port_symbol(i));
@@ -345,7 +345,7 @@ LV2Plugin::set_state(const XMLNode& node)
return -1;
}
- nodes = node.children ("port");
+ nodes = node.children ("Port");
for(iter = nodes.begin(); iter != nodes.end(); ++iter){
diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc
index 0b38ad06a8..4e755d8717 100644
--- a/libs/ardour/midi_model.cc
+++ b/libs/ardour/midi_model.cc
@@ -114,7 +114,7 @@ MidiModel::DeltaCommand::operator()()
// Store the current seek position so we can restore the read iterator
// after modifying the contents of the model
- const double read_time = _model->read_time();
+ const TimeType read_time = _model->read_time();
for (NoteList::iterator i = _added_notes.begin(); i != _added_notes.end(); ++i)
_model->add_note_unlocked(*i);
@@ -139,7 +139,7 @@ MidiModel::DeltaCommand::undo()
// Store the current seek position so we can restore the read iterator
// after modifying the contents of the model
- const double read_time = _model->read_time();
+ const TimeType read_time = _model->read_time();
for (NoteList::iterator i = _added_notes.begin(); i != _added_notes.end(); ++i)
_model->remove_note_unlocked(*i);
@@ -181,7 +181,7 @@ MidiModel::DeltaCommand::marshal_note(const boost::shared_ptr< Evoral::Note<Time
return *xml_note;
}
-boost::shared_ptr< Evoral::Note<double> >
+boost::shared_ptr< Evoral::Note<MidiModel::TimeType> >
MidiModel::DeltaCommand::unmarshal_note(XMLNode *xml_note)
{
unsigned int note;
diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index 12bbc1d15e..946ac3440b 100644
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -246,7 +246,7 @@ MidiTrack::state(bool full_state)
/* Alignment: act as a proxy for the diskstream */
- XMLNode* align_node = new XMLNode (X_("alignment"));
+ XMLNode* align_node = new XMLNode (X_("Alignment"));
AlignStyle as = _diskstream->alignment_style ();
align_node->add_property (X_("style"), enum_2_string (as));
root.add_child_nocopy (*align_node);
@@ -329,7 +329,7 @@ MidiTrack::set_state_part_two ()
/* Alignment: act as a proxy for the diskstream */
- if ((fnode = find_named_node (*pending_state, X_("alignment"))) != 0) {
+ if ((fnode = find_named_node (*pending_state, X_("Alignment"))) != 0) {
if ((prop = fnode->property (X_("style"))) != 0) {
diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc
index a7cf405190..b7dfd79068 100644
--- a/libs/ardour/panner.cc
+++ b/libs/ardour/panner.cc
@@ -498,7 +498,7 @@ EqualPowerStereoPanner::set_state (const XMLNode& node)
for (XMLNodeConstIterator iter = node.children().begin(); iter != node.children().end(); ++iter) {
- if ((*iter)->name() == X_("controllable")) {
+ if ((*iter)->name() == X_("Controllable")) {
if ((prop = (*iter)->property("name")) != 0 && prop->value() == "panner") {
_control->set_state (**iter);
}
diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc
index 2256afb782..75930b7806 100644
--- a/libs/ardour/plugin_insert.cc
+++ b/libs/ardour/plugin_insert.cc
@@ -670,7 +670,7 @@ PluginInsert::state (bool full)
{
XMLNode& node = Processor::state (full);
- node.add_property ("type", _plugins[0]->state_node_name());
+ node.add_property("type", _plugins[0]->state_node_name());
node.add_property("unique-id", _plugins[0]->unique_id());
node.add_property("count", string_compose("%1", _plugins.size()));
node.add_child_nocopy (_plugins[0]->get_state());
@@ -791,7 +791,7 @@ PluginInsert::set_state(const XMLNode& node)
const char *port;
uint32_t port_id;
- cnodes = (*niter)->children ("port");
+ cnodes = (*niter)->children ("Port");
for(iter = cnodes.begin(); iter != cnodes.end(); ++iter){
diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc
index 085a27b581..b1725267fb 100644
--- a/libs/ardour/processor.cc
+++ b/libs/ardour/processor.cc
@@ -190,7 +190,7 @@ Processor::set_state (const XMLNode& node)
}
}
- } else if ((*niter)->name() == "extra") {
+ } else if ((*niter)->name() == "Extra") {
_extra_xml = new XMLNode (*(*niter));
} else if ((*niter)->name() == "Redirect") {
if ( !(legacy_active = (*niter)->property("active"))) {
diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
index da3564552a..018e19d60b 100644
--- a/libs/ardour/region.cc
+++ b/libs/ardour/region.cc
@@ -1347,7 +1347,7 @@ Region::set_live_state (const XMLNode& node, Change& what_changed, bool send)
child = (*niter);
- if (child->name () == "extra") {
+ if (child->name () == "Extra") {
_extra_xml = new XMLNode (*child);
break;
}
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 21b7876aca..b0479d4aa5 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -1909,7 +1909,7 @@ Route::state(bool full_state)
node->add_child_nocopy (_solo_control->get_state ());
node->add_child_nocopy (_mute_control->get_state ());
- XMLNode* remote_control_node = new XMLNode (X_("remote_control"));
+ XMLNode* remote_control_node = new XMLNode (X_("RemoteControl"));
snprintf (buf, sizeof (buf), "%d", _remote_control_id);
remote_control_node->add_property (X_("id"), buf);
node->add_child_nocopy (*remote_control_node);
@@ -2270,22 +2270,21 @@ Route::_set_state (const XMLNode& node, bool call_base)
XMLNode *cmt = *(child->children().begin());
_comment = cmt->content();
- } else if (child->name() == X_("extra")) {
+ } else if (child->name() == X_("Extra")) {
_extra_xml = new XMLNode (*child);
- } else if (child->name() == X_("controllable") && (prop = child->property("name")) != 0) {
+ } else if (child->name() == X_("Controllable") && (prop = child->property("name")) != 0) {
if (prop->value() == "solo") {
_solo_control->set_state (*child);
_session.add_controllable (_solo_control);
- }
- else if (prop->value() == "mute") {
+ } else if (prop->value() == "mute") {
_mute_control->set_state (*child);
_session.add_controllable (_mute_control);
}
}
- else if (child->name() == X_("remote_control")) {
+ else if (child->name() == X_("RemoteControl")) {
if ((prop = child->property (X_("id"))) != 0) {
int32_t x;
sscanf (prop->value().c_str(), "%d", &x);
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 4184300e78..ce6878b881 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -1212,7 +1212,7 @@ Session::set_state (const XMLNode& node)
/* Object loading order:
Path
- extra
+ Extra
Options/Config
MIDI Control // relies on data from Options/Config
Metadata
@@ -1228,7 +1228,7 @@ Session::set_state (const XMLNode& node)
ControlProtocols
*/
- if ((child = find_named_node (node, "extra")) != 0) {
+ if ((child = find_named_node (node, "Extra")) != 0) {
_extra_xml = new XMLNode (*child);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-05 00:55:00 +0000