Soundship
/
Loopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

-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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/run.sh
View File

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

6
src/controller/genericmidi.cxx
View File

@ -363,15 +363,15 @@ int GenericMIDI::loadController( std::string file )
} }
else 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 ); cJSON_Delete( controllerJson );
free ( sampleString ); delete[] sampleString;
} }
else 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; return LUPPP_RETURN_WARNING;
} }

2
src/jack.cxx
View File

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