From 28a29d219e30bbab3ffd6fecc5b65a5f0e1fd84b Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sun, 22 Sep 2024 12:41:22 +0200 Subject: [PATCH] moodbar: Formatting --- src/moodbar/moodbarbuilder.cpp | 52 ++++++++++++++-------------- src/moodbar/moodbarbuilder.h | 46 +++++++++++++------------ src/moodbar/moodbarcontroller.cpp | 38 ++++++++++++--------- src/moodbar/moodbarcontroller.h | 36 +++++++++++--------- src/moodbar/moodbaritemdelegate.cpp | 36 +++++++++++--------- src/moodbar/moodbaritemdelegate.h | 36 +++++++++++--------- src/moodbar/moodbarloader.cpp | 36 +++++++++++--------- src/moodbar/moodbarloader.h | 36 +++++++++++--------- src/moodbar/moodbarpipeline.cpp | 53 +++++++++++++++++------------ src/moodbar/moodbarpipeline.h | 41 +++++++++++----------- src/moodbar/moodbarproxystyle.cpp | 36 +++++++++++--------- src/moodbar/moodbarproxystyle.h | 36 +++++++++++--------- src/moodbar/moodbarrenderer.cpp | 35 ++++++++++--------- src/moodbar/moodbarrenderer.h | 35 ++++++++++--------- 14 files changed, 305 insertions(+), 247 deletions(-) diff --git a/src/moodbar/moodbarbuilder.cpp b/src/moodbar/moodbarbuilder.cpp index de326c166..553517255 100644 --- a/src/moodbar/moodbarbuilder.cpp +++ b/src/moodbar/moodbarbuilder.cpp @@ -1,19 +1,23 @@ -/* This file was part of Clementine. - Copyright 2014, David Sansome - - Strawberry is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Strawberry is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Strawberry. If not, see . -*/ +/* + * Strawberry Music Player + * This file was part of Clementine. + * Copyright 2014, David Sansome + * Copyright 2019-2024, Jonas Kvinge + * + * Strawberry is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Strawberry is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Strawberry. If not, see . + * + */ #include #include @@ -22,6 +26,7 @@ #include #include "moodbarbuilder.h" +#include "core/logging.h" #include "core/arraysize.h" namespace { @@ -33,11 +38,11 @@ constexpr int sBarkBandCount = arraysize(sBarkBands); MoodbarBuilder::MoodbarBuilder() : bands_(0), rate_hz_(0) {} -int MoodbarBuilder::BandFrequency(int band) const { +int MoodbarBuilder::BandFrequency(const int band) const { return ((rate_hz_ / 2) * band + rate_hz_ / 4) / bands_; } -void MoodbarBuilder::Init(int bands, int rate_hz) { +void MoodbarBuilder::Init(const int bands, const int rate_hz) { bands_ = bands; rate_hz_ = rate_hz; @@ -56,18 +61,14 @@ void MoodbarBuilder::Init(int bands, int rate_hz) { } -void MoodbarBuilder::AddFrame(const double *magnitudes, int size) { +void MoodbarBuilder::AddFrame(const double *magnitudes, const int size) { if (size > barkband_table_.length()) { return; } // Calculate total magnitudes for different bark bands. - double bands[sBarkBandCount]; - for (int i = 0; i < sBarkBandCount; ++i) { - bands[i] = 0.0; - } - + double bands[sBarkBandCount]{}; for (int i = 0; i < size; ++i) { bands[barkband_table_[i]] += magnitudes[i]; } @@ -160,7 +161,7 @@ void MoodbarBuilder::Normalize(QList *vals, double Rgb::*member) { } -QByteArray MoodbarBuilder::Finish(int width) { +QByteArray MoodbarBuilder::Finish(const int width) { QByteArray ret; ret.resize(width * 3); @@ -191,6 +192,7 @@ QByteArray MoodbarBuilder::Finish(int width) { *(data++) = static_cast(rgb.b / n); } + return ret; } diff --git a/src/moodbar/moodbarbuilder.h b/src/moodbar/moodbarbuilder.h index f0f52f75e..9e7b481e3 100644 --- a/src/moodbar/moodbarbuilder.h +++ b/src/moodbar/moodbarbuilder.h @@ -1,19 +1,23 @@ -/* This file was part of Clementine. - Copyright 2014, David Sansome - - Strawberry is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Strawberry is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Strawberry. If not, see . -*/ +/* + * Strawberry Music Player + * This file was part of Clementine. + * Copyright 2014, David Sansome + * Copyright 2019-2024, Jonas Kvinge + * + * Strawberry is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Strawberry is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Strawberry. If not, see . + * + */ #ifndef MOODBARBUILDER_H #define MOODBARBUILDER_H @@ -26,19 +30,19 @@ class MoodbarBuilder { public: explicit MoodbarBuilder(); - void Init(int bands, int rate_hz); - void AddFrame(const double *magnitudes, int size); - QByteArray Finish(int width); + void Init(const int bands, const int rate_hz); + void AddFrame(const double *magnitudes, const int size); + QByteArray Finish(const int width); private: struct Rgb { Rgb() : r(0), g(0), b(0) {} - Rgb(double r_, double g_, double b_) : r(r_), g(g_), b(b_) {} + Rgb(const double r_, const double g_, const double b_) : r(r_), g(g_), b(b_) {} double r, g, b; }; - int BandFrequency(int band) const; + int BandFrequency(const int band) const; static void Normalize(QList *vals, double Rgb::*member); QList barkband_table_; diff --git a/src/moodbar/moodbarcontroller.cpp b/src/moodbar/moodbarcontroller.cpp index d147b66c3..403599f71 100644 --- a/src/moodbar/moodbarcontroller.cpp +++ b/src/moodbar/moodbarcontroller.cpp @@ -1,19 +1,23 @@ -/* This file was part of Clementine. - Copyright 2012, David Sansome - - Strawberry is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Strawberry is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Strawberry. If not, see . -*/ +/* + * Strawberry Music Player + * This file was part of Clementine. + * Copyright 2012, David Sansome + * Copyright 2019-2024, Jonas Kvinge + * + * Strawberry is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Strawberry is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Strawberry. If not, see . + * + */ #include #include @@ -81,9 +85,11 @@ void MoodbarController::CurrentSongChanged(const Song &song) { } void MoodbarController::PlaybackStopped() { + if (enabled_) { Q_EMIT CurrentMoodbarDataChanged(QByteArray()); } + } void MoodbarController::AsyncLoadComplete(MoodbarPipeline *pipeline, const QUrl &url) { diff --git a/src/moodbar/moodbarcontroller.h b/src/moodbar/moodbarcontroller.h index 9f9e08f2d..7d5e6b8f7 100644 --- a/src/moodbar/moodbarcontroller.h +++ b/src/moodbar/moodbarcontroller.h @@ -1,19 +1,23 @@ -/* This file was part of Clementine. - Copyright 2012, David Sansome - - Strawberry is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Strawberry is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Strawberry. If not, see . -*/ +/* + * Strawberry Music Player + * This file was part of Clementine. + * Copyright 2012, David Sansome + * Copyright 2019-2024, Jonas Kvinge + * + * Strawberry is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Strawberry is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Strawberry. If not, see . + * + */ #ifndef MOODBARCONTROLLER_H #define MOODBARCONTROLLER_H diff --git a/src/moodbar/moodbaritemdelegate.cpp b/src/moodbar/moodbaritemdelegate.cpp index 6ddcdef30..16820907f 100644 --- a/src/moodbar/moodbaritemdelegate.cpp +++ b/src/moodbar/moodbaritemdelegate.cpp @@ -1,19 +1,23 @@ -/* This file was part of Clementine. - Copyright 2012, David Sansome - - Strawberry is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Strawberry is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Strawberry. If not, see . -*/ +/* + * Strawberry Music Player + * This file was part of Clementine. + * Copyright 2012, David Sansome + * Copyright 2019-2024, Jonas Kvinge + * + * Strawberry is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Strawberry is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Strawberry. If not, see . + * + */ #include #include diff --git a/src/moodbar/moodbaritemdelegate.h b/src/moodbar/moodbaritemdelegate.h index 7e75df64f..16ec915ea 100644 --- a/src/moodbar/moodbaritemdelegate.h +++ b/src/moodbar/moodbaritemdelegate.h @@ -1,19 +1,23 @@ -/* This file is part of Clementine. - Copyright 2012, David Sansome - - Strawberry is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Strawberry is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Strawberry. If not, see . -*/ +/* + * Strawberry Music Player + * This file was part of Clementine. + * Copyright 2012, David Sansome + * Copyright 2019-2024, Jonas Kvinge + * + * Strawberry is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Strawberry is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Strawberry. If not, see . + * + */ #ifndef MOODBARITEMDELEGATE_H #define MOODBARITEMDELEGATE_H diff --git a/src/moodbar/moodbarloader.cpp b/src/moodbar/moodbarloader.cpp index eecc2b236..c75047f4f 100644 --- a/src/moodbar/moodbarloader.cpp +++ b/src/moodbar/moodbarloader.cpp @@ -1,19 +1,23 @@ -/* This file was part of Clementine. - Copyright 2012, David Sansome - - Strawberry is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Strawberry is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Strawberry. If not, see . -*/ +/* + * Strawberry Music Player + * This file was part of Clementine. + * Copyright 2012, David Sansome + * Copyright 2019-2024, Jonas Kvinge + * + * Strawberry is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Strawberry is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Strawberry. If not, see . + * + */ #include "moodbarloader.h" diff --git a/src/moodbar/moodbarloader.h b/src/moodbar/moodbarloader.h index 243cad306..0ca01b47b 100644 --- a/src/moodbar/moodbarloader.h +++ b/src/moodbar/moodbarloader.h @@ -1,19 +1,23 @@ -/* This file was part of Clementine. - Copyright 2012, David Sansome - - Strawberry is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Strawberry is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Strawberry. If not, see . -*/ +/* + * Strawberry Music Player + * This file was part of Clementine. + * Copyright 2012, David Sansome + * Copyright 2019-2024, Jonas Kvinge + * + * Strawberry is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Strawberry is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Strawberry. If not, see . + * + */ #ifndef MOODBARLOADER_H #define MOODBARLOADER_H diff --git a/src/moodbar/moodbarpipeline.cpp b/src/moodbar/moodbarpipeline.cpp index 638d9f713..359294149 100644 --- a/src/moodbar/moodbarpipeline.cpp +++ b/src/moodbar/moodbarpipeline.cpp @@ -1,19 +1,23 @@ -/* This file was part of Clementine. - Copyright 2012, David Sansome - - Strawberry is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Strawberry is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Strawberry. If not, see . -*/ +/* + * Strawberry Music Player + * This file was part of Clementine. + * Copyright 2012, David Sansome + * Copyright 2019-2024, Jonas Kvinge + * + * Strawberry is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Strawberry is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Strawberry. If not, see . + * + */ #include "moodbarpipeline.h" @@ -122,8 +126,8 @@ void MoodbarPipeline::Start() { g_object_set(decodebin, "uri", gst_url.constData(), nullptr); g_object_set(spectrum, "bands", kBands, nullptr); - GstStrawberryFastSpectrum *fast_spectrum = reinterpret_cast(spectrum); - fast_spectrum->output_callback = [this](double *magnitudes, int size) { builder_->AddFrame(magnitudes, size); }; + GstStrawberryFastSpectrum *fastspectrum = reinterpret_cast(spectrum); + fastspectrum->output_callback = [this](double *magnitudes, const int size) { builder_->AddFrame(magnitudes, size); }; // Connect signals CHECKED_GCONNECT(decodebin, "pad-added", &NewPadCallback, this); @@ -154,7 +158,9 @@ void MoodbarPipeline::ReportError(GstMessage *msg) { } -void MoodbarPipeline::NewPadCallback(GstElement*, GstPad *pad, gpointer data) { +void MoodbarPipeline::NewPadCallback(GstElement *element, GstPad *pad, gpointer data) { + + Q_UNUSED(element) MoodbarPipeline *self = reinterpret_cast(data); @@ -193,23 +199,26 @@ void MoodbarPipeline::NewPadCallback(GstElement*, GstPad *pad, gpointer data) { } -GstBusSyncReply MoodbarPipeline::BusCallbackSync(GstBus*, GstMessage *msg, gpointer data) { +GstBusSyncReply MoodbarPipeline::BusCallbackSync(GstBus *bus, GstMessage *message, gpointer data) { + + Q_UNUSED(bus) MoodbarPipeline *self = reinterpret_cast(data); - switch (GST_MESSAGE_TYPE(msg)) { + switch (GST_MESSAGE_TYPE(message)) { case GST_MESSAGE_EOS: self->Stop(true); break; case GST_MESSAGE_ERROR: - self->ReportError(msg); + self->ReportError(message); self->Stop(false); break; default: break; } + return GST_BUS_PASS; } diff --git a/src/moodbar/moodbarpipeline.h b/src/moodbar/moodbarpipeline.h index d04c43d89..97d2d98c3 100644 --- a/src/moodbar/moodbarpipeline.h +++ b/src/moodbar/moodbarpipeline.h @@ -1,19 +1,23 @@ -/* This file was part of Clementine. - Copyright 2012, David Sansome - - Strawberry is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Strawberry is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Strawberry. If not, see . -*/ +/* + * Strawberry Music Player + * This file was part of Clementine. + * Copyright 2012, David Sansome + * Copyright 2019-2024, Jonas Kvinge + * + * Strawberry is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Strawberry is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Strawberry. If not, see . + * + */ #ifndef MOODBARPIPELINE_H #define MOODBARPIPELINE_H @@ -57,10 +61,9 @@ class MoodbarPipeline : public QObject { void Stop(const bool success); void Cleanup(); - static void NewPadCallback(GstElement*, GstPad *pad, gpointer data); + static void NewPadCallback(GstElement *element, GstPad *pad, gpointer data); static GstFlowReturn NewBufferCallback(GstAppSink *app_sink, gpointer self); - static gboolean BusCallback(GstBus*, GstMessage *msg, gpointer data); - static GstBusSyncReply BusCallbackSync(GstBus*, GstMessage *msg, gpointer data); + static GstBusSyncReply BusCallbackSync(GstBus *bus, GstMessage *message, gpointer data); private: QUrl url_; diff --git a/src/moodbar/moodbarproxystyle.cpp b/src/moodbar/moodbarproxystyle.cpp index 4183911d9..bce12cd53 100644 --- a/src/moodbar/moodbarproxystyle.cpp +++ b/src/moodbar/moodbarproxystyle.cpp @@ -1,19 +1,23 @@ -/* This file was part of Clementine. - Copyright 2012, David Sansome - - Strawberry is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Strawberry is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Strawberry. If not, see . -*/ +/* + * Strawberry Music Player + * This file was part of Clementine. + * Copyright 2012, David Sansome + * Copyright 2019-2024, Jonas Kvinge + * + * Strawberry is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Strawberry is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Strawberry. If not, see . + * + */ #include #include diff --git a/src/moodbar/moodbarproxystyle.h b/src/moodbar/moodbarproxystyle.h index f623526bd..42011cb9c 100644 --- a/src/moodbar/moodbarproxystyle.h +++ b/src/moodbar/moodbarproxystyle.h @@ -1,19 +1,23 @@ -/* This file was part of Clementine. - Copyright 2012, David Sansome - - Strawberry is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Strawberry is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Strawberry. If not, see . -*/ +/* + * Strawberry Music Player + * This file was part of Clementine. + * Copyright 2012, David Sansome + * Copyright 2019-2024, Jonas Kvinge + * + * Strawberry is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Strawberry is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Strawberry. If not, see . + * + */ #ifndef MOODBARPROXYSTYLE_H #define MOODBARPROXYSTYLE_H diff --git a/src/moodbar/moodbarrenderer.cpp b/src/moodbar/moodbarrenderer.cpp index f4b92763c..77b36b89e 100644 --- a/src/moodbar/moodbarrenderer.cpp +++ b/src/moodbar/moodbarrenderer.cpp @@ -1,19 +1,22 @@ -/* This file was part of Clementine. - Copyright 2012, David Sansome - - Strawberry is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Strawberry is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Strawberry. If not, see . -*/ +/* + * Strawberry Music Player + * This file was part of Clementine. + * Copyright 2012, David Sansome + * + * Strawberry is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Strawberry is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Strawberry. If not, see . + * + */ #include #include diff --git a/src/moodbar/moodbarrenderer.h b/src/moodbar/moodbarrenderer.h index 09880542e..66975aed8 100644 --- a/src/moodbar/moodbarrenderer.h +++ b/src/moodbar/moodbarrenderer.h @@ -1,19 +1,22 @@ -/* This file was part of Clementine. - Copyright 2012, David Sansome - - Strawberry is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Strawberry is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Strawberry. If not, see . -*/ +/* + * Strawberry Music Player + * This file was part of Clementine. + * Copyright 2012, David Sansome + * + * Strawberry is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Strawberry is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Strawberry. If not, see . + * + */ #ifndef MOODBARRENDERER_H #define MOODBARRENDERER_H