Skip to content

Commit 5f0dbd8

Browse files
committed
fix: clang-tidy warnings, naming, AQBase TEvent
1 parent e445b3b commit 5f0dbd8

4 files changed

Lines changed: 16 additions & 11 deletions

File tree

packages/react-native-audio-api/common/cpp/audioapi/core/AudioParam.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ class AudioParam {
6868
/// @note Audio Thread only
6969
void cancelAndHoldAtTime(double cancelTime);
7070

71-
template <
72-
typename F,
73-
typename = std::enable_if_t<std::is_invocable_r_v<void, std::decay_t<F>, BaseAudioContext &>>>
74-
bool scheduleAudioEvent(F &&event) noexcept {
71+
template <typename F>
72+
bool scheduleAudioEvent(F &&event) noexcept
73+
requires(std::is_invocable_r_v<void, std::decay_t<F>, BaseAudioContext &>)
74+
{
7575
if (std::shared_ptr<BaseAudioContext> context = context_.lock()) {
7676
return context->scheduleAudioEvent(std::forward<F>(event));
7777
}
@@ -140,6 +140,7 @@ class AudioParam {
140140
void updateQueue(RenderAutomationEvent &&event) {
141141
eventsQueue_.push(std::move(event));
142142
}
143+
143144
float getValueAtTime(double time);
144145
void processInputs(
145146
const std::shared_ptr<DSPAudioBuffer> &outputBuffer,

packages/react-native-audio-api/common/cpp/audioapi/core/utils/automation/AutomationControlQueue.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ Result<NoneType, std::string> AutomationControlQueue::checkCurveExclusion(
1919
event.getStartTime(),
2020
event.getEndTime(),
2121
toString(conflict->getType()),
22-
conflict->getAutomationEventTime()));
22+
conflict->getAutomationTime()));
2323
}
2424
} else {
25-
const auto *conflict = findEventAtTime(event.getAutomationEventTime());
25+
const auto *conflict = findEventAtTime(event.getAutomationTime());
2626
if ((conflict != nullptr) && conflict->getType() == AutomationEventType::SET_VALUE_CURVE) {
2727
return Err(
2828
std::format(
2929
"Cannot schedule event of type {} at time {} because it conflicts with an existing curve event from time {} to {}.",
3030
toString(event.getType()),
31-
event.getAutomationEventTime(),
31+
event.getAutomationTime(),
3232
conflict->getStartTime(),
3333
conflict->getEndTime()));
3434
}
@@ -37,7 +37,7 @@ Result<NoneType, std::string> AutomationControlQueue::checkCurveExclusion(
3737
}
3838

3939
void AutomationControlQueue::cancelScheduledValues(double cancelTime) {
40-
while (!eventQueue_.isEmpty() && eventQueue_.peekBack().getAutomationEventTime() >= cancelTime) {
40+
while (!eventQueue_.isEmpty() && eventQueue_.peekBack().getAutomationTime() >= cancelTime) {
4141
eventQueue_.popBack();
4242
}
4343
}
@@ -47,7 +47,7 @@ const AutomationEvent *AutomationControlQueue::findEventAtTime(double automation
4747
for (const auto &event : eventQueue_) {
4848
if ((event.getType() == AutomationEventType::SET_VALUE_CURVE &&
4949
event.getStartTime() <= automationTime && automationTime <= event.getEndTime()) ||
50-
event.getAutomationEventTime() == automationTime) {
50+
event.getAutomationTime() == automationTime) {
5151
return &event;
5252
}
5353
}

packages/react-native-audio-api/common/cpp/audioapi/core/utils/automation/AutomationEvent.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class AutomationEvent {
3535
return *this;
3636
}
3737

38-
[[nodiscard]] double getAutomationEventTime() const noexcept {
38+
[[nodiscard]] double getAutomationTime() const noexcept {
3939
return isRamp(type_) ? endTime_ : startTime_;
4040
}
4141

packages/react-native-audio-api/common/cpp/audioapi/core/utils/automation/AutomationQueueBase.hpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
namespace audioapi {
88

99
template <typename TEvent>
10+
concept AutomationEventConcept = requires(TEvent event) {
11+
{ event.getAutomationTime() } -> std::convertible_to<double>;
12+
};
13+
template <AutomationEventConcept TEvent>
1014
class AutomationQueueBase {
1115
public:
1216
AutomationQueueBase() = default;
@@ -53,7 +57,7 @@ class AutomationQueueBase {
5357
protected:
5458
struct EventComparator {
5559
bool operator()(const TEvent &a, const TEvent &b) const {
56-
return a.getAutomationEventTime() < b.getAutomationEventTime();
60+
return a.getAutomationTime() < b.getAutomationTime();
5761
}
5862
};
5963

0 commit comments

Comments
 (0)