Includes, comments and bugfixes

- Fix includes - Use common regex (Song::kCoverRemoveDisc) for removing Disc/CD from album - Remove Disc/CD from album when creating hash - Make imobiledevice support compile - Fix setting device on windows
2018-05-01 00:41:33 +02:00
parent fccbd6790c
commit e337b7933b
518 changed files with 7003 additions and 4693 deletions
--- a/src/analyzer/analyzer.cpp
+++ b/src/analyzer/analyzer.cpp
@@ -1,11 +1,17 @@
+#include "config.h"
+
+#include <QWidget>
+#include <QGLWidget>
+#include <QVector>
+
 #include "analyzer.h"

-#include "engines/enginebase.h"
+#include "engine/enginebase.h"

-AnalyzerBase::AnalyzerBase(QWidget* parent)
+AnalyzerBase::AnalyzerBase(QWidget *parent)
    : QGLWidget(parent), engine_(nullptr) {}

-void AnalyzerBase::set_engine(Engine::Base* engine) {
+void AnalyzerBase::set_engine(Engine::Base *engine) {
  disconnect(engine_);
  engine_ = engine;
  if (engine_) {
--- a/src/analyzer/analyzerbase.cpp
+++ b/src/analyzer/analyzerbase.cpp
@@ -15,14 +15,17 @@
 *                                                                         *
 ***************************************************************************/

-#include "analyzerbase.h"
+#include "config.h"

-#include <cmath>  //interpolate()
+#include <cmath>

-#include <QEvent>  //event()
+#include <QWidget>
 #include <QPainter>
-#include <QPaintEvent>
-#include <QtDebug>
+#include <QPalette>
+#include <QTimerEvent>
+#include <QtEvents>
+
+#include "analyzerbase.h"

 #include "engine/enginebase.h"

@@ -45,7 +48,7 @@
 template class Analyzer::Base<QWidget>;
 #endif

-Analyzer::Base::Base(QWidget* parent, uint scopeSize)
+Analyzer::Base::Base(QWidget *parent, uint scopeSize)
    : QWidget(parent),
      m_timeout(40)  // msec
      ,
@@ -70,9 +73,9 @@ void Analyzer::Base::transform(Scope& scope)  // virtual
  // values
  // scope.resize( m_fht->size() );

-  float* front = static_cast<float*>(&scope.front());
+  float *front = static_cast<float*>(&scope.front());

-  float* f = new float[m_fht->size()];
+  float *f = new float[m_fht->size()];
  m_fht->copy(&f[0], front);
  m_fht->logSpectrum(front, &f[0]);
  m_fht->scale(front, 1.0 / 20);
@@ -82,7 +85,7 @@ void Analyzer::Base::transform(Scope& scope)  // virtual

 }

-void Analyzer::Base::paintEvent(QPaintEvent* e) {
+void Analyzer::Base::paintEvent(QPaintEvent *e) {

  QPainter p(this);
  p.fillRect(e->rect(), palette().color(QPalette::Window));
@@ -92,8 +95,7 @@ void Analyzer::Base::paintEvent(QPaintEvent* e) {
      const Engine::Scope& thescope = m_engine->scope(m_timeout);
      int i = 0;

-      // convert to mono here - our built in analyzers need mono, but the
-      // engines provide interleaved pcm
+      // convert to mono here - our built in analyzers need mono, but the engines provide interleaved pcm
      for (uint x = 0; (int)x < m_fht->size(); ++x) {
        m_lastScope[x] = double(thescope[i] + thescope[i + 1]) / (2 * (1 << 15));
        i += 2;
@@ -180,8 +182,7 @@ void Analyzer::Base::polishEvent() {
  init();  // virtual
 }

-void Analyzer::interpolate(const Scope& inVec, Scope& outVec)  // static
-{
+void Analyzer::interpolate(const Scope& inVec, Scope& outVec) {

  double pos = 0.0;
  const double step = (double)inVec.size() / outVec.size();
@@ -203,8 +204,7 @@ void Analyzer::interpolate(const Scope& inVec, Scope& outVec)  // static

 }

-void Analyzer::initSin(Scope& v, const uint size)  // static
-{
+void Analyzer::initSin(Scope& v, const uint size) {
  double step = (M_PI * 2) / size;
  double radian = 0;

@@ -214,7 +214,7 @@ void Analyzer::initSin(Scope& v, const uint size)  // static
  }
 }

-void Analyzer::Base::timerEvent(QTimerEvent* e) {
+void Analyzer::Base::timerEvent(QTimerEvent *e) {
  QWidget::timerEvent(e);
  if (e->timerId() != m_timer.timerId()) return;

--- a/src/analyzer/analyzerbase.h
+++ b/src/analyzer/analyzerbase.h
@@ -4,29 +4,38 @@
 #ifndef ANALYZERBASE_H
 #define ANALYZERBASE_H

+#include "config.h"
+
 #ifdef __FreeBSD__
 #include <sys/types.h>
 #endif

-#include "analyzer/fht.h"  //stack allocated and convenience
-#include "engine/engine_fwd.h"
-#include <QPixmap>      //stack allocated and convenience
-#include <QBasicTimer>  //stack allocated
-#include <QWidget>      //baseclass
-#include <vector>       //included for convenience
+#include <stdbool.h>
+#include <vector>

-#include <QGLWidget>  //baseclass
 #ifdef Q_WS_MACX
-#include <OpenGL/gl.h>   //included for convenience
-#include <OpenGL/glu.h>  //included for convenience
+  #include <OpenGL/gl.h>   //included for convenience
+  #include <OpenGL/glu.h>  //included for convenience
 #else
-#include <GL/gl.h>   //included for convenience
-#include <GL/glu.h>  //included for convenience
+  #include <GL/gl.h>   //included for convenience
+  #include <GL/glu.h>  //included for convenience
 #endif

-class QEvent;
+#include <QtGlobal>
+#include <QObject>
+#include <QWidget>
+#include <QBasicTimer>
+#include <QString>
+#include <QPainter>
+#include <QtEvents>
+
+#include "analyzer/fht.h"
+#include "engine/engine_fwd.h"
+
+class QHideEvent;
+class QShowEvent;
+class QTimerEvent;
 class QPaintEvent;
-class QResizeEvent;

 namespace Analyzer {

--- a/src/analyzer/analyzercontainer.cpp
+++ b/src/analyzer/analyzercontainer.cpp
@@ -17,19 +17,32 @@
   along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
 */

+#include "config.h"
+
+#include <QObject>
+#include <QWidget>
+#include <QVariant>
+#include <QString>
+#include <QMenu>
+#include <QAction>
+#include <QActionGroup>
+#include <QTimer>
+#include <QBoxLayout>
+#include <QLayout>
+#include <QSignalMapper>
+#include <QSettings>
+#include <QtEvents>
+#include <QtDebug>
+
 #include "analyzercontainer.h"
+
+#include "analyzerbase.h"
 #include "blockanalyzer.h"

 #include "core/logging.h"

-#include <QMouseEvent>
-#include <QHBoxLayout>
-#include <QSettings>
-#include <QTimer>
-#include <QtDebug>
-
-const char* AnalyzerContainer::kSettingsGroup = "Analyzer";
-const char* AnalyzerContainer::kSettingsFramerate = "framerate";
+const char *AnalyzerContainer::kSettingsGroup = "Analyzer";
+const char *AnalyzerContainer::kSettingsFramerate = "framerate";

 // Framerates
 const int AnalyzerContainer::kLowFramerate = 20;
@@ -37,7 +50,7 @@ const int AnalyzerContainer::kMediumFramerate = 25;
 const int AnalyzerContainer::kHighFramerate = 30;
 const int AnalyzerContainer::kSuperHighFramerate = 60;

-AnalyzerContainer::AnalyzerContainer(QWidget* parent)
+AnalyzerContainer::AnalyzerContainer(QWidget *parent)
    : QWidget(parent),
      current_framerate_(kMediumFramerate),
      context_menu_(new QMenu(this)),
@@ -51,7 +64,7 @@ AnalyzerContainer::AnalyzerContainer(QWidget* parent)
      ignore_next_click_(false),
      current_analyzer_(nullptr),
      engine_(nullptr) {
-  QHBoxLayout* layout = new QHBoxLayout(this);
+  QHBoxLayout *layout = new QHBoxLayout(this);
  setLayout(layout);
  layout->setContentsMargins(0, 0, 0, 0);

@@ -82,19 +95,18 @@ AnalyzerContainer::AnalyzerContainer(QWidget* parent)
  Load();
 }

-void AnalyzerContainer::SetActions(QAction* visualisation) {
+void AnalyzerContainer::SetActions(QAction *visualisation) {
  visualisation_action_ = visualisation;
  context_menu_->addAction(visualisation_action_);
 }

-void AnalyzerContainer::mouseReleaseEvent(QMouseEvent* e) {
+void AnalyzerContainer::mouseReleaseEvent(QMouseEvent *e) {
  if (e->button() == Qt::LeftButton) {
    if (ignore_next_click_) {
      ignore_next_click_ = false;
    }
    else {
-      // Might be the first click in a double click, so wait a while before
-      // actually doing anything
+      // Might be the first click in a double click, so wait a while before actually doing anything
      double_click_timer_->start();
      last_click_pos_ = e->globalPos();
    }
@@ -115,11 +127,11 @@ void AnalyzerContainer::mouseDoubleClickEvent(QMouseEvent*) {
  if (visualisation_action_) visualisation_action_->trigger();
 }

-void AnalyzerContainer::wheelEvent(QWheelEvent* e) {
+void AnalyzerContainer::wheelEvent(QWheelEvent *e) {
  emit WheelEvent(e->delta());
 }

-void AnalyzerContainer::SetEngine(EngineBase* engine) {
+void AnalyzerContainer::SetEngine(EngineBase *engine) {
  if (current_analyzer_) current_analyzer_->set_engine(engine);
  engine_ = engine;
 }
@@ -132,11 +144,10 @@ void AnalyzerContainer::DisableAnalyzer() {
 }

 void AnalyzerContainer::ChangeAnalyzer(int id) {
-  QObject* instance = analyzer_types_[id]->newInstance(Q_ARG(QWidget*, this));
+  QObject *instance = analyzer_types_[id]->newInstance(Q_ARG(QWidget*, this));

  if (!instance) {
-    qLog(Warning) << "Couldn't intialise a new"
-                  << analyzer_types_[id]->className();
+    qLog(Warning) << "Couldn't intialise a new" << analyzer_types_[id]->className();
    return;
  }

@@ -196,8 +207,7 @@ void AnalyzerContainer::Load() {
 }

 void AnalyzerContainer::SaveFramerate(int framerate) {
-  // For now, framerate is common for all analyzers. Maybe each analyzer should
-  // have its own framerate?
+  // For now, framerate is common for all analyzers. Maybe each analyzer should have its own framerate?
  current_framerate_ = framerate;
  QSettings s;
  s.beginGroup(kSettingsGroup);
@@ -212,7 +222,7 @@ void AnalyzerContainer::Save() {
 }

 void AnalyzerContainer::AddFramerate(const QString& name, int framerate) {
-  QAction* action = context_menu_framerate_->addAction(name, mapper_framerate_, SLOT(map()));
+  QAction *action = context_menu_framerate_->addAction(name, mapper_framerate_, SLOT(map()));
  mapper_framerate_->setMapping(action, framerate);
  group_framerate_->addAction(action);
  framerate_list_ << framerate;
--- a/src/analyzer/analyzercontainer.h
+++ b/src/analyzer/analyzercontainer.h
@@ -20,13 +20,31 @@
 #ifndef ANALYZERCONTAINER_H
 #define ANALYZERCONTAINER_H

-#include <QWidget>
-#include <QMenu>
-#include <QSignalMapper>
+#include "config.h"
+
+#include <stdbool.h>
+
+#include <QObject>
+#include <QWidget>
+#include <QPoint>
+#include <QMenu>
+#include <QAction>
+#include <QActionGroup>
+#include <QList>
+#include <QString>
+#include <QSignalMapper>
+#include <QTimer>
+#include <QtEvents>

-#include "analyzerbase.h"
 #include "engine/engine_fwd.h"

+class QMouseEvent;
+class QWheelEvent;
+
+namespace Analyzer {
+class Base;
+}  // namespace Analyzer
+
 class AnalyzerContainer : public QWidget {
  Q_OBJECT

--- a/src/analyzer/blockanalyzer.cpp
+++ b/src/analyzer/blockanalyzer.cpp
@@ -5,12 +5,19 @@

 #include "blockanalyzer.h"

-#include <cmath>
-
-#include <QMouseEvent>
-#include <QResizeEvent>
 #include <cstdlib>
+#include <cmath>
+#include <scoped_allocator>
+
+#include <QWidget>
+#include <QPixmap>
 #include <QPainter>
+#include <QPalette>
+#include <QColor>
+#include <QtEvents>
+
+#include "analyzerbase.h"
+#include "fht.h"

 const uint BlockAnalyzer::HEIGHT = 2;
 const uint BlockAnalyzer::WIDTH = 4;
@@ -19,10 +26,10 @@ const uint BlockAnalyzer::MIN_COLUMNS = 32;   // arbituary
 const uint BlockAnalyzer::MAX_COLUMNS = 256;  // must be 2**n
 const uint BlockAnalyzer::FADE_SIZE = 90;

-const char* BlockAnalyzer::kName =
+const char *BlockAnalyzer::kName =
    QT_TRANSLATE_NOOP("AnalyzerContainer", "Block analyzer");

-BlockAnalyzer::BlockAnalyzer(QWidget* parent)
+BlockAnalyzer::BlockAnalyzer(QWidget *parent)
    : Analyzer::Base(parent, 9),
      m_columns(0)  // uint
      ,
@@ -43,9 +50,7 @@ BlockAnalyzer::BlockAnalyzer(QWidget* parent)
      ,
      m_fade_intensity(1 << 8, 32)  // vector<uint>
 {
-  setMinimumSize(MIN_COLUMNS * (WIDTH + 1) - 1,
-                 MIN_ROWS * (HEIGHT + 1) -
-                     1);  //-1 is padding, no drawing takes place there
+  setMinimumSize(MIN_COLUMNS * (WIDTH + 1) - 1, MIN_ROWS * (HEIGHT + 1) - 1);  //-1 is padding, no drawing takes place there
  setMaximumWidth(MAX_COLUMNS * (WIDTH + 1) - 1);

  // mxcl says null pixmaps cause crashes, so let's play it safe
@@ -54,7 +59,7 @@ BlockAnalyzer::BlockAnalyzer(QWidget* parent)

 BlockAnalyzer::~BlockAnalyzer() {}

-void BlockAnalyzer::resizeEvent(QResizeEvent* e) {
+void BlockAnalyzer::resizeEvent(QResizeEvent *e) {
  QWidget::resizeEvent(e);

  m_background = QPixmap(size());
@@ -96,8 +101,7 @@ void BlockAnalyzer::resizeEvent(QResizeEvent* e) {
 }

 void BlockAnalyzer::determineStep() {
-  // falltime is dependent on rowcount due to our digital resolution (ie we have
-  // boxes/blocks of pixels)
+  // falltime is dependent on rowcount due to our digital resolution (ie we have boxes/blocks of pixels)
  // I calculated the value 30 based on some trial and error

  // the fall time of 30 is too slow on framerates above 50fps
@@ -119,10 +123,7 @@ void BlockAnalyzer::transform(Analyzer::Scope& s)  // pure virtual
  m_fht->spectrum(front);
  m_fht->scale(front, 1.0 / 20);

-  // the second half is pretty dull, so only show it if the user has a large
-  // analyzer
-  // by setting to m_scope.size() if large we prevent interpolation of large
-  // analyzers, this is good!
+  // the second half is pretty dull, so only show it if the user has a large analyzer by setting to m_scope.size() if large we prevent interpolation of large analyzers, this is good!
  s.resize(m_scope.size() <= MAX_COLUMNS / 2 ? MAX_COLUMNS / 2 : m_scope.size());
 }

@@ -158,15 +159,13 @@ void BlockAnalyzer::analyze(QPainter& p, const Analyzer::Scope& s,
    for (y = 0; m_scope[x] < m_yscale[y]; ++y)
      ;

-    // this is opposite to what you'd think, higher than y
-    // means the bar is lower than y (physically)
+    // this is opposite to what you'd think, higher than y means the bar is lower than y (physically)
    if ((float)y > m_store[x])
      y = int(m_store[x] += m_step);
    else
      m_store[x] = y;

-    // if y is lower than m_fade_pos, then the bar has exceeded the height of
-    // the fadeout
+    // if y is lower than m_fade_pos, then the bar has exceeded the height of the fadeout
    // if the fadeout is quite faded now, then display the new one
    if (y <= m_fade_pos[x] /*|| m_fade_intensity[x] < FADE_SIZE / 3*/) {
      m_fade_pos[x] = y;
@@ -181,8 +180,7 @@ void BlockAnalyzer::analyze(QPainter& p, const Analyzer::Scope& s,

    if (m_fade_intensity[x] == 0) m_fade_pos[x] = m_rows;

-    // REMEMBER: y is a number from 0 to m_rows, 0 means all blocks are glowing,
-    // m_rows means none are
+    // REMEMBER: y is a number from 0 to m_rows, 0 means all blocks are glowing, m_rows means none are
    canvas_painter.drawPixmap(x * (WIDTH + 1), y * (HEIGHT + 1) + m_y, *bar(),
                              0, y * (HEIGHT + 1), bar()->width(),
                              bar()->height());
@@ -195,8 +193,7 @@ void BlockAnalyzer::analyze(QPainter& p, const Analyzer::Scope& s,
 }

 static inline void adjustToLimits(int& b, int& f, uint& amount) {
-  // with a range of 0-255 and maximum adjustment of amount,
-  // maximise the difference between f and b
+  // with a range of 0-255 and maximum adjustment of amount, maximise the difference between f and b

  if (b < f) {
    if (b > 255 - f) {
--- a/src/analyzer/blockanalyzer.h
+++ b/src/analyzer/blockanalyzer.h
@@ -5,12 +5,21 @@
 #ifndef BLOCKANALYZER_H
 #define BLOCKANALYZER_H

+#include <stdbool.h>
+#include <vector>
+
+#include <QtGlobal>
+#include <QObject>
+#include <QWidget>
+#include <QString>
+#include <QPixmap>
+#include <QPainter>
+#include <QPalette>
+#include <QtEvents>
+
 #include "analyzerbase.h"
-#include <qcolor.h>

 class QResizeEvent;
-class QMouseEvent;
-class QPalette;

 /**
 * @author Max Howell
--- a/src/analyzer/fht.cpp
+++ b/src/analyzer/fht.cpp
@@ -20,6 +20,7 @@

 #include <math.h>
 #include <string.h>
+
 #include "fht.h"

 FHT::FHT(int n) : m_buf(0), m_tab(0), m_log(0) {