-Refactoring ~GOptions()
parent
8e0ca98255
commit
3f08b8847e
|
@ -380,7 +380,6 @@ void ControllerUI::addBinding( Binding* b )
|
||||||
|
|
||||||
void ControllerUI::addBindings( GenericMIDI* c )
|
void ControllerUI::addBindings( GenericMIDI* c )
|
||||||
{
|
{
|
||||||
// FIXME: add binding to Avtk::Binding here
|
|
||||||
std::vector<Binding*> bindingVector= c->getMidiToAction();
|
std::vector<Binding*> bindingVector= c->getMidiToAction();
|
||||||
|
|
||||||
for(unsigned int i = 0; i < bindingVector.size(); i++ )
|
for(unsigned int i = 0; i < bindingVector.size(); i++ )
|
||||||
|
@ -391,7 +390,18 @@ void ControllerUI::addBindings( GenericMIDI* c )
|
||||||
|
|
||||||
ControllerUI::~ControllerUI()
|
ControllerUI::~ControllerUI()
|
||||||
{
|
{
|
||||||
// FIXME CRITICAL! free UI component memory here
|
|
||||||
|
// free all binding resources here:
|
||||||
|
|
||||||
|
|
||||||
|
delete authorLabel;
|
||||||
|
delete linkLabel;
|
||||||
|
|
||||||
|
delete targetLabel;
|
||||||
|
delete targetLabelStat;
|
||||||
|
delete bindEnable;
|
||||||
|
delete removeController;
|
||||||
|
delete writeControllerBtn;
|
||||||
}
|
}
|
||||||
|
|
||||||
OptionsWindow::OptionsWindow()
|
OptionsWindow::OptionsWindow()
|
||||||
|
|
|
@ -68,14 +68,10 @@ class ControllerUI
|
||||||
|
|
||||||
Fl_Box* targetLabel;
|
Fl_Box* targetLabel;
|
||||||
Fl_Box* targetLabelStat;
|
Fl_Box* targetLabelStat;
|
||||||
Avtk::Bindings* bindings;
|
//Avtk::Bindings* bindings;
|
||||||
Avtk::LightButton* bindEnable;
|
Avtk::LightButton* bindEnable;
|
||||||
Avtk::Button* removeController;
|
Avtk::Button* removeController;
|
||||||
Avtk::Button* writeControllerBtn;
|
Avtk::Button* writeControllerBtn;
|
||||||
|
|
||||||
|
|
||||||
// Controller
|
|
||||||
Avtk::Button* ctlrButton;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class OptionsWindow
|
class OptionsWindow
|
||||||
|
|
Loading…
Reference in New Issue