From 2fc669964e76edd476adc009431d60dafa0b32e5 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 12 Aug 2025 07:15:17 -0600 Subject: [PATCH] Revert "A new class ('ScopedTempoMapOwner') exposes functions which need to be visible outside of libtemporal" This reverts commit d3a15b11bab8ea1a8713b5ab4f6c478009b66862. This arrived at an awkward time as ScopedTempoMapOwner was being rearranged at the source level. It will be reapplied in a subsequent commit. --- libs/temporal/tempo.cc | 1 - libs/temporal/temporal/scope.h | 3 +-- libs/temporal/temporal/tempo.h | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libs/temporal/tempo.cc b/libs/temporal/tempo.cc index a0f11eff09..01d73d9aee 100644 --- a/libs/temporal/tempo.cc +++ b/libs/temporal/tempo.cc @@ -32,7 +32,6 @@ #include "pbd/string_convert.h" #include "temporal/debug.h" -#include "temporal/scope.h" #include "temporal/tempo.h" #include "temporal/types_convert.h" diff --git a/libs/temporal/temporal/scope.h b/libs/temporal/temporal/scope.h index d4ea3ced57..caeb16b718 100644 --- a/libs/temporal/temporal/scope.h +++ b/libs/temporal/temporal/scope.h @@ -25,11 +25,10 @@ #include "temporal/debug.h" #include "temporal/tempo.h" -#include "temporal/visibility.h" namespace Temporal { -class LIBTEMPORAL_API ScopedTempoMapOwner +class ScopedTempoMapOwner { public: ScopedTempoMapOwner () : local_tempo_map_depth (0) {} diff --git a/libs/temporal/temporal/tempo.h b/libs/temporal/temporal/tempo.h index 9af00e33e8..9caff963d3 100644 --- a/libs/temporal/temporal/tempo.h +++ b/libs/temporal/temporal/tempo.h @@ -1010,8 +1010,8 @@ class /*LIBTEMPORAL_API*/ TempoMap : public PBD::StatefulDestructible static void map_assert (bool expr, char const * exprstr, char const * file, int line); - LIBTEMPORAL_API void set_scope_owner (ScopedTempoMapOwner&); - LIBTEMPORAL_API void clear_scope_owner (); + void set_scope_owner (ScopedTempoMapOwner&); + void clear_scope_owner (); ScopedTempoMapOwner* scope_owner() const { return _scope_owner; } private: