diff --git a/src/Ass/Char.cc b/src/Ass/Char.cc index 32bbc95eba31574e40e85fc3a53271d582d358d0..fbc0f7cf09145a7cc029fcdae9889a4b4dbea52e 100644 --- a/src/Ass/Char.cc +++ b/src/Ass/Char.cc @@ -2,6 +2,7 @@ #include "Syl.h" Char::Char(Syl *const syl, const QChar) - : parentLine(syl->parentLine), parentSyl(syl) + : parentLine(syl->parentLine) + , parentSyl(syl) { } diff --git a/src/Ass/Char.h b/src/Ass/Char.h index 032daead2530cc65a56b0b8b0236a9d201ae43ca..f031e8b8092802d67a36b4bc56534aa32199d712 100644 --- a/src/Ass/Char.h +++ b/src/Ass/Char.h @@ -11,7 +11,7 @@ class Syl; class Char { private: QChar content; - quint64 dur{0}; + quint64 dur{ 0 }; public: Line *const parentLine; @@ -19,11 +19,11 @@ public: public: // Copy constructor - explicit Char(const Char&) = default; + explicit Char(const Char &) = default; explicit Char(Syl *const, const QChar); - Char& operator=(const Char&) = delete; - ~Char() noexcept = default; + Char &operator=(const Char &) = delete; + ~Char() noexcept = default; }; #endif // VIVY_ASS_CHAR_H diff --git a/src/Ass/Line.cc b/src/Ass/Line.cc index d9c6e84a830e8ab362b9d633f39895b111901c10..b4da36c735575cf4dfa901a97758232fbd2b9016 100644 --- a/src/Ass/Line.cc +++ b/src/Ass/Line.cc @@ -1,5 +1,5 @@ #include "Line.h" -Line::Line(const QString&) +Line::Line(const QString &) { } diff --git a/src/Ass/Line.h b/src/Ass/Line.h index 6904659e8444c630ad2b4f3421a6a949c0cf089e..f42abdac291099883814b36183531ec2ae3c2b2d 100644 --- a/src/Ass/Line.h +++ b/src/Ass/Line.h @@ -8,16 +8,16 @@ class Line { private: - quint64 start{0}; - quint64 end{0}; + quint64 start{ 0 }; + quint64 end{ 0 }; QVector<Syl> content{}; public: - explicit Line() = default; - explicit Line(const Line&) = default; - explicit Line(const QString&); - Line& operator=(const Line&) = delete; + explicit Line() = default; + explicit Line(const Line &) = default; + explicit Line(const QString &); + Line &operator=(const Line &) = delete; ~Line() noexcept = default; diff --git a/src/Ass/Style.cc b/src/Ass/Style.cc index 152c85991b3af41271615eb372f4ae36d8619549..557b28662d79df35c3b4a61b4fe477d477c33151 100644 --- a/src/Ass/Style.cc +++ b/src/Ass/Style.cc @@ -1,5 +1,5 @@ #include "Style.h" -Style::Style(const QString&) +Style::Style(const QString &) { } diff --git a/src/Ass/Style.h b/src/Ass/Style.h index 485678db609997c182e95ab2e54433a74146388f..2f9d30cc5bbcf3c675f3136729bfd48c76731010 100644 --- a/src/Ass/Style.h +++ b/src/Ass/Style.h @@ -23,23 +23,22 @@ private: Color primaryColor, secondaryColor, outlineColor, backColor; - bool bold{false}, italic{false}, underline{false}, strikeOut{false}; + bool bold{ false }, italic{ false }, underline{ false }, strikeOut{ false }; - float scaleX{0.0}, scaleY{0.0}; - float spacing{0.0}, angle{0.0}, borderStyle{0.0}; + float scaleX{ 0.0 }, scaleY{ 0.0 }; + float spacing{ 0.0 }, angle{ 0.0 }, borderStyle{ 0.0 }; - int alignment{2}, marginL{0}, marginR{0}, marginV{0}; + int alignment{ 2 }, marginL{ 0 }, marginR{ 0 }, marginV{ 0 }; int encoding; public: // Should grab and copy a user-changeable default style - explicit Style() = delete; - explicit Style(const Style&) = default; - explicit Style(const QString&); + explicit Style() = delete; + explicit Style(const Style &) = default; + explicit Style(const QString &); - Style& operator=(const Style&) = delete; - ~Style() noexcept = default; + Style &operator=(const Style &) = delete; + ~Style() noexcept = default; }; - #endif diff --git a/src/Ass/Syl.cc b/src/Ass/Syl.cc index 8f14ddbc861d9e6a8cef9e32931211e874d037c6..9edf155a6cf90c111d20a1c9747d5d23d190c09c 100644 --- a/src/Ass/Syl.cc +++ b/src/Ass/Syl.cc @@ -1,6 +1,6 @@ #include "Syl.h" -Syl::Syl(Line *const line, const QString&) +Syl::Syl(Line *const line, const QString &) : parentLine(line) { } diff --git a/src/Ass/Syl.h b/src/Ass/Syl.h index a1cad338d86e068d18e31a8d88285e990ed444cc..3dd6c425aef329e92c7689d6c3aece93b2a433a6 100644 --- a/src/Ass/Syl.h +++ b/src/Ass/Syl.h @@ -10,17 +10,17 @@ class Line; class Syl { private: QVector<Char> content; - quint64 dur{0}; + quint64 dur{ 0 }; public: Line *const parentLine; public: - explicit Syl(const Syl&) = default; - explicit Syl(Line *const, const QString&); + explicit Syl(const Syl &) = default; + explicit Syl(Line *const, const QString &); - Syl& operator=(const Syl&) = delete; - ~Syl() noexcept = default; + Syl &operator=(const Syl &) = delete; + ~Syl() noexcept = default; }; #endif diff --git a/src/AudioUtils.c b/src/AudioUtils.c index c2d7f7f4dfbe38b1a26e7850d4849f8f0ceeb1a4..fc7cf39787ad16064ef1f0a1e66ed5d81eeeb71c 100644 --- a/src/AudioUtils.c +++ b/src/AudioUtils.c @@ -175,8 +175,8 @@ RawImageDataNewFromData(const double *data, const size_t size) const int chunk_size = 512; const int overlap = 128; const int decal = chunk_size - overlap; - const size_t width = (size - chunk_size) / decal; - const size_t height = chunk_size; + const size_t width = (size - chunk_size) / decal; + const size_t height = chunk_size; unsigned char *pixs = (unsigned char *)malloc(sizeof(unsigned char) * width * height / 2); FFTSample *chunk_data = (FFTSample *)av_malloc_array(2 * chunk_size, sizeof(FFTSample)); RDFTContext *ctx = av_rdft_init((int)log2(chunk_size), DFT_R2C); diff --git a/src/AudioVisualizer.cc b/src/AudioVisualizer.cc index 0503720c40b311dddc6138ac35f019b19b452c69..19942f59d8a587a9b3a90491295a18d4cb018880 100644 --- a/src/AudioVisualizer.cc +++ b/src/AudioVisualizer.cc @@ -16,7 +16,7 @@ AudioVisualizer::AudioVisualizer(QWidget *parent) noexcept void AudioVisualizer::printSpectrum(QImage pixmap) noexcept { - TimingView *timer = new TimingView(pixmap, 0); + TimingView *timer = new TimingView(pixmap, 0); QVBoxLayout *layout = new QVBoxLayout; layout->addWidget(timer); diff --git a/src/TimingScene.hpp b/src/TimingScene.hpp index a1a799b5de388c1a57f03ee54060f1bac4d8193b..352b2099e709198a68ba7d11dda9cdb9355ffb3c 100644 --- a/src/TimingScene.hpp +++ b/src/TimingScene.hpp @@ -40,7 +40,10 @@ private: TimingMode timingMode; public: - inline QGraphicsPixmapItem* bg() { return backgroundImg; }; + inline QGraphicsPixmapItem *bg() + { + return backgroundImg; + }; void mousePressEvent(QGraphicsSceneMouseEvent *event) noexcept override; diff --git a/src/TimingView.cc b/src/TimingView.cc index 81bd28563ffc0e2cb5e21961335e962ae1b14d70..278936b2f1786d2687135d993271c092a17064fc 100644 --- a/src/TimingView.cc +++ b/src/TimingView.cc @@ -35,8 +35,8 @@ TimingView::mousePressEvent(QMouseEvent *event) noexcept QGraphicsItem *got; if ((got = scene->itemAt(pos, QTransform())) == nullptr || got == scene->bg()) { const int height = static_cast<int>(scene->height()); - scene->addItem(new TimingBar(QLine(x, 0, x, height), - event->button() == Qt::LeftButton ? startColour : endColour)); + scene->addItem( + new TimingBar(QLine(x, 0, x, height), event->button() == Qt::LeftButton ? startColour : endColour)); } QGraphicsView::mousePressEvent(event); diff --git a/src/TimingView.hpp b/src/TimingView.hpp index eb69928299c6abdfab4520e431d16cd6027612fd..1b6a864736fbda7ab3f7f2e8cb73038a635f5a38 100644 --- a/src/TimingView.hpp +++ b/src/TimingView.hpp @@ -26,7 +26,7 @@ public: ~TimingView() noexcept = default; private: - TimingScene* scene; + TimingScene *scene; public slots: };