smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-18 12:46:32 +01:00
Code Issues Projects Releases Wiki Activity

NO-OP: whitespace

Browse source
This commit is contained in:
Robin Gareus 2018-08-07 15:30:26 +02:00
parent 8c7a1e004b
commit f0105dafc1
1 changed files with 366 additions and 377 deletions
Download patch file Download diff file Expand all files Collapse all files

57
libs/surfaces/launch_control_xl/launch_control_xl.h
View file

@ -138,12 +138,6 @@ public:
enum LEDFlag { Normal = 0xC, Blink = 0x8, DoubleBuffering = 0x0 }; enum LEDFlag { Normal = 0xC, Blink = 0x8, DoubleBuffering = 0x0 };
/*
enum LEDState {
Toggle = 0x7F,
Momentary = 0x0,
}; */
enum LEDColor { Off=0, RedLow = 1, RedFull = 3, GreenLow = 16, GreenFull = 48, Yellow = 50, AmberLow = 17, AmberFull = 51}; enum LEDColor { Off=0, RedLow = 1, RedFull = 3, GreenLow = 16, GreenFull = 48, Yellow = 50, AmberLow = 17, AmberFull = 51};
@ -159,7 +153,6 @@ public:
uint8_t _value; uint8_t _value;
}; };
struct LED { struct LED {
LED(uint8_t i, LEDColor c, LaunchControlXL& l) : _index(i), _color(c), _flag(LEDFlag::Normal), lcxl(&l) {} LED(uint8_t i, LEDColor c, LaunchControlXL& l) : _index(i), _color(c), _flag(LEDFlag::Normal), lcxl(&l) {}
LED(uint8_t i, LEDColor c, LEDFlag f, LaunchControlXL& lcxl) : _index(i), _color(c), _flag(f) {} LED(uint8_t i, LEDColor c, LEDFlag f, LaunchControlXL& lcxl) : _index(i), _color(c), _flag(f) {}
@ -189,25 +182,22 @@ public:
struct Button { struct Button {
Button(ButtonID id) Button(ButtonID id)
: press_method(&LaunchControlXL::relax), : press_method(&LaunchControlXL::relax)
release_method(&LaunchControlXL::relax), , release_method(&LaunchControlXL::relax)
long_press_method(&LaunchControlXL::relax), _id(id) {} , long_press_method(&LaunchControlXL::relax), _id(id) {}
Button(ButtonID id, void (LaunchControlXL::*press)()) Button(ButtonID id, void (LaunchControlXL::*press)())
: press_method(press), : press_method(press)
release_method(&LaunchControlXL::relax), , release_method(&LaunchControlXL::relax)
long_press_method(&LaunchControlXL::relax), _id(id) {} , long_press_method(&LaunchControlXL::relax), _id(id) {}
Button(ButtonID id, void (LaunchControlXL::*press)(), Button(ButtonID id, void (LaunchControlXL::*press)(), void (LaunchControlXL::*release)())
void (LaunchControlXL::*release)()) : press_method(press), release_method(release)
: press_method(press), release_method(release), , long_press_method(&LaunchControlXL::relax), _id(id) {}
long_press_method(&LaunchControlXL::relax), _id(id) {}
Button(ButtonID id, void (LaunchControlXL::*press)(), Button(ButtonID id, void (LaunchControlXL::*press)(), void (LaunchControlXL::*release)(), void (LaunchControlXL::*long_press)())
void (LaunchControlXL::*release)(), : press_method(press), release_method(release)
void (LaunchControlXL::*long_press)()) , long_press_method(long_press), _id(id) {}
: press_method(press), release_method(release),
long_press_method(long_press), _id(id) {}
virtual ~Button() {} virtual ~Button() {}
@ -243,8 +233,7 @@ public:
struct NoteButton : public Button { struct NoteButton : public Button {
NoteButton(ButtonID id, uint8_t cn, NoteButton(ButtonID id, uint8_t cn, void (LaunchControlXL::*press)())
void (LaunchControlXL::*press)())
: Button(id, press), _note_number(cn) {} : Button(id, press), _note_number(cn) {}
NoteButton(ButtonID id, uint8_t cn, NoteButton(ButtonID id, uint8_t cn,
@ -275,7 +264,6 @@ public:
: NoteButton(id, nn, press, release), MultiColorLED(index, color, l) {} : NoteButton(id, nn, press, release), MultiColorLED(index, color, l) {}
MidiByteArray state_msg(bool light = true) const; MidiByteArray state_msg(bool light = true) const;
}; };
struct SelectButton : public ControllerButton, public LED { struct SelectButton : public ControllerButton, public LED {
@ -283,29 +271,30 @@ public:
: ControllerButton(id, cn, press), LED(index, LEDColor::RedFull, l) {} : ControllerButton(id, cn, press), LED(index, LEDColor::RedFull, l) {}
MidiByteArray state_msg(bool light) const; MidiByteArray state_msg(bool light) const;
}; };
struct TrackStateButton : public NoteButton, public LED { struct TrackStateButton : public NoteButton, public LED {
TrackStateButton(ButtonID id, uint8_t nn, uint8_t index, void (LaunchControlXL::*press)(), LaunchControlXL& l) TrackStateButton(ButtonID id, uint8_t nn, uint8_t index, void (LaunchControlXL::*press)(), LaunchControlXL& l)
: NoteButton(id, nn, press), LED(index, LEDColor::Yellow, l) {} : NoteButton(id, nn, press)
, LED(index, LEDColor::Yellow, l) {}
TrackStateButton(ButtonID id, uint8_t nn, uint8_t index, void (LaunchControlXL::*press)(), TrackStateButton(ButtonID id, uint8_t nn, uint8_t index, void (LaunchControlXL::*press)(),
void (LaunchControlXL::*release)(), void (LaunchControlXL::*release)(),
LaunchControlXL& l) LaunchControlXL& l)
: NoteButton(id, nn, press, release), LED(index, LEDColor::Yellow, l) {} : NoteButton(id, nn, press, release)
, LED(index, LEDColor::Yellow, l) {}
TrackStateButton(ButtonID id, uint8_t nn, uint8_t index, void (LaunchControlXL::*press)(), TrackStateButton(ButtonID id, uint8_t nn, uint8_t index, void (LaunchControlXL::*press)(),
void (LaunchControlXL::*release)(), void (LaunchControlXL::*release)(),
void (LaunchControlXL::*release_long)(), void (LaunchControlXL::*release_long)(),
LaunchControlXL& l) LaunchControlXL& l)
: NoteButton(id, nn, press, release, release_long), LED(index, LEDColor::Yellow, l) {} : NoteButton(id, nn, press, release, release_long)
, LED(index, LEDColor::Yellow, l) {}
MidiByteArray state_msg(bool light) const; MidiByteArray state_msg(bool light) const;
}; };
struct Fader : public Controller { struct Fader : public Controller {
Fader(FaderID id, uint8_t cn) Fader(FaderID id, uint8_t cn)
: Controller(cn, 0), _id(id) {} // minimal value : Controller(cn, 0), _id(id) {} // minimal value
@ -318,9 +307,10 @@ public:
}; };
struct Knob : public Controller, public MultiColorLED { struct Knob : public Controller, public MultiColorLED {
Knob(KnobID id, uint8_t cn, uint8_t index, LEDColor color, LaunchControlXL& l) Knob(KnobID id, uint8_t cn, uint8_t index, LEDColor color, LaunchControlXL& l)
: Controller(cn, 64), MultiColorLED(index, color, l), _id(id) {} // knob 50/50 value : Controller(cn, 64)
, MultiColorLED(index, color, l)
, _id(id) {} // knob 50/50 value
KnobID id() const { return _id; } KnobID id() const { return _id; }
@ -366,7 +356,6 @@ public:
uint8_t template_number() const { return _template_number; } uint8_t template_number() const { return _template_number; }
private: private:
bool in_use; bool in_use;
TrackMode _track_mode; TrackMode _track_mode;