From 553749fb327284343528392b6c7eee0a93964ee9 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Sun, 29 Sep 2024 02:43:19 +0200 Subject: [PATCH] ase/: remove all JSONIPC_INHERIT() macros, now unused Signed-off-by: Tim Janik --- ase/clapdevice.cc | 2 -- ase/clip.cc | 2 -- ase/crawler.cc | 2 -- ase/gadget.cc | 2 -- ase/internal.hh | 5 ----- ase/monitor.cc | 2 -- ase/nativedevice.cc | 2 -- ase/project.cc | 2 -- ase/server.cc | 2 -- ase/track.cc | 2 -- 10 files changed, 23 deletions(-) diff --git a/ase/clapdevice.cc b/ase/clapdevice.cc index 8f326bd2..a824faaa 100644 --- a/ase/clapdevice.cc +++ b/ase/clapdevice.cc @@ -104,8 +104,6 @@ struct ClapPropertyImpl : public Property, public virtual EmittableImpl { }; // == ClapDeviceImpl == -JSONIPC_INHERIT (ClapDeviceImpl, Device); - ClapDeviceImpl::ClapDeviceImpl (ClapPluginHandleP claphandle) : handle_ (claphandle) { diff --git a/ase/clip.cc b/ase/clip.cc index a4cf68d7..2f5fa3fb 100644 --- a/ase/clip.cc +++ b/ase/clip.cc @@ -36,8 +36,6 @@ ClipNote::operator== (const ClipNote &o) const } // == ClipImpl == -JSONIPC_INHERIT (ClipImpl, Clip); - ClipImpl::ClipImpl (TrackImpl &parent) { track_ = &parent; diff --git a/ase/crawler.cc b/ase/crawler.cc index 9d7924a4..d94dd3a7 100644 --- a/ase/crawler.cc +++ b/ase/crawler.cc @@ -25,8 +25,6 @@ ResourceCrawler::ResourceCrawler() : {} // == FileCrawler == -JSONIPC_INHERIT (FileCrawler, ResourceCrawler); - FileCrawler::FileCrawler (const String &cwd, bool constraindir, bool constrainfile) : cwd_ ("/"), constraindir_ (constraindir), constrainfile_ (constrainfile) { diff --git a/ase/gadget.cc b/ase/gadget.cc index 165eacae..03ad0a12 100644 --- a/ase/gadget.cc +++ b/ase/gadget.cc @@ -15,8 +15,6 @@ Gadget::Gadget() : {} // == GadgetImpl == -JSONIPC_INHERIT (GadgetImpl, Gadget); - GadgetImpl::~GadgetImpl() {} diff --git a/ase/internal.hh b/ase/internal.hh index f5b32f86..6d5291e0 100644 --- a/ase/internal.hh +++ b/ase/internal.hh @@ -73,11 +73,6 @@ using Ase::String; /// Create a Ase::StringVector, from a const char* C-style array. #define STRING_VECTOR_FROM_ARRAY(ConstCharArray) ASE_STRING_VECTOR_FROM_ARRAY(ConstCharArray) -/// Register `IMPL` with Jsonipc and indicate it inherits from `INTERFACE`. -#define JSONIPC_INHERIT(IMPL, INTERFACE) \ - [[maybe_unused]] static bool ASE_CPP_PASTE2 (ase_inherit__, __COUNTER__) = \ - ( Jsonipc::Class< IMPL >().inherit< INTERFACE >() , 0 ) - /// Register `func` as an integrity test. #define TEST_INTEGRITY(FUNC) static void FUNC() __attribute__ ((__cold__, __unused__)); \ static ::Ase::Test::IntegrityCheck ASE_CPP_PASTE2 (__Ase__Test__IntegrityCheck__line, __LINE__) { #FUNC, FUNC, 'I' } diff --git a/ase/monitor.cc b/ase/monitor.cc index 5ed5d545..f8fa5651 100644 --- a/ase/monitor.cc +++ b/ase/monitor.cc @@ -7,8 +7,6 @@ namespace Ase { // == MonitorImpl == -JSONIPC_INHERIT (MonitorImpl, Monitor); - MonitorImpl::MonitorImpl() {} diff --git a/ase/nativedevice.cc b/ase/nativedevice.cc index b09e8dc8..a574aad4 100644 --- a/ase/nativedevice.cc +++ b/ase/nativedevice.cc @@ -10,8 +10,6 @@ namespace Ase { // == NativeDeviceImpl == -JSONIPC_INHERIT (NativeDeviceImpl, NativeDevice); - NativeDeviceImpl::NativeDeviceImpl (const String &aseid, AudioProcessor::StaticInfo static_info, AudioProcessorP aproc) : proc_ (aproc), combo_ (std::dynamic_pointer_cast (aproc)), info_ (extract_info (aseid, static_info)) { diff --git a/ase/project.cc b/ase/project.cc index 7cdaeaff..fc7a6242 100644 --- a/ase/project.cc +++ b/ase/project.cc @@ -41,8 +41,6 @@ Project::last_project() } // == ProjectImpl == -JSONIPC_INHERIT (ProjectImpl, Project); - using StringPairS = std::vector>; struct ProjectImpl::PStorage { diff --git a/ase/server.cc b/ase/server.cc index 28ede0ae..b111562c 100644 --- a/ase/server.cc +++ b/ase/server.cc @@ -18,8 +18,6 @@ namespace Ase { // == ServerImpl == -JSONIPC_INHERIT (ServerImpl, Server); - static constexpr size_t telemetry_size = 4 * 1024 * 1024; ServerImpl *SERVER = nullptr; diff --git a/ase/track.cc b/ase/track.cc index 6fbbfbb4..d51aa045 100644 --- a/ase/track.cc +++ b/ase/track.cc @@ -14,8 +14,6 @@ namespace Ase { // == TrackImpl == -JSONIPC_INHERIT (TrackImpl, Track); - TrackImpl::TrackImpl (ProjectImpl &project, bool masterflag) { gadget_flags (masterflag ? MASTER_TRACK : 0);