Skip to content

Commit f8351bd

Browse files
committed
core: harmonize concept names for ports
1 parent bff2912 commit f8351bd

24 files changed

+372
-739
lines changed

include/avnd/binding/dump/DumpCBOR.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ std::string_view port_type(Field f)
177177
return "texture";
178178
else if constexpr(avnd::image_port<type>)
179179
return "image";
180-
else if constexpr(avnd::parameter<type>)
180+
else if constexpr(avnd::parameter_port<type>)
181181
return "parameter";
182182
else if constexpr(avnd::message<type>)
183183
return "message";
@@ -227,8 +227,8 @@ void print_callback(nlohmann::json& obj)
227227
using type = typename Field::type;
228228
if constexpr(avnd::view_callback<type>)
229229
obj["type"] = "view";
230-
else if constexpr(avnd::dynamic_callback<type>)
231-
obj["type"] = "dynamic";
230+
else if constexpr(avnd::stored_callback<type>)
231+
obj["type"] = "stored";
232232
else
233233
obj["type"] = "unknown";
234234

@@ -288,12 +288,12 @@ void print_parameter(nlohmann::json& obj)
288288
using type = typename Field::type;
289289
obj["value_type"] = parameter_value_type(Field{});
290290

291-
if constexpr(avnd::control<type>)
291+
if constexpr(avnd::control_port<type>)
292292
obj["control"] = true;
293293
else
294294
obj["value_port"] = true;
295295

