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

make casts in MidiFileIn.cpp explicit

Browse Source
This commit is contained in:
Ariel Elkin
2014-03-08 17:18:45 +01:00
parent 1874c0efa9
commit cafad844ad
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/MidiFileIn.cpp
View File

@@ -232,7 +232,7 @@ unsigned long MidiFileIn :: getNextEvent( std::vector<unsigned char> *event, uns
if ( !file_.read( (char *)&c, 1 ) ) goto error; if ( !file_.read( (char *)&c, 1 ) ) goto error;
event->push_back( c ); event->push_back( c );
if ( format_ != 1 && ( c == 0x51 ) ) isTempoEvent = true; if ( format_ != 1 && ( c == 0x51 ) ) isTempoEvent = true;
position = file_.tellg(); position = (unsigned long)file_.tellg();
if ( !readVariableLength( &bytes ) ) goto error; if ( !readVariableLength( &bytes ) ) goto error;
bytes += ( (unsigned long)file_.tellg() - position ); bytes += ( (unsigned long)file_.tellg() - position );
file_.seekg( position, std::ios_base::beg ); file_.seekg( position, std::ios_base::beg );
@@ -242,7 +242,7 @@ unsigned long MidiFileIn :: getNextEvent( std::vector<unsigned char> *event, uns
case 0xF7: // The start or continuation of a Sysex event case 0xF7: // The start or continuation of a Sysex event
trackStatus_[track] = 0; trackStatus_[track] = 0;
event->push_back( c ); event->push_back( c );
position = file_.tellg(); position = (unsigned long)file_.tellg();
if ( !readVariableLength( &bytes ) ) goto error; if ( !readVariableLength( &bytes ) ) goto error;
bytes += ( (unsigned long)file_.tellg() - position ); bytes += ( (unsigned long)file_.tellg() - position );
file_.seekg( position, std::ios_base::beg ); file_.seekg( position, std::ios_base::beg );
@@ -294,7 +294,7 @@ unsigned long MidiFileIn :: getNextEvent( std::vector<unsigned char> *event, uns
} }
// Save the current track pointer value. // Save the current track pointer value.
trackPointers_[track] = file_.tellg(); trackPointers_[track] = (long)file_.tellg();
return ticks; return ticks;