Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-02-08 07:18:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #588 from bnnm/ifdef

Browse Source 
Fix ifdef
This commit is contained in:
bnnm 2020-04-07 01:18:45 +02:00 committed by GitHub
commit 772fe03e10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/meta/encrypted.c
View File

@ -37,8 +37,9 @@ VGMSTREAM* init_vgmstream_encrypted(STREAMFILE* sf) {
temp_sf = setup_ogg_vorbis_streamfile(sf, cfg); temp_sf = setup_ogg_vorbis_streamfile(sf, cfg);
if (!temp_sf) goto fail; if (!temp_sf) goto fail;
VGM_LOG("2\n"); #ifdef VGM_USE_VORBIS
vgmstream = init_vgmstream_ogg_vorbis(temp_sf); vgmstream = init_vgmstream_ogg_vorbis(temp_sf);
#endif
close_streamfile(temp_sf); close_streamfile(temp_sf);
return vgmstream; return vgmstream;
} }
@ -55,7 +56,9 @@ VGMSTREAM* init_vgmstream_encrypted(STREAMFILE* sf) {
temp_sf = setup_ogg_vorbis_streamfile(sf, cfg); temp_sf = setup_ogg_vorbis_streamfile(sf, cfg);
if (!temp_sf) goto fail; if (!temp_sf) goto fail;
#ifdef VGM_USE_FFMPEG //TODO: allow MP3 without FFmpeg
vgmstream = init_vgmstream_ffmpeg(temp_sf); vgmstream = init_vgmstream_ffmpeg(temp_sf);
#endif
close_streamfile(temp_sf); close_streamfile(temp_sf);
return vgmstream; return vgmstream;
} }

2
src/meta/xnb.c
View File

@ -145,7 +145,9 @@ VGMSTREAM* init_vgmstream_xnb(STREAMFILE* sf) {
if (!temp_sf) goto fail; if (!temp_sf) goto fail;
if (is_ogg) { if (is_ogg) {
#ifdef VGM_USE_VORBIS
vgmstream = init_vgmstream_ogg_vorbis(temp_sf); vgmstream = init_vgmstream_ogg_vorbis(temp_sf);
#endif
} else { } else {
vgmstream = init_vgmstream_riff(temp_sf); vgmstream = init_vgmstream_riff(temp_sf);
} }