diff --git a/SADXModLoader/MediaFns.cpp b/SADXModLoader/MediaFns.cpp index a4ea8c8c..45830219 100644 --- a/SADXModLoader/MediaFns.cpp +++ b/SADXModLoader/MediaFns.cpp @@ -31,13 +31,6 @@ void WMPInit_r() bassinit = !!BASS_Init(-1, 44100, BASS_DEVICE_3D, nullptr, nullptr); BASS_Set3DFactors(0.1f, 0.1f, 0.0f); BASS_SetConfig(BASS_CONFIG_3DALGORITHM, BASS_3DALG_FULL); - // Load the WavPack plugin - std::wstring fullPath = bassFolder + L"basswv.dll"; - HPLUGIN plugin = BASS_PluginLoad(fullPath.c_str(), BASS_UNICODE); - if (!plugin) - PrintDebug("Error loading BASS WavPack plugin: %d\n", BASS_ErrorGetCode()); - else if (!BASS_PluginEnable(plugin, TRUE)) - PrintDebug("Error initializing BASS WavPack plugin: %d\n", BASS_ErrorGetCode()); } /** diff --git a/SADXModLoader/sound.cpp b/SADXModLoader/sound.cpp index 72cf04af..f1a2a5fe 100644 --- a/SADXModLoader/sound.cpp +++ b/SADXModLoader/sound.cpp @@ -163,21 +163,10 @@ static void StopBASS(int ch) static BOOL LoadBASS(int ch, void* wavememory, int wavesize, bool dolby) { - if (!wavememory || !sndname) - return FALSE; if (ch >= 0 && ch < MAX_SOUND) { StopBASS(ch); - if (sndname[10] == 'w' && sndname[11] == 'v') - { - // WavPack .wv loaded directly with BASS - bass_channels[ch] = BASS_StreamCreateFile(true, (unsigned char*)wavememory, 0, wavesize, dolby ? BASS_SAMPLE_3D : NULL); - } - else - { - // Other files loaded with vgmstream - bass_channels[ch] = BASS_VGMSTREAM_StreamCreateFromMemory((unsigned char*)wavememory, wavesize, sndname, dolby ? BASS_SAMPLE_3D : NULL); - } + bass_channels[ch] = BASS_VGMSTREAM_StreamCreateFromMemory((unsigned char*)wavememory, wavesize, sndname, dolby ? BASS_SAMPLE_3D : NULL); return bass_channels[ch] != NULL; } return FALSE; diff --git a/extlib/bass/basswv.dll b/extlib/bass/basswv.dll deleted file mode 100644 index 2944ff98..00000000 Binary files a/extlib/bass/basswv.dll and /dev/null differ