X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fevent_type_map.cc;h=4b21d32e583a34c5dc5a2a3b007b1d84a3cee787;hb=80ec3fb37e0156cf02a25e9b353879819b66057d;hp=dd5b1a9149118b2535a140e211745b7d446e7792;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/libs/ardour/event_type_map.cc b/libs/ardour/event_type_map.cc
index dd5b1a9149..4b21d32e58 100644
--- a/libs/ardour/event_type_map.cc
+++ b/libs/ardour/event_type_map.cc
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2008 Paul Davis
-    Author: Dave Robillard
+    Author: David Robillard
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -118,9 +118,9 @@ EventTypeMap::interpolation_of(const Evoral::Parameter& param)
 		case MIDI_CTL_OMNI_ON:
 		case MIDI_CTL_MONO:
 		case MIDI_CTL_POLY:
-			return Evoral::ControlList::Discrete;
-			break;
-		default: return Evoral::ControlList::Linear; break;
+			return Evoral::ControlList::Discrete; break;
+		default:
+			return Evoral::ControlList::Linear; break;
 		}
 		break;
 	case MidiPgmChangeAutomation:       return Evoral::ControlList::Discrete; break;
@@ -140,15 +140,25 @@ EventTypeMap::new_parameter(uint32_t type, uint8_t channel, uint32_t id) const
 	double min    = 0.0f;
 	double max    = 1.0f;
 	double normal = 0.0f;
+
 	switch((AutomationType)type) {
 	case NullAutomation:
 	case GainAutomation:
 		max = 2.0f;
 		normal = 1.0f;
 		break;
-	case PanAutomation:
-		normal = 0.5f;
-		break;
+	case PanAzimuthAutomation:
+		normal = 0.5f; // there really is no normal but this works for stereo, sort of
+                break;
+	case PanWidthAutomation:
+                min = -1.0;
+                max = 1.0;
+		normal = 0.0f;
+                break;
+        case PanElevationAutomation:
+        case PanFrontBackAutomation:
+        case PanLFEAutomation:
+                break;
 	case PluginAutomation:
 	case SoloAutomation:
 	case MuteAutomation:
@@ -168,7 +178,7 @@ EventTypeMap::new_parameter(uint32_t type, uint8_t channel, uint32_t id) const
 		return p;
 	}
 
-	p.set_range(type, min, max, normal);
+	p.set_range(type, min, max, normal, false);
 	return p;
 }
 
@@ -191,11 +201,16 @@ EventTypeMap::new_parameter(const string& str) const
 		p_type = FadeOutAutomation;
 	} else if (str == "envelope") {
 		p_type = EnvelopeAutomation;
-	} else if (str == "pan") {
-		p_type = PanAutomation;
-	} else if (str.length() > 4 && str.substr(0, 4) == "pan-") {
-		p_type = PanAutomation;
-		p_id = atoi(str.c_str()+4);
+	} else if (str == "pan-azimuth") {
+		p_type = PanAzimuthAutomation;
+	} else if (str == "pan-width") {
+		p_type = PanWidthAutomation;
+	} else if (str == "pan-elevation") {
+		p_type = PanElevationAutomation;
+	} else if (str == "pan-frontback") {
+		p_type = PanFrontBackAutomation;
+	} 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);
@@ -219,7 +234,7 @@ EventTypeMap::new_parameter(const string& str) const
 		assert(channel < 16);
 		p_id = 0;
 		p_channel = channel;
-	} else if (str.length() > 24 && str.substr(0, 24) == "midi-channel-pressure-") {
+	} else if (str.length() > 22 && str.substr(0, 22) == "midi-channel-pressure-") {
 		p_type = MidiChannelPressureAutomation;
 		uint32_t channel = 0;
 		sscanf(str.c_str(), "midi-channel-pressure-%d", &channel);
@@ -229,7 +244,7 @@ EventTypeMap::new_parameter(const string& str) const
 	} else {
 		PBD::warning << "Unknown Parameter '" << str << "'" << endmsg;
 	}
-
+	
 	return new_parameter(p_type, p_channel, p_id);
 }
 
@@ -243,8 +258,16 @@ EventTypeMap::to_symbol(const Evoral::Parameter& param) const
 
 	if (t == GainAutomation) {
 		return "gain";
-	} else if (t == PanAutomation) {
-		return string_compose("pan-%1", param.id());
+	} else if (t == PanAzimuthAutomation) {
+                return "pan-azimuth";
+	} else if (t == PanElevationAutomation) {
+                return "pan-elevation";
+	} else if (t == PanWidthAutomation) {
+                return "pan-width";
+	} else if (t == PanFrontBackAutomation) {
+                return "pan-frontback";
+	} else if (t == PanLFEAutomation) {
+                return "pan-lfe";
 	} else if (t == SoloAutomation) {
 		return "solo";
 	} else if (t == MuteAutomation) {