Skip to content

MIDI import: Reset the seek pointer after parsing magic bytes. #4503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
irrenhaus3 wants to merge 1 commit into from
Closed

MIDI import: Reset the seek pointer after parsing magic bytes. #4503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Reset the seek pointer after parsing magic bytes on MIDI import. 
Fixes a silent bug that prevented any and all SMF midi import due to the Alg_midifile_reader's parse() function erroneously reading bytes 4 to 7 instead of 0 to 3.
  • Loading branch information
@irrenhaus3
irrenhaus3 committed Jul 26, 2018
commit 4e8b435dd2dba4b6742524778191593573568eeb
5 changes: 5 additions & 0 deletions include/ImportFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ class LMMS_EXPORT ImportFilter : public Plugin
return -1;
}

inline void resetReadPosition()
{
m_file.seek(0);
}

inline int readBlock( char * _data, int _len )
{
return m_file.read( _data, _len );
Expand Down
6 changes: 5 additions & 1 deletion plugins/MidiImport/MidiImport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,11 @@ bool MidiImport::tryImport( TrackContainer* tc )
}
#endif

switch( readID() )
auto id = readID();
// Reset the seek pointer on the file so the subsequent routines
// don't choke when trying to read the first 4 bytes again.
resetReadPosition();
switch( id )
{
case makeID( 'M', 'T', 'h', 'd' ):
printf( "MidiImport::tryImport(): found MThd\n");
Expand Down