-Updated GenericMidi controller

main
Harry van Haaren 2013-09-24 18:45:54 +01:00
parent c5bcf5f625
commit bcfb35ac4e
3 changed files with 5 additions and 5 deletions

View File

@ -2,4 +2,4 @@
#./src/luppp
xterm -e "sleep 1 && aj-snapshot -r lupppDemo" & src/luppp
xterm -e "sleep 1 && aj-snapshot -r lupppDemo" & cd src/ && ./luppp

View File

@ -363,15 +363,15 @@ int GenericMIDI::loadController( std::string file )
}
else
{
cout << "Warning: audio.cfg has no entry for beats." << endl;
cout << "Warning: controller.cfg has no entry for MIDI inputs." << endl;
}
cJSON_Delete( controllerJson );
free ( sampleString );
delete[] sampleString;
}
else
{
LUPPP_WARN("%s %s","No controller definition found in ", file.c_str() );
LUPPP_WARN("%s %s","No controller file found at ", file.c_str() );
return LUPPP_RETURN_WARNING;
}

View File

@ -156,7 +156,7 @@ Jack::~Jack()
void Jack::activate()
{
Controller* c = new AkaiAPC();
Controller* m = new GenericMIDI("testPath","testName");
Controller* m = new GenericMIDI("testController.cfg","testName");
Controller* g = new LupppGUI();