allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

MCP: make Strip aware of Meter

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11841 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2012-04-08 23:20:14 +00:00
parent 0e0c4277cf
commit ad06e7cb8d
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/surfaces/mackie/controls.cc
View File

@@ -93,6 +93,8 @@ void Strip::add (Control & control)
_vselect = reinterpret_cast<Button*>(&control);
} else if (control.name() == "fader_touch") {
_fader_touch = reinterpret_cast<Button*>(&control);
} else if (control.name() == "meter") {
_meter = reinterpret_cast<Meter*>(&control);
} else if (control.type() == Control::type_led || control.type() == Control::type_led_ring) {
// relax
} else {

7
libs/surfaces/mackie/controls.h
View File

@@ -68,6 +68,7 @@ private:
class Button;
class Pot;
class Fader;
class Meter;
struct StripControlDefinition {
const char* name;
@@ -103,7 +104,8 @@ public:
Button & fader_touch();
Pot & vpot();
Fader & gain();
Meter& meter ();
bool has_solo() const { return _solo != 0; }
bool has_recenable() const { return _recenable != 0; }
bool has_mute() const { return _mute != 0; }
@@ -112,7 +114,7 @@ public:
bool has_fader_touch() const { return _fader_touch != 0; }
bool has_vpot() const { return _vpot != 0; }
bool has_gain() const { return _gain != 0; }
bool has_meter() const { return _meter != 0; }
private:
Button* _solo;
Button* _recenable;
@@ -122,6 +124,7 @@ private:
Button* _fader_touch;
Pot* _vpot;
Fader* _gain;
Meter* _meter;
int _index;
};