e1lama/stk
1
0
Fork 0
mirror of https://github.com/thestk/stk synced 2026-01-11 20:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

#63: add separate index for tokens in parseString

Browse Source 
Added a separate index for accessing tokens leaving the original index for values to work as it always does.  Code now correctly parses SKINI text for midi extension commands as well as basic commands.
This commit is contained in:
rhenninger
2016-08-06 08:11:35 -04:00
committed by GitHub
parent 95fcd14213
commit e1aa259517
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Skini.cpp
View File

@@ -153,10 +153,12 @@ 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) {
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;
@@ -167,11 +169,13 @@ long Skini :: parseString( std::string& line, Message& message )
case SK_INT: case SK_INT:
message.intValues[iValue] = atoi( tokens[iValue+3].c_str() ); message.intValues[iValue] = atoi( tokens[iValue+3].c_str() );
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[iValue+3].c_str() );
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.
@@ -181,7 +185,7 @@ long Skini :: parseString( std::string& line, Message& message )
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 )