diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-04-15 14:30:03 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-04-15 14:30:03 +0000 |
| commit | 97c2832d350458d2da129954375cc9912584b1a5 (patch) | |
| tree | 51b70085246e4135fe4ba17f3effe4d864575cb7 | |
| parent | 2926372b75b7ff88bf2c0da7f276d4a5a1f76720 (diff) | |
MCP: probably fix issues with vpots not working
git-svn-id: svn://localhost/ardour2/branches/3.0@11979 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/surfaces/mackie/pot.cc | 3 | ||||
| -rw-r--r-- | libs/surfaces/mackie/pot.h | 1 | ||||
| -rw-r--r-- | libs/surfaces/mackie/strip.cc | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/libs/surfaces/mackie/pot.cc b/libs/surfaces/mackie/pot.cc index 0b3062be8c..9a3f3360d2 100644 --- a/libs/surfaces/mackie/pot.cc +++ b/libs/surfaces/mackie/pot.cc @@ -24,7 +24,8 @@ using namespace Mackie; -int const Pot::External = 0x2e; +int const Pot::External = 0x2e; /* specific ID for "vpot" representing external control */ +int const Pot::ID = 0x10; /* base value for v-pot IDs */ Control* Pot::factory (Surface& surface, int id, const char* name, Group& group) diff --git a/libs/surfaces/mackie/pot.h b/libs/surfaces/mackie/pot.h index 5aa4f297d1..f8e94a3391 100644 --- a/libs/surfaces/mackie/pot.h +++ b/libs/surfaces/mackie/pot.h @@ -28,6 +28,7 @@ class Pot : public Control { public: static int const External; + static int const ID; enum Mode { dot = 0, diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc index 2d65b663ca..48cc61cec9 100644 --- a/libs/surfaces/mackie/strip.cc +++ b/libs/surfaces/mackie/strip.cc @@ -77,7 +77,7 @@ Strip::Strip (Surface& s, const std::string& name, int index, const map<Button:: , _last_pan_position_written (-1.0) { _fader = dynamic_cast<Fader*> (Fader::factory (*_surface, index, "fader", *this)); - _vpot = dynamic_cast<Pot*> (Pot::factory (*_surface, index, "vpot", *this)); + _vpot = dynamic_cast<Pot*> (Pot::factory (*_surface, Pot::ID + index, "vpot", *this)); _meter = dynamic_cast<Meter*> (Meter::factory (*_surface, index, "meter", *this)); for (map<Button::ID,StripButtonInfo>::const_iterator b = strip_buttons.begin(); b != strip_buttons.end(); ++b) { |