vst_host: remove vstplugin folder creation, code clean-up

This commit is contained in:
Gerasim Troeglazov
2015-04-23 21:37:54 +10:00
parent b5118c36cc
commit 6653e74873
@@ -20,26 +20,24 @@ VSTAddOn::VSTAddOn(image_id image)
: :
BMediaAddOn(image) BMediaAddOn(image)
{ {
const char vst_subdir[]={"media/vstplugins"};
BPath addons_dir;
fPluginsList.MakeEmpty(); fPluginsList.MakeEmpty();
find_directory(B_USER_NONPACKAGED_ADDONS_DIRECTORY, &addons_dir); directory_which dataDirectories[] = {
addons_dir.Append(vst_subdir); B_SYSTEM_ADDONS_DIRECTORY,
ScanPluginsFolders(addons_dir.Path(), true); B_SYSTEM_NONPACKAGED_ADDONS_DIRECTORY,
B_USER_ADDONS_DIRECTORY,
B_USER_NONPACKAGED_ADDONS_DIRECTORY,
};
find_directory(B_USER_ADDONS_DIRECTORY, &addons_dir); for (uint i = 0; i < sizeof(dataDirectories)/sizeof(directory_which); i++) {
addons_dir.Append(vst_subdir); BPath path;
ScanPluginsFolders(addons_dir.Path() ,true); if (find_directory(dataDirectories[i], &path) != B_OK)
continue;
find_directory(B_SYSTEM_NONPACKAGED_ADDONS_DIRECTORY, &addons_dir); path.Append("media/vstplugins");
addons_dir.Append(vst_subdir);
ScanPluginsFolders(addons_dir.Path());
find_directory(B_SYSTEM_ADDONS_DIRECTORY, &addons_dir); ScanPluginsFolders(path.Path());
addons_dir.Append(vst_subdir); }
ScanPluginsFolders(addons_dir.Path());
} }
VSTAddOn::~VSTAddOn() VSTAddOn::~VSTAddOn()
@@ -112,7 +110,8 @@ VSTAddOn::ScanPluginsFolders(const char* path, bool make_dir)
BDirectory dir(path); BDirectory dir(path);
if (dir.InitCheck() != B_OK) { if (dir.InitCheck() != B_OK) {
create_directory(path, 0755); if (make_dir == true)
create_directory(path, 0755);
return 0; return 0;
} }