From 27bafa8ab20a18a1813f5d56d1f183fd106e1039 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Thu, 18 Apr 2019 18:28:11 +0200
Subject: [PATCH] Fir formatting

---
 ext/gstmoodbar/gstfastspectrum.cpp | 9 ++++-----
 ext/gstmoodbar/gstfastspectrum.h   | 9 ++++-----
 src/moodbar/moodbarbuilder.cpp     | 5 ++---
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/ext/gstmoodbar/gstfastspectrum.cpp b/ext/gstmoodbar/gstfastspectrum.cpp
index e1ebc1199..e79973a05 100644
--- a/ext/gstmoodbar/gstfastspectrum.cpp
+++ b/ext/gstmoodbar/gstfastspectrum.cpp
@@ -63,9 +63,8 @@ static gboolean gst_fastspectrum_stop (GstBaseTransform * trans);
 static GstFlowReturn gst_fastspectrum_transform_ip (GstBaseTransform * trans, GstBuffer * in);
 static gboolean gst_fastspectrum_setup (GstAudioFilter * base, const GstAudioInfo * info);
 
-static void
-gst_fastspectrum_class_init (GstFastSpectrumClass * klass)
-{
+static void gst_fastspectrum_class_init (GstFastSpectrumClass * klass) {
+
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
   GstBaseTransformClass *trans_class = GST_BASE_TRANSFORM_CLASS (klass);
@@ -103,6 +102,7 @@ gst_fastspectrum_class_init (GstFastSpectrumClass * klass)
   gst_caps_unref (caps);
 
   klass->fftw_lock = new QMutex;
+
 }
 
 static void gst_fastspectrum_init (GstFastSpectrum * spectrum) {
@@ -365,8 +365,7 @@ static void gst_fastspectrum_run_fft (GstFastSpectrum * spectrum, guint input_po
   guint nfft = 2 * bands - 2;
 
   for (i = 0; i < nfft; i++)
-    spectrum->fft_input[i] =
-        spectrum->input_ring_buffer[(input_pos + i) % nfft];
+    spectrum->fft_input[i] = spectrum->input_ring_buffer[(input_pos + i) % nfft];
 
   // Should be safe to execute the same plan multiple times in parallel.
   fftw_execute(spectrum->plan);
diff --git a/ext/gstmoodbar/gstfastspectrum.h b/ext/gstmoodbar/gstfastspectrum.h
index 27579675b..f0ad24cd1 100644
--- a/ext/gstmoodbar/gstfastspectrum.h
+++ b/ext/gstmoodbar/gstfastspectrum.h
@@ -26,8 +26,8 @@
 //   - Removed all properties except interval and band.
 
 
-#ifndef GST_MOODBAR_FASTSPECTRUM_H_
-#define GST_MOODBAR_FASTSPECTRUM_H_
+#ifndef GST_MOODBAR_FASTSPECTRUM_H
+#define GST_MOODBAR_FASTSPECTRUM_H
 
 #include <functional>
 
@@ -45,8 +45,7 @@ G_BEGIN_DECLS
 
 class QMutex;
 
-typedef void (*GstFastSpectrumInputData)(const guint8* in, double* out,
-    guint len, double max_value, guint op, guint nfft);
+typedef void (*GstFastSpectrumInputData)(const guint8* in, double* out, guint len, double max_value, guint op, guint nfft);
 
 typedef std::function<void(double* magnitudes, int size)> OutputCallback;
 
@@ -95,4 +94,4 @@ GType gst_fastspectrum_get_type (void);
 
 G_END_DECLS
 
-#endif // GST_MOODBAR_FASTSPECTRUM_H_
+#endif // GST_MOODBAR_FASTSPECTRUM_H
diff --git a/src/moodbar/moodbarbuilder.cpp b/src/moodbar/moodbarbuilder.cpp
index ef59c9437..f1d5370a2 100644
--- a/src/moodbar/moodbarbuilder.cpp
+++ b/src/moodbar/moodbarbuilder.cpp
@@ -27,7 +27,8 @@ namespace {
 
 static const int sBarkBands[] = {
     100,  200,  300,  400,  510,  630,  770,  920,  1080, 1270, 1480,  1720,
-    2000, 2320, 2700, 3150, 3700, 4400, 5300, 6400, 7700, 9500, 12000, 15500};
+    2000, 2320, 2700, 3150, 3700, 4400, 5300, 6400, 7700, 9500, 12000, 15500
+};
 
 static const int sBarkBandCount = arraysize(sBarkBands);
 
@@ -99,12 +100,10 @@ void MoodbarBuilder::Normalize(QList<Rgb>* vals, double Rgb::*member) {
   }
 
   double avg = 0;
-  int t = 0;
   for (const Rgb& rgb : *vals) {
     const double value = rgb.*member;
     if (value != mini && value != maxi) {
       avg += value / vals->count();
-      t++;
     }
   }