Can't call the wrong function when there's only one of them: remove ARDOUR::Parameter and just use Evoral::Parameter (move Ardour specific functionality to EventTypeMap where it belongs).

Less than pretty in places but easily seddable just in case...


git-svn-id: svn://localhost/ardour2/branches/3.0@3838 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 1 insertions, 17 deletions

diff --git a/libs/evoral/evoral/Parameter.hpp b/libs/evoral/evoral/Parameter.hpp
index 1ff01df197..d21b1ee3b8 100644
--- a/libs/evoral/evoral/Parameter.hpp
+++ b/libs/evoral/evoral/Parameter.hpp
@@ -40,22 +40,10 @@ namespace Evoral {
 class Parameter
 {
 public:
-	Parameter(uint32_t type, uint8_t channel, uint32_t id=0)
+	Parameter(uint32_t type, uint8_t channel=0, uint32_t id=0)
 		: _type(type), _id(id), _channel(channel)
 	{}
     
-	Parameter(const std::string& str) {
-		int channel;
-		if (sscanf(str.c_str(), "%d_c%d_n%d", &_type, &channel, &_id) == 3) {
-			if (channel >= 0 && channel <= 127) {
-				_channel = channel;
-			} else {
-				std::cerr << "WARNING: Channel out of range: " << channel << std::endl;
-			}
-		}
-		std::cerr << "WARNING: Unable to create parameter from string: " << str << std::endl;
-	}
-
 	virtual ~Parameter() {}
     
 	inline uint32_t type()    const { return _type; }
@@ -113,10 +101,6 @@ public:
 	
 	inline operator bool() const { return (_type != 0); }
 	
-	virtual std::string symbol() const {
-		return (boost::format("%1%_c%2%_n%3%") % _type % (int)_channel % _id).str();
-	}
-
 	/** Not used in indentity/comparison */
 	struct Metadata {
 		Metadata(double low=0.0, double high=1.0, double mid=0.0)