actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RageSoundReader_ChannelSplit.cpp
+3 -4
View File
@@ -38,7 +38,6 @@
#include "RageUtil.h"
#include "RageSoundMixBuffer.h"
#include "RageSoundUtil.h"
#include "Foreach.h"
#include <limits.h>
#include <set>
@@ -185,10 +184,10 @@ int RageSoundSplitterImpl::ReadBuffer()
/* Discard any bytes that are no longer requested by any sound. */
int iMinFrameRequested = INT_MAX;
int iMaxFrameRequested = INT_MIN;
FOREACHS( RageSoundReader_Split *, m_apSounds, snd )
for (RageSoundReader_Split *snd : m_apSounds)
{
iMinFrameRequested = min( iMinFrameRequested, (*snd)->m_iPositionFrame );
iMaxFrameRequested = max( iMaxFrameRequested, (*snd)->m_iPositionFrame + (*snd)->m_iRequestFrames );
iMinFrameRequested = min( iMinFrameRequested, snd->m_iPositionFrame );
iMaxFrameRequested = max( iMaxFrameRequested, snd->m_iPositionFrame + snd->m_iRequestFrames );
}
if( iMinFrameRequested > m_iBufferPositionFrames )