chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Fixed MIDI track repeat when the current file has no loop points

Browse source
This commit is contained in:
Chris Moeller 2014-05-11 19:27:09 -07:00
parent 579451737c
commit 560efaf8b8
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Plugins/MIDI/MIDI/MIDIDecoder.h
View file

@ -17,6 +17,7 @@
midi_container midi_file; midi_container midi_file;
BOOL soundFontsAssigned; BOOL soundFontsAssigned;
BOOL isLooped;
long totalFrames; long totalFrames;
long framesLength; long framesLength;

23
Plugins/MIDI/MIDI/MIDIDecoder.mm
View file

@ -65,11 +65,13 @@
// two loops and a fade // two loops and a fade
framesLength = loopStart + ( loopEnd - loopStart ) * 2; framesLength = loopStart + ( loopEnd - loopStart ) * 2;
framesFade = 8000; framesFade = 8000;
isLooped = YES;
} }
else else
{ {
framesLength += 1000; framesLength += 1000;
framesFade = 0; framesFade = 0;
isLooped = NO;
} }
framesLength = framesLength * 441 / 10; framesLength = framesLength * 441 / 10;
@ -156,8 +158,17 @@
- (int)readAudio:(void *)buf frames:(UInt32)frames - (int)readAudio:(void *)buf frames:(UInt32)frames
{ {
BOOL repeatone = IsRepeatOneSet(); BOOL repeatone = IsRepeatOneSet();
long localFramesLength = framesLength;
long localTotalFrames = totalFrames;
if ( !repeatone && framesRead >= totalFrames ) if ( repeatone && !isLooped )
{
localFramesLength -= 44100;
localTotalFrames -= 44100;
repeatone = NO;
}
if ( !repeatone && framesRead >= localTotalFrames )
return 0; return 0;
if ( !soundFontsAssigned ) { if ( !soundFontsAssigned ) {
@ -172,15 +183,15 @@
player->Play( (float *) buf, frames ); player->Play( (float *) buf, frames );
if ( !repeatone && framesRead + frames > framesLength ) { if ( !repeatone && framesRead + frames > localFramesLength ) {
if ( framesFade ) { if ( framesFade ) {
long fadeStart = (framesLength > framesRead) ? framesLength : framesRead; long fadeStart = (localFramesLength > framesRead) ? localFramesLength : framesRead;
long fadeEnd = (framesRead + frames > totalFrames) ? totalFrames : (framesRead + frames); long fadeEnd = (framesRead + frames > localTotalFrames) ? localTotalFrames : (framesRead + frames);
long fadePos; long fadePos;
float * buff = ( float * ) buf; float * buff = ( float * ) buf;
float fadeScale = (float)(framesFade - (fadeStart - framesLength)) / framesFade; float fadeScale = (float)(framesFade - (fadeStart - localFramesLength)) / framesFade;
float fadeStep = 1.0 / (float)framesFade; float fadeStep = 1.0 / (float)framesFade;
for (fadePos = fadeStart; fadePos < fadeEnd; ++fadePos) { for (fadePos = fadeStart; fadePos < fadeEnd; ++fadePos) {
buff[ 0 ] *= fadeScale; buff[ 0 ] *= fadeScale;
@ -196,7 +207,7 @@
frames = (int)(fadeEnd - framesRead); frames = (int)(fadeEnd - framesRead);
} }
else { else {
frames = (int)(totalFrames - framesRead); frames = (int)(localTotalFrames - framesRead);
} }
} }