From 5a12732cc0149d22bb7abec1374723a32d02d34c Mon Sep 17 00:00:00 2001 From: Curve Date: Fri, 31 May 2024 14:11:42 +0200 Subject: [PATCH] refactor(patchbay)!: remove `ignore_input_media` * Clients can easily handle this themselves by excluding `"media.class": "Stream/Input/Audio"` --- CMakeLists.txt | 2 +- README.md | 3 --- addon/addon.cpp | 2 -- include/vencord/patchbay.hpp | 7 ++----- lib/module.d.ts | 1 - package.json | 2 +- src/patchbay.impl.cpp | 7 ------- 7 files changed, 4 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a3b3f04..33054aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.21) -project(venmic LANGUAGES CXX VERSION 4.0.2) +project(venmic LANGUAGES CXX VERSION 5.0.0) # -------------------------------------------------------------------------------------------------------- # Library options diff --git a/README.md b/README.md index 2cee2f7..3f586a7 100644 --- a/README.md +++ b/README.md @@ -59,9 +59,6 @@ The Rest-Server exposes three simple endpoints The setting `only_default_speakers` is optional and will default to `true`. When enabled it will prevent linking against nodes that don't play to the default speaker. - The setting `ignore_input_media` is optional and will default to `true`. - When enabled it will prevent linking against nodes have a "Input" media-class. - The setting `workaround` is also optional and will default to an empty array. When set, venmic will redirect the first node that matches all of the specified properties to itself. diff --git a/addon/addon.cpp b/addon/addon.cpp index 44ce656..7d921f8 100644 --- a/addon/addon.cpp +++ b/addon/addon.cpp @@ -171,7 +171,6 @@ struct patchbay : public Napi::ObjectWrap auto include = to_array(data.Get("include")); auto exclude = to_array(data.Get("exclude")); auto ignore_devices = convert(data.Get("ignore_devices")); - auto ignore_input_media = convert(data.Get("ignore_input_media")); auto only_default_speakers = convert(data.Get("only_default_speakers")); auto workaround = to_array(data.Get("workaround")); @@ -188,7 +187,6 @@ struct patchbay : public Napi::ObjectWrap .include = include.value_or(std::vector{}), .exclude = exclude.value_or(std::vector{}), .ignore_devices = ignore_devices.value_or(true), - .ignore_input_media = ignore_input_media.value_or(true), .only_default_speakers = only_default_speakers.value_or(true), .workaround = workaround.value_or(std::vector{}), }); diff --git a/include/vencord/patchbay.hpp b/include/vencord/patchbay.hpp index 942522d..8b29772 100644 --- a/include/vencord/patchbay.hpp +++ b/include/vencord/patchbay.hpp @@ -15,11 +15,8 @@ namespace vencord std::vector exclude; public: - bool ignore_devices{true}; // Only link against non-device nodes - bool ignore_input_media{true}; // Ignore Nodes that have "Input" in their media class - - public: - bool only_default_speakers{true}; + bool ignore_devices{true}; // Only link against non-device nodes + bool only_default_speakers{true}; // Ignore nodes that don't play to the default speaker public: std::vector workaround; diff --git a/lib/module.d.ts b/lib/module.d.ts index c2e196a..5fbef16 100644 --- a/lib/module.d.ts +++ b/lib/module.d.ts @@ -18,7 +18,6 @@ export interface LinkData exclude: Node[]; ignore_devices?: boolean; - ignore_input_media?: boolean; only_default_speakers?: boolean; workaround?: Node[]; diff --git a/package.json b/package.json index 86e4d4a..7c6bc5d 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "private": false, "license": "MPL-2.0", "author": "Curve (https://github.com/Curve)", - "version": "4.0.2", + "version": "5.0.0", "main": "./lib/index.js", "types": "./lib/module.d.ts", "scripts": { diff --git a/src/patchbay.impl.cpp b/src/patchbay.impl.cpp index 02e22ca..e7794d1 100644 --- a/src/patchbay.impl.cpp +++ b/src/patchbay.impl.cpp @@ -228,13 +228,6 @@ namespace vencord return; } - if (options.ignore_input_media && props["media.class"].find("Input") != std::string::npos) - { - logger::get()->warn("[patchbay] (link) prevented link to node with input class: {} (\"{}\")", id, - props["media.class"]); - return; - } - logger::get()->debug("[patchbay] (link) linking {}", id); auto mapping = map_ports(target);