smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 13:45:43 +01:00
Code Issues Projects Releases Wiki Activity

Revert "case insensitive ".dll" for VST plugins - fixes #6285"

Browse source 
This reverts commit c2f84af73d.

strcasestr() is not compatible with mingw nor MSVC.
different approach is needed.
This commit is contained in:
Robin Gareus 2015-04-27 00:40:07 +02:00
parent c2f84af73d
commit 3f2306c4fb
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libs/ardour/plugin_manager.cc
View file

@ -686,7 +686,8 @@ PluginManager::windows_vst_refresh (bool cache_only)
static bool windows_vst_filter (const string& str, void * /*arg*/)
{
/* Not a dotfile, has a prefix before a period, suffix is "dll" */
return str[0] != '.' && str.length() > 4 && strings_equal_ignore_case (".dll", str.substr(str.length() - 4));
return str[0] != '.' && (str.length() > 4 && str.find (".dll") == (str.length() - 4));
}
int

6
libs/ardour/vst_info_file.cc
View file

@ -351,7 +351,7 @@ vstfx_write_info_file (FILE* fp, vector<VSTInfo *> *infos)
static bool
vstfx_blacklist_stat (const char *dllpath, int personal)
{
if (strstr (dllpath, ".so" ) == 0 && strcasestr(dllpath, ".dll") == 0) {
if (strstr (dllpath, ".so" ) == 0 && strstr(dllpath, ".dll") == 0) {
return true;
}
string const path = vstfx_blacklist_path (dllpath, personal);
@ -435,7 +435,7 @@ vstfx_remove_infofile (const char *dllpath)
static char *
vstfx_infofile_stat (const char *dllpath, struct stat* statbuf, int personal)
{
if (strstr (dllpath, ".so" ) == 0 && strcasestr(dllpath, ".dll") == 0) {
if (strstr (dllpath, ".so" ) == 0 && strstr(dllpath, ".dll") == 0) {
return 0;
}
@ -494,7 +494,7 @@ vstfx_infofile_for_read (const char* dllpath)
static FILE *
vstfx_infofile_create (const char* dllpath, int personal)
{
if (strstr (dllpath, ".so" ) == 0 && strcasestr(dllpath, ".dll") == 0) {
if (strstr (dllpath, ".so" ) == 0 && strstr(dllpath, ".dll") == 0) {
return 0;
}

4
libs/fst/scanner.cc
View file

@ -75,7 +75,7 @@ int main (int argc, char **argv) {
char *dllpath = NULL;
if (argc == 3 && !strcmp("-f", argv[1])) {
dllpath = argv[2];
if (strstr (dllpath, ".so" ) || strcasestr(dllpath, ".dll")) {
if (strstr (dllpath, ".so" ) || strstr(dllpath, ".dll")) {
vstfx_remove_infofile(dllpath);
vstfx_un_blacklist(dllpath);
}
@ -105,7 +105,7 @@ int main (int argc, char **argv) {
#endif
#ifdef WINDOWS_VST_SUPPORT
else if (strcasestr (dllpath, ".dll")) {
else if (strstr (dllpath, ".dll")) {
infos = vstfx_get_info_fst(dllpath);
}
#endif