X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fvst_info_file.cc;h=3b56876494b93b8bcfbec016736540a4635cecee;hb=8367b7cab344e75908744a95fda860c7fadff420;hp=a723f55d8b11bd710b2f751f509d4b264d58ff68;hpb=114296d9586c957070c1d3ee940e4de8101e3e33;p=ardour.git

diff --git a/libs/ardour/vst_info_file.cc b/libs/ardour/vst_info_file.cc
index a723f55d8b..3b56876494 100644
--- a/libs/ardour/vst_info_file.cc
+++ b/libs/ardour/vst_info_file.cc
@@ -97,6 +97,7 @@ vstfx_cache_file (const char* dllpath, int personal, const char *ext)
 	string dir;
 	if (personal) {
 		dir = get_personal_vst_info_cache_dir();
+		// TODO prefix path relative to scan-root to avoid duplicates
 	} else {
 		dir = Glib::path_get_dirname (std::string(dllpath));
 	}
@@ -227,6 +228,12 @@ vstfx_load_info_block(FILE* fp, VSTInfo *info)
 		info->wantMidi = 1;
 	}
 
+	if ((info->numParams) == 0) {
+		info->ParamNames = NULL;
+		info->ParamLabels = NULL;
+		return true;
+	}
+
 	if ((info->ParamNames = (char **) malloc(sizeof(char*)*info->numParams)) == 0) {
 		return false;
 	}
@@ -344,9 +351,15 @@ vstfx_write_info_file (FILE* fp, vector<VSTInfo *> *infos)
 static bool
 vstfx_blacklist_stat (const char *dllpath, int personal)
 {
-	if (strstr (dllpath, ".so" ) == 0 && strstr(dllpath, ".dll") == 0) {
+	const size_t slen = strlen (dllpath);
+	if (
+			(slen <= 3 || g_ascii_strcasecmp (&dllpath[slen-3], ".so"))
+			&&
+			(slen <= 4 || g_ascii_strcasecmp (&dllpath[slen-4], ".dll"))
+	   ) {
 		return true;
 	}
+
 	string const path = vstfx_blacklist_path (dllpath, personal);
 
 	if (Glib::file_test (path, Glib::FileTest (Glib::FILE_TEST_EXISTS | Glib::FILE_TEST_IS_REGULAR))) {
@@ -384,8 +397,14 @@ vstfx_blacklist_file (const char *dllpath)
 {
 	FILE *f;
 	if ((f = fopen (vstfx_blacklist_path (dllpath, 0).c_str(), "wb"))) {
+#ifndef NDEBUG
+	PBD::info << "Blacklisted VST: '" << vstfx_blacklist_path (dllpath, 0) << "'" << endmsg;
+#endif
 		return f;
 	}
+#ifndef NDEBUG
+	PBD::info << "Blacklisted VST: '" << vstfx_blacklist_path (dllpath, 1) << "'" << endmsg;
+#endif
 	return fopen (vstfx_blacklist_path (dllpath, 1).c_str(), "wb");
 }
 
@@ -422,7 +441,12 @@ vstfx_remove_infofile (const char *dllpath)
 static char *
 vstfx_infofile_stat (const char *dllpath, struct stat* statbuf, int personal)
 {
-	if (strstr (dllpath, ".so" ) == 0 && strstr(dllpath, ".dll") == 0) {
+	const size_t slen = strlen (dllpath);
+	if (
+			(slen <= 3 || g_ascii_strcasecmp (&dllpath[slen-3], ".so"))
+			&&
+			(slen <= 4 || g_ascii_strcasecmp (&dllpath[slen-4], ".dll"))
+	   ) {
 		return 0;
 	}
 
@@ -481,11 +505,19 @@ vstfx_infofile_for_read (const char* dllpath)
 static FILE *
 vstfx_infofile_create (const char* dllpath, int personal)
 {
-	if (strstr (dllpath, ".so" ) == 0 && strstr(dllpath, ".dll") == 0) {
-		return 0;
+	const size_t slen = strlen (dllpath);
+	if (
+			(slen <= 3 || g_ascii_strcasecmp (&dllpath[slen-3], ".so"))
+			&&
+			(slen <= 4 || g_ascii_strcasecmp (&dllpath[slen-4], ".dll"))
+	   ) {
+		return NULL;
 	}
 
 	string const path = vstfx_infofile_path (dllpath, personal);
+#ifndef NDEBUG
+	PBD::info << "Creating VST cache file " << path << endmsg;
+#endif
 	return fopen (path.c_str(), "wb");
 }
 
@@ -537,7 +569,7 @@ bool vstfx_midi_input (VSTState* vstfx)
 	if (vst_version >= 2) {
 		/* should we send it VST events (i.e. MIDI) */
 
-		if ((plugin->flags & effFlagsIsSynth) || (plugin->dispatcher (plugin, effCanDo, 0, 0,(void*) "receiveVstEvents", 0.0f) > 0)) {
+		if ((plugin->flags & effFlagsIsSynth) || (plugin->dispatcher (plugin, effCanDo, 0, 0, const_cast<char*> ("receiveVstEvents"), 0.0f) > 0)) {
 			return true;
 		}
 	}
@@ -555,8 +587,8 @@ bool vstfx_midi_output (VSTState* vstfx)
 	if (vst_version >= 2) {
 		/* should we send it VST events (i.e. MIDI) */
 
-		if (   (plugin->dispatcher (plugin, effCanDo, 0, 0,(void*) "sendVstEvents", 0.0f) > 0)
-				|| (plugin->dispatcher (plugin, effCanDo, 0, 0,(void*) "sendVstMidiEvent", 0.0f) > 0)
+		if (   (plugin->dispatcher (plugin, effCanDo, 0, 0, const_cast<char*> ("sendVstEvents"), 0.0f) > 0)
+		       || (plugin->dispatcher (plugin, effCanDo, 0, 0, const_cast<char*> ("sendVstMidiEvent"), 0.0f) > 0)
 			 ) {
 			return true;
 		}
@@ -721,7 +753,6 @@ vstfx_info_from_plugin (const char *dllpath, VSTState* vstfx, vector<VSTInfo *>
 		int id;
 		vector< pair<int, string> > ids;
 		AEffect *plugin = vstfx->plugin;
-		string path = vstfx->handle->path;
 
 		do {
 			char name[65] = "Unknown";