e1lama/stk
1
0
Fork 0
mirror of https://github.com/thestk/stk synced 2026-02-03 16:16:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #64 from rhenninger/patch-1

Browse Source 
#63: add separate index for tokens in parseString
This commit is contained in:
garyscavone
2016-09-14 19:50:57 -04:00
committed by GitHub
parent 08f71c8fa9 ff52b9f0b0
commit 488301223a
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Skini.cpp
View File

@@ -153,10 +153,13 @@ long Skini :: parseString( std::string& line, Message& message )
// Parse the remaining fields (maximum of 2 more). // Parse the remaining fields (maximum of 2 more).
int iValue = 0; int iValue = 0;
unsigned int iToken = iValue + 3; //rgh: MIDI extension argument counts are different from regular MIDI
long dataType = skini_msgs[iSkini].data2; long dataType = skini_msgs[iSkini].data2;
while ( dataType != NOPE ) { while ( dataType != NOPE ) {
if ( tokens.size() <= (unsigned int) (iValue+3) ) { // if ( tokens.size() <= (unsigned int) (iValue+3) ) { //rgh: test iToken rather than always testing iValue+3
// if (tokens.size() <= iToken) { //rgh: iToken only tests it more tokens are to be consumed (SK_INT, SK_DBL, SK_STR)
if ((tokens.size() <= iToken) && (dataType < 0)) { //Don't fail if remaining iValues come from skini_msgs[] rather than tokens[].
oStream_ << "Skini::parseString: inconsistency between type table and parsed line:\n " << line; oStream_ << "Skini::parseString: inconsistency between type table and parsed line:\n " << line;
handleError( StkError::WARNING ); handleError( StkError::WARNING );
return message.type = 0; return message.type = 0;
@@ -165,23 +168,25 @@ long Skini :: parseString( std::string& line, Message& message )
switch ( dataType ) { switch ( dataType ) {
case SK_INT: case SK_INT:
message.intValues[iValue] = atoi( tokens[iValue+3].c_str() ); message.intValues[iValue] = atoi( tokens[iToken].c_str() ); //rgh: use new index
message.floatValues[iValue] = (StkFloat) message.intValues[iValue]; message.floatValues[iValue] = (StkFloat) message.intValues[iValue];
++iToken; //rgh: increment token index and value index (below)
break; break;
case SK_DBL: case SK_DBL:
message.floatValues[iValue] = atof( tokens[iValue+3].c_str() ); message.floatValues[iValue] = atof( tokens[iToken].c_str() ); //rgh: use new index
message.intValues[iValue] = (long) message.floatValues[iValue]; message.intValues[iValue] = (long) message.floatValues[iValue];
++iToken; //rgh: increment token index and value index (below)
break; break;
case SK_STR: // Must be the last field. case SK_STR: // Must be the last field.
message.remainder = tokens[iValue+3]; message.remainder = tokens[iToken]; //rgh: use new index
return message.type; return message.type;
default: // MIDI extension message default: // MIDI extension message
message.intValues[iValue] = dataType; message.intValues[iValue] = dataType;
message.floatValues[iValue] = (StkFloat) message.intValues[iValue]; message.floatValues[iValue] = (StkFloat) message.intValues[iValue];
iValue--; //iValue--; //rgh: iValue must increment even when iToken does not; resetting iValue only works sometimes
} }
if ( ++iValue == 1 ) if ( ++iValue == 1 )