296-
if constexpr(avnd::sample_accurate_parameter<type>)
296+
if constexpr(avnd::sample_accurate_parameter_port<type>)
297297
{
298298
if constexpr(avnd::linear_sample_accurate_parameter<type>)
299299
{
@@ -303,7 +303,7 @@ void print_parameter(nlohmann::json& obj)
303303
{
304304
obj["sample_accurate"] = "span";
305305
}
306-
else if constexpr(avnd::dynamic_sample_accurate_parameter<type>)
306+
else if constexpr(avnd::dynamic_sample_accurate_parameter_port<type>)
307307
{
308308
obj["sample_accurate"] = "dynamic";
309309
}
@@ -424,7 +424,7 @@ void print_inputs(nlohmann::json::array_t& arr)
424424
print_metadatas<type>(obj);
425425
obj["type"] = port_type(wrap);
426426

427-
if constexpr(avnd::parameter<type>)
427+
if constexpr(avnd::parameter_port<type>)
428428
{
429429
print_parameter<Field>(obj["parameter"]);
430430
}

include/avnd/binding/max/outputs.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -571,14 +571,14 @@ struct value_writer
571571
{
572572
T& self;
573573

574-
template <avnd::parameter Field, std::size_t Idx>
574+
template <avnd::parameter_port Field, std::size_t Idx>
575575
requires(!avnd::sample_accurate_parameter<Field>)
576576
void operator()(Field& ctrl, t_outlet* port, avnd::num<Idx>) const noexcept
577577
{
578578
value_to_max_dispatch<Field>(self, avnd::field_index<Idx>{}, port, ctrl.value);
579579
}
580580

581-
template <avnd::linear_sample_accurate_parameter Field, std::size_t Idx>
581+
template <avnd::linear_sample_accurate_parameter_port Field, std::size_t Idx>
582582
void operator()(Field& ctrl, t_outlet* port, avnd::num<Idx>) const noexcept
583583
{
584584
// FIXME
@@ -604,7 +604,7 @@ struct value_writer
604604
#endif
605605
}
606606

607-
template <avnd::dynamic_sample_accurate_parameter Field, std::size_t Idx>
607+
template <avnd::dynamic_sample_accurate_parameter_port Field, std::size_t Idx>
608608
void operator()(Field& ctrl, t_outlet* port, avnd::num<Idx>) const noexcept
609609
{
610610
for(auto& [timestamp, val] : ctrl.values)
@@ -615,7 +615,7 @@ struct value_writer
615615
}
616616

617617
// does not make sense as output, only as input
618-
template <avnd::span_sample_accurate_parameter Field, std::size_t Idx>
618+
template <avnd::span_sample_accurate_parameter_port Field, std::size_t Idx>
619619
void operator()(Field& ctrl, t_outlet* port, avnd::num<Idx>) const noexcept = delete;
620620

621621
void operator()(auto&&...) const noexcept { }
@@ -665,7 +665,7 @@ struct outputs
665665

666666
}
667667

668-
template <avnd::parameter C>
668+
template <avnd::parameter_port C>
669669
static void setup(C& out, t_outlet& outlet)
670670
{
671671

include/avnd/binding/ossia/callbacks.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ struct do_callback<Self, Idx, Field, R, Args...>
3636
}
3737

3838
// FIXME handle control feedback !
39-
// if constexpr(avnd::control<Field>)
39+
// if constexpr(avnd::control_port<Field>)
4040
// {
4141
// // Get the index of the control in [0; N[
4242
// using type = typename Exec_T::processor_type;

include/avnd/binding/ossia/controls.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ namespace oscr
1212
template <typename Field>
1313
struct controls_type;
1414

15-
template <avnd::parameter Field>
16-
requires avnd::control<Field>
15+
template <avnd::parameter_port Field>
16+
requires avnd::control_port<Field>
1717
struct controls_type<Field>
1818
{
1919
using type = std::decay_t<decltype(Field::value)>;
@@ -23,7 +23,7 @@ template <typename Field>
2323
using controls_type_t = typename controls_type<Field>::type;
2424

2525
template <avnd::callback Field>
26-
requires avnd::control<Field>
26+
requires avnd::control_port<Field>
2727
struct controls_type<Field>
2828
{
2929
// FIXME maybe the tuple of arguments?

include/avnd/binding/ossia/node.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ class safe_node_base : public safe_node_base_base<T>
564564
return true;
565565
}
566566

567-
template <avnd::smooth_parameter Field, typename Val, std::size_t NField>
567+
template <avnd::smooth_parameter_port Field, typename Val, std::size_t NField>
568568
inline bool from_ossia_value(
569569
Field& field, const ossia::value& src, Val& dst, avnd::field_index<NField> idx)
570570
{
@@ -575,7 +575,7 @@ class safe_node_base : public safe_node_base_base<T>
575575
}
576576

577577
// Special case: this one may require the current tempo information
578-
template <avnd::time_control Field, typename Val, std::size_t NField>
578+
template <avnd::time_control_port Field, typename Val, std::size_t NField>
579579
inline bool from_ossia_value(
580580
Field& field, const ossia::value& src, Val& dst, avnd::field_index<NField> idx)
581581
{

include/avnd/binding/ossia/port_run_postprocess.hpp

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@ struct process_after_run
5858
Field& ctrl, ossia::audio_inlet& port, avnd::field_index<Idx>) const noexcept
5959
{
6060
}
61+
template <typename Field, std::size_t Idx>
62+
void operator()(
63+
Field& ctrl, std::vector<ossia::audio_inlet*>& port,
64+
avnd::field_index<Idx>) const noexcept
65+
{
66+
}
6167

6268
template <typename Field, std::size_t Idx>
6369
void
@@ -77,14 +83,14 @@ struct process_after_run
7783
{
7884
}
7985

80-
template <avnd::parameter Field, std::size_t Idx>
86+
template <avnd::parameter_port Field, std::size_t Idx>
8187
requires ossia_port<Field>
8288
void write_value(
8389
Field& ctrl, auto& port, auto& val, int64_t ts,
8490
avnd::field_index<Idx>) const noexcept
8591
{
8692
}
87-
template <avnd::parameter Field, std::size_t Idx>
93+
template <avnd::parameter_port Field, std::size_t Idx>
8894
requires(!ossia_port<Field>)
8995
void write_value(
9096
Field& ctrl, ossia::value_outlet& port, auto& val, int64_t ts,
@@ -94,7 +100,7 @@ struct process_after_run
94100
{
95101
port->write_value(std::move(v), ts);
96102

97-
if constexpr(avnd::control<Field>)
103+
if constexpr(avnd::control_port<Field>)
98104
{
99105
// Get the index of the control in [0; N[
100106
using type = typename Exec_T::processor_type;
@@ -107,8 +113,8 @@ struct process_after_run
107113
}
108114
}
109115

110-
template <avnd::parameter Field, std::size_t Idx>
111-
requires(!avnd::sample_accurate_parameter<Field> && !ossia_port<Field>)
116+
template <avnd::parameter_port Field, std::size_t Idx>
117+
requires(!avnd::sample_accurate_parameter_port<Field> && !ossia_port<Field>)
112118
void operator()(
113119
Field& ctrl, ossia::value_outlet& port, avnd::field_index<Idx>) const noexcept
114120
{
@@ -130,7 +136,7 @@ struct process_after_run
130136
}
131137
}
132138

133-
template <avnd::linear_sample_accurate_parameter Field, std::size_t Idx>
139+
template <avnd::linear_sample_accurate_parameter_port Field, std::size_t Idx>
134140
void operator()(
135141
Field& ctrl, ossia::value_outlet& port, avnd::field_index<Idx> idx) const noexcept
136142
{
@@ -153,7 +159,7 @@ struct process_after_run
153159
}
154160
}
155161

156-
template <avnd::dynamic_sample_accurate_parameter Field, std::size_t Idx>
162+
template <avnd::dynamic_sample_accurate_parameter_port Field, std::size_t Idx>
157163
void operator()(
158164
Field& ctrl, ossia::value_outlet& port, avnd::field_index<Idx>) const noexcept
159165
{
@@ -165,7 +171,7 @@ struct process_after_run
165171
}
166172

167173
// does not make sense as output, only as input
168-
template <avnd::span_sample_accurate_parameter Field, std::size_t Idx>
174+
template <avnd::span_sample_accurate_parameter_port Field, std::size_t Idx>
169175
void operator()(
170176
Field& ctrl, ossia::value_outlet& port, avnd::field_index<Idx>) const noexcept
171177
= delete;
@@ -175,6 +181,12 @@ struct process_after_run
175181
Field& ctrl, ossia::audio_outlet& port, avnd::field_index<Idx>) const noexcept
176182
{
177183
}
184+
template <typename Field, std::size_t Idx>
185+
void operator()(
186+
Field& ctrl, std::vector<ossia::audio_outlet*>& port,
187+
avnd::field_index<Idx>) const noexcept
188+
{
189+
}
178190

179191
template <avnd::raw_container_midi_port Field, std::size_t Idx>
180192
void operator()(

include/avnd/binding/ossia/port_run_preprocess.hpp

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,18 @@ struct process_before_run
6868
int start{};
6969
int frames{};
7070

71-
template <avnd::parameter Field, std::size_t Idx>
71+
template <avnd::parameter_port Field, std::size_t Idx>
7272
requires ossia_port<Field>
7373
void init_value(Field& ctrl, auto& port, avnd::field_index<Idx> idx) const noexcept
7474
{
7575
}
76-
template <avnd::parameter Field, std::size_t Idx>
76+
template <avnd::parameter_port Field, std::size_t Idx>
7777
requires ossia_port<Field>
7878
void operator()(Field& ctrl, auto& port, avnd::field_index<Idx>) const noexcept
7979
{
8080
}
8181

82-
template <avnd::parameter Field, std::size_t Idx>
82+
template <avnd::parameter_port Field, std::size_t Idx>
8383
requires(!ossia_port<Field>)
8484
void init_value(
8585
Field& ctrl, ossia::value_inlet& port, avnd::field_index<Idx> idx) const noexcept
@@ -90,7 +90,7 @@ struct process_before_run
9090
auto& last = port.data.get_data().back().value;
9191
update_value(self, impl, ctrl, last, ctrl.value, idx);
9292

93-
if constexpr(avnd::control<Field>)
93+
if constexpr(avnd::control_port<Field>)
9494
{
9595
// Get the index of the control in [0; N[
9696
using type = typename Exec_T::processor_type;
@@ -122,7 +122,7 @@ struct process_before_run
122122
written |= self.from_ossia_value(ctrl.ports[p], last, ctrl.ports[p].value, idx);
123123

124124
// FIXME
125-
// if constexpr(avnd::control<Field>)
125+
// if constexpr(avnd::control_port<Field>)
126126
// {
127127
// // Get the index of the control in [0; N[
128128
// using type = typename Exec_T::processor_type;
@@ -142,9 +142,9 @@ struct process_before_run
142142
}
143143
}
144144

145-
template <avnd::parameter Field, std::size_t Idx>
145+
template <avnd::parameter_port Field, std::size_t Idx>
146146
requires(
147-
!avnd::sample_accurate_parameter<Field> && !avnd::span_parameter<Field>
147+
!avnd::sample_accurate_parameter_port<Field> && !avnd::span_parameter_port<Field>
148148
&& !ossia_port<Field>)
149149
void operator()(
150150
Field& ctrl, ossia::value_inlet& port, avnd::field_index<Idx> idx) const noexcept
@@ -160,7 +160,7 @@ struct process_before_run
160160
init_value(ctrl, port, avnd::field_index<Idx>{});
161161
}
162162

