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 controller to attempt read the JSON controller definition.

Browse source
This commit is contained in:
Harry van Haaren 2013-09-24 18:38:53 +01:00
parent 58d7776c19
commit c5bcf5f625
2 changed files with 45 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/controller/genericmidi.cxx
View file

@ -3,11 +3,16 @@
#include "genericmidi.hxx"
#include <string>
#include <sstream>
#include <fstream>
#include <iostream>
#include "../jack.hxx"
#include "../gridlogic.hxx"
#include "../cjson/cJSON.h"
extern Jack* jack;
GenericMIDI::GenericMIDI(std::string file, std::string name) :
@ -330,8 +335,46 @@ void GenericMIDI::reset()
int GenericMIDI::loadController( std::string file )
{
LUPPP_NOTE("%s%s","Loading controller : ", file.c_str() );
/// open and read whole file
#ifdef DEBUG_CONTROLLER
cout << "loading controller file " << file.c_str() << endl;
#endif
std::ifstream sampleFile( file.c_str(), std::ios_base::in|std::ios_base::ate);
long file_length = sampleFile.tellg();
if ( file_length > 0 )
{
sampleFile.seekg(0, std::ios_base::beg);
sampleFile.clear();
char *sampleString = new char[file_length];
sampleFile.read(sampleString, file_length);
cJSON* controllerJson = cJSON_Parse( sampleString );
if (!controllerJson) {
LUPPP_ERROR("%s %s","Error in Sample JSON before: ", cJSON_GetErrorPtr() );
return LUPPP_RETURN_ERROR;
}
cJSON* control = cJSON_GetObjectItem( controllerJson, "midiIn" );
if ( control )
{
LUPPP_NOTE("%s,%i","num MIDI inputs: ", control->valueint );
}
else
{
cout << "Warning: audio.cfg has no entry for beats." << endl;
}
cJSON_Delete( controllerJson );
free ( sampleString );
}
else
{
LUPPP_WARN("%s %s","No controller definition found in ", file.c_str() );
return LUPPP_RETURN_WARNING;
}
return LUPPP_RETURN_OK;
}

2
src/diskreader.cxx
View file

@ -120,7 +120,7 @@ int DiskReader::loadSample( int track, int scene, string path )
}
else
{
LUPPP_WARN("%s %s","DiskReader::loadSample() empty or no sample.cfg found at ",base.str().c_str() );
LUPPP_WARN("%s %s","Empty or no sample.cfg found at ",base.str().c_str() );
return LUPPP_RETURN_WARNING;
}