Skip to content

Commit

Permalink
clang-format: add qualifier formatting rule
Browse files Browse the repository at this point in the history
  • Loading branch information
@nooploop
nooploop committed May 12, 2023
1 parent a92a246 commit f79eb27
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 39 deletions.
1 change: 1 addition & 0 deletions .clang-format
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ PenaltyBreakTemplateDeclaration: 10
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60
PointerAlignment: Left
QualifierAlignment: Right
ReflowComments: true
RequiresClausePosition: OwnLine
SortIncludes: true
Expand Down
2 changes: 0 additions & 2 deletions piejam_libs/gui/include/piejam/gui/model/BusType.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

#include <piejam/audio/types.h>

#include <span>

namespace piejam::gui::model
{

Expand Down
2 changes: 1 addition & 1 deletion piejam_libs/log/include/piejam/log/generic_log_sink.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class generic_log_sink : public spdlog::sinks::base_sink<Mutex>
}

protected:
void sink_it_(const spdlog::details::log_msg& msg) override
void sink_it_(spdlog::details::log_msg const& msg) override
{
m_sink_it(msg);
}
Expand Down
4 changes: 2 additions & 2 deletions piejam_libs/numeric/src/piejam/numeric/dft.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ dft::output_size() const noexcept -> std::size_t
}

auto
dft::process(std::span<const float> const in)
-> std::span<const std::complex<float>>
dft::process(std::span<float const> const in)
-> std::span<std::complex<float> const>
{
BOOST_ASSERT(in.size() == m_impl->input_size);

Expand Down
34 changes: 17 additions & 17 deletions piejam_libs/runtime/include/piejam/runtime/selectors.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,33 +34,33 @@ template <class Value>
using selector = reselect::selector<Value, state>;

using sample_rate = std::pair<box<audio::sample_rates_t>, audio::sample_rate>;
extern const selector<sample_rate> select_sample_rate;
extern selector<sample_rate> const select_sample_rate;

using period_size = std::pair<box<audio::period_sizes_t>, audio::period_size>;
extern const selector<period_size> select_period_size;
extern selector<period_size> const select_period_size;

using period_count =
std::pair<box<audio::period_counts_t>, audio::period_count>;
extern const selector<period_count> select_period_count;
extern selector<period_count> const select_period_count;

extern const selector<float> select_buffer_latency;
extern selector<float> const select_buffer_latency;

//! \todo input_devices/output_devices could get a reduced value, not the whole
//! pcm_io_descriptors
using input_devices = std::pair<box<audio::pcm_io_descriptors>, std::size_t>;
extern const selector<input_devices> select_input_devices;
extern selector<input_devices> const select_input_devices;

using output_devices = std::pair<box<audio::pcm_io_descriptors>, std::size_t>;
extern const selector<output_devices> select_output_devices;
extern selector<output_devices> const select_output_devices;

auto make_num_device_channels_selector(io_direction) -> selector<std::size_t>;

auto make_device_bus_list_selector(io_direction)
-> selector<box<device_io::bus_list_t>>;

extern const selector<boxed_vector<mixer::channel_id>>
extern selector<boxed_vector<mixer::channel_id>> const
select_mixer_input_channels;
extern const selector<mixer::channel_id> select_mixer_main_channel;
extern selector<mixer::channel_id> const select_mixer_main_channel;

auto make_mixer_channel_bus_type_selector(mixer::channel_id)
-> selector<audio::bus_type>;
Expand All @@ -85,11 +85,11 @@ struct mixer_device_route
auto operator==(mixer_device_route const&) const noexcept -> bool = default;
};

extern const selector<boxed_vector<mixer_device_route>>
extern selector<boxed_vector<mixer_device_route>> const
select_mixer_mono_input_devices;
extern const selector<boxed_vector<mixer_device_route>>
extern selector<boxed_vector<mixer_device_route>> const
select_mixer_stereo_input_devices;
extern const selector<boxed_vector<mixer_device_route>>
extern selector<boxed_vector<mixer_device_route>> const
select_mixer_output_devices;

struct mixer_channel_route
Expand Down Expand Up @@ -145,7 +145,7 @@ auto make_bus_type_selector(device_io::bus_id) -> selector<audio::bus_type>;
auto make_bus_channel_selector(device_io::bus_id, audio::bus_channel)
-> selector<std::size_t>;

extern const selector<boxed_vector<midi::device_id_t>>
extern selector<boxed_vector<midi::device_id_t>> const
select_midi_input_devices;

auto make_midi_device_name_selector(midi::device_id_t)
Expand Down Expand Up @@ -194,13 +194,13 @@ auto make_level_parameter_value_selector(stereo_level_parameter_id)
auto make_midi_assignment_selector(midi_assignment_id)
-> selector<std::optional<midi_assignment>>;

extern const selector<bool> select_midi_learning;
extern selector<bool> const select_midi_learning;

extern const selector<fx::registry> select_fx_registry;
extern selector<fx::registry> const select_fx_registry;

