Merge pull request #399 from bnnm/fixes

Fixes
This commit is contained in:
bnnm 2019-04-14 22:06:16 +02:00 committed by GitHub
commit 944e26d40b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions

View File

@ -274,7 +274,7 @@ static void apply_config(VGMSTREAM * vgmstream, cli_config *cfg) {
if (vgmstream->config_fade_delay) {
cfg->fade_delay = vgmstream->config_fade_delay;
}
if (vgmstream->config_fade_delay) {
if (vgmstream->config_fade_time) {
cfg->fade_time = vgmstream->config_fade_time;
}
if (vgmstream->config_force_loop) {

View File

@ -204,6 +204,8 @@ VGMSTREAM * init_vgmstream_wave_segmented(STREAMFILE *streamFile) {
vgmstream->loop_end_sample = loop_end_sample;
vgmstream->meta_type = meta_WAVE_segmented;
vgmstream->stream_size = get_streamfile_size(streamFile); /* wrong kbps otherwise */
/* .wave can mix codecs, usually first segment is a small ADPCM section) */
vgmstream->coding_type = (segment_count == 1 ? data->segments[0]->coding_type : data->segments[1]->coding_type);
vgmstream->layout_type = layout_segmented;