diff options
| author | Wohlstand <admin@wohlnet.ru> | 2018-09-25 19:26:21 +0300 |
|---|---|---|
| committer | Wohlstand <admin@wohlnet.ru> | 2018-09-25 19:26:21 +0300 |
| commit | bb0d23251324fadd49cbf53c1673b80ef07ffeff (patch) | |
| tree | 57a9a9b754f40877add55bde772d06791f5727e1 /src/wopl/wopl_file.c | |
| parent | 36f58b5c73766e4173b1cb04168909fdbcf9a5bf (diff) | |
| parent | 923ea2f4d2c26248d518c9af7cafb938cd5ee9d6 (diff) | |
| download | libADLMIDI-bb0d23251324fadd49cbf53c1673b80ef07ffeff.tar.gz libADLMIDI-bb0d23251324fadd49cbf53c1673b80ef07ffeff.tar.bz2 libADLMIDI-bb0d23251324fadd49cbf53c1673b80ef07ffeff.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/wopl/wopl_file.c')
| -rw-r--r-- | src/wopl/wopl_file.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/wopl/wopl_file.c b/src/wopl/wopl_file.c index 25b75be..f018cbc 100644 --- a/src/wopl/wopl_file.c +++ b/src/wopl/wopl_file.c @@ -353,6 +353,8 @@ int WOPL_LoadInstFromMem(WOPIFile *file, void *mem, size_t length) GO_FORWARD(2); } + file->version = version; + {/* is drum flag */ if(length < 1) return WOPL_ERR_UNEXPECTED_ENDING; @@ -434,11 +436,13 @@ size_t WOPL_CalculateInstFileSize(WOPIFile *file, uint16_t version) * is percussive instrument */ - if(version >= 3) - ins_size = WOPL_INST_SIZE_V3; + if(version > 2) + /* Skip sounding delays are not part of single-instrument file + * two sizes of uint16_t will be subtracted */ + ins_size = WOPL_INST_SIZE_V3 - (sizeof(uint16_t) * 2); else ins_size = WOPL_INST_SIZE_V2; - final_size += ins_size * 128; + final_size += ins_size; return final_size; } |