Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove support for FB360 and VISR plugins #289

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

Remove support for FB360 and VISR plugins #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
da5e306
Remove plugin suites for FB360 and VISR
firthm01 Jan 8, 2025
ab75c06
Update pluginsuitetests.cpp
firthm01 Jan 8, 2025
cca6d6d
Remove installs of ADMPresets
firthm01 Jan 8, 2025
cf94e44
Remove plugin_deprecation_warning
firthm01 Jan 8, 2025
b52e5b9
Remove unused test code
firthm01 Jan 8, 2025
b0b6043
Remove any FB360/VISR specific plugin code from tests
firthm01 Jan 8, 2025
4ad0ce3
Update comments
firthm01 Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions packaging/install_list.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,6 @@
<InstallItem Source="UserPlugins/reaper_adm.dylib">
<MacOS Destination="[USERPLUGINS-INSTALL-DIR]/reaper_adm.dylib"/>
</InstallItem>
<InstallItem Source="UserPlugins/ADMPresets/FB360/ambix1stOrder.vstpreset">
<MacOS Destination="[USERPLUGINS-INSTALL-DIR]/ADMPresets/FB360/ambix1stOrder.vstpreset"/>
<Windows Destination="[USERPLUGINS-INSTALL-DIR]/ADMPresets/FB360/ambix1stOrder.vstpreset"/>
</InstallItem>
<InstallItem Source="UserPlugins/ADMPresets/FB360/ambix2ndOrder.vstpreset">
<MacOS Destination="[USERPLUGINS-INSTALL-DIR]/ADMPresets/FB360/ambix2ndOrder.vstpreset"/>
<Windows Destination="[USERPLUGINS-INSTALL-DIR]/ADMPresets/FB360/ambix2ndOrder.vstpreset"/>
</InstallItem>
<InstallItem Source="UserPlugins/ADMPresets/FB360/FuMa1stOrder.vstpreset">
<MacOS Destination="[USERPLUGINS-INSTALL-DIR]/ADMPresets/FB360/FuMa1stOrder.vstpreset"/>
<Windows Destination="[USERPLUGINS-INSTALL-DIR]/ADMPresets/FB360/FuMa1stOrder.vstpreset"/>
</InstallItem>
<InstallItem Source="VST3/ADM Export Source.vst3">
<MacOS Destination="[VST3-INSTALL-DIR]/ADM Export Source.vst3"/>
<Windows Destination="[VST3-INSTALL-DIR]/ADM Export Source.vst3"/>
Expand Down
Binary file removed reaper-adm-extension/src/reaper_adm/ADMPresets/FB360/FuMa1stOrder.vstpreset
View file
Open in desktop
Binary file not shown.
Binary file removed reaper-adm-extension/src/reaper_adm/ADMPresets/FB360/ambix1stOrder.vstpreset
View file
Open in desktop
Binary file not shown.
Binary file removed reaper-adm-extension/src/reaper_adm/ADMPresets/FB360/ambix2ndOrder.vstpreset
View file
Open in desktop
Binary file not shown.
8 changes: 1 addition & 7 deletions reaper-adm-extension/src/reaper_adm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ set(EXTENSION_SOURCES
pluginregistry.cpp
pluginsuite.cpp
pluginsuite_ear.cpp
pluginsuite_fb360.cpp
pluginsuite_visr.cpp
projectelements.cpp
projectnode.cpp
projecttree.cpp
Expand Down Expand Up @@ -139,8 +137,6 @@ set(EXTENSION_HEADERS
pluginregistry.h
pluginsuite.h
pluginsuite_ear.h
pluginsuite_fb360.h
pluginsuite_visr.h
projectelements.h
projectnode.h
projecttree.h
Expand Down Expand Up @@ -259,6 +255,4 @@ if(WIN32)
DESTINATION
${win_install_dir}
OPTIONAL)
endif()

install(DIRECTORY ADMPresets COMPONENT Extension DESTINATION $<$<PLATFORM_ID:Windows>:${win_install_dir}>$<$<PLATFORM_ID:Darwin>:${macos_install_dir}>$<$<PLATFORM_ID:Linux>:${linux_install_dir}>)
endif()
5 changes: 0 additions & 5 deletions reaper-adm-extension/src/reaper_adm/exportaction_admsourcescontainer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#include "exportaction_admsource-admvst.h"
#include "exportaction_admsource-earvst.h"
#include "plugin_deprecation_warning.h"

void AdmExportHandler::repopulate(ReaperAPI const & api)
{
Expand Down Expand Up @@ -68,10 +67,6 @@ std::vector<std::string> AdmExportHandler::generateExportWarningStrings()
auto admExportSources = getAdmExportSources();
std::vector<std::string> msgs;

if (admExportVstSources && admExportVstSources->getAllFoundVsts()->size() > 0) {
msgs.push_back(pluginDeprecationMessage);
}

if(earSceneMasterVstSources && earSceneMasterVstSources->validForExport() && admExportVstSources && admExportVstSources->validForExport()) {
msgs.push_back(std::string("Multiple Types of Export Source!"));
}
Expand Down
17 changes: 0 additions & 17 deletions reaper-adm-extension/src/reaper_adm/plugin_deprecation_warning.h
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions reaper-adm-extension/src/reaper_adm/pluginmain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "pluginsuite.h"
#include "pluginregistry.h"
#include "pluginsuite_ear.h"
#include "plugin_deprecation_warning.h"
#include <update_check.h>
#include <version/eps_version.h>
#include <helper/native_message_box.hpp>
Expand Down Expand Up @@ -297,8 +296,6 @@ extern "C" {
std::make_unique<ImportAction>(hInstance, rec->hwnd_main, pluginSuite.second),
[pluginSuite](ReaperAPI& api, ImportAction& importer) {

pluginDeprecationWarning(pluginSuite, api);

api.Main_openProject("template:"); // This will TRY to start a blank project, but it will replace the current project if successful, so the user is prompted with the save dialog: yes, no, CANCEL
auto res = api.IsProjectDirty(nullptr); // If the project is still dirty (1), the user must have canceled! (yes/no would save/not save and start a new clean project)
if(res == 0) {
Expand Down Expand Up @@ -354,8 +351,6 @@ extern "C" {
std::make_unique<ImportAction>(hInstance, rec->hwnd_main, pluginSuite.second),
[pluginSuite](ReaperAPI& api, ImportAction& importer) {

pluginDeprecationWarning(pluginSuite, api);

char filename[4096];
api.GetProjectPath(filename, 4096);
auto filenameStr = std::string(filename);
Expand Down
2 changes: 1 addition & 1 deletion reaper-adm-extension/src/reaper_adm/pluginregistry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ void admplug::PluginRegistry::repopulateInstalledPlugins(bool warnOnFailure, con
std::string filePath{vstIniPath + fileName};
std::ifstream ifs{filePath};

// Next, parse the fileName... CSV, 3 part; filename + "=" + uid??, uid???, name (e.g, VISR SceneMasterVST (visr) (64ch)) - we might need to do some lazy matching on that... (e.g, end bit probably isn't expected)
// Next, parse the fileName... CSV, 3 part; filename + "=" + uid??, uid???, name (e.g, EAR Object (EBU), EAR Binaural Monitoring (EBU) (128ch)) - we might need to do some lazy matching on that... (e.g, end bit probably isn't expected)
if (ifs) {
fileFound = true;
std::string line;
Expand Down
2 changes: 1 addition & 1 deletion reaper-adm-extension/src/reaper_adm/pluginsuite.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ namespace admplug {

class UniqueValueAssigner {
// This class handles cases where each plugin should be assigned a unique value for a certain parameter
// (see objectId for VISR, or trackMapping for EAR)
// (e.g, trackMapping for EAR)

public:
struct SearchCandidate {
Expand Down
10 changes: 8 additions & 2 deletions reaper-adm-extension/src/reaper_adm/pluginsuite_ear.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,10 @@ void admplug::EARPluginSuite::onCreateObjectTrack(admplug::TrackElement & trackE
{
auto take = trackElement.getTakeElement();
TrackInfo trackInfo;
auto channelCount = static_cast<int>(take->channelCount());
int channelCount{ 0 };
if (take) {
channelCount = static_cast<int>(take->channelCount());
}

if(mapHasKey(takesOnTracks, take)) {
trackInfo = getValueFromMap(takesOnTracks, take);
Expand Down Expand Up @@ -359,7 +362,10 @@ void admplug::EARPluginSuite::onCreateObjectTrack(admplug::TrackElement & trackE
}

auto automationElements = trackElement.getAutomationElements();
auto takeChannels = take->channelsOfOriginal();
std::vector<int> takeChannels;
if (take) {
takeChannels = take->channelsOfOriginal();
}
for(auto const& automationElement : automationElements) {
auto aeChannelOfOriginal = automationElement->channel().channelOfOriginal();
for(int chOffset = 0; chOffset < takeChannels.size(); chOffset++) {
Expand Down
Loading
Loading