clear + re-init faderport at disconnect
This commit is contained in:
parent
dbb3c47eee
commit
629b5e0446
@ -136,7 +136,7 @@ FaderPort8::FaderPort8 (Session& s)
|
|||||||
FaderPort8::~FaderPort8 ()
|
FaderPort8::~FaderPort8 ()
|
||||||
{
|
{
|
||||||
cerr << "~FP8\n";
|
cerr << "~FP8\n";
|
||||||
stop_midi_handling ();
|
disconnected ();
|
||||||
close ();
|
close ();
|
||||||
|
|
||||||
if (_input_port) {
|
if (_input_port) {
|
||||||
@ -328,8 +328,11 @@ void
|
|||||||
FaderPort8::disconnected ()
|
FaderPort8::disconnected ()
|
||||||
{
|
{
|
||||||
stop_midi_handling ();
|
stop_midi_handling ();
|
||||||
for (uint8_t id = 0; id < 8; ++id) {
|
if (_device_active) {
|
||||||
_ctrls.strip(id).unset_controllables ();
|
for (uint8_t id = 0; id < 8; ++id) {
|
||||||
|
_ctrls.strip(id).unset_controllables ();
|
||||||
|
}
|
||||||
|
_ctrls.all_lights_off ();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -266,9 +266,7 @@ FP8Controls::initialize ()
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* initally turn all lights off */
|
/* initally turn all lights off */
|
||||||
for (CtrlButtonMap::const_iterator i = _ctrlmap.begin (); i != _ctrlmap.end (); ++i) {
|
all_lights_off ();
|
||||||
i->second->set_active (false);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* default modes */
|
/* default modes */
|
||||||
button (BtnMaster).set_active (true);
|
button (BtnMaster).set_active (true);
|
||||||
@ -278,6 +276,13 @@ FP8Controls::initialize ()
|
|||||||
|
|
||||||
FP8ButtonInterface::force_change = false;
|
FP8ButtonInterface::force_change = false;
|
||||||
}
|
}
|
||||||
|
void
|
||||||
|
FP8Controls::all_lights_off () const
|
||||||
|
{
|
||||||
|
for (CtrlButtonMap::const_iterator i = _ctrlmap.begin (); i != _ctrlmap.end (); ++i) {
|
||||||
|
i->second->set_active (false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
FP8ButtonInterface&
|
FP8ButtonInterface&
|
||||||
FP8Controls::button (ButtonId id)
|
FP8Controls::button (ButtonId id)
|
||||||
|
@ -137,7 +137,9 @@ public:
|
|||||||
bool midi_event (uint8_t id, uint8_t val);
|
bool midi_event (uint8_t id, uint8_t val);
|
||||||
bool midi_touch (uint8_t id, uint8_t val);
|
bool midi_touch (uint8_t id, uint8_t val);
|
||||||
bool midi_fader (uint8_t id, unsigned short val);
|
bool midi_fader (uint8_t id, unsigned short val);
|
||||||
|
|
||||||
void initialize ();
|
void initialize ();
|
||||||
|
void all_lights_off () const;
|
||||||
|
|
||||||
void set_fader_mode (FP8Types::FaderMode);
|
void set_fader_mode (FP8Types::FaderMode);
|
||||||
protected:
|
protected:
|
||||||
|
Loading…
Reference in New Issue
Block a user