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

Updated GenericMIDI / diskWriter

Browse source
This commit is contained in:
Harry van Haaren 2013-11-21 13:24:08 +00:00
parent d9a6694b88
commit c8af69d044
2 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/controller/genericmidi.cxx
View file

@ -739,13 +739,6 @@ Binding* GenericMIDI::setupBinding( cJSON* binding )
// create binding, then fill in data as from JSON.
Binding* tmp = new Binding();
cJSON* statusJson = cJSON_GetObjectItem( binding, "status" );
cJSON* dataJson = cJSON_GetObjectItem( binding, "data" );
if ( !statusJson || !dataJson )
{
LUPPP_WARN("Binding doesn't have status / data field: fix .ctlr file");
return 0;
}
cJSON* actionJson = cJSON_GetObjectItem( binding, "action" );
if ( !actionJson )
@ -754,6 +747,14 @@ Binding* GenericMIDI::setupBinding( cJSON* binding )
return 0;
}
cJSON* statusJson = cJSON_GetObjectItem( binding, "status" );
cJSON* dataJson = cJSON_GetObjectItem( binding, "data" );
if ( !statusJson || !dataJson )
{
LUPPP_WARN("Binding w Action:%s doesn't have status / data field: fix .ctlr file", actionJson->valuestring);
return 0;
}
tmp->status = statusJson->valueint;
tmp->data = dataJson->valueint;

19
src/diskwriter.cxx
View file

@ -133,7 +133,7 @@ std::string DiskWriter::getLastSavePath()
int DiskWriter::writeControllerFile(std::string name ,
std::string author,
std::string link ,
std::string email,
Controller* c )
{
LUPPP_NOTE("DiskWriter Controller* id: %i", c->getID() );
@ -143,13 +143,13 @@ int DiskWriter::writeControllerFile(std::string name ,
if ( g )
{
LUPPP_NOTE("Writing .ctlr file...");
LUPPP_NOTE("Creating JSON for .ctlr file...");
cJSON* controllerJson = cJSON_CreateObject();
cJSON_AddItemToObject ( controllerJson, "name", cJSON_CreateString( name.c_str() ));
cJSON_AddItemToObject ( controllerJson, "author", cJSON_CreateString( author.c_str() ));
cJSON_AddItemToObject ( controllerJson, "link", cJSON_CreateString( link.c_str() ));
cJSON_AddItemToObject ( controllerJson, "email", cJSON_CreateString( email.c_str() ));
// input bindings
std::vector<Binding*> b = g->getMidiToAction();
@ -172,10 +172,15 @@ int DiskWriter::writeControllerFile(std::string name ,
cJSON_AddNumberToObject( binding, "status", b.at(i)->status );
cJSON_AddNumberToObject( binding, "data" , b.at(i)->data );
cJSON_AddNumberToObject( binding, "track" , b.at(i)->track );
cJSON_AddNumberToObject( binding, "scene" , b.at(i)->scene );
cJSON_AddNumberToObject( binding, "send" , b.at(i)->send );
cJSON_AddNumberToObject( binding, "active", b.at(i)->active );
// only add JSON elements if they're not the "invalid" defaults
if ( b.at(i)->track != -2 )
cJSON_AddNumberToObject( binding, "track" , b.at(i)->track );
if ( b.at(i)->scene != -1 )
cJSON_AddNumberToObject( binding, "scene" , b.at(i)->scene );
if ( b.at(i)->send != -1 )
cJSON_AddNumberToObject( binding, "send" , b.at(i)->send );
if ( b.at(i)->active!= -1 )
cJSON_AddNumberToObject( binding, "active", b.at(i)->active );
LUPPP_NOTE("Creating Binding: action %i == %s!", b.at(i)->action, actionName );
}