diff options
Diffstat (limited to 'utils/gen_adldata')
| -rw-r--r-- | utils/gen_adldata/file_formats/load_jv.h | 2 | ||||
| -rw-r--r-- | utils/gen_adldata/ini/ini_processing.cpp | 4 | ||||
| -rw-r--r-- | utils/gen_adldata/measurer.cpp | 4 | ||||
| -rw-r--r-- | utils/gen_adldata/progs_cache.h | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/utils/gen_adldata/file_formats/load_jv.h b/utils/gen_adldata/file_formats/load_jv.h index 125356a..b79832f 100644 --- a/utils/gen_adldata/file_formats/load_jv.h +++ b/utils/gen_adldata/file_formats/load_jv.h @@ -66,7 +66,7 @@ static bool LoadJunglevision(const char *fn, unsigned bank, const char *prefix) tmp[1].data[9] = data[offset + 9 + 11]; tmp[1].data[10] = data[offset + 7 + 11] & 0x0F;//~0x30; tmp[1].finetune = 0; - tmp[1].diff = data[offset]; + tmp[1].diff = (data[offset] != 0); struct ins tmp2; tmp2.notenum = data[offset + 1]; diff --git a/utils/gen_adldata/ini/ini_processing.cpp b/utils/gen_adldata/ini/ini_processing.cpp index 4ef43fc..6e53ba5 100644 --- a/utils/gen_adldata/ini/ini_processing.cpp +++ b/utils/gen_adldata/ini/ini_processing.cpp @@ -416,9 +416,9 @@ bool IniProcessing::parseFile(const char *filename) int newSize = MultiByteToWideChar(CP_UTF8, 0, filename, - dest.size(), + (int)dest.size(), (wchar_t *)dest.c_str(), - dest.size()); + (int)dest.size()); dest.resize(newSize); FILE *cFile = _wfopen(dest.c_str(), L"rb"); #else diff --git a/utils/gen_adldata/measurer.cpp b/utils/gen_adldata/measurer.cpp index 3116045..4789b43 100644 --- a/utils/gen_adldata/measurer.cpp +++ b/utils/gen_adldata/measurer.cpp @@ -220,8 +220,8 @@ DurationInfo MeasureDurations(const ins &in) result.peak_amplitude_time = peak_amplitude_time; result.peak_amplitude_value = peak_amplitude_value; result.begin_amplitude = begin_amplitude; - result.quarter_amplitude_time = quarter_amplitude_time; - result.keyoff_out_time = keyoff_out_time; + result.quarter_amplitude_time = (double)quarter_amplitude_time; + result.keyoff_out_time = (double)keyoff_out_time; result.ms_sound_kon = (long)(quarter_amplitude_time * 1000.0 / interval); result.ms_sound_koff = (long)(keyoff_out_time * 1000.0 / interval); diff --git a/utils/gen_adldata/progs_cache.h b/utils/gen_adldata/progs_cache.h index aa29c8a..7b4cd39 100644 --- a/utils/gen_adldata/progs_cache.h +++ b/utils/gen_adldata/progs_cache.h @@ -6,6 +6,7 @@ #include <utility> #include <memory> #include <cstring> +#include <algorithm> #include <cstdint> #include <string> #include <vector> |