extern const selector<bool> select_recording;
extern selector<bool> const select_recording;

extern const selector<std::size_t> select_xruns;
extern const selector<float> select_cpu_load;
extern selector<std::size_t> const select_xruns;
extern selector<float> const select_cpu_load;

} // namespace piejam::runtime::selectors
34 changes: 17 additions & 17 deletions piejam_libs/runtime/src/piejam/runtime/selectors.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,40 +25,40 @@
namespace piejam::runtime::selectors
{

const selector<sample_rate> select_sample_rate(
selector<sample_rate> const select_sample_rate(
[get_sample_rates = memo(boxify_result(&runtime::sample_rates))](
state const& st) -> sample_rate {
return {get_sample_rates(st.input.hw_params, st.output.hw_params),
st.sample_rate};
});

const selector<period_size> select_period_size(
selector<period_size> const select_period_size(
[get_period_sizes = memo(boxify_result(&runtime::period_sizes))](
state const& st) -> period_size {
return {get_period_sizes(st.input.hw_params, st.output.hw_params),
st.period_size};
});

const selector<period_count> select_period_count(
selector<period_count> const select_period_count(
[get = memo(boxify_result(&runtime::period_counts))](state const& st)
-> period_count {
return {get(st.input.hw_params, st.output.hw_params),
st.period_count};
});

const selector<float> select_buffer_latency([](state const& st) {
selector<float> const select_buffer_latency([](state const& st) {
return st.sample_rate.get() != 0
? (st.period_size.get() * st.period_count.get() * 1000.f) /
st.sample_rate.as_float()
: 0.f;
});

const selector<input_devices>
selector<input_devices> const
select_input_devices([](state const& st) -> input_devices {
return {st.pcm_devices, st.input.index};
});

const selector<output_devices>
selector<output_devices> const
select_output_devices([](state const& st) -> output_devices {
return {st.pcm_devices, st.output.index};
});
Expand Down Expand Up @@ -95,10 +95,10 @@ make_device_bus_list_selector(io_direction const bd)
}
}

const selector<boxed_vector<mixer::channel_id>> select_mixer_input_channels(
selector<boxed_vector<mixer::channel_id>> const select_mixer_input_channels(
[](state const& st) { return st.mixer_state.inputs; });

const selector<mixer::channel_id> select_mixer_main_channel(
selector<mixer::channel_id> const select_mixer_main_channel(
[](state const& st) { return st.mixer_state.main; });

auto
Expand Down Expand Up @@ -199,7 +199,7 @@ make_mixer_device_routes(
return result;
}

const selector<boxed_vector<mixer_device_route>>
selector<boxed_vector<mixer_device_route>> const
select_mixer_mono_input_devices(
[get = memo(boxify_result(&make_mixer_device_routes))](
state const& st) mutable {
Expand All @@ -209,7 +209,7 @@ const selector<boxed_vector<mixer_device_route>>
audio::bus_type::mono);
});

const selector<boxed_vector<mixer_device_route>>
selector<boxed_vector<mixer_device_route>> const
select_mixer_stereo_input_devices(
[get = memo(boxify_result(&make_mixer_device_routes))](
state const& st) mutable {
Expand All @@ -219,7 +219,7 @@ const selector<boxed_vector<mixer_device_route>>
audio::bus_type::stereo);
});

const selector<boxed_vector<mixer_device_route>> select_mixer_output_devices(
selector<boxed_vector<mixer_device_route>> const select_mixer_output_devices(
[get = memo(boxify_result(&make_mixer_device_routes))](
state const& st) mutable {
return get(
Expand Down Expand Up @@ -502,7 +502,7 @@ make_bus_channel_selector(
__builtin_unreachable();
}

const selector<boxed_vector<midi::device_id_t>> select_midi_input_devices(
selector<boxed_vector<midi::device_id_t>> const select_midi_input_devices(
[](state const& st) -> boxed_vector<midi::device_id_t> {
return st.midi_inputs;
});
Expand Down Expand Up @@ -869,23 +869,23 @@ make_midi_assignment_selector(midi_assignment_id const id)
};
}

const selector<bool> select_midi_learning([](state const& st) {
selector<bool> const select_midi_learning([](state const& st) {
return st.midi_learning.has_value();
});

const selector<fx::registry> select_fx_registry([](state const& st) {
selector<fx::registry> const select_fx_registry([](state const& st) {
return st.fx_registry;
});

const selector<bool> select_recording([](state const& st) {
selector<bool> const select_recording([](state const& st) {
return st.recording;
});

const selector<std::size_t> select_xruns([](state const& st) {
selector<std::size_t> const select_xruns([](state const& st) {
return st.xruns;
});

const selector<float> select_cpu_load([](state const& st) {
selector<float> const select_cpu_load([](state const& st) {
return st.cpu_load;
});

Expand Down

0 comments on commit f79eb27

Please sign in to comment.