hiro/openAV-Luppp
1
0
Fork 0
mirror of https://github.com/vale981/openAV-Luppp synced 2025-03-05 09:01:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

-Fixed "double-register" of GuiController

Browse source
This commit is contained in:
Harry van Haaren 2013-12-04 14:13:13 +00:00
parent d8411389a9
commit a3f9eda1d4
2 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/controllerupdater.cxx
View file

@ -11,9 +11,15 @@ ControllerUpdater::ControllerUpdater()
void ControllerUpdater::registerController( Controller* controller ) void ControllerUpdater::registerController( Controller* controller )
{ {
if (!controller)
LUPPP_ERROR("Register Controller passed NULL controller!");
LUPPP_NOTE("Registering controller %s", controller->getName().c_str() );
// store the controller instance // store the controller instance
c.push_back( controller ); c.push_back( controller );
// and tell it to register itself (MidiObserver / AudioObserver etc) // and tell it to register itself (MidiObserver / AudioObserver etc)
controller->registerComponents(); controller->registerComponents();
} }
@ -99,7 +105,7 @@ void ControllerUpdater::specialScene(int t, int scene)
{ {
for(unsigned int i = 0; i < c.size(); i++) for(unsigned int i = 0; i < c.size(); i++)
{ {
printf("calling on c %i\n", i); printf("calling on c %i, %s\n", i, c.at(i)->getName().c_str() );
c.at(i)->specialScene(t, scene); c.at(i)->specialScene(t, scene);
} }
} }

28
src/jack.cxx
View file

@ -202,6 +202,20 @@ Jack::Jack( std::string name ) :
{ {
LUPPP_ERROR("%s","Error setting timebase callback"); LUPPP_ERROR("%s","Error setting timebase callback");
} }
//Controller* m = new AkaiAPC();
// TODO: Add GUI dialog to add controllers, and insert them into the controller map.
// Watch out for RT stuff, loading file, registering ports etc: before activate?!
//Controller* m = new GenericMIDI("akai_apc.ctlr","apc");
Controller* gui = new LupppGUI();
controllerUpdater->registerController( gui );
if ( !gui )
{
LUPPP_ERROR("%s","Error creating LupppGUI Controller instance");
}
} }
Jack::~Jack() Jack::~Jack()
@ -219,20 +233,6 @@ Jack::~Jack()
void Jack::activate() void Jack::activate()
{ {
//Controller* m = new AkaiAPC();
// TODO: Add GUI dialog to add controllers, and insert them into the controller map.
// Watch out for RT stuff, loading file, registering ports etc: before activate?!
//Controller* m = new GenericMIDI("akai_apc.ctlr","apc");
Controller* gui = new LupppGUI();
controllerUpdater->registerController( gui );
if ( !gui )
{
LUPPP_ERROR("%s","Error creating LupppGUI Controller instance");
}
jack_activate( client ); jack_activate( client );
jack_transport_start(client); jack_transport_start(client);
} }