diff options
| author | Vitaly Novichkov <admin@wohlnet.ru> | 2018-04-22 01:32:56 +0300 |
|---|---|---|
| committer | Vitaly Novichkov <admin@wohlnet.ru> | 2018-04-22 01:32:56 +0300 |
| commit | 019a6872153bc5b976f3fb77ee82868ec6c9766c (patch) | |
| tree | d3c936798ae0f2d07cd787e1758f7968ab0dd866 /src/chips/opl_chip_base.cpp | |
| parent | 3bfdba4d2339d0250226d6bac028ce51e28ec59c (diff) | |
| parent | ad9e507ad8e37898ffcfa8492dbf90def964389d (diff) | |
| download | libADLMIDI-019a6872153bc5b976f3fb77ee82868ec6c9766c.tar.gz libADLMIDI-019a6872153bc5b976f3fb77ee82868ec6c9766c.tar.bz2 libADLMIDI-019a6872153bc5b976f3fb77ee82868ec6c9766c.zip | |
Merge branch 'master' into stable
# Conflicts:
# android/jni/Android.mk
Diffstat (limited to 'src/chips/opl_chip_base.cpp')
| -rw-r--r-- | src/chips/opl_chip_base.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/chips/opl_chip_base.cpp b/src/chips/opl_chip_base.cpp index 4a7c4f5..670a998 100644 --- a/src/chips/opl_chip_base.cpp +++ b/src/chips/opl_chip_base.cpp @@ -26,7 +26,7 @@ int OPLChipBase::generate32(int32_t *output, size_t frames) enum { maxFramesAtOnce = 256 }; int16_t temp[2 * maxFramesAtOnce]; for(size_t left = frames; left > 0;) { - size_t count = (left < maxFramesAtOnce) ? left : maxFramesAtOnce; + size_t count = (left < static_cast<size_t>(maxFramesAtOnce)) ? left : static_cast<size_t>(maxFramesAtOnce); generate(temp, count); for(size_t i = 0; i < 2 * count; ++i) output[i] = temp[i]; @@ -41,7 +41,7 @@ int OPLChipBase::generateAndMix32(int32_t *output, size_t frames) enum { maxFramesAtOnce = 256 }; int16_t temp[2 * maxFramesAtOnce]; for(size_t left = frames; left > 0;) { - size_t count = (left < maxFramesAtOnce) ? left : maxFramesAtOnce; + size_t count = (left < static_cast<size_t>(maxFramesAtOnce)) ? left : static_cast<size_t>(maxFramesAtOnce); generate(temp, count); for(size_t i = 0; i < 2 * count; ++i) output[i] += temp[i]; |