AxioDL/amuse
2
0
Fork 0
mirror of https://github.com/AxioDL/amuse.git synced 2025-12-09 05:27:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better CMake dependency handling

Browse Source
This commit is contained in:
Jack Andersen
2019-06-11 16:02:52 -10:00
parent 1b10016369
commit 2a3444400e
22 changed files with 141 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/SongConverter.cpp
View File

@@ -1185,7 +1185,7 @@ std::vector<uint8_t> SongConverter::MIDIToSong(const std::vector<uint8_t>& data,
}
/* See if there's a matching region buffer already present */
int regIdx = 0;
size_t regIdx = 0;
for (Region& reg : regions) {
if (reg == region)
break;
@@ -1279,7 +1279,7 @@ std::vector<uint8_t> SongConverter::MIDIToSong(const std::vector<uint8_t>& data,
head.swapToBig();
*reinterpret_cast<SongState::Header*>(&*ret.insert(ret.cend(), headSz, 0)) = head;
for (int i = 0; i < 64; ++i) {
for (size_t i = 0; i < 64; ++i) {
if (i >= trackRegionIdxArr.size()) {
ret.insert(ret.cend(), 4, 0);
continue;
@@ -1361,7 +1361,7 @@ std::vector<uint8_t> SongConverter::MIDIToSong(const std::vector<uint8_t>& data,
for (SongState::TrackRegion& reg : regionBuf)
*reinterpret_cast<SongState::TrackRegion*>(&*ret.insert(ret.cend(), 12, 0)) = reg;
for (int i = 0; i < 64; ++i) {
for (size_t i = 0; i < 64; ++i) {
if (i >= trackRegionIdxArr.size()) {
ret.insert(ret.cend(), 4, 0);
continue;