fix merge with master

diff --cc gtk2_ardour/automation_line.cc
index 9fe1e0fa19cf61beee1b2fe81757dd9d37dfe431,993b4779dd8f4e1cfd55ce57bc67eb35cf762513..a4d58cb53120fad787397f5e25f75385636b33e7
--- 1/gtk2_ardour/automation_line.cc
--- 2/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@@ -956,9 -930,9 +949,9 @@@ AutomationLine::reset_callback (const E
  
                model_to_view_coord (tx, ty);
  
 -              if (std::isnan (tx) || std::isnan (ty)) {
 +              if (isnan (tx) || isnan (ty)) {
                        warning << string_compose (_("Ignoring illegal points on AutomationLine \"%1\""),
-                                                  _name) << endmsg;
+                                                  _name) << endmsg;
                        continue;
                }
                

diff --cc gtk2_ardour/automation_line.h
Simple merge

diff --cc libs/ardour/ardour/midi_patch_manager.h
Simple merge

diff --cc libs/midi++2/midi++/midnam_patch.h
index d67543429a61cdef79da4b5ba03231ebc9949748,f3d766d7e3ec1dfac1e39e694dd780889c8a29c7..9b2a611d9e82a76e0231594bba3fa16a01f90a0e
--- 1/libs/midi++2/midi++/midnam_patch.h
--- 2/libs/midi++2/midi++/midnam_patch.h
+++ b/libs/midi++2/midi++/midnam_patch.h
@@@ -263,7 -262,56 +263,56 @@@ private
        Notes       _notes;
  };
  
 -class Value
++class LIBMIDIPP_API Value
+ {
+ public:
+       Value() {}
+       Value(const uint16_t     number,
+             const std::string& name)
+               : _number(number)
+               , _name(name)
+       {}
+ 
+       uint16_t           number() const { return _number; }
+       const std::string& name()   const { return _name; }
+ 
+       void set_number(uint16_t number)       { _number = number; }
+       void set_name(const std::string& name) { _name = name; }
+ 
+       XMLNode& get_state(void);
+       int      set_state(const XMLTree&, const XMLNode&);
+ 
+ private:
+       uint16_t    _number;
+       std::string _name;
+ };
+ 
 -class ValueNameList
++class LIBMIDIPP_API ValueNameList
+ {
+ public:
+       typedef std::map<uint16_t, boost::shared_ptr<Value> > Values;
+ 
+       ValueNameList() {}
+       ValueNameList(const std::string& name) : _name(name) {}
+ 
+       const std::string& name() const { return _name; }
+ 
+       void set_name(const std::string& name) { _name = name; }
+ 
+       boost::shared_ptr<const Value> value(uint16_t num) const;
+       boost::shared_ptr<const Value> max_value_below(uint16_t num) const;
+ 
+       const Values& values() const { return _values; }
+ 
+       XMLNode& get_state(void);
+       int      set_state(const XMLTree&, const XMLNode&);
+ 
+ private:
+       std::string _name;
+       Values      _values;
+ };
+ 
 -class Control
 +class LIBMIDIPP_API Control
  {
  public:
        Control() {}
@@@ -290,9 -341,12 +342,12 @@@ private
        std::string _type;
        uint16_t    _number;
        std::string _name;
+ 
+       std::string                      _value_name_list_name;  ///< Global, UsesValueNameList
+       boost::shared_ptr<ValueNameList> _value_name_list;       ///< Local, ValueNameList
  };
  
 -class ControlNameList 
 +class LIBMIDIPP_API ControlNameList 
  {
  public:
        typedef std::map<uint16_t, boost::shared_ptr<Control> > Controls;
@@@ -394,9 -456,10 +457,10 @@@ private
        NoteNameLists         _note_name_lists;
        PatchNameLists        _patch_name_lists;
        ControlNameLists      _control_name_lists;
+       ValueNameLists        _value_name_lists;
  };
  
 -class MIDINameDocument
 +class LIBMIDIPP_API MIDINameDocument
  {
  public:
        // Maps Model names to MasterDeviceNames

diff --cc libs/midi++2/midnam_patch.cc
Simple merge