OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Adjusted Timidity++ to soundfint manager

Browse source
This commit is contained in:
Christoph Oelckers 2018-02-23 08:54:01 +01:00
commit 6618656e7c
8 changed files with 48 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/sound/timiditypp/smplfile.cpp
View file

@ -278,7 +278,7 @@ int Instruments::import_wave_discriminant(char *sample_file)
struct timidity_file *tf;
char buf[12];
if ((tf = open_file(sample_file, false, pathlist)) == NULL)
if ((tf = open_file(sample_file, sfreader)) == NULL)
return 1;
if (tf_read(buf, 12, 1, tf) != 1
|| memcmp(&buf[0], "RIFF", 4) != 0 || memcmp(&buf[8], "WAVE", 4) != 0)
@ -309,7 +309,7 @@ int Instruments::import_wave_load(char *sample_file, Instrument *inst)
WAVSamplerChunk samplerc = {0,};
GeneralInstrumentInfo instc;
if ((tf = open_file(sample_file, false, pathlist)) == NULL)
if ((tf = open_file(sample_file, sfreader)) == NULL)
return 1;
if (tf_read(buf, 12, 1, tf) != 1
|| memcmp(&buf[0], "RIFF", 4) != 0 || memcmp(&buf[8], "WAVE", 4) != 0)
@ -551,7 +551,7 @@ int Instruments::import_aiff_discriminant(char *sample_file)
struct timidity_file *tf;
char buf[12];
if ((tf = open_file(sample_file, false, pathlist)) == NULL)
if ((tf = open_file(sample_file, sfreader)) == NULL)
return 1;
if (tf_read(buf, 12, 1, tf) != 1
|| memcmp(&buf[0], "FORM", 4) != 0 || memcmp(&buf[8], "AIF", 3) != 0
@ -591,7 +591,7 @@ int Instruments::import_aiff_load(char *sample_file, Instrument *inst)
AIFFLoopInfo loop_info = {0,0,0};
AIFFMarkerData *marker_data;
if ((tf = open_file(sample_file, false, pathlist)) == NULL)
if ((tf = open_file(sample_file, sfreader)) == NULL)
return 1;
if (tf_read(buf, 12, 1, tf) != 1
|| memcmp(&buf[0], "FORM", 4) != 0 || memcmp(&buf[8], "AIF", 3) != 0
@ -1222,4 +1222,4 @@ static double ConvertFromIeeeExtended(const char *bytes)
else
return f;
}
}
}