Skip to content

Commit

Permalink
Clang-format the code base
Browse files Browse the repository at this point in the history
So the PR job no longer fails
  • Loading branch information
baconpaul committed Jul 27, 2024
1 parent da04f1a commit 060203f
Show file tree
Hide file tree
Showing 10 changed files with 202 additions and 193 deletions.
355 changes: 182 additions & 173 deletions src/core/monique_core_Datastructures.cpp

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions src/core/monique_core_Synth.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1347,8 +1347,7 @@ class LFO : public RuntimeListener
public:
//==========================================================================
LFO(RuntimeNotifyer *const notifyer_, MoniqueSynthData *synth_data_, LFOData *lfo_data_,
const float *const sine_lookup_)
noexcept
const float *const sine_lookup_) noexcept
: RuntimeListener(notifyer_),

sine_lookup(sine_lookup_),
Expand Down
2 changes: 1 addition & 1 deletion src/core/monique_core_Synth.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class RuntimeNotifyer;
class MoniqueSynthesizer;

#define TABLESIZE_MULTI 1000
//#define LOOKUP_TABLE_SIZE int(float_Pi*TABLESIZE_MULTI*2)
// #define LOOKUP_TABLE_SIZE int(float_Pi*TABLESIZE_MULTI*2)
static const int LOOKUP_TABLE_SIZE = int(juce::MathConstants<float>::twoPi * TABLESIZE_MULTI);

class MoniqueSynthesiserVoice : public juce::SynthesiserVoice
Expand Down
3 changes: 2 additions & 1 deletion src/ui/monique_ui_AmpPainter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,8 @@ void Monique_Ui_AmpPainter::paint(juce::Graphics &g)
g.setColour (colours.label_text_colour.withAlpha(0.3f));
g.fillRect (paint_start_offset_x, int(paint_start_offset_y+height/2), width, 1 );
*/
} {
}
{
#include "mono_ui_includeHacks_BEGIN.h"
WIDTH_AND_HIGHT_FACTORS

Expand Down
6 changes: 3 additions & 3 deletions src/ui/monique_ui_ENVPopup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,9 @@ Monique_Ui_ENVPopup::Monique_Ui_ENVPopup(Monique_Ui_Refresher *ui_refresher_,
Monique_Ui_Mainwindow *const parent_,
ENVData *const env_data_, Parameter *const sustain_,
bool left_, bool has_negative_sustain_)
: Monique_Ui_Refreshable(ui_refresher_), juce::DropShadower(juce::DropShadow(
juce::Colours::black.withAlpha(0.8f), 10,
juce::Point<int>(10, 10))),
: Monique_Ui_Refreshable(ui_refresher_),
juce::DropShadower(
juce::DropShadow(juce::Colours::black.withAlpha(0.8f), 10, juce::Point<int>(10, 10))),
original_w(710), original_h(190), left(left_), parent(parent_), env_data(env_data_),
sustain(sustain_)
{
Expand Down
6 changes: 3 additions & 3 deletions src/ui/monique_ui_LookAndFeel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2263,11 +2263,11 @@ void UiLookAndFeel::drawTooltip(juce::Graphics &g, const juce::String &text, int
{
g.fillAll(findColour(juce::TooltipWindow::backgroundColourId));

//#if ! JUCE_MAC // The mac windows already have a non-optional 1 pix outline, so don't double
// it here..
// #if ! JUCE_MAC // The mac windows already have a non-optional 1 pix outline, so don't double
// it here..
g.setColour(findColour(juce::TooltipWindow::outlineColourId));
g.drawRect(0, 0, width, height, 1);
//#endif
// #endif

juce::Rectangle<float> rect = juce::Rectangle<float>((float)width, (float)height);
juce::TextLayout tl = LookAndFeelHelpers::layoutTooltipText(
Expand Down
6 changes: 3 additions & 3 deletions src/ui/monique_ui_MFOPopup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,9 @@ void Monique_Ui_MFOPopup::sliderClicked(juce::Slider *s_)
Monique_Ui_MFOPopup::Monique_Ui_MFOPopup(Monique_Ui_Refresher *ui_refresher_,
Monique_Ui_Mainwindow *const parent_,
LFOData *const mfo_data_, COLOUR_THEMES theme_)
: Monique_Ui_Refreshable(ui_refresher_), juce::DropShadower(juce::DropShadow(
juce::Colours::black.withAlpha(0.8f), 10,
juce::Point<int>(10, 10))),
: Monique_Ui_Refreshable(ui_refresher_),
juce::DropShadower(
juce::DropShadow(juce::Colours::black.withAlpha(0.8f), 10, juce::Point<int>(10, 10))),
original_w(540), original_h(190), parent(parent_), mfo_data(mfo_data_)
{
ui_refresher_->synth_data->midi_lfo_wave.set_value_without_notification(mfo_data_->wave);
Expand Down
6 changes: 3 additions & 3 deletions src/ui/monique_ui_MidiLearnPopup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ void Monique_Ui_MainwindowPopup::update_positions()
Monique_Ui_MainwindowPopup::Monique_Ui_MainwindowPopup(Monique_Ui_Refresher *ui_refresher_,
Monique_Ui_Mainwindow *const parent_,
MIDIControl *midi_control_)
: Monique_Ui_Refreshable(ui_refresher_), juce::DropShadower(juce::DropShadow(
juce::Colours::black.withAlpha(0.8f), 10,
juce::Point<int>(10, 10))),
: Monique_Ui_Refreshable(ui_refresher_),
juce::DropShadower(
juce::DropShadow(juce::Colours::black.withAlpha(0.8f), 10, juce::Point<int>(10, 10))),
original_w(80), original_h(95), parent(parent_), _midi_control(midi_control_)
{
setOwner(this);
Expand Down
6 changes: 3 additions & 3 deletions src/ui/monique_ui_OptionPopup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ void Monique_Ui_OptionPopup::set_infos(juce::StringRef text_a, juce::StringRef t
Monique_Ui_OptionPopup::Monique_Ui_OptionPopup(Monique_Ui_Refresher *ui_refresher_,
Monique_Ui_Mainwindow *const parent_,
BoolParameter *param_a_, BoolParameter *param_b_)
: Monique_Ui_Refreshable(ui_refresher_), juce::DropShadower(juce::DropShadow(
juce::Colours::black.withAlpha(0.8f), 10,
juce::Point<int>(10, 10))),
: Monique_Ui_Refreshable(ui_refresher_),
juce::DropShadower(
juce::DropShadow(juce::Colours::black.withAlpha(0.8f), 10, juce::Point<int>(10, 10))),
param_a(param_a_), param_b(param_b_), original_w(140), original_h(90), parent(parent_)
{
setOwner(this);
Expand Down
2 changes: 1 addition & 1 deletion src/ui/mono_ui_includeHacks_BEGIN.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ COLOUR_REPLACEMENT_START
#define lineTo(x, y) \
lineTo(x > 2 ? float(x) * width_factor : x, y > 2 ? float(y) * height_factor : y)
#define quadraticTo(x, y, x2, y2) \
quadraticTo(x *(1.0f / width_factor, y * height_factor, x2 * width_factor, y2 * height_factor))
quadraticTo(x * (1.0f / width_factor, y * height_factor, x2 * width_factor, y2 * height_factor))

0 comments on commit 060203f

Please sign in to comment.