Optimize automation-event process splitting

[ardour.git] / libs / ardour / event_type_map.cc

diff --git a/libs/ardour/event_type_map.cc b/libs/ardour/event_type_map.cc
index 2b26e169f5b09832757a9fc6603bc54eb218ff45..708a52205f776056115f37e6ab885cd3b838ee75 100644 (file)
--- a/libs/ardour/event_type_map.cc
+++ b/libs/ardour/event_type_map.cc
@@ -24,7 +24,7 @@
 #include "ardour/event_type_map.h"
 #include "ardour/parameter_descriptor.h"
 #include "ardour/parameter_types.h"
-#ifdef LV2_Support
+#ifdef LV2_SUPPORT
 #include "ardour/uri_map.h"
 #endif
 #include "evoral/Parameter.hpp"
@@ -137,6 +137,10 @@ EventTypeMap::from_symbol(const string& str) const
                p_type = TrimAutomation;
        } else if (str == "solo") {
                p_type = SoloAutomation;
+       } else if (str == "solo-iso") {
+               p_type = SoloIsolateAutomation;
+       } else if (str == "solo-safe") {
+               p_type = SoloSafeAutomation;
        } else if (str == "mute") {
                p_type = MuteAutomation;
        } else if (str == "fadein") {
@@ -155,6 +159,16 @@ EventTypeMap::from_symbol(const string& str) const
                p_type = PanFrontBackAutomation;
        } else if (str == "pan-lfe") {
                p_type = PanLFEAutomation;
+       } else if (str == "rec-enable") {
+               p_type = RecEnableAutomation;
+       } else if (str == "rec-safe") {
+               p_type = RecSafeAutomation;
+       } else if (str == "phase") {
+               p_type = PhaseAutomation;
+       } else if (str == "monitor") {
+               p_type = MonitoringAutomation;
+       } else if (str == "pan-lfe") {
+               p_type = PanLFEAutomation;
        } else if (str.length() > 10 && str.substr(0, 10) == "parameter-") {
                p_type = PluginAutomation;
                p_id = atoi(str.c_str()+10);
@@ -241,27 +255,39 @@ EventTypeMap::to_symbol(const Evoral::Parameter& param) const
                return "fadeout";
        } else if (t == EnvelopeAutomation) {
                return "envelope";
+       } else if (t == PhaseAutomation) {
+               return "phase";
+       } else if (t == SoloIsolateAutomation) {
+               return "solo-iso";
+       } else if (t == SoloSafeAutomation) {
+               return "solo-safe";
+       } else if (t == MonitoringAutomation) {
+               return "monitor";
+       } else if (t == RecEnableAutomation) {
+               return "rec-enable";
+       } else if (t == RecSafeAutomation) {
+               return "rec-safe";
        } else if (t == PluginAutomation) {
-               return string_compose("parameter-%1", param.id());
+               return std::string("parameter-") + PBD::to_string(param.id());
 #ifdef LV2_SUPPORT
        } else if (t == PluginPropertyAutomation) {
                const char* uri = _uri_map->id_to_uri(param.id());
                if (uri) {
-                       return string_compose("property-%1", uri);
+                       return std::string("property-") + uri;
                } else {
-                       return string_compose("property-%1", param.id());
+                       return std::string("property-") + PBD::to_string(param.id());
                }
 #endif
        } else if (t == MidiCCAutomation) {
-               return string_compose("midicc-%1-%2", int(param.channel()), param.id());
+               return std::string("midicc-") + PBD::to_string (param.channel()) + "-" + PBD::to_string (param.id());
        } else if (t == MidiPgmChangeAutomation) {
-               return string_compose("midi-pgm-change-%1", int(param.channel()));
+               return std::string("midi-pgm-change-") + PBD::to_string(param.channel());
        } else if (t == MidiPitchBenderAutomation) {
-               return string_compose("midi-pitch-bender-%1", int(param.channel()));
+               return std::string("midi-pitch-bender-") + PBD::to_string(param.channel());
        } else if (t == MidiChannelPressureAutomation) {
-               return string_compose("midi-channel-pressure-%1", int(param.channel()));
+               return std::string("midi-channel-pressure-") + PBD::to_string(param.channel());
        } else if (t == MidiNotePressureAutomation) {
-               return string_compose("midi-note-pressure-%1-%2", int(param.channel()), param.id());
+               return std::string ("midi-note-pressure-") + PBD::to_string (param.channel()) + "-" + PBD::to_string (param.id());
        } else {
                PBD::warning << "Uninitialized Parameter symbol() called." << endmsg;
                return "";