163-
template <avnd::linear_sample_accurate_parameter Field, std::size_t Idx>
163+
template <avnd::linear_sample_accurate_parameter_port Field, std::size_t Idx>
164164
void operator()(
165165
Field& ctrl, ossia::value_inlet& port, avnd::field_index<Idx>) const noexcept
166166
{
@@ -177,7 +177,7 @@ struct process_before_run
177177
}
178178
}
179179

180-
template <avnd::span_sample_accurate_parameter Field, std::size_t Idx>
180+
template <avnd::span_sample_accurate_parameter_port Field, std::size_t Idx>
181181
void operator()(
182182
Field& ctrl, ossia::value_inlet& port, avnd::field_index<Idx>) const noexcept
183183
{
@@ -188,7 +188,7 @@ struct process_before_run
188188
}
189189
}
190190

191-
template <avnd::dynamic_sample_accurate_parameter Field, std::size_t Idx>
191+
template <avnd::dynamic_sample_accurate_parameter_port Field, std::size_t Idx>
192192
void operator()(
193193
Field& ctrl, ossia::value_inlet& port, avnd::field_index<Idx>) const noexcept
194194
{
@@ -313,6 +313,13 @@ struct process_before_run
313313
Field& ctrl, ossia::audio_inlet& port, avnd::field_index<Idx>) const noexcept
314314
{
315315
}
316+
template <typename Field, std::size_t Idx>
317+
void operator()(
318+
Field& ctrl, std::vector<ossia::audio_inlet*>& ports,
319+
avnd::field_index<Idx>) const noexcept
320+
{
321+
ctrl.ports.resize(ports.size());
322+
}
316323

