ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Bug fix imported from Mixbus2 (SVN r11448)

Browse Source 
If we couldn't figure out a plugin creator's name, either use as much of it as we could determine or mark the creator as 'Unknown'
This commit is contained in:
John Emmas 2014-05-10 08:32:14 +01:00
parent 349f66f413
commit b377bc44c2
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk2_ardour/plugin_selector.cc
View File

@ -316,7 +316,12 @@ PluginSelector::refiller (const PluginInfoList& plugs, const::std::string& filte
#else
while (pos < creator.length() && (isalnum (creator[pos]) || isspace (creator[pos]))) ++pos;
#endif
creator = creator.substr (0, pos);
// If there were too few characters to create a
// meaningfule name, mark this creator as 'Unknown'
if (creator.length()<2 || pos<3)
creator = "Unknown";
else
creator = creator.substr (0, pos);
newrow[plugin_columns.creator] = creator;
@ -685,11 +690,20 @@ PluginSelector::create_by_creator_menu (ARDOUR::PluginInfoList& all_plugs)
/* stupid LADSPA creator strings */
string::size_type pos = 0;
#ifdef PLATFORM_WINDOWS
while (pos < creator.length() && creator[pos] > -2 && creator[pos] < 256 && (isalnum (creator[pos]) || isspace (creator[pos]))) ++pos;
while (pos < creator.length() && creator[pos]>(-2) && creator[pos]<256 && (isprint (creator[pos]))) ++pos;
#else
while (pos < creator.length() && (isalnum (creator[pos]) || isspace (creator[pos]))) ++pos;
#endif
creator = creator.substr (0, pos);
// Check to see if we found any invalid characters.
if (creator.length() != pos) {
// If there were too few characters to create a
// meaningfule name, mark this creator as 'Unknown'
if (pos<3)
creator = "Unknown?";
else
creator = creator.substr (0, pos);
}
SubmenuMap::iterator x;
Gtk::Menu* submenu;