317324
template <avnd::raw_container_midi_port Field, std::size_t Idx>
318325
void
@@ -327,7 +334,7 @@ struct process_before_run
327334
{
328335
}
329336

330-
template <avnd::span_parameter Field, std::size_t Idx>
337+
template <avnd::span_parameter_port Field, std::size_t Idx>
331338
void operator()(
332339
Field& ctrl, ossia::value_inlet& port, avnd::field_index<Idx> idx) const noexcept
333340
{
@@ -463,8 +470,8 @@ struct process_before_run
463470
}
464471
}
465472

466-
template <avnd::control Field, std::size_t Idx>
467-
requires(!avnd::sample_accurate_control<Field>)
473+
template <avnd::control_port Field, std::size_t Idx>
474+
requires(!avnd::sample_accurate_control_port<Field>)
468475
void operator()(
469476
Field& ctrl, ossia::value_outlet& port, avnd::field_index<Idx>) const noexcept
470477
{
@@ -481,7 +488,7 @@ struct process_before_run
481488
ctrl.value = {};
482489
}
483490

484-
template <avnd::sample_accurate_control Field, std::size_t Idx>
491+
template <avnd::sample_accurate_control_port Field, std::size_t Idx>
485492
void operator()(
486493
Field& ctrl, ossia::value_outlet& port, avnd::field_index<Idx>) const noexcept
487494
{
@@ -498,6 +505,13 @@ struct process_before_run
498505
Field& ctrl, ossia::audio_outlet& port, avnd::field_index<Idx>) const noexcept
499506
{
500507
}
508+
template <typename Field, std::size_t Idx>
509+
void operator()(
510+
Field& ctrl, std::vector<ossia::audio_outlet*>& ports,
511+
avnd::field_index<Idx>) const noexcept
512+
{
513+
ctrl.ports.resize(ports.size());
514+
}
501515

502516
template <avnd::raw_container_midi_port Field, std::size_t Idx>
503517
void operator()(

0 commit comments

Comments
 (0)