Release 0.4.2

Unsure about copyright issues using it, the image is from the Strawbs boxset, removing
it for now.

.gitignore

@@ -34,6 +34,12 @@ Thumbs.db
 *.rc
 /.qmake.cache
 /.qmake.stash
+*.spec
+*.nsi
+*.plist
+maketarball.sh
+dist/debian/changelog
+dist/pacman/PKGBUILD
 
 # qtcreator generated files
 *.pro.user*

.travis.yml

@@ -0,0 +1,30 @@
+sudo: required
+language: C++
+os:
+  - linux
+  - osx
+services:
+  - docker
+compiler:
+  - gcc
+  - clang
+
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -f Dockerfile -t strawberry-build . ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run --name build -itd strawberry-build /bin/bash ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker exec build git clone https://github.com/jonaski/strawberry ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew unlink python ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install glib pkgconfig protobuf protobuf-c qt ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install sqlite --with-fts ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gstreamer gst-plugins-base ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gst-plugins-good --with-flac ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gst-plugins-bad gst-plugins-ugly ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install chromaprint ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export Qt5_DIR=/usr/local/opt/qt5/lib/cmake ; fi
+before_script:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker exec build cmake -Hstrawberry -Bbuild -DENABLE_STREAM_DEEZER=ON ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir build; cd build; cmake .. -DFORCE_GIT_REVISION="0.0.0-0-g0000000"; fi
+script:
+- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker exec build make -C build -j8 ; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make -j8 ; fi

3rdparty/qocoa/qsearchfield.h

@@ -6,43 +6,38 @@
 #include <QMenu>
 
 class QSearchFieldPrivate;
-class QSearchField : public QWidget
-{
-    Q_OBJECT
+class QSearchField : public QWidget {
+  Q_OBJECT
 
-    Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged USER true);
-    Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText);
+  Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged USER true);
+  Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText);
 
 public:
-    explicit QSearchField(QWidget *parent);
+  explicit QSearchField(QWidget *parent);
 
-    QString text() const;
-    QString placeholderText() const;
-    void setFocus(Qt::FocusReason);
-    void setMenu(QMenu *menu);
+  QString text() const;
+  QString placeholderText() const;
+  void setFocus(Qt::FocusReason);
 
 public slots:
-    void setText(const QString &text);
-    void setPlaceholderText(const QString &text);
-    void clear();
-    void selectAll();
-    void setFocus();
+  void setText(const QString &text);
+  void setPlaceholderText(const QString &text);
+  void clear();
+  void selectAll();
+  void setFocus();
 
 signals:
-    void textChanged(const QString &text);
-    void editingFinished();
-    void returnPressed();
-
-private slots:
-    void popupMenu();
+  void textChanged(const QString &text);
+  void editingFinished();
+  void returnPressed();
 
 protected:
-    void changeEvent(QEvent*);
-    void resizeEvent(QResizeEvent*);
+  void resizeEvent(QResizeEvent*);
+  bool eventFilter(QObject*, QEvent*);
 
 private:
-    friend class QSearchFieldPrivate;
-    QPointer <QSearchFieldPrivate> pimpl;
+  friend class QSearchFieldPrivate;
+  QPointer <QSearchFieldPrivate> pimpl;
 };
 
 #endif // QSEARCHFIELD_H

3rdparty/qocoa/qsearchfield_mac.mm

@@ -32,57 +32,50 @@ THE SOFTWARE.
 #include <QKeyEvent>
 #include <QClipboard>
 
-class QSearchFieldPrivate : public QObject
-{
+class QSearchFieldPrivate : public QObject {
 public:
-    QSearchFieldPrivate(QSearchField *qSearchField, NSSearchField *nsSearchField)
-        : QObject(qSearchField), qSearchField(qSearchField), nsSearchField(nsSearchField) {}
+  QSearchFieldPrivate(QSearchField *qSearchField, NSSearchField *nsSearchField)
+    : QObject(qSearchField), qSearchField(qSearchField), nsSearchField(nsSearchField) {}
 
-    void textDidChange(const QString &text)
-    {
-        if (qSearchField)
-            emit qSearchField->textChanged(text);
+  void textDidChange(const QString &text) {
+    if (qSearchField) emit qSearchField->textChanged(text);
+  }
+
+  void textDidEndEditing() {
+    if (qSearchField)
+      emit qSearchField->editingFinished();
     }
 
-    void textDidEndEditing()
-    {
-        if (qSearchField)
-            emit qSearchField->editingFinished();
+  void returnPressed() {
+    if (qSearchField) {
+      emit qSearchField->returnPressed();
+      QKeyEvent* event = new QKeyEvent(QEvent::KeyPress, Qt::Key_Return, Qt::NoModifier);
+      QApplication::postEvent(qSearchField, event);
     }
+  }
 
-    void returnPressed()
-    {
-        if (qSearchField) {
-            emit qSearchField->returnPressed();
-            QKeyEvent* event = new QKeyEvent(QEvent::KeyPress, Qt::Key_Return, Qt::NoModifier);
-            QApplication::postEvent(qSearchField, event);
-        }
+  void keyDownPressed() {
+    if (qSearchField) {
+      QKeyEvent* event = new QKeyEvent(QEvent::KeyPress, Qt::Key_Down, Qt::NoModifier);
+      QApplication::postEvent(qSearchField, event);
     }
+  }
 
-    void keyDownPressed()
-    {
-        if (qSearchField) {
-            QKeyEvent* event = new QKeyEvent(QEvent::KeyPress, Qt::Key_Down, Qt::NoModifier);
-            QApplication::postEvent(qSearchField, event);
-        }
+  void keyUpPressed() {
+    if (qSearchField) {
+      QKeyEvent* event = new QKeyEvent(QEvent::KeyPress, Qt::Key_Up, Qt::NoModifier);
+      QApplication::postEvent(qSearchField, event);
     }
+  }
 
-    void keyUpPressed()
-    {
-        if (qSearchField) {
-            QKeyEvent* event = new QKeyEvent(QEvent::KeyPress, Qt::Key_Up, Qt::NoModifier);
-            QApplication::postEvent(qSearchField, event);
-        }
-    }
+  QPointer<QSearchField> qSearchField;
+  NSSearchField *nsSearchField;
 
-    QPointer<QSearchField> qSearchField;
-    NSSearchField *nsSearchField;
 };
 
-@interface QSearchFieldDelegate : NSObject<NSTextFieldDelegate>
-{
+@interface QSearchFieldDelegate : NSObject<NSTextFieldDelegate> {
 @public
-    QPointer<QSearchFieldPrivate> pimpl;
+  QPointer<QSearchFieldPrivate> pimpl;
 }
 -(void)controlTextDidChange:(NSNotification*)notification;
 -(void)controlTextDidEndEditing:(NSNotification*)notification;
@@ -90,35 +83,33 @@ public:
 
 @implementation QSearchFieldDelegate
 -(void)controlTextDidChange:(NSNotification*)notification {
-    Q_ASSERT(pimpl);
-    if (pimpl)
-        pimpl->textDidChange(toQString([[notification object] stringValue]));
+  Q_ASSERT(pimpl);
+  if (pimpl) pimpl->textDidChange(toQString([[notification object] stringValue]));
 }
 
 -(void)controlTextDidEndEditing:(NSNotification*)notification {
-    Q_UNUSED(notification);
-    // No Q_ASSERT here as it is called on destruction.
-    if (pimpl)
-        pimpl->textDidEndEditing();
-
-    if ([[[notification userInfo] objectForKey:@"NSTextMovement"] intValue] == NSReturnTextMovement)
-        pimpl->returnPressed();
+  Q_UNUSED(notification);
+  // No Q_ASSERT here as it is called on destruction.
+  if (!pimpl) return;
+  pimpl->textDidEndEditing();
+  if ([[[notification userInfo] objectForKey:@"NSTextMovement"] intValue] == NSReturnTextMovement)
+    pimpl->returnPressed();
 }
 
 -(BOOL)control: (NSControl *)control textView:
-        (NSTextView *)textView doCommandBySelector:
-        (SEL)commandSelector {
-    Q_ASSERT(pimpl);
-    if (!pimpl) return NO;
-
-    if (commandSelector == @selector(moveDown:)) {
-        pimpl->keyDownPressed();
-        return YES;
-    } else if (commandSelector == @selector(moveUp:)) {
-        pimpl->keyUpPressed();
-        return YES;
-    }
-    return NO;
+(NSTextView *)textView doCommandBySelector:
+(SEL)commandSelector {
+  Q_ASSERT(pimpl);
+  if (!pimpl) return NO;
+  if (commandSelector == @selector(moveDown:)) {
+    pimpl->keyDownPressed();
+    return YES;
+  }
+  else if (commandSelector == @selector(moveUp:)) {
+    pimpl->keyUpPressed();
+    return YES;
+  }
+  return NO;
 }
 
 @end
@@ -129,169 +120,109 @@ public:
 
 @implementation QocoaSearchField
 -(BOOL)performKeyEquivalent:(NSEvent*)event {
-    // First, check if we have the focus.
-    // If no, it probably means this event isn't for us.
-    NSResponder* firstResponder = [[NSApp keyWindow] firstResponder];
-    if ([firstResponder isKindOfClass:[NSText class]] &&
-            [(NSText*)firstResponder delegate] == self) {
+  // First, check if we have the focus.
+  // If no, it probably means this event isn't for us.
+  NSResponder* firstResponder = [[NSApp keyWindow] firstResponder];
+  if ([firstResponder isKindOfClass:[NSText class]] && [(NSText*)firstResponder delegate] == self) {
 
-        if ([event type] == NSEventTypeKeyDown && [event modifierFlags] & NSEventModifierFlagCommand)
-        {
-            QString keyString = toQString([event characters]);
-            if (keyString == "a")  // Cmd+a
-            {
-                [self performSelector:@selector(selectText:)];
-                return YES;
-            }
-            else if (keyString == "c")  // Cmd+c
-            {
-                [[self currentEditor] copy: nil];
-                return YES;
-            }
-            else if (keyString == "v")  // Cmd+v
-            {
-                [[self currentEditor] paste: nil];
-                return YES;
-            }
-            else if (keyString == "x")  // Cmd+x
-            {
-                [[self currentEditor] cut: nil];
-                return YES;
-            }
-        }
+    if ([event type] == NSEventTypeKeyDown && [event modifierFlags] & NSEventModifierFlagCommand) {
+      QString keyString = toQString([event characters]);
+      if (keyString == "a")  // Cmd+a
+      {
+        [self performSelector:@selector(selectText:)];
+        return YES;
+      }
+      else if (keyString == "c")  // Cmd+c
+      {
+        [[self currentEditor] copy: nil];
+        return YES;
+      }
+      else if (keyString == "v")  // Cmd+v
+      {
+        [[self currentEditor] paste: nil];
+        return YES;
+      }
+      else if (keyString == "x")  // Cmd+x
+      {
+        [[self currentEditor] cut: nil];
+        return YES;
+      }
     }
+  }
 
-    return NO;
+  return NO;
 }
 @end
 
-QSearchField::QSearchField(QWidget *parent) : QWidget(parent)
-{
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
-    NSSearchField *search = [[QocoaSearchField alloc] init];
-
-    QSearchFieldDelegate *delegate = [[QSearchFieldDelegate alloc] init];
-    pimpl = delegate->pimpl = new QSearchFieldPrivate(this, search);
-    [search setDelegate:delegate];
-
-    setupLayout(search, this);
-
-    setFixedHeight(24);
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-
-    [search release];
-
-    [pool drain];
+QSearchField::QSearchField(QWidget *parent) : QWidget(parent) {
+  NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+  NSSearchField *search = [[QocoaSearchField alloc] init];
+  QSearchFieldDelegate *delegate = [[QSearchFieldDelegate alloc] init];
+  pimpl = delegate->pimpl = new QSearchFieldPrivate(this, search);
+  [search setDelegate:delegate];
+  setupLayout(search, this);
+  setFixedHeight(24);
+  setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+  [search release];
+  [pool drain];
 }
 
-void QSearchField::setMenu(QMenu *menu)
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return;
+void QSearchField::setText(const QString &text) {
+  Q_ASSERT(pimpl);
+  if (!pimpl) return;
 
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
-    NSMenu *nsMenu = menu->macMenu();
-#else
-    NSMenu *nsMenu = menu->toNSMenu();
-#endif
-
-    [[pimpl->nsSearchField cell] setSearchMenuTemplate:nsMenu];
+  NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+  [pimpl->nsSearchField setStringValue:fromQString(text)];
+  if (!text.isEmpty()) {
+    [pimpl->nsSearchField selectText:pimpl->nsSearchField];
+    [[pimpl->nsSearchField currentEditor] setSelectedRange:NSMakeRange([[pimpl->nsSearchField stringValue] length], 0)];
+  }
+  [pool drain];
 }
 
-void QSearchField::popupMenu()
-{
+void QSearchField::setPlaceholderText(const QString &text) {
+  Q_ASSERT(pimpl);
+  if (!pimpl) return;
+  NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+  [[pimpl->nsSearchField cell] setPlaceholderString:fromQString(text)];
+  [pool drain];
 }
 
-void QSearchField::setText(const QString &text)
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return;
-
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-    [pimpl->nsSearchField setStringValue:fromQString(text)];
-    [pool drain];
+void QSearchField::clear() {
+  Q_ASSERT(pimpl);
+  if (!pimpl) return;
+  [pimpl->nsSearchField setStringValue:@""];
+  emit textChanged(QString());
 }
 
-void QSearchField::setPlaceholderText(const QString &text)
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return;
-
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-    [[pimpl->nsSearchField cell] setPlaceholderString:fromQString(text)];
-    [pool drain];
+void QSearchField::selectAll() {
+  Q_ASSERT(pimpl);
+  if (!pimpl) return;
+  [pimpl->nsSearchField performSelector:@selector(selectText:)];
 }
 
-void QSearchField::clear()
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return;
-
-    [pimpl->nsSearchField setStringValue:@""];
-    emit textChanged(QString());
+QString QSearchField::text() const {
+  Q_ASSERT(pimpl);
+  if (!pimpl) return QString();
+  return toQString([pimpl->nsSearchField stringValue]);
 }
 
-void QSearchField::selectAll()
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return;
-
-    [pimpl->nsSearchField performSelector:@selector(selectText:)];
+QString QSearchField::placeholderText() const {
+  Q_ASSERT(pimpl);
+  return toQString([[pimpl->nsSearchField cell] placeholderString]);
 }
 
-QString QSearchField::text() const
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return QString();
+void QSearchField::setFocus(Qt::FocusReason) {}
 
-    return toQString([pimpl->nsSearchField stringValue]);
+void QSearchField::setFocus() {
+  setFocus(Qt::OtherFocusReason);
 }
 
-QString QSearchField::placeholderText() const
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return QString();
-
-    return toQString([[pimpl->nsSearchField cell] placeholderString]);
+void QSearchField::resizeEvent(QResizeEvent *resizeEvent) {
+  QWidget::resizeEvent(resizeEvent);
 }
 
-void QSearchField::setFocus(Qt::FocusReason)
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return;
-
-    if ([pimpl->nsSearchField acceptsFirstResponder])
-        [[pimpl->nsSearchField window] makeFirstResponder: pimpl->nsSearchField];
+bool QSearchField::eventFilter(QObject *o, QEvent *e) {
+  return QWidget::eventFilter(o, e);
 }
 
-void QSearchField::setFocus()
-{
-    setFocus(Qt::OtherFocusReason);
-}
-
-void QSearchField::changeEvent(QEvent* event)
-{
-    if (event->type() == QEvent::EnabledChange) {
-        Q_ASSERT(pimpl);
-        if (!pimpl)
-            return;
-
-        const bool enabled = isEnabled();
-        [pimpl->nsSearchField setEnabled: enabled];
-    }
-    QWidget::changeEvent(event);
-}
-
-void QSearchField::resizeEvent(QResizeEvent *resizeEvent)
-{
-    QWidget::resizeEvent(resizeEvent);
-}

3rdparty/qocoa/qsearchfield_nonmac.cpp

@@ -22,235 +22,140 @@ THE SOFTWARE.
 
 #include "qsearchfield.h"
 
+#include <QApplication>
+#include <QDesktopWidget>
 #include <QLineEdit>
 #include <QVBoxLayout>
 #include <QToolButton>
 #include <QStyle>
-#include <QApplication>
-#include <QDesktopWidget>
+#include <QEvent>
 
 #include <QDir>
 #include <QDebug>
 
-class QSearchFieldPrivate : public QObject
-{
+#include "../../src/core/iconloader.h"
+
+class QSearchFieldPrivate : public QObject {
 public:
-    QSearchFieldPrivate(QSearchField *searchField, QLineEdit *lineEdit, QToolButton *clearButton, QToolButton *searchButton)
-        : QObject(searchField), lineEdit(lineEdit), clearButton(clearButton), searchButton(searchButton) {}
+  QSearchFieldPrivate(QSearchField *searchField, QLineEdit *lineEdit, QToolButton *clearButton)
+      : QObject(searchField), lineEdit(lineEdit), clearButton(clearButton) {}
 
-    int lineEditFrameWidth() const {
-        return lineEdit->style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
-    }
+  int lineEditFrameWidth() const {
+    return lineEdit->style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
+  }
 
-    int clearButtonPaddedWidth() const {
-        return clearButton->width() + lineEditFrameWidth() * 2;
-    }
+  int clearButtonPaddedWidth() const {
+    return clearButton->width() + lineEditFrameWidth() * 2;
+  }
 
-    int clearButtonPaddedHeight() const {
-        return clearButton->height() + lineEditFrameWidth() * 2;
-    }
+  int clearButtonPaddedHeight() const {
+    return clearButton->height() + lineEditFrameWidth() * 2;
+  }
 
-    int searchButtonPaddedWidth() const {
-        return searchButton->width() + lineEditFrameWidth() * 2;
-    }
-
-    int searchButtonPaddedHeight() const {
-        return searchButton->height() + lineEditFrameWidth() * 2;
-    }
-
-    QPointer<QLineEdit> lineEdit;
-    QPointer<QToolButton> clearButton;
-    QPointer<QToolButton> searchButton;
-    QPointer<QMenu> searchMenu;
+  QPointer<QLineEdit> lineEdit;
+  QPointer<QToolButton> clearButton;
 };
 
-QSearchField::QSearchField(QWidget *parent) : QWidget(parent)
-{
-    QLineEdit *lineEdit = new QLineEdit(this);
-    connect(lineEdit, SIGNAL(textChanged(QString)),
-            this, SIGNAL(textChanged(QString)));
-    connect(lineEdit, SIGNAL(editingFinished()),
-            this, SIGNAL(editingFinished()));
-    connect(lineEdit, SIGNAL(returnPressed()),
-            this, SIGNAL(returnPressed()));
-    connect(lineEdit, SIGNAL(textChanged(QString)),
-            this, SLOT(setText(QString)));
+QSearchField::QSearchField(QWidget *parent) : QWidget(parent) {
 
-    int iconsize = style()->pixelMetric(QStyle::PM_SmallIconSize);
-    QToolButton *clearButton = new QToolButton(this);
-    QIcon clearIcon = QIcon::fromTheme(QLatin1String("edit-clear"),
-                                       QIcon(QLatin1String(":/Qocoa/qsearchfield_nonmac_clear.png")));
-    clearButton->setIcon(clearIcon);
-    clearButton->setIconSize(QSize(iconsize, iconsize));
-    clearButton->setFixedSize(QSize(iconsize, iconsize));
-    clearButton->setStyleSheet("border: none;");
-    clearButton->hide();
-    connect(clearButton, SIGNAL(clicked()), this, SLOT(clear()));
+  QLineEdit *lineEdit = new QLineEdit(this);
+  connect(lineEdit, SIGNAL(textChanged(QString)), this, SIGNAL(textChanged(QString)));
+  connect(lineEdit, SIGNAL(editingFinished()), this, SIGNAL(editingFinished()));
+  connect(lineEdit, SIGNAL(returnPressed()), this, SIGNAL(returnPressed()));
+  connect(lineEdit, SIGNAL(textChanged(QString)), this, SLOT(setText(QString)));
 
-    QToolButton *searchButton = new QToolButton(this);
-    QIcon searchIcon = QIcon(QLatin1String(":/Qocoa/qsearchfield_nonmac_magnifier.png"));
-    searchButton->setIcon(searchIcon);
-    searchButton->setIconSize(QSize(iconsize, iconsize));
-    searchButton->setFixedSize(QSize(iconsize, iconsize));
-    searchButton->setStyleSheet("border: none;");
-    searchButton->setPopupMode(QToolButton::InstantPopup);
-    searchButton->setEnabled(false);
-    connect(searchButton, SIGNAL(clicked()), this, SLOT(popupMenu()));
+  QToolButton *clearButton = new QToolButton(this);
+  QIcon clearIcon(IconLoader::Load("edit-clear-locationbar-ltr"));
 
-    pimpl = new QSearchFieldPrivate(this, lineEdit, clearButton, searchButton);
+  clearButton->setIcon(clearIcon);
+  clearButton->setIconSize(QSize(16, 16));
+  clearButton->setStyleSheet("border: none; padding: 0px;");
+  clearButton->resize(clearButton->sizeHint());
 
-    lineEdit->setStyleSheet(QString("QLineEdit { padding-left: %1px; padding-right: %2px; } ")
-                            .arg(pimpl->searchButtonPaddedWidth())
-                            .arg(pimpl->clearButtonPaddedWidth()));
-    const int width = qMax(lineEdit->minimumSizeHint().width(), pimpl->clearButtonPaddedWidth() + pimpl->searchButtonPaddedWidth());
-    const int height = qMax(lineEdit->minimumSizeHint().height(),
-                       qMax(pimpl->clearButtonPaddedHeight(),
-                            pimpl->searchButtonPaddedHeight()));
-    lineEdit->setMinimumSize(width, height);
+  connect(clearButton, SIGNAL(clicked()), this, SLOT(clear()));
+
+  pimpl = new QSearchFieldPrivate(this, lineEdit, clearButton);
+
+  const int frame_width = lineEdit->style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
+
+  lineEdit->setStyleSheet(QString("QLineEdit { padding-left: %1px; } ").arg(clearButton->width()));
+  const int width = frame_width + qMax(lineEdit->minimumSizeHint().width(), pimpl->clearButtonPaddedWidth());
+  const int height = frame_width + qMax(lineEdit->minimumSizeHint().height(), pimpl->clearButtonPaddedHeight());
+  lineEdit->setMinimumSize(width, height);
+
+  QVBoxLayout *layout = new QVBoxLayout(this);
+  layout->setMargin(0);
+  layout->addWidget(lineEdit);
+
+  lineEdit->installEventFilter(this);
 
-    QVBoxLayout *layout = new QVBoxLayout(this);
-    layout->setMargin(0);
-    layout->addWidget(lineEdit);
 }
 
-void QSearchField::setMenu(QMenu *menu)
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return;
+void QSearchField::setText(const QString &text) {
 
-    pimpl->searchMenu = menu;
+  Q_ASSERT(pimpl && pimpl->clearButton && pimpl->lineEdit);
+  if (!(pimpl && pimpl->clearButton && pimpl->lineEdit)) return;
+  if (text != this->text()) pimpl->lineEdit->setText(text);
 
-    QIcon searchIcon = menu ? QIcon(QLatin1String(":/Qocoa/qsearchfield_nonmac_magnifier_menu.png"))
-                            : QIcon(QLatin1String(":/Qocoa/qsearchfield_nonmac_magnifier.png"));
-    pimpl->searchButton->setIcon(searchIcon);
-    pimpl->searchButton->setEnabled(isEnabled() && menu);
 }
 
-void QSearchField::popupMenu()
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return;
-
-    if (pimpl->searchMenu) {
-        const QRect screenRect = qApp->desktop()->availableGeometry(pimpl->searchButton);
-        const QSize sizeHint = pimpl->searchMenu->sizeHint();
-        const QRect rect = pimpl->searchButton->rect();
-        const int x = pimpl->searchButton->isRightToLeft()
-                ? rect.right() - sizeHint.width()
-                : rect.left();
-        const int y = pimpl->searchButton->mapToGlobal(QPoint(0, rect.bottom())).y() + sizeHint.height() <= screenRect.height()
-                ? rect.bottom()
-                : rect.top() - sizeHint.height();
-        QPoint point = pimpl->searchButton->mapToGlobal(QPoint(x, y));
-        point.rx() = qMax(screenRect.left(), qMin(point.x(), screenRect.right() - sizeHint.width()));
-        point.ry() += 1;
-
-        pimpl->searchMenu->popup(point);
-    }
-}
-
-void QSearchField::changeEvent(QEvent* event)
-{
-    if (event->type() == QEvent::EnabledChange) {
-        Q_ASSERT(pimpl);
-        if (!pimpl)
-            return;
-
-        const bool enabled = isEnabled();
-        pimpl->searchButton->setEnabled(enabled && pimpl->searchMenu);
-        pimpl->lineEdit->setEnabled(enabled);
-        pimpl->clearButton->setEnabled(enabled);
-    }
-    QWidget::changeEvent(event);
-}
-
-void QSearchField::setText(const QString &text)
-{
-    Q_ASSERT(pimpl && pimpl->clearButton && pimpl->lineEdit);
-    if (!(pimpl && pimpl->clearButton && pimpl->lineEdit))
-        return;
-
-    pimpl->clearButton->setVisible(!text.isEmpty());
-
-    if (text != this->text())
-        pimpl->lineEdit->setText(text);
-}
-
-void QSearchField::setPlaceholderText(const QString &text)
-{
-    Q_ASSERT(pimpl && pimpl->lineEdit);
-    if (!(pimpl && pimpl->lineEdit))
-        return;
-
-#if QT_VERSION >= 0x040700
-    pimpl->lineEdit->setPlaceholderText(text);
-#endif
-}
-
-void QSearchField::clear()
-{
-    Q_ASSERT(pimpl && pimpl->lineEdit);
-    if (!(pimpl && pimpl->lineEdit))
-        return;
-
-    pimpl->lineEdit->clear();
-}
-
-void QSearchField::selectAll()
-{
-    Q_ASSERT(pimpl && pimpl->lineEdit);
-    if (!(pimpl && pimpl->lineEdit))
-        return;
-
-    pimpl->lineEdit->selectAll();
-}
-
-QString QSearchField::text() const
-{
-    Q_ASSERT(pimpl && pimpl->lineEdit);
-    if (!(pimpl && pimpl->lineEdit))
-        return QString();
-
-    return pimpl->lineEdit->text();
+void QSearchField::setPlaceholderText(const QString &text) {
+  Q_ASSERT(pimpl && pimpl->lineEdit);
+  if (!(pimpl && pimpl->lineEdit)) return;
+  pimpl->lineEdit->setPlaceholderText(text);
 }
 
 QString QSearchField::placeholderText() const {
-    Q_ASSERT(pimpl && pimpl->lineEdit);
-    if (!(pimpl && pimpl->lineEdit))
-        return QString();
-
-#if QT_VERSION >= 0x040700
-    return pimpl->lineEdit->placeholderText();
-#else
-    return QString();
-#endif
+  return pimpl->lineEdit->placeholderText();
 }
 
-void QSearchField::setFocus(Qt::FocusReason reason)
-{
-    Q_ASSERT(pimpl && pimpl->lineEdit);
-    if (pimpl && pimpl->lineEdit)
-        pimpl->lineEdit->setFocus(reason);
+void QSearchField::setFocus(Qt::FocusReason reason) {
+  Q_ASSERT(pimpl && pimpl->lineEdit);
+  if (pimpl && pimpl->lineEdit) pimpl->lineEdit->setFocus(reason);
 }
 
-void QSearchField::setFocus()
-{
-    setFocus(Qt::OtherFocusReason);
+void QSearchField::setFocus() {
+  setFocus(Qt::OtherFocusReason);
 }
 
-void QSearchField::resizeEvent(QResizeEvent *resizeEvent)
-{
-    Q_ASSERT(pimpl && pimpl->clearButton && pimpl->lineEdit);
-    if (!(pimpl && pimpl->clearButton && pimpl->lineEdit))
-        return;
-
-    QWidget::resizeEvent(resizeEvent);
-    const int x = width() - pimpl->clearButtonPaddedWidth();
-    const int y = (height() - pimpl->clearButton->height())/2;
-    pimpl->clearButton->move(x, y);
-
-    pimpl->searchButton->move(pimpl->lineEditFrameWidth() * 2,
-                              (height() - pimpl->searchButton->height())/2);
+void QSearchField::clear() {
+  Q_ASSERT(pimpl && pimpl->lineEdit);
+  if (!(pimpl && pimpl->lineEdit)) return;
+  pimpl->lineEdit->clear();
+}
+
+void QSearchField::selectAll() {
+  Q_ASSERT(pimpl && pimpl->lineEdit);
+  if (!(pimpl && pimpl->lineEdit)) return;
+  pimpl->lineEdit->selectAll();
+}
+
+QString QSearchField::text() const {
+  Q_ASSERT(pimpl && pimpl->lineEdit);
+  if (!(pimpl && pimpl->lineEdit)) return QString();
+  return pimpl->lineEdit->text();
+}
+
+void QSearchField::resizeEvent(QResizeEvent *resizeEvent) {
+  Q_ASSERT(pimpl && pimpl->clearButton && pimpl->lineEdit);
+  if (!(pimpl && pimpl->clearButton && pimpl->lineEdit)) return;
+
+  QWidget::resizeEvent(resizeEvent);
+  const int x = pimpl->lineEditFrameWidth();
+  const int y = (height() - pimpl->clearButton->height())/2;
+  pimpl->clearButton->move(x, y);
+}
+
+bool QSearchField::eventFilter(QObject *o, QEvent *e) {
+  if (pimpl && pimpl->lineEdit && o == pimpl->lineEdit) {
+    // Forward some lineEdit events to QSearchField (only those we need for
+    // now, but some might be added later if needed)
+    switch (e->type()) {
+      case QEvent::FocusIn:
+      case QEvent::FocusOut:
+        QApplication::sendEvent(this, e);
+        break;
+    }
+  }
+  return QWidget::eventFilter(o, e);
 }

3rdparty/qtsingleapplication/CMakeLists.txt

@@ -13,11 +13,11 @@ set(SINGLEAPP-MOC-HEADERS
     qtsinglecoreapplication.h
 )
 
-if(WIN32)
-  set(SINGLEAPP-SOURCES ${SINGLEAPP-SOURCES} qtlockedfile_win.cpp)
-elseif(WIN32)
+if(UNIX)
   set(SINGLEAPP-SOURCES ${SINGLEAPP-SOURCES} qtlockedfile_unix.cpp)
-endif(WIN32)
+elseif(WIN32)
+  set(SINGLEAPP-SOURCES ${SINGLEAPP-SOURCES} qtlockedfile_win.cpp)
+endif()
 
 QT5_WRAP_CPP(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS})
 
@@ -27,3 +27,5 @@ ADD_LIBRARY(qtsingleapplication STATIC
 )
 
 target_link_libraries(qtsingleapplication Qt5::Core Qt5::Widgets Qt5::Network)
+
+include_directories(${CMAKE_BINARY_DIR}/src)

3rdparty/qtsingleapplication/qtlocalpeer.cpp

@@ -157,7 +157,7 @@ bool QtLocalPeer::sendMessage(const QString &message, int timeout)
         Sleep(DWORD(ms));
 #else
         struct timespec ts = { ms / 1000, (ms % 1000) * 1000 * 1000 };
-        nanosleep(&ts, NULL);
+        nanosleep(&ts, nullptr);
 #endif
     }
     if (!connOk)

3rdparty/qtsingleapplication/qtlockedfile.h

@@ -45,7 +45,7 @@
 #include <QVector>
 #endif
 
-#if defined(Q_WS_WIN) || defined(Q_OS_WIN)
+#if defined(Q_OS_WIN)
 #  if !defined(QT_QTLOCKEDFILE_EXPORT) && !defined(QT_QTLOCKEDFILE_IMPORT)
 #    define QT_QTLOCKEDFILE_EXPORT
 #  elif defined(QT_QTLOCKEDFILE_IMPORT)

3rdparty/qtsingleapplication/qtlockedfile_win.cpp

@@ -58,7 +58,7 @@ Qt::HANDLE QtLockedFile::getMutexHandle(int idx, bool doCreate)
 
     Qt::HANDLE mutex;
     if (doCreate) {
-	mutex = CreateMutexW(NULL, FALSE, (WCHAR*)mname.utf16());
+	mutex = CreateMutexW(nullptr, FALSE, (WCHAR*)mname.utf16());
         if (!mutex) {
             qErrnoWarning("QtLockedFile::lock(): CreateMutex failed");
             return 0;

3rdparty/qtsingleapplication/qtsingleapplication.cpp

@@ -37,6 +37,7 @@
 **
 ****************************************************************************/
 
+#include "config.h"
 
 #include "qtsingleapplication.h"
 
@@ -173,47 +174,6 @@ QtSingleApplication::QtSingleApplication(const QString &appId, int &argc, char *
 }
 
 
-#if defined(Q_WS_X11)
-/*!
-  Special constructor for X11, ref. the documentation of
-  QApplication's corresponding constructor. The application identifier
-  will be QCoreApplication::applicationFilePath(). \a dpy, \a visual,
-  and \a cmap are passed on to the QApplication constructor.
-*/
-QtSingleApplication::QtSingleApplication(Display* dpy, Qt::HANDLE visual, Qt::HANDLE cmap)
-    : QApplication(dpy, visual, cmap)
-{
-    sysInit();
-}
-
-/*!
-  Special constructor for X11, ref. the documentation of
-  QApplication's corresponding constructor. The application identifier
-  will be QCoreApplication::applicationFilePath(). \a dpy, \a argc, \a
-  argv, \a visual, and \a cmap are passed on to the QApplication
-  constructor.
-*/
-QtSingleApplication::QtSingleApplication(Display *dpy, int &argc, char **argv, Qt::HANDLE visual, Qt::HANDLE cmap)
-    : QApplication(dpy, argc, argv, visual, cmap)
-{
-    sysInit();
-}
-
-/*!
-  Special constructor for X11, ref. the documentation of
-  QApplication's corresponding constructor. The application identifier
-  will be \a appId. \a dpy, \a argc, \a
-  argv, \a visual, and \a cmap are passed on to the QApplication
-  constructor.
-*/
-QtSingleApplication::QtSingleApplication(Display* dpy, const QString &appId, int argc, char **argv, Qt::HANDLE visual, Qt::HANDLE cmap)
-    : QApplication(dpy, argc, argv, visual, cmap)
-{
-    sysInit(appId);
-}
-#endif
-
-
 /*!
     Returns true if another instance of this application is running;
     otherwise false.

3rdparty/qtsingleapplication/qtsingleapplication.h

@@ -40,14 +40,17 @@
 #ifndef QTSINGLEAPPLICATION_H
 #define QTSINGLEAPPLICATION_H
 
+#include "config.h"
+
 #include <QtGlobal>
 #include <QObject>
 #include <QWidget>
 #include <QApplication>
 #include <QString>
+
 class QtLocalPeer;
 
-#if defined(Q_WS_WIN) || defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN) || defined(Q_OS_WIN32)
 #  if !defined(QT_QTSINGLEAPPLICATION_EXPORT) && !defined(QT_QTSINGLEAPPLICATION_IMPORT)
 #    define QT_QTSINGLEAPPLICATION_EXPORT
 #  elif defined(QT_QTSINGLEAPPLICATION_IMPORT)
@@ -70,11 +73,6 @@ class QT_QTSINGLEAPPLICATION_EXPORT QtSingleApplication : public QApplication
 public:
     QtSingleApplication(int &argc, char **argv, bool GUIenabled = true);
     QtSingleApplication(const QString &id, int &argc, char **argv);
-#if defined(Q_WS_X11)
-    QtSingleApplication(Display* dpy, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0);
-    QtSingleApplication(Display *dpy, int &argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE cmap= 0);
-    QtSingleApplication(Display* dpy, const QString &appId, int argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0);
-#endif
 
     bool isRunning();
     QString id() const;

3rdparty/qtsingleapplication/qtsinglecoreapplication.h

@@ -40,6 +40,8 @@
 #ifndef QTSINGLECOREAPPLICATION_H
 #define QTSINGLECOREAPPLICATION_H
 
+#include "config.h"
+
 #include <QCoreApplication>
 #include <QObject>
 #include <QString>

3rdparty/qtwin/CMakeLists.txt

@@ -1,14 +0,0 @@
-cmake_minimum_required(VERSION 2.8.11)
-set(CMAKE_CXX_STANDARD 11)
-
-set(QTWIN-SOURCES
-    qtwin.cpp
-)
-
-ADD_LIBRARY(qtwin STATIC
-    ${QTWIN-SOURCES}
-)
-
-target_link_libraries(qtwin
-    Qt5::Widgets
-)

3rdparty/qtwin/qtwin.cpp

@@ -1,229 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Use, modification and distribution is allowed without limitation,
-** warranty, liability or support of any kind.
-**
-****************************************************************************/
-
-#include "qtwin.h"
-#include <QLibrary>
-#include <QApplication>
-#include <QWidget>
-#include <QList>
-#include <QPointer>
-
-#ifdef Q_WS_WIN
-
-#include <qt_windows.h>
-
-// Blur behind data structures
-#define DWM_BB_ENABLE                 0x00000001  // fEnable has been specified
-#define DWM_BB_BLURREGION             0x00000002  // hRgnBlur has been specified
-#define DWM_BB_TRANSITIONONMAXIMIZED  0x00000004  // fTransitionOnMaximized has been specified
-#define WM_DWMCOMPOSITIONCHANGED        0x031E    // Composition changed window message
-
-typedef struct _DWM_BLURBEHIND
-{
-    DWORD dwFlags;
-    BOOL fEnable;
-    HRGN hRgnBlur;
-    BOOL fTransitionOnMaximized;
-} DWM_BLURBEHIND, *PDWM_BLURBEHIND;
-
-typedef struct _MARGINS
-{
-    int cxLeftWidth;
-    int cxRightWidth;
-    int cyTopHeight;
-    int cyBottomHeight;
-} MARGINS, *PMARGINS;
-
-typedef HRESULT (WINAPI *PtrDwmIsCompositionEnabled)(BOOL* pfEnabled);
-typedef HRESULT (WINAPI *PtrDwmExtendFrameIntoClientArea)(HWND hWnd, const MARGINS* pMarInset);
-typedef HRESULT (WINAPI *PtrDwmEnableBlurBehindWindow)(HWND hWnd, const DWM_BLURBEHIND* pBlurBehind);
-typedef HRESULT (WINAPI *PtrDwmGetColorizationColor)(DWORD *pcrColorization, BOOL *pfOpaqueBlend);
-
-static PtrDwmIsCompositionEnabled pDwmIsCompositionEnabled= 0;
-static PtrDwmEnableBlurBehindWindow pDwmEnableBlurBehindWindow = 0;
-static PtrDwmExtendFrameIntoClientArea pDwmExtendFrameIntoClientArea = 0;
-static PtrDwmGetColorizationColor pDwmGetColorizationColor = 0;
-
-
-/*
- * Internal helper class that notifies windows if the
- * DWM compositing state changes and updates the widget
- * flags correspondingly.
- */
-class WindowNotifier : public QWidget
-{
-public:
-    WindowNotifier() { winId(); }
-    void addWidget(QWidget *widget) { widgets.append(widget); }
-    void removeWidget(QWidget *widget) { widgets.removeAll(widget); }
-    bool winEvent(MSG *message, long *result);
-
-private:
-    QWidgetList widgets;
-};
-
-static bool resolveLibs()
-{
-    if (!pDwmIsCompositionEnabled) {
-        QLibrary dwmLib(QString::toLatin1("dwmapi"));
-        pDwmIsCompositionEnabled =(PtrDwmIsCompositionEnabled)dwmLib.resolve("DwmIsCompositionEnabled");
-        pDwmExtendFrameIntoClientArea = (PtrDwmExtendFrameIntoClientArea)dwmLib.resolve("DwmExtendFrameIntoClientArea");
-        pDwmEnableBlurBehindWindow = (PtrDwmEnableBlurBehindWindow)dwmLib.resolve("DwmEnableBlurBehindWindow");
-        pDwmGetColorizationColor = (PtrDwmGetColorizationColor)dwmLib.resolve("DwmGetColorizationColor");
-    }
-    return pDwmIsCompositionEnabled != 0;
-}
-
-#endif
-
-/*!
-  * Chekcs and returns true if Windows DWM composition
-  * is currently enabled on the system.
-  *
-  * To get live notification on the availability of
-  * this feature, you will currently have to
-  * reimplement winEvent() on your widget and listen
-  * for the WM_DWMCOMPOSITIONCHANGED event to occur.
-  *
-  */
-bool QtWin::isCompositionEnabled()
-{
-#ifdef Q_WS_WIN
-    if (resolveLibs()) {
-        HRESULT hr = S_OK;
-        BOOL isEnabled = false;
-        hr = pDwmIsCompositionEnabled(&isEnabled);
-        if (SUCCEEDED(hr))
-            return isEnabled;
-    }
-#endif
-    return false;
-}
-
-/*!
-  * Enables Blur behind on a Widget.
-  *
-  * \a enable tells if the blur should be enabled or not
-  */
-bool QtWin::enableBlurBehindWindow(QWidget *widget, bool enable,
-                                   const QRegion &region)
-{
-    Q_ASSERT(widget);
-    bool result = false;
-#ifdef Q_WS_WIN
-    if (resolveLibs()) {
-        DWM_BLURBEHIND bb = {0};
-        HRESULT hr = S_OK;
-        bb.fEnable = enable;
-        bb.dwFlags = DWM_BB_ENABLE;
-        bb.hRgnBlur = NULL;
-
-        if (!region.isEmpty()) {
-            bb.dwFlags |= DWM_BB_BLURREGION;
-            bb.hRgnBlur = region.handle();
-        }
-
-        widget->setAttribute(Qt::WA_TranslucentBackground, enable);
-        widget->setAttribute(Qt::WA_NoSystemBackground, enable);
-        hr = pDwmEnableBlurBehindWindow(widget->winId(), &bb);
-        if (SUCCEEDED(hr)) {
-            result = true;
-            windowNotifier()->addWidget(widget);
-        }
-    }
-#endif
-    return result;
-}
-
-/*!
-  * ExtendFrameIntoClientArea.
-  *
-  * This controls the rendering of the frame inside the window.
-  * Note that passing margins of -1 (the default value) will completely
-  * remove the frame from the window.
-  *
-  * \note you should not call enableBlurBehindWindow before calling
-  *       this functions
-  *
-  * \a enable tells if the blur should be enabled or not
-  */
-bool QtWin::extendFrameIntoClientArea(QWidget *widget, int left, int top, int right, int bottom)
-{
-
-    Q_ASSERT(widget);
-    Q_UNUSED(left);
-    Q_UNUSED(top);
-    Q_UNUSED(right);
-    Q_UNUSED(bottom);
-
-    bool result = false;
-#ifdef Q_WS_WIN
-    if (resolveLibs()) {
-        QLibrary dwmLib(QString::toLatin1("dwmapi"));
-        HRESULT hr = S_OK;
-        MARGINS m = {left, top, right, bottom};
-        hr = pDwmExtendFrameIntoClientArea(widget->winId(), &m);
-        if (SUCCEEDED(hr)) {
-            result = true;
-            windowNotifier()->addWidget(widget);
-        }
-        widget->setAttribute(Qt::WA_TranslucentBackground, result);
-    }
-#endif
-    return result;
-}
-
-/*!
-  * Returns the current colorizationColor for the window.
-  *
-  * \a enable tells if the blur should be enabled or not
-  */
-QColor QtWin::colorizatinColor()
-{
-    QColor resultColor = QApplication::palette().window().color();
-
-#ifdef Q_WS_WIN
-    if (resolveLibs()) {
-        DWORD color = 0;
-        BOOL opaque = FALSE;
-        QLibrary dwmLib(QString::toLatin1("dwmapi"));
-        HRESULT hr = S_OK;
-        hr = pDwmGetColorizationColor(&color, &opaque);
-        if (SUCCEEDED(hr))
-            resultColor = QColor(color);
-    }
-#endif
-    return resultColor;
-}
-
-#ifdef Q_WS_WIN
-WindowNotifier *QtWin::windowNotifier()
-{
-    static WindowNotifier *windowNotifierInstance = 0;
-    if (!windowNotifierInstance)
-        windowNotifierInstance = new WindowNotifier;
-    return windowNotifierInstance;
-}
-
-
-/* Notify all enabled windows that the DWM state changed */
-bool WindowNotifier::winEvent(MSG *message, long *result)
-{
-    if (message && message->message == WM_DWMCOMPOSITIONCHANGED) {
-        bool compositionEnabled = QtWin::isCompositionEnabled();
-        foreach(QWidget * widget, widgets) {
-            if (widget) {
-                widget->setAttribute(Qt::WA_NoSystemBackground, compositionEnabled);
-            }
-            widget->update();
-        }
-    }
-    return QWidget::winEvent(message, result);
-}
-#endif

3rdparty/qtwin/qtwin.h

@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Use, modification and distribution is allowed without limitation,
-** warranty, liability or support of any kind.
-**
-****************************************************************************/
-
-#ifndef QTWIN_H
-#define QTWIN_H
-
-#include <QColor>
-#include <QWidget>
-/**
-  * This is a helper class for using the Desktop Window Manager
-  * functionality on Windows 7 and Windows Vista. On other platforms
-  * these functions will simply not do anything.
-  */
-
-class WindowNotifier;
-
-class QtWin
-{
-public:
-    static bool enableBlurBehindWindow(QWidget *widget, bool enable = true,
-                                       const QRegion& region = QRegion());
-    static bool extendFrameIntoClientArea(QWidget *widget,
-                                          int left = -1, int top = -1,
-                                          int right = -1, int bottom = -1);
-    static bool isCompositionEnabled();
-    static QColor colorizatinColor();
-
-private:
-    static WindowNotifier *windowNotifier();
-};
-
-#endif // QTWIN_H

3rdparty/qxt/CMakeLists.txt

@@ -1,26 +1,31 @@
 cmake_minimum_required(VERSION 2.8.11)
 set(CMAKE_CXX_STANDARD 11)
 
-set(QXT-SOURCES
-  qxtglobal.cpp
-  qxtglobalshortcut.cpp
-)
+if (UNIX AND NOT APPLE)
+  find_package(X11)
+  if (X11_FOUND)
+    include_directories(${X11_INCLUDE_DIR})
+  endif(X11_FOUND)
+endif(UNIX AND NOT APPLE)
 
-set(QXT-MOC-HEADERS
-  qxtglobalshortcut.h
-)
-
-find_package(X11)
-include_directories(${X11_INCLUDE_DIR})
 include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
+if (NOT WIN32 AND NOT APPLE)
+  find_path(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H qpa/qplatformnativeinterface.h PATHS ${Qt5Gui_PRIVATE_INCLUDE_DIRS})
+  if(NOT HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
+    message(FATAL_ERROR "Missing qpa/qplatformnativeinterface.h, check that you got the QT private headers installed (package libQt5Gui-private-headers-devel, qtbase5-private-dev or similar)")
+  endif(NOT HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
+endif(NOT WIN32 AND NOT APPLE)
 
-if(WIN32)
-  set(QXT-SOURCES ${QXT-SOURCES} qxtglobalshortcut_win.cpp)
+set(QXT-SOURCES qxtglobal.cpp qxtglobalshortcut.cpp)
+set(QXT-MOC-HEADERS qxtglobalshortcut.h )
+
+if(X11_FOUND)
+  set(QXT-SOURCES ${QXT-SOURCES} qxtglobalshortcut_x11.cpp)
 elseif(APPLE)
   set(QXT-SOURCES ${QXT-SOURCES} qxtglobalshortcut_mac.cpp)
-else(WIN32)
-  set(QXT-SOURCES ${QXT-SOURCES} qxtglobalshortcut_x11.cpp)
-endif(WIN32)
+elseif(WIN32)
+  set(QXT-SOURCES ${QXT-SOURCES} qxtglobalshortcut_win.cpp)
+endif()
 
 QT5_WRAP_CPP(QXT-SOURCES-MOC ${QXT-MOC-HEADERS})
 
@@ -29,8 +34,8 @@ ADD_LIBRARY(qxt STATIC
   ${QXT-SOURCES-MOC}
 )
 
-if(WIN32)
-  target_link_libraries(qxt Qt5::Core Qt5::Widgets)
-else(WIN32)
-  target_link_libraries(qxt Qt5::Core Qt5::Widgets Qt5::X11Extras)
-endif(WIN32)
+target_link_libraries(qxt Qt5::Core Qt5::Widgets)
+
+if(X11_FOUND)
+  target_link_libraries(qxt Qt5::X11Extras)
+endif(X11_FOUND)

3rdparty/qxt/qxtglobal.cpp

@@ -1,4 +1,3 @@
-
 /****************************************************************************
 ** Copyright (c) 2006 - 2011, the LibQxt project.
 ** See the Qxt AUTHORS file for a list of authors and copyright holders.

3rdparty/qxt/qxtglobal.h

@@ -1,4 +1,3 @@
-
 /****************************************************************************
 ** Copyright (c) 2006 - 2011, the LibQxt project.
 ** See the Qxt AUTHORS file for a list of authors and copyright holders.
@@ -161,73 +160,73 @@ template <typename PUB>
 class QxtPrivate
 {
 public:
-    virtual ~QxtPrivate()
-    {}
-    inline void QXT_setPublic(PUB* pub)
-    {
-        qxt_p_ptr = pub;
-    }
+  virtual ~QxtPrivate()
+  {}
+  inline void QXT_setPublic(PUB* pub)
+  {
+    qxt_p_ptr = pub;
+  }
 
 protected:
-    inline PUB& qxt_p()
-    {
-        return *qxt_p_ptr;
-    }
-    inline const PUB& qxt_p() const
-    {
-        return *qxt_p_ptr;
-    }
-    inline PUB* qxt_ptr()
-    {
-        return qxt_p_ptr;
-    }
-    inline const PUB* qxt_ptr() const
-    {
-        return qxt_p_ptr;
-    }
+  inline PUB& qxt_p()
+  {
+    return *qxt_p_ptr;
+  }
+  inline const PUB& qxt_p() const
+  {
+    return *qxt_p_ptr;
+  }
+  inline PUB* qxt_ptr()
+  {
+    return qxt_p_ptr;
+  }
+  inline const PUB* qxt_ptr() const
+  {
+    return qxt_p_ptr;
+  }
 
 private:
-    PUB* qxt_p_ptr;
+  PUB* qxt_p_ptr;
 };
 
 template <typename PUB, typename PVT>
 class QxtPrivateInterface
 {
-    friend class QxtPrivate<PUB>;
+  friend class QxtPrivate<PUB>;
 public:
-    QxtPrivateInterface()
-    {
-        pvt = new PVT;
-    }
-    ~QxtPrivateInterface()
-    {
-        delete pvt;
-    }
+  QxtPrivateInterface()
+  {
+    pvt = new PVT;
+  }
+  ~QxtPrivateInterface()
+  {
+    delete pvt;
+  }
 
-    inline void setPublic(PUB* pub)
-    {
-        pvt->QXT_setPublic(pub);
-    }
-    inline PVT& operator()()
-    {
-        return *static_cast<PVT*>(pvt);
-    }
-    inline const PVT& operator()() const
-    {
-        return *static_cast<PVT*>(pvt);
-    }
-    inline PVT * operator->()
-    {
+  inline void setPublic(PUB* pub)
+  {
+    pvt->QXT_setPublic(pub);
+  }
+  inline PVT& operator()()
+  {
+    return *static_cast<PVT*>(pvt);
+  }
+  inline const PVT& operator()() const
+  {
+    return *static_cast<PVT*>(pvt);
+  }
+  inline PVT * operator->()
+  {
 	return static_cast<PVT*>(pvt);
-    }
-    inline const PVT * operator->() const
-    {
+  }
+  inline const PVT * operator->() const
+  {
 	return static_cast<PVT*>(pvt);
-    }
+  }
 private:
-    QxtPrivateInterface(const QxtPrivateInterface&) { }
-    QxtPrivateInterface& operator=(const QxtPrivateInterface&) { }
-    QxtPrivate<PUB>* pvt;
+  QxtPrivateInterface(const QxtPrivateInterface&) { }
+  QxtPrivateInterface& operator=(const QxtPrivateInterface&) { }
+  QxtPrivate<PUB>* pvt;
 };
 
 #endif // QXT_GLOBAL

3rdparty/qxt/qxtglobalshortcut.cpp

@@ -38,185 +38,160 @@
 #include "qxtglobalshortcut_p.h"
 
 bool QxtGlobalShortcutPrivate::error = false;
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MACOS
 int QxtGlobalShortcutPrivate::ref = 0;
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
-QAbstractEventDispatcher::EventFilter QxtGlobalShortcutPrivate::prevEventFilter = 0;
-#endif
-#endif // Q_WS_MAC
+#endif // Q_OS_MACOS
 QHash<QPair<quint32, quint32>, QxtGlobalShortcut*> QxtGlobalShortcutPrivate::shortcuts;
 
-QxtGlobalShortcutPrivate::QxtGlobalShortcutPrivate() : enabled(true), key(Qt::Key(0)), mods(Qt::NoModifier)
-{
-#ifndef Q_WS_MAC
-    if (!ref++)
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
-        prevEventFilter = QAbstractEventDispatcher::instance()->setEventFilter(eventFilter);
-#else
+QxtGlobalShortcutPrivate::QxtGlobalShortcutPrivate() : enabled(true), key(Qt::Key(0)), mods(Qt::NoModifier) {
+#ifndef Q_OS_MACOS
+  if (!ref++)
    QAbstractEventDispatcher::instance()->installNativeEventFilter(this);
-#endif
-#endif // Q_WS_MAC
+#endif // Q_OS_MACOS
 }
 
-QxtGlobalShortcutPrivate::~QxtGlobalShortcutPrivate()
-{
-#ifndef Q_WS_MAC
-    if (!--ref)
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
-        QAbstractEventDispatcher::instance()->setEventFilter(prevEventFilter);
-#else
-        QAbstractEventDispatcher::instance()->removeNativeEventFilter(this);
-#endif
-#endif // Q_WS_MAC
+QxtGlobalShortcutPrivate::~QxtGlobalShortcutPrivate() {
+#ifndef Q_OS_MACOS
+  if (!--ref)
+    QAbstractEventDispatcher::instance()->removeNativeEventFilter(this);
+#endif // Q_OS_MACOS
 }
 
-bool QxtGlobalShortcutPrivate::setShortcut(const QKeySequence& shortcut)
-{
-    Qt::KeyboardModifiers allMods = Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier;
-    key = shortcut.isEmpty() ? Qt::Key(0) : Qt::Key((shortcut[0] ^ allMods) & shortcut[0]);
-    mods = shortcut.isEmpty() ? Qt::KeyboardModifiers(0) : Qt::KeyboardModifiers(shortcut[0] & allMods);
-    const quint32 nativeKey = nativeKeycode(key);
-    const quint32 nativeMods = nativeModifiers(mods);
-    const bool res = registerShortcut(nativeKey, nativeMods);
-    if (res)
-        shortcuts.insert(qMakePair(nativeKey, nativeMods), &qxt_p());
-    else
-        qWarning() << "QxtGlobalShortcut failed to register:" << QKeySequence(key + mods).toString();
-    return res;
+bool QxtGlobalShortcutPrivate::setShortcut(const QKeySequence& shortcut) {
+
+  Qt::KeyboardModifiers allMods = Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier;
+  key = shortcut.isEmpty() ? Qt::Key(0) : Qt::Key((shortcut[0] ^ allMods) & shortcut[0]);
+  mods = shortcut.isEmpty() ? Qt::KeyboardModifiers(0) : Qt::KeyboardModifiers(shortcut[0] & allMods);
+  const quint32 nativeKey = nativeKeycode(key);
+  const quint32 nativeMods = nativeModifiers(mods);
+  const bool res = registerShortcut(nativeKey, nativeMods);
+  if (res)
+    shortcuts.insert(qMakePair(nativeKey, nativeMods), &qxt_p());
+  else
+    qWarning() << "QxtGlobalShortcut failed to register:" << QKeySequence(key + mods).toString();
+  return res;
+
 }
 
-bool QxtGlobalShortcutPrivate::unsetShortcut()
-{
-    bool res = false;
-    const quint32 nativeKey = nativeKeycode(key);
-    const quint32 nativeMods = nativeModifiers(mods);
-    if (shortcuts.value(qMakePair(nativeKey, nativeMods)) == &qxt_p())
-        res = unregisterShortcut(nativeKey, nativeMods);
-    if (res)
-        shortcuts.remove(qMakePair(nativeKey, nativeMods));
-    else
-        qWarning() << "QxtGlobalShortcut failed to unregister:" << QKeySequence(key + mods).toString();
-    key = Qt::Key(0);
-    mods = Qt::KeyboardModifiers(0);
-    return res;
+bool QxtGlobalShortcutPrivate::unsetShortcut() {
+  bool res = false;
+  const quint32 nativeKey = nativeKeycode(key);
+  const quint32 nativeMods = nativeModifiers(mods);
+  if (shortcuts.value(qMakePair(nativeKey, nativeMods)) == &qxt_p())
+    res = unregisterShortcut(nativeKey, nativeMods);
+  if (res)
+    shortcuts.remove(qMakePair(nativeKey, nativeMods));
+  else
+    qWarning() << "QxtGlobalShortcut failed to unregister:" << QKeySequence(key + mods).toString();
+  key = Qt::Key(0);
+  mods = Qt::KeyboardModifiers(0);
+  return res;
 }
 
-void QxtGlobalShortcutPrivate::activateShortcut(quint32 nativeKey, quint32 nativeMods)
-{
-    QxtGlobalShortcut* shortcut = shortcuts.value(qMakePair(nativeKey, nativeMods));
-    if (shortcut && shortcut->isEnabled())
-        emit shortcut->activated();
+void QxtGlobalShortcutPrivate::activateShortcut(quint32 nativeKey, quint32 nativeMods) {
+  QxtGlobalShortcut* shortcut = shortcuts.value(qMakePair(nativeKey, nativeMods));
+  if (shortcut && shortcut->isEnabled())
+    emit shortcut->activated();
 }
 
 /*!
-    \class QxtGlobalShortcut
-    \inmodule QxtWidgets
-    \brief The QxtGlobalShortcut class provides a global shortcut aka "hotkey".
+  \class QxtGlobalShortcut
+  \inmodule QxtWidgets
+  \brief The QxtGlobalShortcut class provides a global shortcut aka "hotkey".
 
-    A global shortcut triggers even if the application is not active. This
-    makes it easy to implement applications that react to certain shortcuts
-    still if some other application is active or if the application is for
-    example minimized to the system tray.
+  A global shortcut triggers even if the application is not active. This
+  makes it easy to implement applications that react to certain shortcuts
+  still if some other application is active or if the application is for
+  example minimized to the system tray.
 
-    Example usage:
-    \code
-    QxtGlobalShortcut* shortcut = new QxtGlobalShortcut(window);
-    connect(shortcut, SIGNAL(activated()), window, SLOT(toggleVisibility()));
-    shortcut->setShortcut(QKeySequence("Ctrl+Shift+F12"));
-    \endcode
+  Example usage:
+  \code
+  QxtGlobalShortcut* shortcut = new QxtGlobalShortcut(window);
+  connect(shortcut, SIGNAL(activated()), window, SLOT(toggleVisibility()));
+  shortcut->setShortcut(QKeySequence("Ctrl+Shift+F12"));
+  \endcode
 
-    \bold {Note:} Since Qxt 0.6 QxtGlobalShortcut no more requires QxtApplication.
+  \bold {Note:} Since Qxt 0.6 QxtGlobalShortcut no more requires QxtApplication.
  */
 
 /*!
-    \fn QxtGlobalShortcut::activated()
+  \fn QxtGlobalShortcut::activated()
 
-    This signal is emitted when the user types the shortcut's key sequence.
+  This signal is emitted when the user types the shortcut's key sequence.
 
-    \sa shortcut
+  \sa shortcut
  */
 
 /*!
-    Constructs a new QxtGlobalShortcut with \a parent.
+  Constructs a new QxtGlobalShortcut with \a parent.
  */
-QxtGlobalShortcut::QxtGlobalShortcut(QObject* parent)
-        : QObject(parent)
-{
-    QXT_INIT_PRIVATE(QxtGlobalShortcut);
+QxtGlobalShortcut::QxtGlobalShortcut(QObject* parent) : QObject(parent) {
+  QXT_INIT_PRIVATE(QxtGlobalShortcut);
 }
 
 /*!
-    Constructs a new QxtGlobalShortcut with \a shortcut and \a parent.
+  Constructs a new QxtGlobalShortcut with \a shortcut and \a parent.
  */
-QxtGlobalShortcut::QxtGlobalShortcut(const QKeySequence& shortcut, QObject* parent)
-        : QObject(parent)
-{
-    QXT_INIT_PRIVATE(QxtGlobalShortcut);
-    setShortcut(shortcut);
+QxtGlobalShortcut::QxtGlobalShortcut(const QKeySequence& shortcut, QObject* parent) : QObject(parent) {
+  QXT_INIT_PRIVATE(QxtGlobalShortcut);
+  setShortcut(shortcut);
 }
 
 /*!
-    Destructs the QxtGlobalShortcut.
+  Destructs the QxtGlobalShortcut.
  */
-QxtGlobalShortcut::~QxtGlobalShortcut()
-{
-    if (qxt_d().key != 0)
-        qxt_d().unsetShortcut();
+QxtGlobalShortcut::~QxtGlobalShortcut() {
+  if (qxt_d().key != 0) qxt_d().unsetShortcut();
 }
 
 /*!
-    \property QxtGlobalShortcut::shortcut
-    \brief the shortcut key sequence
+  \property QxtGlobalShortcut::shortcut
+  \brief the shortcut key sequence
 
-    \bold {Note:} Notice that corresponding key press and release events are not
-    delivered for registered global shortcuts even if they are disabled.
-    Also, comma separated key sequences are not supported.
-    Only the first part is used:
+  \bold {Note:} Notice that corresponding key press and release events are not
+  delivered for registered global shortcuts even if they are disabled.
+  Also, comma separated key sequences are not supported.
+  Only the first part is used:
 
-    \code
-    qxtShortcut->setShortcut(QKeySequence("Ctrl+Alt+A,Ctrl+Alt+B"));
-    Q_ASSERT(qxtShortcut->shortcut() == QKeySequence("Ctrl+Alt+A"));
-    \endcode
+  \code
+  qxtShortcut->setShortcut(QKeySequence("Ctrl+Alt+A,Ctrl+Alt+B"));
+  Q_ASSERT(qxtShortcut->shortcut() == QKeySequence("Ctrl+Alt+A"));
+  \endcode
  */
-QKeySequence QxtGlobalShortcut::shortcut() const
-{
-    return QKeySequence(qxt_d().key | qxt_d().mods);
+QKeySequence QxtGlobalShortcut::shortcut() const {
+  return QKeySequence(qxt_d().key | qxt_d().mods);
 }
 
-bool QxtGlobalShortcut::setShortcut(const QKeySequence& shortcut)
-{
-    if (qxt_d().key != 0)
-        qxt_d().unsetShortcut();
-    return qxt_d().setShortcut(shortcut);
+bool QxtGlobalShortcut::setShortcut(const QKeySequence& shortcut) {
+  if (qxt_d().key != 0)
+    qxt_d().unsetShortcut();
+  return qxt_d().setShortcut(shortcut);
 }
 
 /*!
-    \property QxtGlobalShortcut::enabled
-    \brief whether the shortcut is enabled
+  \property QxtGlobalShortcut::enabled
+  \brief whether the shortcut is enabled
 
-    A disabled shortcut does not get activated.
+  A disabled shortcut does not get activated.
 
-    The default value is \c true.
+  The default value is \c true.
 
-    \sa setDisabled()
+  \sa setDisabled()
  */
-bool QxtGlobalShortcut::isEnabled() const
-{
-    return qxt_d().enabled;
+bool QxtGlobalShortcut::isEnabled() const {
+  return qxt_d().enabled;
 }
 
-void QxtGlobalShortcut::setEnabled(bool enabled)
-{
-    qxt_d().enabled = enabled;
+void QxtGlobalShortcut::setEnabled(bool enabled) {
+  qxt_d().enabled = enabled;
 }
 
 /*!
-    Sets the shortcut \a disabled.
+  Sets the shortcut \a disabled.
 
-    \sa enabled
+  \sa enabled
  */
-void QxtGlobalShortcut::setDisabled(bool disabled)
-{
-    qxt_d().enabled = !disabled;
+void QxtGlobalShortcut::setDisabled(bool disabled) {
+  qxt_d().enabled = !disabled;
 }
 

3rdparty/qxt/qxtglobalshortcut.h

@@ -1,4 +1,3 @@
-#ifndef QXTGLOBALSHORTCUT_H
 /****************************************************************************
 ** Copyright (c) 2006 - 2011, the LibQxt project.
 ** See the Qxt AUTHORS file for a list of authors and copyright holders.
@@ -29,6 +28,7 @@
 ** <http://libqxt.org>  <foundation@libqxt.org>
 *****************************************************************************/
 
+#ifndef QXTGLOBALSHORTCUT_H
 #define QXTGLOBALSHORTCUT_H
 
 #include <QObject>
@@ -39,30 +39,29 @@
 
 class QxtGlobalShortcutPrivate;
 
-class QXT_GUI_EXPORT QxtGlobalShortcut : public QObject
-{
-    Q_OBJECT
-    QXT_DECLARE_PRIVATE(QxtGlobalShortcut)
-    Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled)
-    Q_PROPERTY(QKeySequence shortcut READ shortcut WRITE setShortcut)
+class QXT_GUI_EXPORT QxtGlobalShortcut : public QObject {
+  Q_OBJECT
+  QXT_DECLARE_PRIVATE(QxtGlobalShortcut)
+  Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled)
+  Q_PROPERTY(QKeySequence shortcut READ shortcut WRITE setShortcut)
 
 public:
-    explicit QxtGlobalShortcut(QObject* parent = 0);
-    explicit QxtGlobalShortcut(const QKeySequence& shortcut, QObject* parent = 0);
-    virtual ~QxtGlobalShortcut();
+  explicit QxtGlobalShortcut(QObject* parent = nullptr);
+  explicit QxtGlobalShortcut(const QKeySequence& shortcut, QObject* parent = nullptr);
+  ~QxtGlobalShortcut();
 
-    QKeySequence shortcut() const;
-    bool setShortcut(const QKeySequence& shortcut);
+  QKeySequence shortcut() const;
+  bool setShortcut(const QKeySequence& shortcut);
 
-    bool isEnabled() const;
+  bool isEnabled() const;
 
 public Q_SLOTS:
-    void setEnabled(bool enabled = true);
-    void setDisabled(bool disabled = true);
+  void setEnabled(bool enabled = true);
+  void setDisabled(bool disabled = true);
 
 Q_SIGNALS:
-    void activated();
+  void activated();
 };
 
-#endif // QXTGLOBALSHORTCUT_H
+#endif  // QXTGLOBALSHORTCUT_H
 

3rdparty/qxt/qxtglobalshortcut_mac.cpp

@@ -1,4 +1,3 @@
-#include <Carbon/Carbon.h>
 /****************************************************************************
 ** Copyright (c) 2006 - 2011, the LibQxt project.
 ** See the Qxt AUTHORS file for a list of authors and copyright holders.
@@ -29,230 +28,180 @@
 ** <http://libqxt.org>  <foundation@libqxt.org>
 *****************************************************************************/
 
-#include "qxtglobalshortcut_p.h"
-#include <QMap>
-#include <QHash>
-#include <QtDebug>
-#include <QApplication>
-
-typedef QPair<uint, uint> Identifier;
-static QMap<quint32, EventHotKeyRef> keyRefs;
-static QHash<Identifier, quint32> keyIDs;
-static quint32 hotKeySerial = 0;
-static bool qxt_mac_handler_installed = false;
-
-OSStatus qxt_mac_handle_hot_key(EventHandlerCallRef nextHandler, EventRef event, void* data)
-{
-    Q_UNUSED(nextHandler);
-    Q_UNUSED(data);
-    if (GetEventClass(event) == kEventClassKeyboard && GetEventKind(event) == kEventHotKeyPressed)
-    {
-        EventHotKeyID keyID;
-        GetEventParameter(event, kEventParamDirectObject, typeEventHotKeyID, NULL, sizeof(keyID), NULL, &keyID);
-        Identifier id = keyIDs.key(keyID.id);
-        QxtGlobalShortcutPrivate::activateShortcut(id.second, id.first);
-    }
-    return noErr;
-}
-
-quint32 QxtGlobalShortcutPrivate::nativeModifiers(Qt::KeyboardModifiers modifiers)
-{
-    quint32 native = 0;
-    if (modifiers & Qt::ShiftModifier)
-        native |= shiftKey;
-    if (modifiers & Qt::ControlModifier)
-        native |= cmdKey;
-    if (modifiers & Qt::AltModifier)
-        native |= optionKey;
-    if (modifiers & Qt::MetaModifier)
-        native |= controlKey;
-    if (modifiers & Qt::KeypadModifier)
-        native |= kEventKeyModifierNumLockMask;
-    return native;
-}
-
-quint32 QxtGlobalShortcutPrivate::nativeKeycode(Qt::Key key)
-{
-    UTF16Char ch;
-    // Constants found in NSEvent.h from AppKit.framework
-    switch (key)
-    {
-    case Qt::Key_Return:
-        return kVK_Return;
-    case Qt::Key_Enter:
-        return kVK_ANSI_KeypadEnter;
-    case Qt::Key_Tab:
-        return kVK_Tab;
-    case Qt::Key_Space:
-        return kVK_Space;
-    case Qt::Key_Backspace:
-        return kVK_Delete;
-    case Qt::Key_Control:
-        return kVK_Command;
-    case Qt::Key_Shift:
-        return kVK_Shift;
-    case Qt::Key_CapsLock:
-        return kVK_CapsLock;
-    case Qt::Key_Option:
-        return kVK_Option;
-    case Qt::Key_Meta:
-        return kVK_Control;
-    case Qt::Key_F17:
-        return kVK_F17;
-    case Qt::Key_VolumeUp:
-        return kVK_VolumeUp;
-    case Qt::Key_VolumeDown:
-        return kVK_VolumeDown;
-    case Qt::Key_F18:
-        return kVK_F18;
-    case Qt::Key_F19:
-        return kVK_F19;
-    case Qt::Key_F20:
-        return kVK_F20;
-    case Qt::Key_F5:
-        return kVK_F5;
-    case Qt::Key_F6:
-        return kVK_F6;
-    case Qt::Key_F7:
-        return kVK_F7;
-    case Qt::Key_F3:
-        return kVK_F3;
-    case Qt::Key_F8:
-        return kVK_F8;
-    case Qt::Key_F9:
-        return kVK_F9;
-    case Qt::Key_F11:
-        return kVK_F11;
-    case Qt::Key_F13:
-        return kVK_F13;
-    case Qt::Key_F16:
-        return kVK_F16;
-    case Qt::Key_F14:
-        return kVK_F14;
-    case Qt::Key_F10:
-        return kVK_F10;
-    case Qt::Key_F12:
-        return kVK_F12;
-    case Qt::Key_F15:
-        return kVK_F15;
-    case Qt::Key_Help:
-        return kVK_Help;
-    case Qt::Key_Home:
-        return kVK_Home;
-    case Qt::Key_PageUp:
-        return kVK_PageUp;
-    case Qt::Key_Delete:
-        return kVK_ForwardDelete;
-    case Qt::Key_F4:
-        return kVK_F4;
-    case Qt::Key_End:
-        return kVK_End;
-    case Qt::Key_F2:
-        return kVK_F2;
-    case Qt::Key_PageDown:
-        return kVK_PageDown;
-    case Qt::Key_F1:
-        return kVK_F1;
-    case Qt::Key_Left:
-        return kVK_LeftArrow;
-    case Qt::Key_Right:
-        return kVK_RightArrow;
-    case Qt::Key_Down:
-        return kVK_DownArrow;
-    case Qt::Key_Up:
-        return kVK_UpArrow;
-    default:
-        ;
-    }
-
-    if (key == Qt::Key_Escape)	ch = 27;
-    else if (key == Qt::Key_Return) ch = 13;
-    else if (key == Qt::Key_Enter) ch = 3;
-    else if (key == Qt::Key_Tab) ch = 9;
-    else ch = key;
-
-    CFDataRef currentLayoutData;
-    TISInputSourceRef currentKeyboard = TISCopyCurrentKeyboardInputSource();
-
-    if (currentKeyboard == NULL)
-        return 0;
-
-    currentLayoutData = (CFDataRef)TISGetInputSourceProperty(currentKeyboard, kTISPropertyUnicodeKeyLayoutData);
-    CFRelease(currentKeyboard);
-    if (currentLayoutData == NULL)
-        return 0;
-
-    UCKeyboardLayout* header = (UCKeyboardLayout*)CFDataGetBytePtr(currentLayoutData);
-    UCKeyboardTypeHeader* table = header->keyboardTypeList;
-
-    uint8_t *data = (uint8_t*)header;
-    // God, would a little documentation for this shit kill you...
-    for (quint32 i=0; i < header->keyboardTypeCount; i++)
-    {
-        UCKeyStateRecordsIndex* stateRec = 0;
-        if (table[i].keyStateRecordsIndexOffset != 0)
-        {
-            stateRec = reinterpret_cast<UCKeyStateRecordsIndex*>(data + table[i].keyStateRecordsIndexOffset);
-            if (stateRec->keyStateRecordsIndexFormat != kUCKeyStateRecordsIndexFormat) stateRec = 0;
-        }
-
-        UCKeyToCharTableIndex* charTable = reinterpret_cast<UCKeyToCharTableIndex*>(data + table[i].keyToCharTableIndexOffset);
-        if (charTable->keyToCharTableIndexFormat != kUCKeyToCharTableIndexFormat) continue;
-
-        for (quint32 j=0; j < charTable->keyToCharTableCount; j++)
-        {
-            UCKeyOutput* keyToChar = reinterpret_cast<UCKeyOutput*>(data + charTable->keyToCharTableOffsets[j]);
-            for (quint32 k=0; k < charTable->keyToCharTableSize; k++)
-            {
-                if (keyToChar[k] & kUCKeyOutputTestForIndexMask)
-                {
-                    long idx = keyToChar[k] & kUCKeyOutputGetIndexMask;
-                    if (stateRec && idx < stateRec->keyStateRecordCount)
-                    {
-                        UCKeyStateRecord* rec = reinterpret_cast<UCKeyStateRecord*>(data + stateRec->keyStateRecordOffsets[idx]);
-                        if (rec->stateZeroCharData == ch) return k;
-                    }
-                }
-                else if (!(keyToChar[k] & kUCKeyOutputSequenceIndexMask) && keyToChar[k] < 0xFFFE)
-                {
-                    if (keyToChar[k] == ch) return k;
-                }
-            } // for k
-        } // for j
-    } // for i
-    return 0;
-}
-
-bool QxtGlobalShortcutPrivate::registerShortcut(quint32 nativeKey, quint32 nativeMods)
-{
-    if (!qxt_mac_handler_installed)
-    {
-        EventTypeSpec t;
-        t.eventClass = kEventClassKeyboard;
-        t.eventKind = kEventHotKeyPressed;
-        InstallApplicationEventHandler(&qxt_mac_handle_hot_key, 1, &t, NULL, NULL);
-    }
-
-    EventHotKeyID keyID;
-    keyID.signature = 'cute';
-    keyID.id = ++hotKeySerial;
-
-    EventHotKeyRef ref = 0;
-    bool rv = !RegisterEventHotKey(nativeKey, nativeMods, keyID, GetApplicationEventTarget(), 0, &ref);
-    if (rv)
-    {
-        keyIDs.insert(Identifier(nativeMods, nativeKey), keyID.id);
-        keyRefs.insert(keyID.id, ref);
-    }
-    return rv;
-}
-
-bool QxtGlobalShortcutPrivate::unregisterShortcut(quint32 nativeKey, quint32 nativeMods)
-{
-    Identifier id(nativeMods, nativeKey);
-    if (!keyIDs.contains(id)) return false;
-
-    EventHotKeyRef ref = keyRefs.take(keyIDs[id]);
-    keyIDs.remove(id);
-    return !UnregisterEventHotKey(ref);
-}
+#include <Carbon/Carbon.h>
+
+#include "qxtglobalshortcut_p.h"
+#include <QMap>
+#include <QHash>
+#include <QPair>
+#include <QtDebug>
+#include <QApplication>
+
+typedef QPair<uint, uint> Identifier;
+static QMap<quint32, EventHotKeyRef> keyRefs;
+static QHash<Identifier, quint32> keyIDs;
+static quint32 hotKeySerial = 0;
+static bool qxt_mac_handler_installed = false;
+
+OSStatus qxt_mac_handle_hot_key(EventHandlerCallRef nextHandler, EventRef event, void* data) {
+
+  Q_UNUSED(nextHandler);
+  Q_UNUSED(data);
+  if (GetEventClass(event) == kEventClassKeyboard && GetEventKind(event) == kEventHotKeyPressed) {
+    EventHotKeyID keyID;
+    GetEventParameter(event, kEventParamDirectObject, typeEventHotKeyID, nullptr, sizeof(keyID), nullptr, &keyID);
+    Identifier id = keyIDs.key(keyID.id);
+    QxtGlobalShortcutPrivate::activateShortcut(id.second, id.first);
+  }
+  return noErr;
+
+}
+
+quint32 QxtGlobalShortcutPrivate::nativeModifiers(Qt::KeyboardModifiers modifiers) {
+
+  quint32 native = 0;
+  if (modifiers & Qt::ShiftModifier)   native |= shiftKey;
+  if (modifiers & Qt::ControlModifier) native |= cmdKey;
+  if (modifiers & Qt::AltModifier)     native |= optionKey;
+  if (modifiers & Qt::MetaModifier)    native |= controlKey;
+  if (modifiers & Qt::KeypadModifier)  native |= kEventKeyModifierNumLockMask;
+  return native;
+
+}
+
+quint32 QxtGlobalShortcutPrivate::nativeKeycode(Qt::Key key) {
+
+  UTF16Char ch;
+  // Constants found in NSEvent.h from AppKit.framework
+  switch (key) {
+    case Qt::Key_Return:      return kVK_Return;
+    case Qt::Key_Enter:       return kVK_ANSI_KeypadEnter;
+    case Qt::Key_Tab:         return kVK_Tab;
+    case Qt::Key_Space:       return kVK_Space;
+    case Qt::Key_Backspace:   return kVK_Delete;
+    case Qt::Key_Control:     return kVK_Command;
+    case Qt::Key_Shift:       return kVK_Shift;
+    case Qt::Key_CapsLock:    return kVK_CapsLock;
+    case Qt::Key_Option:      return kVK_Option;
+    case Qt::Key_Meta:        return kVK_Control;
+    case Qt::Key_F17:         return kVK_F17;
+    case Qt::Key_VolumeUp:    return kVK_VolumeUp;
+    case Qt::Key_VolumeDown:  return kVK_VolumeDown;
+    case Qt::Key_F18:         return kVK_F18;
+    case Qt::Key_F19:         return kVK_F19;
+    case Qt::Key_F20:         return kVK_F20;
+    case Qt::Key_F5:          return kVK_F5;
+    case Qt::Key_F6:          return kVK_F6;
+    case Qt::Key_F7:          return kVK_F7;
+    case Qt::Key_F3:          return kVK_F3;
+    case Qt::Key_F8:          return kVK_F8;
+    case Qt::Key_F9:          return kVK_F9;
+    case Qt::Key_F11:         return kVK_F11;
+    case Qt::Key_F13:         return kVK_F13;
+    case Qt::Key_F16:         return kVK_F16;
+    case Qt::Key_F14:         return kVK_F14;
+    case Qt::Key_F10:         return kVK_F10;
+    case Qt::Key_F12:         return kVK_F12;
+    case Qt::Key_F15:         return kVK_F15;
+    case Qt::Key_Help:        return kVK_Help;
+    case Qt::Key_Home:        return kVK_Home;
+    case Qt::Key_PageUp:      return kVK_PageUp;
+    case Qt::Key_Delete:      return kVK_ForwardDelete;
+    case Qt::Key_F4:          return kVK_F4;
+    case Qt::Key_End:         return kVK_End;
+    case Qt::Key_F2:          return kVK_F2;
+    case Qt::Key_PageDown:    return kVK_PageDown;
+    case Qt::Key_F1:          return kVK_F1;
+    case Qt::Key_Left:        return kVK_LeftArrow;
+    case Qt::Key_Right:       return kVK_RightArrow;
+    case Qt::Key_Down:        return kVK_DownArrow;
+    case Qt::Key_Up:          return kVK_UpArrow;
+  default:
+    ;
+  }
+
+  if (key == Qt::Key_Escape)	ch = 27;
+  else if (key == Qt::Key_Return) ch = 13;
+  else if (key == Qt::Key_Enter) ch = 3;
+  else if (key == Qt::Key_Tab) ch = 9;
+  else ch = key;
+
+  CFDataRef currentLayoutData;
+  TISInputSourceRef currentKeyboard = TISCopyCurrentKeyboardInputSource();
+
+  if (currentKeyboard == nullptr)
+    return 0;
+
+  currentLayoutData = (CFDataRef)TISGetInputSourceProperty(currentKeyboard, kTISPropertyUnicodeKeyLayoutData);
+  CFRelease(currentKeyboard);
+  if (currentLayoutData == nullptr)
+    return 0;
+
+  UCKeyboardLayout* header = (UCKeyboardLayout*)CFDataGetBytePtr(currentLayoutData);
+  UCKeyboardTypeHeader* table = header->keyboardTypeList;
+
+  uint8_t *data = (uint8_t*)header;
+  // God, would a little documentation for this shit kill you...
+  for (quint32 i=0; i < header->keyboardTypeCount; i++) {
+    UCKeyStateRecordsIndex* stateRec = 0;
+    if (table[i].keyStateRecordsIndexOffset != 0) {
+      stateRec = reinterpret_cast<UCKeyStateRecordsIndex*>(data + table[i].keyStateRecordsIndexOffset);
+      if (stateRec->keyStateRecordsIndexFormat != kUCKeyStateRecordsIndexFormat) stateRec = 0;
+    }
+
+    UCKeyToCharTableIndex* charTable = reinterpret_cast<UCKeyToCharTableIndex*>(data + table[i].keyToCharTableIndexOffset);
+    if (charTable->keyToCharTableIndexFormat != kUCKeyToCharTableIndexFormat) continue;
+
+    for (quint32 j=0; j < charTable->keyToCharTableCount; j++) {
+      UCKeyOutput* keyToChar = reinterpret_cast<UCKeyOutput*>(data + charTable->keyToCharTableOffsets[j]);
+      for (quint32 k=0; k < charTable->keyToCharTableSize; k++) {
+        if (keyToChar[k] & kUCKeyOutputTestForIndexMask) {
+          long idx = keyToChar[k] & kUCKeyOutputGetIndexMask;
+          if (stateRec && idx < stateRec->keyStateRecordCount) {
+            UCKeyStateRecord* rec = reinterpret_cast<UCKeyStateRecord*>(data + stateRec->keyStateRecordOffsets[idx]);
+            if (rec->stateZeroCharData == ch) return k;
+          }
+        }
+        else if (!(keyToChar[k] & kUCKeyOutputSequenceIndexMask) && keyToChar[k] < 0xFFFE) {
+          if (keyToChar[k] == ch) return k;
+        }
+      } // for k
+    } // for j
+  } // for i
+  return 0;
+
+}
+
+bool QxtGlobalShortcutPrivate::registerShortcut(quint32 nativeKey, quint32 nativeMods) {
+
+  if (!qxt_mac_handler_installed) {
+    EventTypeSpec t;
+    t.eventClass = kEventClassKeyboard;
+    t.eventKind = kEventHotKeyPressed;
+    InstallApplicationEventHandler(&qxt_mac_handle_hot_key, 1, &t, nullptr, nullptr);
+  }
+
+  EventHotKeyID keyID;
+  keyID.signature = 'cute';
+  keyID.id = ++hotKeySerial;
+
+  EventHotKeyRef ref = 0;
+  bool rv = !RegisterEventHotKey(nativeKey, nativeMods, keyID, GetApplicationEventTarget(), 0, &ref);
+  if (rv) {
+    keyIDs.insert(Identifier(nativeMods, nativeKey), keyID.id);
+    keyRefs.insert(keyID.id, ref);
+  }
+  return rv;
+
+}
+
+bool QxtGlobalShortcutPrivate::unregisterShortcut(quint32 nativeKey, quint32 nativeMods) {
+
+  Identifier id(nativeMods, nativeKey);
+  if (!keyIDs.contains(id)) return false;
+
+  EventHotKeyRef ref = keyRefs.take(keyIDs[id]);
+  keyIDs.remove(id);
+  return !UnregisterEventHotKey(ref);
+
+}

3rdparty/qxt/qxtglobalshortcut_p.h

@@ -1,84 +1,72 @@
-#ifndef QXTGLOBALSHORTCUT_P_H
-/****************************************************************************
-** Copyright (c) 2006 - 2011, the LibQxt project.
-** See the Qxt AUTHORS file for a list of authors and copyright holders.
-** All rights reserved.
-**
-** Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are met:
-**     * Redistributions of source code must retain the above copyright
-**       notice, this list of conditions and the following disclaimer.
-**     * Redistributions in binary form must reproduce the above copyright
-**       notice, this list of conditions and the following disclaimer in the
-**       documentation and/or other materials provided with the distribution.
-**     * Neither the name of the LibQxt project nor the
-**       names of its contributors may be used to endorse or promote products
-**       derived from this software without specific prior written permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-** WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-** DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-** DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-** (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-** LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-**
-** <http://libqxt.org>  <foundation@libqxt.org>
-*****************************************************************************/
-
-#define QXTGLOBALSHORTCUT_P_H
-
-#include "qxtglobalshortcut.h"
-#include <QAbstractEventDispatcher>
-#include <QKeySequence>
-#include <QHash>
-
-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-#include <QAbstractNativeEventFilter>
-#endif
-
-
-class QxtGlobalShortcutPrivate : public QxtPrivate<QxtGlobalShortcut>
-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-        ,public QAbstractNativeEventFilter
-#endif
-{
-public:
-    QXT_DECLARE_PUBLIC(QxtGlobalShortcut)
-    QxtGlobalShortcutPrivate();
-    ~QxtGlobalShortcutPrivate();
-
-    bool enabled;
-    Qt::Key key;
-    Qt::KeyboardModifiers mods;
-
-    bool setShortcut(const QKeySequence& shortcut);
-    bool unsetShortcut();
-
-    static bool error;
-#ifndef Q_WS_MAC
-    static int ref;
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
-    static QAbstractEventDispatcher::EventFilter prevEventFilter;
-    static bool eventFilter(void* message);
-#else
-    virtual bool nativeEventFilter(const QByteArray & eventType, void * message, long * result);
-#endif // QT_VERSION < QT_VERSION_CHECK(5,0,0)
-#endif // Q_WS_MAC
-
-    static void activateShortcut(quint32 nativeKey, quint32 nativeMods);
-
-private:
-    static quint32 nativeKeycode(Qt::Key keycode);
-    static quint32 nativeModifiers(Qt::KeyboardModifiers modifiers);
-
-    static bool registerShortcut(quint32 nativeKey, quint32 nativeMods);
-    static bool unregisterShortcut(quint32 nativeKey, quint32 nativeMods);
-
-    static QHash<QPair<quint32, quint32>, QxtGlobalShortcut*> shortcuts;
-};
-
-#endif // QXTGLOBALSHORTCUT_P_H
+/****************************************************************************
+** Copyright (c) 2006 - 2011, the LibQxt project.
+** See the Qxt AUTHORS file for a list of authors and copyright holders.
+** All rights reserved.
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are met:
+**     * Redistributions of source code must retain the above copyright
+**       notice, this list of conditions and the following disclaimer.
+**     * Redistributions in binary form must reproduce the above copyright
+**       notice, this list of conditions and the following disclaimer in the
+**       documentation and/or other materials provided with the distribution.
+**     * Neither the name of the LibQxt project nor the
+**       names of its contributors may be used to endorse or promote products
+**       derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+** WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+** DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+** DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+** (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+** LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
+** <http://libqxt.org>  <foundation@libqxt.org>
+*****************************************************************************/
+
+#ifndef QXTGLOBALSHORTCUT_P_H
+#define QXTGLOBALSHORTCUT_P_H
+
+#include "qxtglobalshortcut.h"
+
+#include <QHash>
+#include <QAbstractEventDispatcher>
+#include <QAbstractNativeEventFilter>
+#include <QKeySequence>
+
+class QxtGlobalShortcutPrivate : public QxtPrivate<QxtGlobalShortcut>, public QAbstractNativeEventFilter {
+public:
+  QXT_DECLARE_PUBLIC(QxtGlobalShortcut)
+  QxtGlobalShortcutPrivate();
+  ~QxtGlobalShortcutPrivate();
+
+  bool enabled;
+  Qt::Key key;
+  Qt::KeyboardModifiers mods;
+
+  bool setShortcut(const QKeySequence& shortcut);
+  bool unsetShortcut();
+
+  static bool error;
+#ifndef Q_OS_MACOS
+  static int ref;
+  virtual bool nativeEventFilter(const QByteArray & eventType, void * message, long * result);
+#endif // Q_OS_MAC
+
+  static void activateShortcut(quint32 nativeKey, quint32 nativeMods);
+
+private:
+  static quint32 nativeKeycode(Qt::Key keycode);
+  static quint32 nativeModifiers(Qt::KeyboardModifiers modifiers);
+
+  static bool registerShortcut(quint32 nativeKey, quint32 nativeMods);
+  static bool unregisterShortcut(quint32 nativeKey, quint32 nativeMods);
+
+  static QHash<QPair<quint32, quint32>, QxtGlobalShortcut*> shortcuts;
+};
+
+#endif  // QXTGLOBALSHORTCUT_P_H

3rdparty/qxt/qxtglobalshortcut_win.cpp

@@ -1,247 +1,239 @@
-#include "qxtglobalshortcut_p.h"
-/****************************************************************************
-** Copyright (c) 2006 - 2011, the LibQxt project.
-** See the Qxt AUTHORS file for a list of authors and copyright holders.
-** All rights reserved.
-**
-** Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are met:
-**     * Redistributions of source code must retain the above copyright
-**       notice, this list of conditions and the following disclaimer.
-**     * Redistributions in binary form must reproduce the above copyright
-**       notice, this list of conditions and the following disclaimer in the
-**       documentation and/or other materials provided with the distribution.
-**     * Neither the name of the LibQxt project nor the
-**       names of its contributors may be used to endorse or promote products
-**       derived from this software without specific prior written permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-** WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-** DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-** DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-** (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-** LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-**
-** <http://libqxt.org>  <foundation@libqxt.org>
-*****************************************************************************/
-
-#include <qt_windows.h>
-
-
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
-bool QxtGlobalShortcutPrivate::eventFilter(void* message)
-{
-#else
-bool QxtGlobalShortcutPrivate::nativeEventFilter(const QByteArray & eventType,
-    void * message, long * result)
-{
-    Q_UNUSED(eventType);
-    Q_UNUSED(result);
-#endif
-    MSG* msg = static_cast<MSG*>(message);
-    if (msg->message == WM_HOTKEY)
-    {
-        const quint32 keycode = HIWORD(msg->lParam);
-        const quint32 modifiers = LOWORD(msg->lParam);
-        activateShortcut(keycode, modifiers);
-    }
-    return false;
-}
-
-
-quint32 QxtGlobalShortcutPrivate::nativeModifiers(Qt::KeyboardModifiers modifiers)
-{
-    // MOD_ALT, MOD_CONTROL, (MOD_KEYUP), MOD_SHIFT, MOD_WIN
-    quint32 native = 0;
-    if (modifiers & Qt::ShiftModifier)
-        native |= MOD_SHIFT;
-    if (modifiers & Qt::ControlModifier)
-        native |= MOD_CONTROL;
-    if (modifiers & Qt::AltModifier)
-        native |= MOD_ALT;
-    if (modifiers & Qt::MetaModifier)
-        native |= MOD_WIN;
-    // TODO: resolve these?
-    //if (modifiers & Qt::KeypadModifier)
-    //if (modifiers & Qt::GroupSwitchModifier)
-    return native;
-}
-
-quint32 QxtGlobalShortcutPrivate::nativeKeycode(Qt::Key key)
-{
-    switch (key)
-    {
-    case Qt::Key_Escape:
-        return VK_ESCAPE;
-    case Qt::Key_Tab:
-    case Qt::Key_Backtab:
-        return VK_TAB;
-    case Qt::Key_Backspace:
-        return VK_BACK;
-    case Qt::Key_Return:
-    case Qt::Key_Enter:
-        return VK_RETURN;
-    case Qt::Key_Insert:
-        return VK_INSERT;
-    case Qt::Key_Delete:
-        return VK_DELETE;
-    case Qt::Key_Pause:
-        return VK_PAUSE;
-    case Qt::Key_Print:
-        return VK_PRINT;
-    case Qt::Key_Clear:
-        return VK_CLEAR;
-    case Qt::Key_Home:
-        return VK_HOME;
-    case Qt::Key_End:
-        return VK_END;
-    case Qt::Key_Left:
-        return VK_LEFT;
-    case Qt::Key_Up:
-        return VK_UP;
-    case Qt::Key_Right:
-        return VK_RIGHT;
-    case Qt::Key_Down:
-        return VK_DOWN;
-    case Qt::Key_PageUp:
-        return VK_PRIOR;
-    case Qt::Key_PageDown:
-        return VK_NEXT;
-    case Qt::Key_F1:
-        return VK_F1;
-    case Qt::Key_F2:
-        return VK_F2;
-    case Qt::Key_F3:
-        return VK_F3;
-    case Qt::Key_F4:
-        return VK_F4;
-    case Qt::Key_F5:
-        return VK_F5;
-    case Qt::Key_F6:
-        return VK_F6;
-    case Qt::Key_F7:
-        return VK_F7;
-    case Qt::Key_F8:
-        return VK_F8;
-    case Qt::Key_F9:
-        return VK_F9;
-    case Qt::Key_F10:
-        return VK_F10;
-    case Qt::Key_F11:
-        return VK_F11;
-    case Qt::Key_F12:
-        return VK_F12;
-    case Qt::Key_F13:
-        return VK_F13;
-    case Qt::Key_F14:
-        return VK_F14;
-    case Qt::Key_F15:
-        return VK_F15;
-    case Qt::Key_F16:
-        return VK_F16;
-    case Qt::Key_F17:
-        return VK_F17;
-    case Qt::Key_F18:
-        return VK_F18;
-    case Qt::Key_F19:
-        return VK_F19;
-    case Qt::Key_F20:
-        return VK_F20;
-    case Qt::Key_F21:
-        return VK_F21;
-    case Qt::Key_F22:
-        return VK_F22;
-    case Qt::Key_F23:
-        return VK_F23;
-    case Qt::Key_F24:
-        return VK_F24;
-    case Qt::Key_Space:
-        return VK_SPACE;
-    case Qt::Key_Asterisk:
-        return VK_MULTIPLY;
-    case Qt::Key_Plus:
-        return VK_ADD;
-    case Qt::Key_Comma:
-        return VK_SEPARATOR;
-    case Qt::Key_Minus:
-        return VK_SUBTRACT;
-    case Qt::Key_Slash:
-        return VK_DIVIDE;
-    case Qt::Key_MediaNext:
-        return VK_MEDIA_NEXT_TRACK;
-    case Qt::Key_MediaPrevious:
-        return VK_MEDIA_PREV_TRACK;
-    case Qt::Key_MediaPlay:
-        return VK_MEDIA_PLAY_PAUSE;
-    case Qt::Key_MediaStop:
-        return VK_MEDIA_STOP;
-        // couldn't find those in VK_*
-        //case Qt::Key_MediaLast:
-        //case Qt::Key_MediaRecord:
-    case Qt::Key_VolumeDown:
-        return VK_VOLUME_DOWN;
-    case Qt::Key_VolumeUp:
-        return VK_VOLUME_UP;
-    case Qt::Key_VolumeMute:
-        return VK_VOLUME_MUTE;
-
-        // numbers
-    case Qt::Key_0:
-    case Qt::Key_1:
-    case Qt::Key_2:
-    case Qt::Key_3:
-    case Qt::Key_4:
-    case Qt::Key_5:
-    case Qt::Key_6:
-    case Qt::Key_7:
-    case Qt::Key_8:
-    case Qt::Key_9:
-        return key;
-
-        // letters
-    case Qt::Key_A:
-    case Qt::Key_B:
-    case Qt::Key_C:
-    case Qt::Key_D:
-    case Qt::Key_E:
-    case Qt::Key_F:
-    case Qt::Key_G:
-    case Qt::Key_H:
-    case Qt::Key_I:
-    case Qt::Key_J:
-    case Qt::Key_K:
-    case Qt::Key_L:
-    case Qt::Key_M:
-    case Qt::Key_N:
-    case Qt::Key_O:
-    case Qt::Key_P:
-    case Qt::Key_Q:
-    case Qt::Key_R:
-    case Qt::Key_S:
-    case Qt::Key_T:
-    case Qt::Key_U:
-    case Qt::Key_V:
-    case Qt::Key_W:
-    case Qt::Key_X:
-    case Qt::Key_Y:
-    case Qt::Key_Z:
-        return key;
-
-    default:
-        return 0;
-    }
-}
-
-bool QxtGlobalShortcutPrivate::registerShortcut(quint32 nativeKey, quint32 nativeMods)
-{
-    return RegisterHotKey(0, nativeMods ^ nativeKey, nativeMods, nativeKey);
-}
-
-bool QxtGlobalShortcutPrivate::unregisterShortcut(quint32 nativeKey, quint32 nativeMods)
-{
-    return UnregisterHotKey(0, nativeMods ^ nativeKey);
-}
+#include "qxtglobalshortcut_p.h"
+/****************************************************************************
+** Copyright (c) 2006 - 2011, the LibQxt project.
+** See the Qxt AUTHORS file for a list of authors and copyright holders.
+** All rights reserved.
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are met:
+**     * Redistributions of source code must retain the above copyright
+**       notice, this list of conditions and the following disclaimer.
+**     * Redistributions in binary form must reproduce the above copyright
+**       notice, this list of conditions and the following disclaimer in the
+**       documentation and/or other materials provided with the distribution.
+**     * Neither the name of the LibQxt project nor the
+**       names of its contributors may be used to endorse or promote products
+**       derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+** WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+** DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+** DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+** (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+** LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
+** <http://libqxt.org>  <foundation@libqxt.org>
+*****************************************************************************/
+
+#include <qt_windows.h>
+
+bool QxtGlobalShortcutPrivate::nativeEventFilter(const QByteArray & eventType, void * message, long * result) {
+
+  Q_UNUSED(eventType);
+  Q_UNUSED(result);
+  MSG* msg = static_cast<MSG*>(message);
+  if (msg->message == WM_HOTKEY) {
+    const quint32 keycode = HIWORD(msg->lParam);
+    const quint32 modifiers = LOWORD(msg->lParam);
+    activateShortcut(keycode, modifiers);
+  }
+  return false;
+
+}
+
+
+quint32 QxtGlobalShortcutPrivate::nativeModifiers(Qt::KeyboardModifiers modifiers) {
+
+  // MOD_ALT, MOD_CONTROL, (MOD_KEYUP), MOD_SHIFT, MOD_WIN
+  quint32 native = 0;
+  if (modifiers & Qt::ShiftModifier)
+    native |= MOD_SHIFT;
+  if (modifiers & Qt::ControlModifier)
+    native |= MOD_CONTROL;
+  if (modifiers & Qt::AltModifier)
+    native |= MOD_ALT;
+  if (modifiers & Qt::MetaModifier)
+    native |= MOD_WIN;
+  // TODO: resolve these?
+  //if (modifiers & Qt::KeypadModifier)
+  //if (modifiers & Qt::GroupSwitchModifier)
+  return native;
+
+}
+
+quint32 QxtGlobalShortcutPrivate::nativeKeycode(Qt::Key key) {
+
+  switch (key) {
+  case Qt::Key_Escape:
+    return VK_ESCAPE;
+  case Qt::Key_Tab:
+  case Qt::Key_Backtab:
+    return VK_TAB;
+  case Qt::Key_Backspace:
+    return VK_BACK;
+  case Qt::Key_Return:
+  case Qt::Key_Enter:
+    return VK_RETURN;
+  case Qt::Key_Insert:
+    return VK_INSERT;
+  case Qt::Key_Delete:
+    return VK_DELETE;
+  case Qt::Key_Pause:
+    return VK_PAUSE;
+  case Qt::Key_Print:
+    return VK_PRINT;
+  case Qt::Key_Clear:
+    return VK_CLEAR;
+  case Qt::Key_Home:
+    return VK_HOME;
+  case Qt::Key_End:
+    return VK_END;
+  case Qt::Key_Left:
+    return VK_LEFT;
+  case Qt::Key_Up:
+    return VK_UP;
+  case Qt::Key_Right:
+    return VK_RIGHT;
+  case Qt::Key_Down:
+    return VK_DOWN;
+  case Qt::Key_PageUp:
+    return VK_PRIOR;
+  case Qt::Key_PageDown:
+    return VK_NEXT;
+  case Qt::Key_F1:
+    return VK_F1;
+  case Qt::Key_F2:
+    return VK_F2;
+  case Qt::Key_F3:
+    return VK_F3;
+  case Qt::Key_F4:
+    return VK_F4;
+  case Qt::Key_F5:
+    return VK_F5;
+  case Qt::Key_F6:
+    return VK_F6;
+  case Qt::Key_F7:
+    return VK_F7;
+  case Qt::Key_F8:
+    return VK_F8;
+  case Qt::Key_F9:
+    return VK_F9;
+  case Qt::Key_F10:
+    return VK_F10;
+  case Qt::Key_F11:
+    return VK_F11;
+  case Qt::Key_F12:
+    return VK_F12;
+  case Qt::Key_F13:
+    return VK_F13;
+  case Qt::Key_F14:
+    return VK_F14;
+  case Qt::Key_F15:
+    return VK_F15;
+  case Qt::Key_F16:
+    return VK_F16;
+  case Qt::Key_F17:
+    return VK_F17;
+  case Qt::Key_F18:
+    return VK_F18;
+  case Qt::Key_F19:
+    return VK_F19;
+  case Qt::Key_F20:
+    return VK_F20;
+  case Qt::Key_F21:
+    return VK_F21;
+  case Qt::Key_F22:
+    return VK_F22;
+  case Qt::Key_F23:
+    return VK_F23;
+  case Qt::Key_F24:
+    return VK_F24;
+  case Qt::Key_Space:
+    return VK_SPACE;
+  case Qt::Key_Asterisk:
+    return VK_MULTIPLY;
+  case Qt::Key_Plus:
+    return VK_ADD;
+  case Qt::Key_Comma:
+    return VK_SEPARATOR;
+  case Qt::Key_Minus:
+    return VK_SUBTRACT;
+  case Qt::Key_Slash:
+    return VK_DIVIDE;
+  case Qt::Key_MediaNext:
+    return VK_MEDIA_NEXT_TRACK;
+  case Qt::Key_MediaPrevious:
+    return VK_MEDIA_PREV_TRACK;
+  case Qt::Key_MediaPlay:
+    return VK_MEDIA_PLAY_PAUSE;
+  case Qt::Key_MediaStop:
+    return VK_MEDIA_STOP;
+    // couldn't find those in VK_*
+    //case Qt::Key_MediaLast:
+    //case Qt::Key_MediaRecord:
+  case Qt::Key_VolumeDown:
+    return VK_VOLUME_DOWN;
+  case Qt::Key_VolumeUp:
+    return VK_VOLUME_UP;
+  case Qt::Key_VolumeMute:
+    return VK_VOLUME_MUTE;
+
+    // numbers
+  case Qt::Key_0:
+  case Qt::Key_1:
+  case Qt::Key_2:
+  case Qt::Key_3:
+  case Qt::Key_4:
+  case Qt::Key_5:
+  case Qt::Key_6:
+  case Qt::Key_7:
+  case Qt::Key_8:
+  case Qt::Key_9:
+    return key;
+
+    // letters
+  case Qt::Key_A:
+  case Qt::Key_B:
+  case Qt::Key_C:
+  case Qt::Key_D:
+  case Qt::Key_E:
+  case Qt::Key_F:
+  case Qt::Key_G:
+  case Qt::Key_H:
+  case Qt::Key_I:
+  case Qt::Key_J:
+  case Qt::Key_K:
+  case Qt::Key_L:
+  case Qt::Key_M:
+  case Qt::Key_N:
+  case Qt::Key_O:
+  case Qt::Key_P:
+  case Qt::Key_Q:
+  case Qt::Key_R:
+  case Qt::Key_S:
+  case Qt::Key_T:
+  case Qt::Key_U:
+  case Qt::Key_V:
+  case Qt::Key_W:
+  case Qt::Key_X:
+  case Qt::Key_Y:
+  case Qt::Key_Z:
+    return key;
+
+  default:
+    return 0;
+  }
+
+}
+
+bool QxtGlobalShortcutPrivate::registerShortcut(quint32 nativeKey, quint32 nativeMods) {
+  return RegisterHotKey(0, nativeMods ^ nativeKey, nativeMods, nativeKey);
+}
+
+bool QxtGlobalShortcutPrivate::unregisterShortcut(quint32 nativeKey, quint32 nativeMods) {
+  return UnregisterHotKey(0, nativeMods ^ nativeKey);
+}

3rdparty/qxt/qxtglobalshortcut_x11.cpp

@@ -1,263 +1,236 @@
-#include "qxtglobalshortcut_p.h"
-/****************************************************************************
-** Copyright (c) 2006 - 2011, the LibQxt project.
-** See the Qxt AUTHORS file for a list of authors and copyright holders.
-** All rights reserved.
-**
-** Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are met:
-**     * Redistributions of source code must retain the above copyright
-**       notice, this list of conditions and the following disclaimer.
-**     * Redistributions in binary form must reproduce the above copyright
-**       notice, this list of conditions and the following disclaimer in the
-**       documentation and/or other materials provided with the distribution.
-**     * Neither the name of the LibQxt project nor the
-**       names of its contributors may be used to endorse or promote products
-**       derived from this software without specific prior written permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-** WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-** DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-** DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-** (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-** LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-**
-** <http://libqxt.org>  <foundation@libqxt.org>
-*****************************************************************************/
-
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
-#   include <QX11Info>
-#else
-#   include <qpa/qplatformnativeinterface.h>
-#   include <xcb/xcb.h>
-#   include <QApplication>
-#endif
-#include <X11/X.h>
-#include <X11/Xlib.h>
-#include <xcb/xproto.h>
-
-#include <QtGlobal>
-#include <QByteArray>
-#include <QGuiApplication>
-#include <QKeySequence>
-#include <QString>
-#include <QVector>
-
-#include "keymapper_x11.h"
-
-namespace {
-
-const QVector<quint32> maskModifiers = QVector<quint32>()
-    << 0 << Mod2Mask << LockMask << (Mod2Mask | LockMask);
-
-typedef int (*X11ErrorHandler)(Display *display, XErrorEvent *event);
-
-class QxtX11ErrorHandler {
-public:
-    static bool error;
-
-    static int qxtX11ErrorHandler(Display *display, XErrorEvent *event)
-    {
-        Q_UNUSED(display);
-        switch (event->error_code)
-        {
-            case BadAccess:
-            case BadValue:
-            case BadWindow:
-                if (event->request_code == 33 /* X_GrabKey */ ||
-                        event->request_code == 34 /* X_UngrabKey */)
-                {
-                    error = true;
-                    //TODO:
-                    //char errstr[256];
-                    //XGetErrorText(dpy, err->error_code, errstr, 256);
-                }
-        }
-        return 0;
-    }
-
-    QxtX11ErrorHandler()
-    {
-        error = false;
-        m_previousErrorHandler = XSetErrorHandler(qxtX11ErrorHandler);
-    }
-
-    ~QxtX11ErrorHandler()
-    {
-        XSetErrorHandler(m_previousErrorHandler);
-    }
-
-private:
-    X11ErrorHandler m_previousErrorHandler;
-};
-
-bool QxtX11ErrorHandler::error = false;
-
-class QxtX11Data {
-public:
-    QxtX11Data()
-    {
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
-        m_display = QX11Info::display();
-#else
-        QPlatformNativeInterface *native = qApp->platformNativeInterface();
-        void *display = native->nativeResourceForScreen(QByteArray("display"),
-                                                        QGuiApplication::primaryScreen());
-        m_display = reinterpret_cast<Display *>(display);
-#endif
-    }
-
-    bool isValid()
-    {
-        return m_display != 0;
-    }
-
-    Display *display()
-    {
-        Q_ASSERT(isValid());
-        return m_display;
-    }
-
-    Window rootWindow()
-    {
-        return DefaultRootWindow(display());
-    }
-
-    bool grabKey(quint32 keycode, quint32 modifiers, Window window)
-    {
-        QxtX11ErrorHandler errorHandler;
-
-        for (int i = 0; !errorHandler.error && i < maskModifiers.size(); ++i) {
-            XGrabKey(display(), keycode, modifiers | maskModifiers[i], window, True,
-                     GrabModeAsync, GrabModeAsync);
-        }
-
-        if (errorHandler.error) {
-            ungrabKey(keycode, modifiers, window);
-            return false;
-        }
-
-        return true;
-    }
-
-    bool ungrabKey(quint32 keycode, quint32 modifiers, Window window)
-    {
-        QxtX11ErrorHandler errorHandler;
-
-        foreach (quint32 maskMods, maskModifiers) {
-            XUngrabKey(display(), keycode, modifiers | maskMods, window);
-        }
-
-        return !errorHandler.error;
-    }
-
-private:
-    Display *m_display;
-};
-
-} // namespace
-
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
-bool QxtGlobalShortcutPrivate::eventFilter(void *message)
-{
-    XEvent *event = static_cast<XEvent *>(message);
-    if (event->type == KeyPress)
-    {
-        XKeyEvent *key = reinterpret_cast<XKeyEvent *>(event);
-        unsigned int keycode = key->keycode;
-        unsigned int keystate = key->state;
-#else
-bool QxtGlobalShortcutPrivate::nativeEventFilter(const QByteArray & eventType,
-    void *message, long *result)
-{
-    Q_UNUSED(result);
-
-    xcb_key_press_event_t *kev = 0;
-    if (eventType == "xcb_generic_event_t") {
-        xcb_generic_event_t *ev = static_cast<xcb_generic_event_t *>(message);
-        if ((ev->response_type & 127) == XCB_KEY_PRESS)
-            kev = static_cast<xcb_key_press_event_t *>(message);
-    }
-
-    if (kev != 0) {
-        unsigned int keycode = kev->detail;
-        unsigned int keystate = 0;
-        if(kev->state & XCB_MOD_MASK_1)
-            keystate |= Mod1Mask;
-        if(kev->state & XCB_MOD_MASK_CONTROL)
-            keystate |= ControlMask;
-        if(kev->state & XCB_MOD_MASK_4)
-            keystate |= Mod4Mask;
-        if(kev->state & XCB_MOD_MASK_SHIFT)
-            keystate |= ShiftMask;
-#endif
-        activateShortcut(keycode,
-            // Mod1Mask == Alt, Mod4Mask == Meta
-            keystate & (ShiftMask | ControlMask | Mod1Mask | Mod4Mask));
-    }
-    return false;
-}
-
-quint32 QxtGlobalShortcutPrivate::nativeModifiers(Qt::KeyboardModifiers modifiers)
-{
-    // ShiftMask, LockMask, ControlMask, Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, and Mod5Mask
-    quint32 native = 0;
-    if (modifiers & Qt::ShiftModifier)
-        native |= ShiftMask;
-    if (modifiers & Qt::ControlModifier)
-        native |= ControlMask;
-    if (modifiers & Qt::AltModifier)
-        native |= Mod1Mask;
-    if (modifiers & Qt::MetaModifier)
-        native |= Mod4Mask;
-
-    // TODO: resolve these?
-    //if (modifiers & Qt::MetaModifier)
-    //if (modifiers & Qt::KeypadModifier)
-    //if (modifiers & Qt::GroupSwitchModifier)
-    return native;
-}
-
-quint32 QxtGlobalShortcutPrivate::nativeKeycode(Qt::Key key)
-{
-  // (davidsansome) Try the table from QKeyMapper first - this seems to be
-  // the only way to get Keysyms for the media keys.
-  unsigned int keysym = 0;
-  int i = 0;
-  while (KeyTbl[i]) {
-    if (KeyTbl[i+1] == static_cast<uint>(key)) {
-      keysym = KeyTbl[i];
-      break;
-    }
-    i += 2;
-  }
-
-  // If that didn't work then fall back on XStringToKeysym
-  if (!keysym) {
-    keysym = XStringToKeysym(QKeySequence(key).toString().toLatin1().data());
-    if (keysym == NoSymbol)
-      keysym = static_cast<ushort>(key);
-  }
-
-  QxtX11Data x11;
-  if (!x11.isValid())
-    return 0;
-
-  return XKeysymToKeycode(x11.display(), keysym);
-}
-
-bool QxtGlobalShortcutPrivate::registerShortcut(quint32 nativeKey, quint32 nativeMods)
-{
-    QxtX11Data x11;
-    return x11.isValid() && x11.grabKey(nativeKey, nativeMods, x11.rootWindow());
-}
-
-bool QxtGlobalShortcutPrivate::unregisterShortcut(quint32 nativeKey, quint32 nativeMods)
-{
-    QxtX11Data x11;
-    return x11.isValid() && x11.ungrabKey(nativeKey, nativeMods, x11.rootWindow());
-}
+/****************************************************************************
+** Copyright (c) 2006 - 2011, the LibQxt project.
+** See the Qxt AUTHORS file for a list of authors and copyright holders.
+** All rights reserved.
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are met:
+**     * Redistributions of source code must retain the above copyright
+**       notice, this list of conditions and the following disclaimer.
+**     * Redistributions in binary form must reproduce the above copyright
+**       notice, this list of conditions and the following disclaimer in the
+**       documentation and/or other materials provided with the distribution.
+**     * Neither the name of the LibQxt project nor the
+**       names of its contributors may be used to endorse or promote products
+**       derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+** WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+** DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+** DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+** (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+** LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
+** <http://libqxt.org>  <foundation@libqxt.org>
+*****************************************************************************/
+
+#include "qxtglobalshortcut_p.h"
+
+#include <QtGlobal>
+#include <QApplication>
+#include <QGuiApplication>
+#include <QKeySequence>
+#include <QByteArray>
+#include <QString>
+#include <QVector>
+#include <QX11Info>
+
+#include <qpa/qplatformnativeinterface.h>
+
+#include <X11/X.h>
+#include <X11/Xlib.h>
+#include <xcb/xcb.h>
+#include <xcb/xproto.h>
+
+#include "keymapper_x11.h"
+
+namespace {
+
+const QVector<quint32> maskModifiers = QVector<quint32>() << 0 << Mod2Mask << LockMask << (Mod2Mask | LockMask);
+
+typedef int (*X11ErrorHandler)(Display *display, XErrorEvent *event);
+
+class QxtX11ErrorHandler {
+public:
+  static bool error;
+
+  static int qxtX11ErrorHandler(Display *display, XErrorEvent *event) {
+    Q_UNUSED(display);
+    switch (event->error_code) {
+      case BadAccess:
+      case BadValue:
+      case BadWindow:
+        if (event->request_code == 33 /* X_GrabKey */ ||
+            event->request_code == 34 /* X_UngrabKey */)
+        {
+          error = true;
+          //TODO:
+          //char errstr[256];
+          //XGetErrorText(dpy, err->error_code, errstr, 256);
+        }
+    }
+    return 0;
+  }
+
+  QxtX11ErrorHandler() {
+    error = false;
+    m_previousErrorHandler = XSetErrorHandler(qxtX11ErrorHandler);
+  }
+
+  ~QxtX11ErrorHandler() {
+    XSetErrorHandler(m_previousErrorHandler);
+  }
+
+private:
+  X11ErrorHandler m_previousErrorHandler;
+};
+
+bool QxtX11ErrorHandler::error = false;
+
+class QxtX11Data {
+public:
+  QxtX11Data() {
+    QPlatformNativeInterface *native = qApp->platformNativeInterface();
+    //void *display = native->nativeResourceForScreen(QByteArray("display"), QGuiApplication::primaryScreen());
+    //m_display = reinterpret_cast<Display *>(display);
+    m_display = QX11Info::display();
+  }
+
+  bool isValid() {
+    return m_display != nullptr;
+  }
+
+  Display *display() {
+    Q_ASSERT(isValid());
+    return m_display;
+  }
+
+  Window rootWindow() {
+    return DefaultRootWindow(display());
+  }
+
+  bool grabKey(quint32 keycode, quint32 modifiers, Window window) {
+    QxtX11ErrorHandler errorHandler;
+
+    for (int i = 0; !errorHandler.error && i < maskModifiers.size(); ++i) {
+      XGrabKey(display(), keycode, modifiers | maskModifiers[i], window, True, GrabModeAsync, GrabModeAsync);
+    }
+
+    if (errorHandler.error) {
+      ungrabKey(keycode, modifiers, window);
+      return false;
+    }
+
+    return true;
+  }
+
+  bool ungrabKey(quint32 keycode, quint32 modifiers, Window window) {
+    QxtX11ErrorHandler errorHandler;
+
+    foreach (quint32 maskMods, maskModifiers) {
+      XUngrabKey(display(), keycode, modifiers | maskMods, window);
+    }
+
+    return !errorHandler.error;
+  }
+
+private:
+  Display *m_display;
+};
+
+} // namespace
+
+bool QxtGlobalShortcutPrivate::nativeEventFilter(const QByteArray & eventType, void *message, long *result) {
+
+  Q_UNUSED(result);
+
+  xcb_key_press_event_t *kev = nullptr;
+  if (eventType == "xcb_generic_event_t") {
+    xcb_generic_event_t *ev = static_cast<xcb_generic_event_t *>(message);
+    if ((ev->response_type & 127) == XCB_KEY_PRESS)
+      kev = static_cast<xcb_key_press_event_t *>(message);
+  }
+
+  if (kev != nullptr) {
+    unsigned int keycode = kev->detail;
+    unsigned int keystate = 0;
+    if(kev->state & XCB_MOD_MASK_1)
+      keystate |= Mod1Mask;
+    if(kev->state & XCB_MOD_MASK_CONTROL)
+      keystate |= ControlMask;
+    if(kev->state & XCB_MOD_MASK_4)
+      keystate |= Mod4Mask;
+    if(kev->state & XCB_MOD_MASK_SHIFT)
+      keystate |= ShiftMask;
+
+    activateShortcut(keycode,
+      // Mod1Mask == Alt, Mod4Mask == Meta
+      keystate & (ShiftMask | ControlMask | Mod1Mask | Mod4Mask));
+  }
+  return false;
+
+}
+
+quint32 QxtGlobalShortcutPrivate::nativeModifiers(Qt::KeyboardModifiers modifiers) {
+
+  // ShiftMask, LockMask, ControlMask, Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, and Mod5Mask
+  quint32 native = 0;
+  if (modifiers & Qt::ShiftModifier)
+    native |= ShiftMask;
+  if (modifiers & Qt::ControlModifier)
+    native |= ControlMask;
+  if (modifiers & Qt::AltModifier)
+    native |= Mod1Mask;
+  if (modifiers & Qt::MetaModifier)
+    native |= Mod4Mask;
+
+  // TODO: resolve these?
+  //if (modifiers & Qt::MetaModifier)
+  //if (modifiers & Qt::KeypadModifier)
+  //if (modifiers & Qt::GroupSwitchModifier)
+  return native;
+
+}
+
+quint32 QxtGlobalShortcutPrivate::nativeKeycode(Qt::Key key) {
+
+  // (davidsansome) Try the table from QKeyMapper first - this seems to be
+  // the only way to get Keysyms for the media keys.
+  unsigned int keysym = 0;
+  int i = 0;
+  while (KeyTbl[i]) {
+    if (KeyTbl[i+1] == static_cast<uint>(key)) {
+      keysym = KeyTbl[i];
+      break;
+    }
+    i += 2;
+  }
+
+  // If that didn't work then fall back on XStringToKeysym
+  if (!keysym) {
+  keysym = XStringToKeysym(QKeySequence(key).toString().toLatin1().data());
+  if (keysym == NoSymbol)
+    keysym = static_cast<ushort>(key);
+  }
+
+  QxtX11Data x11;
+  if (!x11.isValid())
+    return 0;
+
+  return XKeysymToKeycode(x11.display(), keysym);
+
+}
+
+bool QxtGlobalShortcutPrivate::registerShortcut(quint32 nativeKey, quint32 nativeMods) {
+  QxtX11Data x11;
+  return x11.isValid() && x11.grabKey(nativeKey, nativeMods, x11.rootWindow());
+}
+
+bool QxtGlobalShortcutPrivate::unregisterShortcut(quint32 nativeKey, quint32 nativeMods) {
+  QxtX11Data x11;
+  return x11.isValid() && x11.ungrabKey(nativeKey, nativeMods, x11.rootWindow());
+}

3rdparty/sha2/sha2.cpp

@@ -1,7 +1,7 @@
 /*
  * FILE:	sha2.c
  * AUTHOR:	Aaron D. Gifford - http://www.aarongifford.com/
- * 
+ *
  * Copyright (c) 2000-2001, Aaron D. Gifford
  * All rights reserved.
  *
@@ -16,7 +16,7 @@
  * 3. Neither the name of the copyright holder nor the names of contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

3rdparty/sha2/sha2.h

@@ -1,7 +1,7 @@
 /*
  * FILE:	sha2.h
  * AUTHOR:	Aaron D. Gifford - http://www.aarongifford.com/
- * 
+ *
  * Copyright (c) 2000-2001, Aaron D. Gifford
  * All rights reserved.
  *
@@ -16,7 +16,7 @@
  * 3. Neither the name of the copyright holder nor the names of contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

3rdparty/taglib/CMakeLists.txt

@@ -47,6 +47,8 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/s3m
   ${CMAKE_CURRENT_SOURCE_DIR}/it
   ${CMAKE_CURRENT_SOURCE_DIR}/xm
+  ${CMAKE_CURRENT_SOURCE_DIR}/dsf
+  ${CMAKE_CURRENT_SOURCE_DIR}/dsdiff
   ${CMAKE_SOURCE_DIR}/3rdparty
 )
 
@@ -161,6 +163,11 @@ set(tag_HDRS
   s3m/s3mproperties.h
   xm/xmfile.h
   xm/xmproperties.h
+  dsf/dsffile.h
+  dsf/dsfproperties.h
+  dsdiff/dsdifffile.h
+  dsdiff/dsdiffproperties.h
+  dsdiff/dsdiffdiintag.h
 )
 
 set(mpeg_SRCS
@@ -316,6 +323,17 @@ set(xm_SRCS
   xm/xmproperties.cpp
 )
 
+set(dsf_SRCS
+  dsf/dsffile.cpp
+  dsf/dsfproperties.cpp
+)
+
+set(dsdiff_SRCS
+  dsdiff/dsdifffile.cpp
+  dsdiff/dsdiffproperties.cpp
+  dsdiff/dsdiffdiintag.cpp
+)
+
 set(toolkit_SRCS
   toolkit/tstring.cpp
   toolkit/tstringlist.cpp
@@ -347,7 +365,7 @@ set(tag_LIB_SRCS
   ${mpeg_SRCS} ${id3v1_SRCS} ${id3v2_SRCS} ${frames_SRCS} ${ogg_SRCS}
   ${vorbis_SRCS} ${oggflacs_SRCS} ${mpc_SRCS} ${ape_SRCS} ${toolkit_SRCS} ${flacs_SRCS}
   ${wavpack_SRCS} ${speex_SRCS} ${trueaudio_SRCS} ${riff_SRCS} ${aiff_SRCS} ${wav_SRCS}
-  ${asf_SRCS} ${mp4_SRCS} ${mod_SRCS} ${s3m_SRCS} ${it_SRCS} ${xm_SRCS} ${opus_SRCS}
+  ${asf_SRCS} ${mp4_SRCS} ${mod_SRCS} ${s3m_SRCS} ${it_SRCS} ${xm_SRCS} ${opus_SRCS} ${dsf_SRCS} ${dsdiff_SRCS}
   ${zlib_SRCS}
   tag.cpp
   tagunion.cpp

3rdparty/taglib/audioproperties.cpp

@@ -38,6 +38,8 @@
 #include "vorbisproperties.h"
 #include "wavproperties.h"
 #include "wavpackproperties.h"
+#include "dsfproperties.h"
+#include "dsdiffproperties.h"
 
 #include "audioproperties.h"
 
@@ -73,6 +75,10 @@ using namespace TagLib;
     return dynamic_cast<const Vorbis::Properties*>(this)->function_name();      \
   else if(dynamic_cast<const WavPack::Properties*>(this))                       \
     return dynamic_cast<const WavPack::Properties*>(this)->function_name();     \
+  else if(dynamic_cast<const DSF::Properties*>(this))                           \
+    return dynamic_cast<const DSF::Properties*>(this)->function_name();         \
+  else if(dynamic_cast<const DSDIFF::Properties*>(this))                        \
+    return dynamic_cast<const DSDIFF::Properties*>(this)->function_name();      \
   else                                                                          \
     return (default_value);
 

3rdparty/taglib/dsdiff/dsdiffdiintag.cpp

@@ -0,0 +1,162 @@
+/***************************************************************************
+ copyright            : (C) 2016 by Damien Plisson, Audirvana
+ email                : damien78@audirvana.com
+ ***************************************************************************/
+
+/***************************************************************************
+ *   This library is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This library 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     *
+ *   Lesser General Public License for more details.                       *
+ *                                                                         *
+ *   You should have received a copy of the GNU Lesser General Public      *
+ *   License along with this library; if not, write to the Free Software   *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
+ *   02110-1301  USA                                                       *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#include "dsdiffdiintag.h"
+#include "tstringlist.h"
+#include "tpropertymap.h"
+
+using namespace TagLib;
+using namespace DSDIFF::DIIN;
+
+class DSDIFF::DIIN::Tag::TagPrivate
+{
+public:
+  TagPrivate()
+  {
+  }
+
+  String title;
+  String artist;
+};
+
+DSDIFF::DIIN::Tag::Tag() : TagLib::Tag()
+{
+  d = new TagPrivate;
+}
+
+DSDIFF::DIIN::Tag::~Tag()
+{
+  delete d;
+}
+
+String DSDIFF::DIIN::Tag::title() const
+{
+  return d->title;
+}
+
+String DSDIFF::DIIN::Tag::artist() const
+{
+  return d->artist;
+}
+
+String DSDIFF::DIIN::Tag::album() const
+{
+  return String();
+}
+
+String DSDIFF::DIIN::Tag::comment() const
+{
+  return String();
+}
+
+String DSDIFF::DIIN::Tag::genre() const
+{
+  return String();
+}
+
+unsigned int DSDIFF::DIIN::Tag::year() const
+{
+  return 0;
+}
+
+unsigned int DSDIFF::DIIN::Tag::track() const
+{
+  return 0;
+}
+
+void DSDIFF::DIIN::Tag::setTitle(const String &title)
+{
+  if(title.isNull() || title.isEmpty())
+    d->title = String();
+  else
+    d->title = title;
+}
+
+void DSDIFF::DIIN::Tag::setArtist(const String &artist)
+{
+  if(artist.isNull() || artist.isEmpty())
+    d->artist = String();
+  else
+    d->artist = artist;
+}
+
+void DSDIFF::DIIN::Tag::setAlbum(const String &)
+{
+}
+
+void DSDIFF::DIIN::Tag::setComment(const String &)
+{
+}
+
+void DSDIFF::DIIN::Tag::setGenre(const String &)
+{
+}
+
+void DSDIFF::DIIN::Tag::setYear(unsigned int)
+{
+}
+
+void DSDIFF::DIIN::Tag::setTrack(unsigned int)
+{
+}
+
+PropertyMap DSDIFF::DIIN::Tag::properties() const
+{
+  PropertyMap properties;
+  properties["TITLE"] = d->title;
+  properties["ARTIST"] = d->artist;
+  return properties;
+}
+
+PropertyMap DSDIFF::DIIN::Tag::setProperties(const PropertyMap &origProps)
+{
+  PropertyMap properties(origProps);
+  properties.removeEmpty();
+  StringList oneValueSet;
+
+  if(properties.contains("TITLE")) {
+    d->title = properties["TITLE"].front();
+    oneValueSet.append("TITLE");
+  } else
+    d->title = String();
+
+  if(properties.contains("ARTIST")) {
+    d->artist = properties["ARTIST"].front();
+    oneValueSet.append("ARTIST");
+  } else
+    d->artist = String();
+
+  // for each tag that has been set above, remove the first entry in the corresponding
+  // value list. The others will be returned as unsupported by this format.
+  for(StringList::Iterator it = oneValueSet.begin(); it != oneValueSet.end(); ++it) {
+    if(properties[*it].size() == 1)
+      properties.erase(*it);
+    else
+      properties[*it].erase(properties[*it].begin());
+  }
+
+  return properties;
+}
+

3rdparty/taglib/dsdiff/dsdiffdiintag.h

@@ -0,0 +1,150 @@
+/***************************************************************************
+ copyright            : (C) 2016 by Damien Plisson, Audirvana
+ email                : damien78@audirvana.com
+ ***************************************************************************/
+
+/***************************************************************************
+ *   This library is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This library 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     *
+ *   Lesser General Public License for more details.                       *
+ *                                                                         *
+ *   You should have received a copy of the GNU Lesser General Public      *
+ *   License along with this library; if not, write to the Free Software   *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
+ *   02110-1301  USA                                                       *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#ifndef TAGLIB_DSDIFFDIINTAG_H
+#define TAGLIB_DSDIFFDIINTAG_H
+
+#include "tag.h"
+
+namespace TagLib {
+
+  namespace DSDIFF {
+
+    namespace DIIN {
+
+      /*!
+       * Tags from the Edited Master Chunk Info
+       *
+       * Only Title and Artist tags are supported
+       */
+      class TAGLIB_EXPORT Tag : public TagLib::Tag
+      {
+      public:
+        Tag();
+        virtual ~Tag();
+
+        /*!
+         * Returns the track name; if no track name is present in the tag
+         * String() will be returned.
+         */
+        String title() const;
+
+        /*!
+         * Returns the artist name; if no artist name is present in the tag
+         * String() will be returned.
+         */
+        String artist() const;
+
+        /*!
+         * Not supported.  Therefore always returns String().
+         */
+        String album() const;
+
+        /*!
+         * Not supported.  Therefore always returns String().
+         */
+        String comment() const;
+
+        /*!
+         * Not supported.  Therefore always returns String().
+         */
+        String genre() const;
+
+        /*!
+         * Not supported.  Therefore always returns 0.
+         */
+        unsigned int year() const;
+
+        /*!
+         * Not supported.  Therefore always returns 0.
+         */
+        unsigned int track() const;
+
+        /*!
+         * Sets the title to \a title.  If \a title is String() then this
+         * value will be cleared.
+         */
+        void setTitle(const String &title);
+
+        /*!
+         * Sets the artist to \a artist.  If \a artist is String() then this
+         * value will be cleared.
+         */
+        void setArtist(const String &artist);
+
+        /*!
+         * Not supported and therefore ignored.
+         */
+        void setAlbum(const String &album);
+
+        /*!
+         * Not supported and therefore ignored.
+         */
+        void setComment(const String &comment);
+
+        /*!
+         * Not supported and therefore ignored.
+         */
+        void setGenre(const String &genre);
+
+        /*!
+         * Not supported and therefore ignored.
+         */
+        void setYear(unsigned int year);
+
+        /*!
+         * Not supported and therefore ignored.
+         */
+        void setTrack(unsigned int track);
+
+        /*!
+         * Implements the unified property interface -- export function.
+         * Since the DIIN tag is very limited, the exported map is as well.
+         */
+        PropertyMap properties() const;
+
+        /*!
+         * Implements the unified property interface -- import function.
+         * Because of the limitations of the DIIN file tag, any tags besides
+         * TITLE and ARTIST, will be
+         * returned. Additionally, if the map contains tags with multiple values,
+         * all but the first will be contained in the returned map of unsupported
+         * properties.
+         */
+        PropertyMap setProperties(const PropertyMap &);
+
+      private:
+        Tag(const Tag &);
+        Tag &operator=(const Tag &);
+
+        class TagPrivate;
+        TagPrivate *d;
+      };
+    }
+  }
+}
+
+#endif
+

3rdparty/taglib/dsdiff/dsdifffile.cpp

@@ -0,0 +1,812 @@
+/***************************************************************************
+ copyright            : (C) 2016 by Damien Plisson, Audirvana
+ email                : damien78@audirvana.com
+ ***************************************************************************/
+
+/***************************************************************************
+ *   This library is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This library 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     *
+ *   Lesser General Public License for more details.                       *
+ *                                                                         *
+ *   You should have received a copy of the GNU Lesser General Public      *
+ *   License along with this library; if not, write to the Free Software   *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
+ *   02110-1301  USA                                                       *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#include <tbytevector.h>
+#include <tdebug.h>
+#include <id3v2tag.h>
+#include <tstringlist.h>
+#include <tpropertymap.h>
+#include <tagutils.h>
+
+#include "tagunion.h"
+#include "dsdifffile.h"
+
+using namespace TagLib;
+
+struct Chunk64
+{
+  ByteVector name;
+  unsigned long long offset;
+  unsigned long long size;
+  char padding;
+};
+
+namespace
+{
+  enum {
+    ID3v2Index = 0,
+    DIINIndex = 1
+  };
+  enum {
+    PROPChunk = 0,
+    DIINChunk = 1
+  };
+}
+
+class DSDIFF::File::FilePrivate
+{
+public:
+  FilePrivate() :
+  endianness(BigEndian),
+  size(0),
+  isID3InPropChunk(false),
+  duplicateID3V2chunkIndex(-1),
+  properties(0),
+  id3v2TagChunkID("ID3 "),
+  hasID3v2(false),
+  hasDiin(false)
+  {
+    childChunkIndex[ID3v2Index] = -1;
+    childChunkIndex[DIINIndex] = -1;
+  }
+
+  ~FilePrivate()
+  {
+    delete properties;
+  }
+
+  Endianness endianness;
+  ByteVector type;
+  unsigned long long size;
+  ByteVector format;
+  std::vector<Chunk64> chunks;
+  std::vector<Chunk64> childChunks[2];
+  int childChunkIndex[2];
+  bool isID3InPropChunk; // Two possibilities can be found: ID3V2 chunk inside PROP chunk or at root level
+  int duplicateID3V2chunkIndex; // 2 ID3 chunks are present. This is then the index of the one in
+                                // PROP chunk that will be removed upon next save to remove duplicates.
+
+  Properties *properties;
+
+  TagUnion tag;
+
+  ByteVector id3v2TagChunkID;
+
+  bool hasID3v2;
+  bool hasDiin;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// static members
+////////////////////////////////////////////////////////////////////////////////
+
+bool DSDIFF::File::isSupported(IOStream *stream)
+{
+    // A DSDIFF file has to start with "FRM8????????DSD ".
+
+    const ByteVector id = Utils::readHeader(stream, 16, false);
+    return (id.startsWith("FRM8") && id.containsAt("DSD ", 12));
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// public members
+////////////////////////////////////////////////////////////////////////////////
+
+DSDIFF::File::File(FileName file, bool readProperties,
+                   Properties::ReadStyle propertiesStyle) : TagLib::File(file)
+{
+  d = new FilePrivate;
+  d->endianness = BigEndian;
+  if(isOpen())
+    read(readProperties, propertiesStyle);
+}
+
+DSDIFF::File::File(IOStream *stream, bool readProperties,
+                   Properties::ReadStyle propertiesStyle) : TagLib::File(stream)
+{
+  d = new FilePrivate;
+  d->endianness = BigEndian;
+  if(isOpen())
+    read(readProperties, propertiesStyle);
+}
+
+DSDIFF::File::~File()
+{
+  delete d;
+}
+
+TagLib::Tag *DSDIFF::File::tag() const
+{
+  return &d->tag;
+}
+
+ID3v2::Tag *DSDIFF::File::ID3v2Tag() const
+{
+  return d->tag.access<ID3v2::Tag>(ID3v2Index, false);
+}
+
+bool DSDIFF::File::hasID3v2Tag() const
+{
+  return d->hasID3v2;
+}
+
+DSDIFF::DIIN::Tag *DSDIFF::File::DIINTag() const
+{
+  return d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, false);
+}
+
+bool DSDIFF::File::hasDIINTag() const
+{
+  return d->hasDiin;
+}
+
+PropertyMap DSDIFF::File::properties() const
+{
+  if(d->hasID3v2)
+    return d->tag.access<ID3v2::Tag>(ID3v2Index, false)->properties();
+
+  return PropertyMap();
+}
+
+void DSDIFF::File::removeUnsupportedProperties(const StringList &unsupported)
+{
+  if(d->hasID3v2)
+    d->tag.access<ID3v2::Tag>(ID3v2Index, false)->removeUnsupportedProperties(unsupported);
+
+  if(d->hasDiin)
+    d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, false)->removeUnsupportedProperties(unsupported);
+}
+
+PropertyMap DSDIFF::File::setProperties(const PropertyMap &properties)
+{
+  return d->tag.access<ID3v2::Tag>(ID3v2Index, true)->setProperties(properties);
+}
+
+DSDIFF::Properties *DSDIFF::File::audioProperties() const
+{
+  return d->properties;
+}
+
+bool DSDIFF::File::save()
+{
+  if(readOnly()) {
+    debug("DSDIFF::File::save() -- File is read only.");
+    return false;
+  }
+
+  if(!isValid()) {
+    debug("DSDIFF::File::save() -- Trying to save invalid file.");
+    return false;
+  }
+
+  // First: save ID3V2 chunk
+  ID3v2::Tag *id3v2Tag = d->tag.access<ID3v2::Tag>(ID3v2Index, false);
+  if(d->isID3InPropChunk) {
+    if(id3v2Tag != NULL && !id3v2Tag->isEmpty()) {
+      setChildChunkData(d->id3v2TagChunkID, id3v2Tag->render(), PROPChunk);
+      d->hasID3v2 = true;
+    }
+    else {
+      // Empty tag: remove it
+      setChildChunkData(d->id3v2TagChunkID, ByteVector(), PROPChunk);
+      d->hasID3v2 = false;
+    }
+  }
+  else {
+    if(id3v2Tag != NULL && !id3v2Tag->isEmpty()) {
+      setRootChunkData(d->id3v2TagChunkID, id3v2Tag->render());
+      d->hasID3v2 = true;
+    }
+    else {
+      // Empty tag: remove it
+      setRootChunkData(d->id3v2TagChunkID, ByteVector());
+      d->hasID3v2 = false;
+    }
+  }
+
+  // Second: save the DIIN chunk
+  if(d->hasDiin) {
+    DSDIFF::DIIN::Tag *diinTag = d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, false);
+
+    if(!diinTag->title().isNull() && !diinTag->title().isEmpty()) {
+      ByteVector diinTitle;
+      diinTitle.append(ByteVector::fromUInt(diinTag->title().size(), d->endianness == BigEndian));
+      diinTitle.append(ByteVector::fromCString(diinTag->title().toCString()));
+      setChildChunkData("DITI", diinTitle, DIINChunk);
+    }
+    else
+      setChildChunkData("DITI", ByteVector(), DIINChunk);
+
+    if(!diinTag->artist().isNull() && !diinTag->artist().isEmpty()) {
+      ByteVector diinArtist;
+      diinArtist.append(ByteVector::fromUInt(diinTag->artist().size(), d->endianness == BigEndian));
+      diinArtist.append(ByteVector::fromCString(diinTag->artist().toCString()));
+      setChildChunkData("DIAR", diinArtist, DIINChunk);
+    }
+    else
+      setChildChunkData("DIAR", ByteVector(), DIINChunk);
+  }
+
+  // Third: remove the duplicate ID3V2 chunk (inside PROP chunk) if any
+  if(d->duplicateID3V2chunkIndex>=0) {
+    setChildChunkData(d->duplicateID3V2chunkIndex, ByteVector(), PROPChunk);
+    d->duplicateID3V2chunkIndex = -1;
+  }
+
+  return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// private members
+////////////////////////////////////////////////////////////////////////////////
+
+void DSDIFF::File::setRootChunkData(unsigned int i, const ByteVector &data)
+{
+  if(data.isNull() || data.isEmpty()) {
+    // Null data: remove chunk
+    // Update global size
+    unsigned long long removedChunkTotalSize = d->chunks[i].size + d->chunks[i].padding + 12;
+    d->size -= removedChunkTotalSize;
+    insert(ByteVector::fromLongLong(d->size, d->endianness == BigEndian), 4, 8);
+
+    removeBlock(d->chunks[i].offset - 12, removedChunkTotalSize);
+
+    // Update the internal offsets
+    for(unsigned long r = i + 1; r < d->chunks.size(); r++)
+      d->chunks[r].offset = d->chunks[r - 1].offset + 12
+        + d->chunks[r - 1].size + d->chunks[r - 1].padding;
+
+    d->chunks.erase(d->chunks.begin() + i);
+  }
+  else {
+    // Non null data: update chunk
+    // First we update the global size
+    d->size += ((data.size() + 1) & ~1) - (d->chunks[i].size + d->chunks[i].padding);
+    insert(ByteVector::fromLongLong(d->size, d->endianness == BigEndian), 4, 8);
+
+    // Now update the specific chunk
+    writeChunk(d->chunks[i].name,
+               data,
+               d->chunks[i].offset - 12,
+               d->chunks[i].size + d->chunks[i].padding + 12);
+
+    d->chunks[i].size = data.size();
+    d->chunks[i].padding = (data.size() & 0x01) ? 1 : 0;
+
+    // Finally update the internal offsets
+    updateRootChunksStructure(i + 1);
+  }
+}
+
+void DSDIFF::File::setRootChunkData(const ByteVector &name, const ByteVector &data)
+{
+  if(d->chunks.size() == 0) {
+    debug("DSDIFF::File::setPropChunkData - No valid chunks found.");
+    return;
+  }
+
+  for(unsigned int i = 0; i < d->chunks.size(); i++) {
+    if(d->chunks[i].name == name) {
+      setRootChunkData(i, data);
+      return;
+    }
+  }
+
+  // Couldn't find an existing chunk, so let's create a new one.
+  unsigned int i = d->chunks.size() - 1;
+  unsigned long offset = d->chunks[i].offset + d->chunks[i].size + d->chunks[i].padding;
+
+  // First we update the global size
+  d->size += (offset & 1) + ((data.size() + 1) & ~1) + 12;
+  insert(ByteVector::fromLongLong(d->size, d->endianness == BigEndian), 4, 8);
+
+  // Now add the chunk to the file
+  writeChunk(name,
+             data,
+             offset,
+             std::max<unsigned long long>(0, length() - offset),
+             (offset & 1) ? 1 : 0);
+
+  Chunk64 chunk;
+  chunk.name = name;
+  chunk.size = data.size();
+  chunk.offset = offset + 12;
+  chunk.padding = (data.size() & 0x01) ? 1 : 0;
+
+  d->chunks.push_back(chunk);
+}
+
+void DSDIFF::File::setChildChunkData(unsigned int i,
+                                     const ByteVector &data,
+                                     unsigned int childChunkNum)
+{
+  std::vector<Chunk64> &childChunks = d->childChunks[childChunkNum];
+
+  if(data.isNull() || data.isEmpty()) {
+    // Null data: remove chunk
+    // Update global size
+    unsigned long long removedChunkTotalSize = childChunks[i].size + childChunks[i].padding + 12;
+    d->size -= removedChunkTotalSize;
+    insert(ByteVector::fromLongLong(d->size, d->endianness == BigEndian), 4, 8);
+    // Update child chunk size
+    d->chunks[d->childChunkIndex[childChunkNum]].size -= removedChunkTotalSize;
+    insert(ByteVector::fromLongLong(d->chunks[d->childChunkIndex[childChunkNum]].size,
+                                    d->endianness == BigEndian),
+           d->chunks[d->childChunkIndex[childChunkNum]].offset - 8, 8);
+    // Remove the chunk
+    removeBlock(childChunks[i].offset - 12, removedChunkTotalSize);
+
+    // Update the internal offsets
+    // For child chunks
+    if((i + 1) < childChunks.size()) {
+      childChunks[i + 1].offset = childChunks[i].offset;
+      i++;
+      for(i++; i < childChunks.size(); i++)
+        childChunks[i].offset = childChunks[i - 1].offset + 12
+          + childChunks[i - 1].size + childChunks[i - 1].padding;
+    }
+
+    // And for root chunks
+    for(i = d->childChunkIndex[childChunkNum] + 1; i < d->chunks.size(); i++)
+      d->chunks[i].offset = d->chunks[i - 1].offset + 12
+        + d->chunks[i - 1].size + d->chunks[i - 1].padding;
+
+    childChunks.erase(childChunks.begin() + i);
+  }
+  else {
+    // Non null data: update chunk
+    // First we update the global size
+    d->size += ((data.size() + 1) & ~1) - (childChunks[i].size + childChunks[i].padding);
+    insert(ByteVector::fromLongLong(d->size, d->endianness == BigEndian), 4, 8);
+    // And the PROP chunk size
+    d->chunks[d->childChunkIndex[childChunkNum]].size += ((data.size() + 1) & ~1)
+      - (childChunks[i].size + childChunks[i].padding);
+    insert(ByteVector::fromLongLong(d->chunks[d->childChunkIndex[childChunkNum]].size,
+                                    d->endianness == BigEndian),
+           d->chunks[d->childChunkIndex[childChunkNum]].offset - 8, 8);
+
+    // Now update the specific chunk
+    writeChunk(childChunks[i].name,
+               data,
+               childChunks[i].offset - 12,
+               childChunks[i].size + childChunks[i].padding + 12);
+
+    childChunks[i].size = data.size();
+    childChunks[i].padding = (data.size() & 0x01) ? 1 : 0;
+
+    // Now update the internal offsets
+    // For child Chunks
+    for(i++; i < childChunks.size(); i++)
+      childChunks[i].offset = childChunks[i - 1].offset + 12
+      + childChunks[i - 1].size + childChunks[i - 1].padding;
+
+    // And for root chunks
+    updateRootChunksStructure(d->childChunkIndex[childChunkNum] + 1);
+  }
+}
+
+void DSDIFF::File::setChildChunkData(const ByteVector &name,
+                                     const ByteVector &data,
+                                     unsigned int childChunkNum)
+{
+  std::vector<Chunk64> &childChunks = d->childChunks[childChunkNum];
+
+  if(childChunks.size() == 0) {
+    debug("DSDIFF::File::setPropChunkData - No valid chunks found.");
+    return;
+  }
+
+  for(unsigned int i = 0; i < childChunks.size(); i++) {
+    if(childChunks[i].name == name) {
+      setChildChunkData(i, data, childChunkNum);
+      return;
+    }
+  }
+
+  // Do not attempt to remove a non existing chunk
+  if(data.isNull() || data.isEmpty())
+    return;
+
+  // Couldn't find an existing chunk, so let's create a new one.
+  unsigned int i = childChunks.size() - 1;
+  unsigned long offset = childChunks[i].offset + childChunks[i].size + childChunks[i].padding;
+
+  // First we update the global size
+  d->size += (offset & 1) + ((data.size() + 1) & ~1) + 12;
+  insert(ByteVector::fromLongLong(d->size, d->endianness == BigEndian), 4, 8);
+  // And the child chunk size
+  d->chunks[d->childChunkIndex[childChunkNum]].size += (offset & 1)
+    + ((data.size() + 1) & ~1) + 12;
+  insert(ByteVector::fromLongLong(d->chunks[d->childChunkIndex[childChunkNum]].size,
+                                  d->endianness == BigEndian),
+         d->chunks[d->childChunkIndex[childChunkNum]].offset - 8, 8);
+
+  // Now add the chunk to the file
+  unsigned long long nextRootChunkIdx = length();
+  if((d->childChunkIndex[childChunkNum] + 1) < static_cast<int>(d->chunks.size()))
+    nextRootChunkIdx = d->chunks[d->childChunkIndex[childChunkNum] + 1].offset - 12;
+
+  writeChunk(name, data, offset,
+             std::max<unsigned long long>(0, nextRootChunkIdx - offset),
+             (offset & 1) ? 1 : 0);
+
+  // For root chunks
+  updateRootChunksStructure(d->childChunkIndex[childChunkNum] + 1);
+
+  Chunk64 chunk;
+  chunk.name = name;
+  chunk.size = data.size();
+  chunk.offset = offset + 12;
+  chunk.padding = (data.size() & 0x01) ? 1 : 0;
+
+  childChunks.push_back(chunk);
+}
+
+static bool isValidChunkID(const ByteVector &name)
+{
+  if(name.size() != 4)
+    return false;
+
+  for(int i = 0; i < 4; i++) {
+    if(name[i] < 32 || name[i] > 127)
+      return false;
+  }
+
+  return true;
+}
+
+void DSDIFF::File::updateRootChunksStructure(unsigned int startingChunk)
+{
+  for(unsigned int i = startingChunk; i < d->chunks.size(); i++)
+    d->chunks[i].offset = d->chunks[i - 1].offset + 12
+      + d->chunks[i - 1].size + d->chunks[i - 1].padding;
+
+  // Update childchunks structure as well
+  if(d->childChunkIndex[PROPChunk] >= static_cast<int>(startingChunk)) {
+    std::vector<Chunk64> &childChunksToUpdate = d->childChunks[PROPChunk];
+    if(childChunksToUpdate.size() > 0) {
+      childChunksToUpdate[0].offset = d->chunks[d->childChunkIndex[PROPChunk]].offset + 12;
+      for(unsigned int i = 1; i < childChunksToUpdate.size(); i++)
+        childChunksToUpdate[i].offset = childChunksToUpdate[i - 1].offset + 12
+          + childChunksToUpdate[i - 1].size + childChunksToUpdate[i - 1].padding;
+    }
+  }
+  if(d->childChunkIndex[DIINChunk] >= static_cast<int>(startingChunk)) {
+    std::vector<Chunk64> &childChunksToUpdate = d->childChunks[DIINChunk];
+    if(childChunksToUpdate.size() > 0) {
+      childChunksToUpdate[0].offset = d->chunks[d->childChunkIndex[DIINChunk]].offset + 12;
+      for(unsigned int i = 1; i < childChunksToUpdate.size(); i++)
+        childChunksToUpdate[i].offset = childChunksToUpdate[i - 1].offset + 12
+          + childChunksToUpdate[i - 1].size + childChunksToUpdate[i - 1].padding;
+    }
+  }
+}
+
+void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesStyle)
+{
+  bool bigEndian = (d->endianness == BigEndian);
+
+  d->type = readBlock(4);
+  d->size = readBlock(8).toLongLong(bigEndian);
+  d->format = readBlock(4);
+
+  // + 12: chunk header at least, fix for additional junk bytes
+  while(tell() + 12 <= length()) {
+    ByteVector chunkName = readBlock(4);
+    unsigned long long chunkSize = readBlock(8).toLongLong(bigEndian);
+
+    if(!isValidChunkID(chunkName)) {
+      debug("DSDIFF::File::read() -- Chunk '" + chunkName + "' has invalid ID");
+      setValid(false);
+      break;
+    }
+
+    if(static_cast<unsigned long long>(tell()) + chunkSize > static_cast<unsigned long long>(length())) {
+      debug("DSDIFF::File::read() -- Chunk '" + chunkName
+            + "' has invalid size (larger than the file size)");
+      setValid(false);
+      break;
+    }
+
+    Chunk64 chunk;
+    chunk.name = chunkName;
+    chunk.size = chunkSize;
+    chunk.offset = tell();
+
+    seek(chunk.size, Current);
+
+    // Check padding
+    chunk.padding = 0;
+    long uPosNotPadded = tell();
+    if((uPosNotPadded & 0x01) != 0) {
+      ByteVector iByte = readBlock(1);
+      if((iByte.size() != 1) || (iByte[0] != 0))
+        // Not well formed, re-seek
+        seek(uPosNotPadded, Beginning);
+      else
+        chunk.padding = 1;
+    }
+    d->chunks.push_back(chunk);
+  }
+
+  unsigned long long lengthDSDSamplesTimeChannels = 0; // For DSD uncompressed
+  unsigned long long audioDataSizeinBytes = 0; // For computing bitrate
+  unsigned long dstNumFrames = 0; // For DST compressed frames
+  unsigned short dstFrameRate = 0; // For DST compressed frames
+
+  for(unsigned int i = 0; i < d->chunks.size(); i++) {
+    if(d->chunks[i].name == "DSD ") {
+      lengthDSDSamplesTimeChannels = d->chunks[i].size * 8;
+      audioDataSizeinBytes = d->chunks[i].size;
+    }
+    else if(d->chunks[i].name == "DST ") {
+      // Now decode the chunks inside the DST chunk to read the DST Frame Information one
+      long long dstChunkEnd = d->chunks[i].offset + d->chunks[i].size;
+      seek(d->chunks[i].offset);
+
+      audioDataSizeinBytes = d->chunks[i].size;
+
+      while(tell() + 12 <= dstChunkEnd) {
+        ByteVector dstChunkName = readBlock(4);
+        long long dstChunkSize = readBlock(8).toLongLong(bigEndian);
+
+        if(!isValidChunkID(dstChunkName)) {
+          debug("DSDIFF::File::read() -- DST Chunk '" + dstChunkName + "' has invalid ID");
+          setValid(false);
+          break;
+        }
+
+        if(static_cast<long long>(tell()) + dstChunkSize > dstChunkEnd) {
+          debug("DSDIFF::File::read() -- DST Chunk '" + dstChunkName
+                + "' has invalid size (larger than the DST chunk)");
+          setValid(false);
+          break;
+        }
+
+        if(dstChunkName == "FRTE") {
+          // Found the DST frame information chunk
+          dstNumFrames = readBlock(4).toUInt(bigEndian);
+          dstFrameRate = readBlock(2).toUShort(bigEndian);
+          break; // Found the wanted one, no need to look at the others
+        }
+
+        seek(dstChunkSize, Current);
+
+        // Check padding
+        long uPosNotPadded = tell();
+        if((uPosNotPadded & 0x01) != 0) {
+          ByteVector iByte = readBlock(1);
+          if((iByte.size() != 1) || (iByte[0] != 0))
+            // Not well formed, re-seek
+            seek(uPosNotPadded, Beginning);
+        }
+      }
+    }
+    else if(d->chunks[i].name == "PROP") {
+      d->childChunkIndex[PROPChunk] = i;
+      // Now decodes the chunks inside the PROP chunk
+      long long propChunkEnd = d->chunks[i].offset + d->chunks[i].size;
+      seek(d->chunks[i].offset + 4); // +4 to remove the 'SND ' marker at beginning of 'PROP' chunk
+      while(tell() + 12 <= propChunkEnd) {
+        ByteVector propChunkName = readBlock(4);
+        long long propChunkSize = readBlock(8).toLongLong(bigEndian);
+
+        if(!isValidChunkID(propChunkName)) {
+          debug("DSDIFF::File::read() -- PROP Chunk '" + propChunkName + "' has invalid ID");
+          setValid(false);
+          break;
+        }
+
+        if(static_cast<long long>(tell()) + propChunkSize > propChunkEnd) {
+          debug("DSDIFF::File::read() -- PROP Chunk '" + propChunkName
+                + "' has invalid size (larger than the PROP chunk)");
+          setValid(false);
+          break;
+        }
+
+        Chunk64 chunk;
+        chunk.name = propChunkName;
+        chunk.size = propChunkSize;
+        chunk.offset = tell();
+
+        seek(chunk.size, Current);
+
+        // Check padding
+        chunk.padding = 0;
+        long uPosNotPadded = tell();
+        if((uPosNotPadded & 0x01) != 0) {
+          ByteVector iByte = readBlock(1);
+          if((iByte.size() != 1) || (iByte[0] != 0))
+            // Not well formed, re-seek
+            seek(uPosNotPadded, Beginning);
+          else
+            chunk.padding = 1;
+        }
+        d->childChunks[PROPChunk].push_back(chunk);
+      }
+    }
+    else if(d->chunks[i].name == "DIIN") {
+      d->childChunkIndex[DIINChunk] = i;
+      d->hasDiin = true;
+      // Now decode the chunks inside the DIIN chunk
+      long long diinChunkEnd = d->chunks[i].offset + d->chunks[i].size;
+      seek(d->chunks[i].offset);
+
+      while(tell() + 12 <= diinChunkEnd) {
+        ByteVector diinChunkName = readBlock(4);
+        long long diinChunkSize = readBlock(8).toLongLong(bigEndian);
+
+        if(!isValidChunkID(diinChunkName)) {
+          debug("DSDIFF::File::read() -- DIIN Chunk '" + diinChunkName + "' has invalid ID");
+          setValid(false);
+          break;
+        }
+
+        if(static_cast<long long>(tell()) + diinChunkSize > diinChunkEnd) {
+          debug("DSDIFF::File::read() -- DIIN Chunk '" + diinChunkName
+                + "' has invalid size (larger than the DIIN chunk)");
+          setValid(false);
+          break;
+        }
+
+        Chunk64 chunk;
+        chunk.name = diinChunkName;
+        chunk.size = diinChunkSize;
+        chunk.offset = tell();
+
+        seek(chunk.size, Current);
+
+        // Check padding
+        chunk.padding = 0;
+        long uPosNotPadded = tell();
+        if((uPosNotPadded & 0x01) != 0) {
+          ByteVector iByte = readBlock(1);
+          if((iByte.size() != 1) || (iByte[0] != 0))
+            // Not well formed, re-seek
+            seek(uPosNotPadded, Beginning);
+          else
+            chunk.padding = 1;
+        }
+        d->childChunks[DIINChunk].push_back(chunk);
+      }
+    }
+    else if(d->chunks[i].name == "ID3 " || d->chunks[i].name == "id3 ") {
+      d->id3v2TagChunkID = d->chunks[i].name;
+      d->tag.set(ID3v2Index, new ID3v2::Tag(this, d->chunks[i].offset));
+      d->isID3InPropChunk = false;
+      d->hasID3v2 = true;
+    }
+  }
+
+  if(!isValid())
+    return;
+
+  if(d->childChunkIndex[PROPChunk] < 0) {
+    debug("DSDIFF::File::read() -- no PROP chunk found");
+    setValid(false);
+    return;
+  }
+
+  // Read properties
+
+  unsigned int sampleRate=0;
+  unsigned short channels=0;
+
+  for(unsigned int i = 0; i < d->childChunks[PROPChunk].size(); i++) {
+    if(d->childChunks[PROPChunk][i].name == "ID3 " || d->childChunks[PROPChunk][i].name == "id3 ") {
+      if(d->hasID3v2) {
+        d->duplicateID3V2chunkIndex = i;
+        continue; // ID3V2 tag has already been found at root level
+      }
+      d->id3v2TagChunkID = d->childChunks[PROPChunk][i].name;
+      d->tag.set(ID3v2Index, new ID3v2::Tag(this, d->childChunks[PROPChunk][i].offset));
+      d->isID3InPropChunk = true;
+      d->hasID3v2 = true;
+    }
+    else if(d->childChunks[PROPChunk][i].name == "FS  ") {
+      // Sample rate
+      seek(d->childChunks[PROPChunk][i].offset);
+      sampleRate = readBlock(4).toUInt(0, 4, bigEndian);
+    }
+    else if(d->childChunks[PROPChunk][i].name == "CHNL") {
+      // Channels
+      seek(d->childChunks[PROPChunk][i].offset);
+      channels = readBlock(2).toShort(0, bigEndian);
+    }
+  }
+
+  // Read title & artist from DIIN chunk
+  d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, true);
+
+  if(d->hasDiin) {
+    for(unsigned int i = 0; i < d->childChunks[DIINChunk].size(); i++) {
+      if(d->childChunks[DIINChunk][i].name == "DITI") {
+        seek(d->childChunks[DIINChunk][i].offset);
+        unsigned int titleStrLength = readBlock(4).toUInt(0, 4, bigEndian);
+        if(titleStrLength <= d->childChunks[DIINChunk][i].size) {
+          ByteVector titleStr = readBlock(titleStrLength);
+          d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, false)->setTitle(titleStr);
+        }
+      }
+      else if(d->childChunks[DIINChunk][i].name == "DIAR") {
+        seek(d->childChunks[DIINChunk][i].offset);
+        unsigned int artistStrLength = readBlock(4).toUInt(0, 4, bigEndian);
+        if(artistStrLength <= d->childChunks[DIINChunk][i].size) {
+          ByteVector artistStr = readBlock(artistStrLength);
+          d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, false)->setArtist(artistStr);
+        }
+      }
+    }
+  }
+
+  if(readProperties) {
+    if(lengthDSDSamplesTimeChannels == 0) {
+      // DST compressed signal : need to compute length of DSD uncompressed frames
+      if(dstFrameRate > 0)
+        lengthDSDSamplesTimeChannels = (unsigned long long)dstNumFrames
+          * (unsigned long long)sampleRate / (unsigned long long)dstFrameRate;
+      else
+        lengthDSDSamplesTimeChannels = 0;
+    }
+    else {
+      // In DSD uncompressed files, the read number of samples is the total for each channel
+      if(channels > 0)
+        lengthDSDSamplesTimeChannels /= channels;
+    }
+    int bitrate = 0;
+    if(lengthDSDSamplesTimeChannels > 0)
+      bitrate = (audioDataSizeinBytes*8*sampleRate) / lengthDSDSamplesTimeChannels / 1000;
+
+    d->properties = new Properties(sampleRate,
+                                   channels,
+                                   lengthDSDSamplesTimeChannels,
+                                   bitrate,
+                                   propertiesStyle);
+  }
+
+  if(!ID3v2Tag()) {
+    d->tag.access<ID3v2::Tag>(ID3v2Index, true);
+    d->isID3InPropChunk = false; // By default, ID3 chunk is at root level
+    d->hasID3v2 = false;
+  }
+}
+
+void DSDIFF::File::writeChunk(const ByteVector &name, const ByteVector &data,
+                              unsigned long long offset, unsigned long replace,
+                              unsigned int leadingPadding)
+{
+  ByteVector combined;
+  if(leadingPadding)
+    combined.append(ByteVector(leadingPadding, '\x00'));
+
+  combined.append(name);
+  combined.append(ByteVector::fromLongLong(data.size(), d->endianness == BigEndian));
+  combined.append(data);
+  if((data.size() & 0x01) != 0)
+    combined.append('\x00');
+
+  insert(combined, offset, replace);
+}
+

3rdparty/taglib/dsdiff/dsdifffile.h

@@ -0,0 +1,260 @@
+/***************************************************************************
+ copyright            : (C) 2016 by Damien Plisson, Audirvana
+ email                : damien78@audirvana.com
+ ***************************************************************************/
+
+/***************************************************************************
+ *   This library is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This library 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     *
+ *   Lesser General Public License for more details.                       *
+ *                                                                         *
+ *   You should have received a copy of the GNU Lesser General Public      *
+ *   License along with this library; if not, write to the Free Software   *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
+ *   02110-1301  USA                                                       *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#ifndef TAGLIB_DSDIFFFILE_H
+#define TAGLIB_DSDIFFFILE_H
+
+#include "rifffile.h"
+#include "id3v2tag.h"
+#include "dsdiffproperties.h"
+#include "dsdiffdiintag.h"
+
+namespace TagLib {
+
+  //! An implementation of DSDIFF metadata
+
+  /*!
+   * This is implementation of DSDIFF metadata.
+   *
+   * This supports an ID3v2 tag as well as reading stream from the ID3 RIFF
+   * chunk as well as properties from the file.
+   * Description of the DSDIFF format is available 
+   * at http://dsd-guide.com/sites/default/files/white-papers/DSDIFF_1.5_Spec.pdf
+   * DSDIFF standard does not explictly specify the ID3V2 chunk
+   * It can be found at the root level, but also sometimes inside the PROP chunk
+   * In addition, title and artist info are stored as part of the standard
+   */
+
+  namespace DSDIFF {
+
+    //! An implementation of TagLib::File with DSDIFF specific methods
+
+    /*!
+     * This implements and provides an interface for DSDIFF files to the
+     * TagLib::Tag and TagLib::AudioProperties interfaces by way of implementing
+     * the abstract TagLib::File API as well as providing some additional
+     * information specific to DSDIFF files.
+     */
+
+    class TAGLIB_EXPORT File : public TagLib::File
+    {
+    public:
+      /*!
+       * Constructs an DSDIFF file from \a file.  If \a readProperties is true
+       * the file's audio properties will also be read.
+       *
+       * \note In the current implementation, \a propertiesStyle is ignored.
+       */
+      File(FileName file, bool readProperties = true,
+           Properties::ReadStyle propertiesStyle = Properties::Average);
+
+      /*!
+       * Constructs an DSDIFF file from \a stream.  If \a readProperties is true
+       * the file's audio properties will also be read.
+       *
+       * \note TagLib will *not* take ownership of the stream, the caller is
+       * responsible for deleting it after the File object.
+       *
+       * \note In the current implementation, \a propertiesStyle is ignored.
+       */
+      File(IOStream *stream, bool readProperties = true,
+           Properties::ReadStyle propertiesStyle = Properties::Average);
+
+      /*!
+       * Destroys this instance of the File.
+       */
+      virtual ~File();
+
+      /*!
+       * Returns a pointer to a tag that is the union of the ID3v2 and DIIN
+       * tags. The ID3v2 tag is given priority in reading the information -- if
+       * requested information exists in both the ID3v2 tag and the ID3v1 tag,
+       * the information from the ID3v2 tag will be returned.
+       *
+       * If you would like more granular control over the content of the tags,
+       * with the concession of generality, use the tag-type specific calls.
+       *
+       * \note As this tag is not implemented as an ID3v2 tag or a DIIN tag,
+       * but a union of the two this pointer may not be cast to the specific
+       * tag types.
+       *
+       * \see ID3v2Tag()
+       * \see DIINTag()
+       */
+      virtual Tag *tag() const;
+
+      /*!
+       * Returns the ID3V2 Tag for this file.
+       *
+       * \note This always returns a valid pointer regardless of whether or not
+       * the file on disk has an ID3v2 tag.  Use hasID3v2Tag() to check if the
+       * file on disk actually has an ID3v2 tag.
+       *
+       * \see hasID3v2Tag()
+       */
+      virtual ID3v2::Tag *ID3v2Tag() const;
+
+      /*!
+       * Returns the DSDIFF DIIN Tag for this file
+       *
+       */
+      DSDIFF::DIIN::Tag *DIINTag() const;
+
+      /*!
+       * Implements the unified property interface -- export function.
+       * This method forwards to ID3v2::Tag::properties().
+       */
+      PropertyMap properties() const;
+
+      void removeUnsupportedProperties(const StringList &properties);
+
+      /*!
+       * Implements the unified property interface -- import function.
+       * This method forwards to ID3v2::Tag::setProperties().
+       */
+      PropertyMap setProperties(const PropertyMap &);
+
+      /*!
+       * Returns the AIFF::Properties for this file.  If no audio properties
+       * were read then this will return a null pointer.
+       */
+      virtual Properties *audioProperties() const;
+
+      /*!
+       * Save the file.  If at least one tag -- ID3v1 or DIIN -- exists this
+       * will duplicate its content into the other tag.  This returns true
+       * if saving was successful.
+       *
+       * If neither exists or if both tags are empty, this will strip the tags
+       * from the file.
+       *
+       * This is the same as calling save(AllTags);
+       *
+       * If you would like more granular control over the content of the tags,
+       * with the concession of generality, use paramaterized save call below.
+       *
+       * \see save(int tags)
+       */
+      virtual bool save();
+
+      /*!
+       * Save the file.  This will attempt to save all of the tag types that are
+       * specified by OR-ing together TagTypes values.  The save() method above
+       * uses AllTags.  This returns true if saving was successful.
+       *
+       * This strips all tags not included in the mask, but does not modify them
+       * in memory, so later calls to save() which make use of these tags will
+       * remain valid.  This also strips empty tags.
+       */
+      bool save(int tags);
+
+      /*!
+       * Returns whether or not the file on disk actually has an ID3v2 tag.
+       *
+       * \see ID3v2Tag()
+       */
+      bool hasID3v2Tag() const;
+
+      /*!
+       * Returns whether or not the file on disk actually has the DSDIFF 
+       * Title & Artist tag.
+       *
+       * \see DIINTag()
+       */
+      bool hasDIINTag() const;
+
+      /*!
+       * Returns whether or not the given \a stream can be opened as a DSDIFF
+       * file.
+       *
+       * \note This method is designed to do a quick check.  The result may
+       * not necessarily be correct.
+       */
+       static bool isSupported(IOStream *stream);
+
+    protected:
+      enum Endianness { BigEndian, LittleEndian };
+
+      File(FileName file, Endianness endianness);
+      File(IOStream *stream, Endianness endianness);
+
+    private:
+      File(const File &);
+      File &operator=(const File &);
+
+      /*!
+       * Sets the data for the the specified chunk at root level to \a data.
+       *
+       * \warning This will update the file immediately.
+       */
+      void setRootChunkData(unsigned int i, const ByteVector &data);
+
+      /*!
+       * Sets the data for the root-level chunk \a name to \a data.
+       * If a root-level chunk with the given name already exists
+       * it will be overwritten, otherwise it will be
+       * created after the existing chunks.
+       *
+       * \warning This will update the file immediately.
+       */
+      void setRootChunkData(const ByteVector &name, const ByteVector &data);
+
+      /*!
+       * Sets the data for the the specified child chunk to \a data.
+       *
+       * If data is null, then remove the chunk
+       *
+       * \warning This will update the file immediately.
+       */
+      void setChildChunkData(unsigned int i, const ByteVector &data,
+                             unsigned int childChunkNum);
+
+      /*!
+       * Sets the data for the child chunk \a name to \a data.  If a chunk with
+       * the given name already exists it will be overwritten, otherwise it will
+       * be created after the existing chunks inside child chunk.
+       *
+       * If data is null, then remove the chunks with \a name name
+       *
+       * \warning This will update the file immediately.
+       */
+      void setChildChunkData(const ByteVector &name, const ByteVector &data,
+                             unsigned int childChunkNum);
+
+      void updateRootChunksStructure(unsigned int startingChunk);
+
+      void read(bool readProperties, Properties::ReadStyle propertiesStyle);
+      void writeChunk(const ByteVector &name, const ByteVector &data,
+                      unsigned long long offset, unsigned long replace = 0,
+                      unsigned int leadingPadding = 0);
+
+      class FilePrivate;
+      FilePrivate *d;
+    };
+  }
+}
+
+#endif
+

3rdparty/taglib/dsdiff/dsdiffproperties.cpp

@@ -0,0 +1,120 @@
+/***************************************************************************
+ copyright            : (C) 2016 by Damien Plisson, Audirvana
+ email                : damien78@audirvana.com
+ ***************************************************************************/
+
+/***************************************************************************
+ *   This library is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This library 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     *
+ *   Lesser General Public License for more details.                       *
+ *                                                                         *
+ *   You should have received a copy of the GNU Lesser General Public      *
+ *   License along with this library; if not, write to the Free Software   *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
+ *   02110-1301  USA                                                       *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#include <tstring.h>
+#include <tdebug.h>
+
+#include "dsdiffproperties.h"
+
+using namespace TagLib;
+
+class DSDIFF::Properties::PropertiesPrivate
+{
+public:
+  PropertiesPrivate() :
+  length(0),
+  bitrate(0),
+  sampleRate(0),
+  channels(0),
+  sampleWidth(0),
+  sampleCount(0)
+  {
+  }
+
+  int length;
+  int bitrate;
+  int sampleRate;
+  int channels;
+  int sampleWidth;
+  unsigned long long sampleCount;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// public members
+////////////////////////////////////////////////////////////////////////////////
+
+DSDIFF::Properties::Properties(const unsigned int sampleRate,
+                               const unsigned short channels,
+                               const unsigned long long samplesCount,
+                               const int bitrate,
+                               ReadStyle style) : AudioProperties(style)
+{
+  d = new PropertiesPrivate;
+
+  d->channels    = channels;
+  d->sampleCount = samplesCount;
+  d->sampleWidth = 1;
+  d->sampleRate  = sampleRate;
+  d->bitrate     = bitrate;
+  d->length      = d->sampleRate > 0
+    ? static_cast<int>((d->sampleCount * 1000.0) / d->sampleRate + 0.5)
+    : 0;
+}
+
+DSDIFF::Properties::~Properties()
+{
+  delete d;
+}
+
+int DSDIFF::Properties::length() const
+{
+  return lengthInSeconds();
+}
+
+int DSDIFF::Properties::lengthInSeconds() const
+{
+  return d->length / 1000;
+}
+
+int DSDIFF::Properties::lengthInMilliseconds() const
+{
+  return d->length;
+}
+
+int DSDIFF::Properties::bitrate() const
+{
+  return d->bitrate;
+}
+
+int DSDIFF::Properties::sampleRate() const
+{
+  return d->sampleRate;
+}
+
+int DSDIFF::Properties::channels() const
+{
+  return d->channels;
+}
+
+int DSDIFF::Properties::bitsPerSample() const
+{
+  return d->sampleWidth;
+}
+
+long long DSDIFF::Properties::sampleCount() const
+{
+  return d->sampleCount;
+}
+

3rdparty/taglib/dsdiff/dsdiffproperties.h

@@ -0,0 +1,83 @@
+/***************************************************************************
+    copyright            : (C) 2016 by Damien Plisson, Audirvana
+    email                : damien78@audirvana.com
+***************************************************************************/
+
+/***************************************************************************
+ *   This library is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This library 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     *
+ *   Lesser General Public License for more details.                       *
+ *                                                                         *
+ *   You should have received a copy of the GNU Lesser General Public      *
+ *   License along with this library; if not, write to the Free Software   *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
+ *   02110-1301  USA                                                       *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#ifndef TAGLIB_DSDIFFPROPERTIES_H
+#define TAGLIB_DSDIFFPROPERTIES_H
+
+#include "audioproperties.h"
+
+namespace TagLib {
+
+  namespace DSDIFF {
+
+    class File;
+
+    //! An implementation of audio property reading for DSDIFF
+
+    /*!
+     * This reads the data from an DSDIFF stream found in the AudioProperties
+     * API.
+     */
+
+    class TAGLIB_EXPORT Properties : public AudioProperties
+    {
+    public:
+      /*!
+       * Create an instance of DSDIFF::Properties with the data read from the
+       * ByteVector \a data.
+       */
+      Properties(const unsigned int sampleRate, const unsigned short channels,
+                 const unsigned long long samplesCount, const int bitrate,
+                 ReadStyle style);
+
+      /*!
+       * Destroys this DSDIFF::Properties instance.
+       */
+      virtual ~Properties();
+
+      // Reimplementations.
+
+      virtual int length() const;
+      virtual int lengthInSeconds() const;
+      virtual int lengthInMilliseconds() const;
+      virtual int bitrate() const;
+      virtual int sampleRate() const;
+      virtual int channels() const;
+
+      int bitsPerSample() const;
+      long long sampleCount() const;
+
+    private:
+      Properties(const Properties &);
+      Properties &operator=(const Properties &);
+
+      class PropertiesPrivate;
+      PropertiesPrivate *d;
+    };
+  }
+}
+
+#endif
+

3rdparty/taglib/dsf/dsffile.cpp

@@ -0,0 +1,241 @@
+/***************************************************************************
+ copyright            : (C) 2013 - 2018 by Stephen F. Booth
+ email                : me@sbooth.org
+ ***************************************************************************/
+
+/***************************************************************************
+ *   This library is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This library 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     *
+ *   Lesser General Public License for more details.                       *
+ *                                                                         *
+ *   You should have received a copy of the GNU Lesser General Public      *
+ *   License along with this library; if not, write to the Free Software   *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
+ *   02110-1301  USA                                                       *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#include <tbytevector.h>
+#include <tdebug.h>
+#include <id3v2tag.h>
+#include <tstringlist.h>
+#include <tpropertymap.h>
+#include <tagutils.h>
+
+#include "dsffile.h"
+
+using namespace TagLib;
+
+// The DSF specification is located at http://dsd-guide.com/sites/default/files/white-papers/DSFFileFormatSpec_E.pdf
+
+class DSF::File::FilePrivate
+{
+public:
+  FilePrivate() :
+  properties(0),
+  tag(0)
+  {
+  }
+
+  ~FilePrivate()
+  {
+    delete properties;
+    delete tag;
+  }
+
+  long long fileSize;
+  long long metadataOffset;
+  Properties *properties;
+  ID3v2::Tag *tag;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// static members
+////////////////////////////////////////////////////////////////////////////////
+
+bool DSF::File::isSupported(IOStream *stream)
+{
+    // A DSF file has to start with "DSD "
+    const ByteVector id = Utils::readHeader(stream, 4, false);
+    return id.startsWith("DSD ");
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// public members
+////////////////////////////////////////////////////////////////////////////////
+
+DSF::File::File(FileName file, bool readProperties,
+                Properties::ReadStyle propertiesStyle) :
+  TagLib::File(file),
+  d(new FilePrivate())
+{
+  if(isOpen())
+    read(readProperties, propertiesStyle);
+}
+
+DSF::File::File(IOStream *stream, bool readProperties,
+                Properties::ReadStyle propertiesStyle) :
+  TagLib::File(stream),
+  d(new FilePrivate())
+{
+  if(isOpen())
+    read(readProperties, propertiesStyle);
+}
+
+DSF::File::~File()
+{
+  delete d;
+}
+
+ID3v2::Tag *DSF::File::tag() const
+{
+  return d->tag;
+}
+
+PropertyMap DSF::File::properties() const
+{
+  return d->tag->properties();
+}
+
+PropertyMap DSF::File::setProperties(const PropertyMap &properties)
+{
+  return d->tag->setProperties(properties);
+}
+
+DSF::Properties *DSF::File::audioProperties() const
+{
+  return d->properties;
+}
+
+bool DSF::File::save()
+{
+  if(readOnly()) {
+    debug("DSF::File::save() -- File is read only.");
+    return false;
+  }
+
+  if(!isValid()) {
+    debug("DSF::File::save() -- Trying to save invalid file.");
+    return false;
+  }
+
+  // Three things must be updated: the file size, the tag data, and the metadata offset
+
+  if(d->tag->isEmpty()) {
+    long long newFileSize = d->metadataOffset ? d->metadataOffset : d->fileSize;
+
+    // Update the file size
+    if(d->fileSize != newFileSize) {
+      insert(ByteVector::fromLongLong(newFileSize, false), 12, 8);
+      d->fileSize = newFileSize;
+    }
+
+    // Update the metadata offset to 0 since there is no longer a tag
+    if(d->metadataOffset) {
+      insert(ByteVector::fromLongLong(0ULL, false), 20, 8);
+      d->metadataOffset = 0;
+    }
+
+    // Delete the old tag
+    truncate(newFileSize);
+  }
+  else {
+    ByteVector tagData = d->tag->render();
+
+    long long newMetadataOffset = d->metadataOffset ? d->metadataOffset : d->fileSize;
+    long long newFileSize = newMetadataOffset + tagData.size();
+    long long oldTagSize = d->fileSize - newMetadataOffset;
+
+    // Update the file size
+    if(d->fileSize != newFileSize) {
+      insert(ByteVector::fromLongLong(newFileSize, false), 12, 8);
+      d->fileSize = newFileSize;
+    }
+
+    // Update the metadata offset
+    if(d->metadataOffset != newMetadataOffset) {
+      insert(ByteVector::fromLongLong(newMetadataOffset, false), 20, 8);
+      d->metadataOffset = newMetadataOffset;
+    }
+
+    // Delete the old tag and write the new one
+    insert(tagData, newMetadataOffset, static_cast<size_t>(oldTagSize));
+  }
+
+  return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// private members
+////////////////////////////////////////////////////////////////////////////////
+
+
+void DSF::File::read(bool readProperties, Properties::ReadStyle propertiesStyle)
+{
+  // A DSF file consists of four chunks: DSD chunk, format chunk, data chunk, and metadata chunk
+  // The file format is not chunked in the sense of a RIFF File, though
+
+  // DSD chunk
+  ByteVector chunkName = readBlock(4);
+  if(chunkName != "DSD ") {
+    debug("DSF::File::read() -- Not a DSF file.");
+    setValid(false);
+    return;
+  }
+
+  long long chunkSize = readBlock(8).toLongLong(false);
+
+  // Integrity check
+  if(28 != chunkSize) {
+    debug("DSF::File::read() -- File is corrupted, wrong chunk size");
+    setValid(false);
+    return;
+  }
+
+  d->fileSize = readBlock(8).toLongLong(false);
+
+  // File is malformed or corrupted
+  if(d->fileSize != length()) {
+    debug("DSF::File::read() -- File is corrupted wrong length");
+    setValid(false);
+    return;
+  }
+
+  d->metadataOffset = readBlock(8).toLongLong(false);
+
+  // File is malformed or corrupted
+  if(d->metadataOffset > d->fileSize) {
+    debug("DSF::File::read() -- Invalid metadata offset.");
+    setValid(false);
+    return;
+  }
+
+  // Format chunk
+  chunkName = readBlock(4);
+  if(chunkName != "fmt ") {
+    debug("DSF::File::read() -- Missing 'fmt ' chunk.");
+    setValid(false);
+    return;
+  }
+
+  chunkSize = readBlock(8).toLongLong(false);
+
+  d->properties = new Properties(readBlock(chunkSize), propertiesStyle);
+
+  // Skip the data chunk
+
+  // A metadata offset of 0 indicates the absence of an ID3v2 tag
+  if(0 == d->metadataOffset)
+    d->tag = new ID3v2::Tag();
+  else
+    d->tag = new ID3v2::Tag(this, d->metadataOffset);
+}
+

3rdparty/taglib/dsf/dsffile.h

@@ -0,0 +1,128 @@
+/***************************************************************************
+    copyright            : (C) 2013 - 2018 by Stephen F. Booth
+    email                : me@sbooth.org
+ ***************************************************************************/
+
+/***************************************************************************
+ *   This library is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This library 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     *
+ *   Lesser General Public License for more details.                       *
+ *                                                                         *
+ *   You should have received a copy of the GNU Lesser General Public      *
+ *   License along with this library; if not, write to the Free Software   *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
+ *   02110-1301  USA                                                       *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#ifndef TAGLIB_DSFFILE_H
+#define TAGLIB_DSFFILE_H
+
+#include "tfile.h"
+#include "id3v2tag.h"
+#include "dsfproperties.h"
+
+namespace TagLib {
+
+  //! An implementation of DSF metadata
+
+  /*!
+   * This is implementation of DSF metadata.
+   *
+   * This supports an ID3v2 tag as well as properties from the file.
+   */
+
+  namespace DSF {
+
+    //! An implementation of TagLib::File with DSF specific methods
+
+    /*!
+     * This implements and provides an interface for DSF files to the
+     * TagLib::Tag and TagLib::AudioProperties interfaces by way of implementing
+     * the abstract TagLib::File API as well as providing some additional
+     * information specific to DSF files.
+     */
+
+    class TAGLIB_EXPORT File : public TagLib::File
+    {
+    public:
+      /*!
+       * Contructs an DSF file from \a file.  If \a readProperties is true the
+       * file's audio properties will also be read using \a propertiesStyle.  If
+       * false, \a propertiesStyle is ignored.
+       */
+      File(FileName file, bool readProperties = true,
+           Properties::ReadStyle propertiesStyle = Properties::Average);
+
+      /*!
+       * Contructs an DSF file from \a file.  If \a readProperties is true the
+       * file's audio properties will also be read using \a propertiesStyle.  If
+       * false, \a propertiesStyle is ignored.
+       */
+      File(IOStream *stream, bool readProperties = true,
+           Properties::ReadStyle propertiesStyle = Properties::Average);
+
+      /*!
+       * Destroys this instance of the File.
+       */
+      virtual ~File();
+
+      /*!
+       * Returns the Tag for this file.
+       */
+      ID3v2::Tag *tag() const;
+
+      /*!
+       * Implements the unified property interface -- export function.
+       * This method forwards to ID3v2::Tag::properties().
+       */
+      PropertyMap properties() const;
+
+      /*!
+       * Implements the unified property interface -- import function.
+       * This method forwards to ID3v2::Tag::setProperties().
+       */
+      PropertyMap setProperties(const PropertyMap &);
+
+      /*!
+       * Returns the DSF::AudioProperties for this file.  If no audio properties
+       * were read then this will return a null pointer.
+       */
+      virtual Properties *audioProperties() const;
+
+      /*!
+       * Saves the file.
+       */
+      virtual bool save();
+
+      /*!
+       * Returns whether or not the given \a stream can be opened as a DSF
+       * file.
+       *
+       * \note This method is designed to do a quick check.  The result may
+       * not necessarily be correct.
+       */
+      static bool isSupported(IOStream *stream);
+
+    private:
+      File(const File &);
+      File &operator=(const File &);
+
+      void read(bool readProperties, Properties::ReadStyle propertiesStyle);
+
+      class FilePrivate;
+      FilePrivate *d;
+    };
+  }
+}
+
+#endif
+

3rdparty/taglib/dsf/dsfproperties.cpp

@@ -0,0 +1,161 @@
+/***************************************************************************
+ copyright            : (C) 2013 by Stephen F. Booth
+ email                : me@sbooth.org
+ ***************************************************************************/
+
+/***************************************************************************
+ *   This library is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This library 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     *
+ *   Lesser General Public License for more details.                       *
+ *                                                                         *
+ *   You should have received a copy of the GNU Lesser General Public      *
+ *   License along with this library; if not, write to the Free Software   *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
+ *   02110-1301  USA                                                       *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#include <tstring.h>
+#include <tdebug.h>
+
+#include "dsfproperties.h"
+
+using namespace TagLib;
+
+class DSF::Properties::PropertiesPrivate
+{
+public:
+  PropertiesPrivate() :
+  formatVersion(0),
+  formatID(0),
+  channelType(0),
+  channelNum(0),
+  samplingFrequency(0),
+  bitsPerSample(0),
+  sampleCount(0),
+  blockSizePerChannel(0),
+  bitrate(0),
+  length(0)
+  {
+  }
+
+  // Nomenclature is from DSF file format specification
+  unsigned int formatVersion;
+  unsigned int formatID;
+  unsigned int channelType;
+  unsigned int channelNum;
+  unsigned int samplingFrequency;
+  unsigned int bitsPerSample;
+  long long sampleCount;
+  unsigned int blockSizePerChannel;
+
+  // Computed
+  unsigned int bitrate;
+  unsigned int length;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// public members
+////////////////////////////////////////////////////////////////////////////////
+
+DSF::Properties::Properties(const ByteVector &data, ReadStyle style) : TagLib::AudioProperties(style)
+{
+  d = new PropertiesPrivate;
+  read(data);
+}
+
+DSF::Properties::~Properties()
+{
+  delete d;
+}
+
+int DSF::Properties::length() const
+{
+  return lengthInSeconds();
+}
+
+int DSF::Properties::lengthInSeconds() const
+{
+  return d->length / 1000;
+}
+
+int DSF::Properties::lengthInMilliseconds() const
+{
+  return d->length;
+}
+
+int DSF::Properties::bitrate() const
+{
+  return d->bitrate;
+}
+
+int DSF::Properties::sampleRate() const
+{
+  return d->samplingFrequency;
+}
+
+int DSF::Properties::channels() const
+{
+  return d->channelNum;
+}
+
+// DSF specific
+int DSF::Properties::formatVersion() const
+{
+  return d->formatVersion;
+}
+
+int DSF::Properties::formatID() const
+{
+  return d->formatID;
+}
+
+int DSF::Properties::channelType() const
+{
+  return d->channelType;
+}
+
+int DSF::Properties::bitsPerSample() const
+{
+  return d->bitsPerSample;
+}
+
+long long DSF::Properties::sampleCount() const
+{
+  return d->sampleCount;
+}
+
+int DSF::Properties::blockSizePerChannel() const
+{
+  return d->blockSizePerChannel;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// private members
+////////////////////////////////////////////////////////////////////////////////
+
+void DSF::Properties::read(const ByteVector &data)
+{
+  d->formatVersion         = data.toUInt(0U,false);
+  d->formatID              = data.toUInt(4U,false);
+  d->channelType           = data.toUInt(8U,false);
+  d->channelNum            = data.toUInt(12U,false);
+  d->samplingFrequency     = data.toUInt(16U,false);
+  d->bitsPerSample         = data.toUInt(20U,false);
+  d->sampleCount           = data.toLongLong(24U,false);
+  d->blockSizePerChannel   = data.toUInt(32U,false);
+
+  d->bitrate
+  = static_cast<unsigned int>((d->samplingFrequency * d->bitsPerSample * d->channelNum) / 1000.0 + 0.5);
+  d->length
+  = d->samplingFrequency > 0 ? static_cast<unsigned int>(d->sampleCount * 1000.0 / d->samplingFrequency + 0.5) : 0;
+}
+

3rdparty/taglib/dsf/dsfproperties.h

@@ -0,0 +1,92 @@
+/***************************************************************************
+    copyright            : (C) 2013 by Stephen F. Booth
+    email                : me@sbooth.org
+ ***************************************************************************/
+
+/***************************************************************************
+ *   This library is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This library 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     *
+ *   Lesser General Public License for more details.                       *
+ *                                                                         *
+ *   You should have received a copy of the GNU Lesser General Public      *
+ *   License along with this library; if not, write to the Free Software   *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
+ *   02110-1301  USA                                                       *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#ifndef TAGLIB_DSFPROPERTIES_H
+#define TAGLIB_DSFPROPERTIES_H
+
+#include "audioproperties.h"
+
+namespace TagLib {
+
+  namespace DSF {
+
+    class File;
+
+    //! An implementation of audio property reading for DSF
+
+    /*!
+     * This reads the data from a DSF stream found in the AudioProperties
+     * API.
+     */
+
+    class TAGLIB_EXPORT Properties : public TagLib::AudioProperties
+    {
+    public:
+      /*!
+       * Create an instance of DSF::AudioProperties with the data read from the
+       * ByteVector \a data.
+       */
+      Properties(const ByteVector &data, ReadStyle style);
+
+      /*!
+       * Destroys this DSF::AudioProperties instance.
+        */
+      virtual ~Properties();
+
+      // Reimplementations.
+
+      virtual int length() const;
+      virtual int lengthInSeconds() const;
+      virtual int lengthInMilliseconds() const;
+      virtual int bitrate() const;
+      virtual int sampleRate() const;
+      virtual int channels() const;
+
+      int formatVersion() const;
+      int formatID() const;
+
+      /*!
+       * Channel type values: 1 = mono, 2 = stereo, 3 = 3 channels, 
+       * 4 = quad, 5 = 4 channels, 6 = 5 channels, 7 = 5.1 channels
+       */
+      int channelType() const;
+      int bitsPerSample() const;
+      long long sampleCount() const;
+      int blockSizePerChannel() const;
+
+    private:
+      Properties(const Properties &);
+      Properties &operator=(const Properties &);
+
+      void read(const ByteVector &data);
+
+      class PropertiesPrivate;
+      PropertiesPrivate *d;
+    };
+  }
+}
+
+#endif
+

3rdparty/taglib/fileref.cpp

@@ -52,6 +52,8 @@
 #include "s3mfile.h"
 #include "itfile.h"
 #include "xmfile.h"
+#include "dsffile.h"
+#include "dsdifffile.h"
 
 using namespace TagLib;
 
@@ -135,6 +137,10 @@ namespace
       return new IT::File(stream, readAudioProperties, audioPropertiesStyle);
     if(ext == "XM")
       return new XM::File(stream, readAudioProperties, audioPropertiesStyle);
+    if(ext == "DFF" || ext == "DSDIFF")
+      return new DSDIFF::File(stream, readAudioProperties, audioPropertiesStyle);
+    if(ext == "DSF")
+      return new DSF::File(stream, readAudioProperties, audioPropertiesStyle);
 
     return 0;
   }
@@ -174,6 +180,10 @@ namespace
       file = new RIFF::WAV::File(stream, readAudioProperties, audioPropertiesStyle);
     else if(APE::File::isSupported(stream))
       file = new APE::File(stream, readAudioProperties, audioPropertiesStyle);
+    else if(DSDIFF::File::isSupported(stream))
+      file = new DSDIFF::File(stream, readAudioProperties, audioPropertiesStyle);
+    else if(DSF::File::isSupported(stream))
+      file = new DSF::File(stream, readAudioProperties, audioPropertiesStyle);
 
     // isSupported() only does a quick check, so double check the file here.
 
@@ -255,6 +265,10 @@ namespace
       return new IT::File(fileName, readAudioProperties, audioPropertiesStyle);
     if(ext == "XM")
       return new XM::File(fileName, readAudioProperties, audioPropertiesStyle);
+    if(ext == "DFF" || ext == "DSDIFF")
+      return new DSDIFF::File(fileName, readAudioProperties, audioPropertiesStyle);
+    if(ext == "DSF")
+      return new DSF::File(fileName, readAudioProperties, audioPropertiesStyle);
 
     return 0;
   }
@@ -387,6 +401,9 @@ StringList FileRef::defaultFileExtensions()
   l.append("s3m");
   l.append("it");
   l.append("xm");
+  l.append("dsf");
+  l.append("dff");
+  l.append("dsdiff"); // alias for "dff"
 
   return l;
 }

3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp

@@ -216,7 +216,23 @@ void TableOfContentsFrame::removeEmbeddedFrames(const ByteVector &id)
 
 String TableOfContentsFrame::toString() const
 {
-  return String();
+  String s = String(d->elementID) +
+             ": top level: " + (d->isTopLevel ? "true" : "false") +
+             ", ordered: " + (d->isOrdered ? "true" : "false");
+
+  if(!d->childElements.isEmpty()) {
+    s+= ", chapters: [ " + String(d->childElements.toByteVector(", ")) + " ]";
+  }
+
+  if(!d->embeddedFrameList.isEmpty()) {
+    StringList frameIDs;
+    for(FrameList::ConstIterator it = d->embeddedFrameList.begin();
+        it != d->embeddedFrameList.end(); ++it)
+      frameIDs.append((*it)->frameID());
+    s += ", sub-frames: [ " + frameIDs.toString(", ") + " ]";
+  }
+
+  return s;
 }
 
 PropertyMap TableOfContentsFrame::asProperties() const

3rdparty/taglib/mpeg/id3v2/frames/textidentificationframe.cpp

@@ -339,7 +339,13 @@ UserTextIdentificationFrame::UserTextIdentificationFrame(const String &descripti
 
 String UserTextIdentificationFrame::toString() const
 {
-  return "[" + description() + "] " + fieldList().toString();
+  // first entry is the description itself, drop from values list
+  StringList l = fieldList();
+  for(StringList::Iterator it = l.begin(); it != l.end(); ++it) {
+    l.erase(it);
+    break;
+  }
+  return "[" + description() + "] " + l.toString();
 }
 
 String UserTextIdentificationFrame::description() const

3rdparty/taglib/ogg/flac/oggflacfile.cpp

@@ -231,11 +231,21 @@ void Ogg::FLAC::File::scan()
 
   if(!metadataHeader.startsWith("fLaC"))  {
     // FLAC 1.1.2+
+    // See https://xiph.org/flac/ogg_mapping.html for the header specification.
+    if(metadataHeader.size() < 13)
+      return;
+
+    if(metadataHeader[0] != 0x7f)
+      return;
+
     if(metadataHeader.mid(1, 4) != "FLAC")
       return;
 
-    if(metadataHeader[5] != 1)
-      return; // not version 1
+    if(metadataHeader[5] != 1 && metadataHeader[6] != 0)
+      return; // not version 1.0
+
+    if(metadataHeader.mid(9, 4) != "fLaC")
+      return;
 
     metadataHeader = metadataHeader.mid(13);
   }

3rdparty/taglib/toolkit/tfile.cpp

@@ -63,6 +63,8 @@
 #include "itfile.h"
 #include "xmfile.h"
 #include "mp4file.h"
+#include "dsffile.h"
+#include "dsdifffile.h"
 
 using namespace TagLib;
 
@@ -148,6 +150,10 @@ PropertyMap File::properties() const
     return dynamic_cast<const MP4::File* >(this)->properties();
   if(dynamic_cast<const ASF::File* >(this))
     return dynamic_cast<const ASF::File* >(this)->properties();
+  if(dynamic_cast<const DSF::File* >(this))
+    return dynamic_cast<const DSF::File* >(this)->properties();
+  if(dynamic_cast<const DSDIFF::File* >(this))
+    return dynamic_cast<const DSDIFF::File* >(this)->properties();
   return tag()->properties();
 }
 
@@ -177,6 +183,10 @@ void File::removeUnsupportedProperties(const StringList &properties)
     dynamic_cast<MP4::File* >(this)->removeUnsupportedProperties(properties);
   else if(dynamic_cast<ASF::File* >(this))
     dynamic_cast<ASF::File* >(this)->removeUnsupportedProperties(properties);
+  else if(dynamic_cast<DSF::File* >(this))
+    dynamic_cast<DSF::File* >(this)->removeUnsupportedProperties(properties);
+  else if(dynamic_cast<DSDIFF::File* >(this))
+    dynamic_cast<DSDIFF::File* >(this)->removeUnsupportedProperties(properties);
   else
     tag()->removeUnsupportedProperties(properties);
 }
@@ -219,6 +229,10 @@ PropertyMap File::setProperties(const PropertyMap &properties)
     return dynamic_cast<MP4::File* >(this)->setProperties(properties);
   else if(dynamic_cast<ASF::File* >(this))
     return dynamic_cast<ASF::File* >(this)->setProperties(properties);
+  else if(dynamic_cast<DSF::File* >(this))
+    return dynamic_cast<DSF::File* >(this)->setProperties(properties);
+  else if(dynamic_cast<DSDIFF::File* >(this))
+    return dynamic_cast<DSDIFF::File* >(this)->setProperties(properties);
   else
     return tag()->setProperties(properties);
 }

3rdparty/taglib/toolkit/tfilestream.cpp

@@ -58,6 +58,11 @@ namespace
 #endif
   }
 
+  FileHandle openFile(const int fileDescriptor, bool readOnly)
+  {
+    return InvalidFileHandle;
+  }
+
   void closeFile(FileHandle file)
   {
     CloseHandle(file);
@@ -98,6 +103,11 @@ namespace
     return fopen(path, readOnly ? "rb" : "rb+");
   }
 
+  FileHandle openFile(const int fileDescriptor, bool readOnly)
+  {
+    return fdopen(fileDescriptor, readOnly ? "rb" : "rb+");
+  }
+
   void closeFile(FileHandle file)
   {
     fclose(file);
@@ -149,13 +159,28 @@ FileStream::FileStream(FileName fileName, bool openReadOnly)
     d->file = openFile(fileName, true);
 
   if(d->file == InvalidFileHandle)
-  {
 # ifdef _WIN32
     debug("Could not open file " + fileName.toString());
 # else
     debug("Could not open file " + String(static_cast<const char *>(d->name)));
 # endif
-  }
+}
+
+FileStream::FileStream(int fileDescriptor, bool openReadOnly)
+  : d(new FileStreamPrivate(""))
+{
+  // First try with read / write mode, if that fails, fall back to read only.
+
+  if(!openReadOnly)
+    d->file = openFile(fileDescriptor, false);
+
+  if(d->file != InvalidFileHandle)
+    d->readOnly = false;
+  else
+    d->file = openFile(fileDescriptor, true);
+
+  if(d->file == InvalidFileHandle)
+    debug("Could not open file using file descriptor");
 }
 
 FileStream::~FileStream()
@@ -255,8 +280,7 @@ void FileStream::insert(const ByteVector &data, unsigned long start, unsigned lo
   ByteVector buffer = data;
   ByteVector aboutToOverwrite(static_cast<unsigned int>(bufferLength));
 
-  while(true)
-  {
+  while(true) {
     // Seek to the current read position and read the data that we're about
     // to overwrite.  Appropriately increment the readPosition.
 
@@ -304,8 +328,7 @@ void FileStream::removeBlock(unsigned long start, unsigned long length)
 
   ByteVector buffer(static_cast<unsigned int>(bufferLength));
 
-  for(unsigned int bytesRead = -1; bytesRead != 0;)
-  {
+  for(unsigned int bytesRead = -1; bytesRead != 0;) {
     seek(readPosition);
     bytesRead = static_cast<unsigned int>(readFile(d->file, buffer));
     readPosition += bytesRead;
@@ -401,7 +424,8 @@ long FileStream::tell() const
   const LARGE_INTEGER zero = {};
   LARGE_INTEGER position;
 
-  if(SetFilePointerEx(d->file, zero, &position, FILE_CURRENT) && position.QuadPart <= LONG_MAX) {
+  if(SetFilePointerEx(d->file, zero, &position, FILE_CURRENT) &&
+     position.QuadPart <= LONG_MAX) {
     return static_cast<long>(position.QuadPart);
   }
   else {
@@ -470,9 +494,8 @@ void FileStream::truncate(long length)
 #else
 
   const int error = ftruncate(fileno(d->file), length);
-  if(error != 0) {
+  if(error != 0)
     debug("FileStream::truncate() -- Coundn't truncate the file.");
-  }
 
 #endif
 }

3rdparty/taglib/toolkit/tfilestream.h

@@ -54,6 +54,11 @@ namespace TagLib {
      */
     FileStream(FileName file, bool openReadOnly = false);
 
+    /*!
+     * Construct a File object and opens the \a file using file descriptor.
+     */
+    FileStream(int fileDescriptor, bool openReadOnly = false);
+
     /*!
      * Destroys this FileStream instance.
      */

CMakeLists.txt

@@ -1,7 +1,5 @@
 # Strawberry Music Player
 # Copyright 2013, Jonas Kvinge <jonas@strawbs.net>
-# This file was part of Clementine.
-# Copyright 2010, David Sansome <me@davidsansome.com>
 #
 # Strawberry is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,9 +16,8 @@
 
 project(strawberry)
 cmake_minimum_required(VERSION 2.8.11)
-cmake_policy(SET CMP0054 NEW)
-if(${CMAKE_VERSION} VERSION_GREATER "3.10.3") 
-  cmake_policy(SET CMP0072 NEW)
+if(${CMAKE_VERSION} VERSION_GREATER "3.0")
+  cmake_policy(SET CMP0054 NEW)
 endif()
 
 include(CheckCXXCompilerFlag)
@@ -32,26 +29,30 @@ include(cmake/Summary.cmake)
 include(cmake/OptionalSource.cmake)
 include(cmake/ParseArguments.cmake)
 include(cmake/Rpm.cmake)
+include(cmake/Deb.cmake)
 
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-  set(LINUX 1)
+  set(LINUX ON)
 endif()
 if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-  set(FREEBSD 1)
+  set(FREEBSD ON)
 endif()
 if (${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
-  set(OPENBSD 1)
+  set(OPENBSD ON)
 endif()
 
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
-#set(CMAKE_BUILD_TYPE Debug)
 
 if(${CMAKE_BUILD_TYPE} MATCHES "Release")
   add_definitions(-DNDEBUG)
   add_definitions(-DQT_NO_DEBUG_OUTPUT)
   #add_definitions(-DQT_NO_WARNING_OUTPUT)
-endif(${CMAKE_BUILD_TYPE} MATCHES "Release")
+endif()
+
+if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
+  set(DEBUG ON)
+endif()
 
 if (CMAKE_CXX_COMPILER MATCHES ".*clang")
   set(CMAKE_COMPILER_IS_CLANGXX 1)
@@ -82,15 +83,14 @@ find_package(Protobuf REQUIRED)
 find_library(PROTOBUF_STATIC_LIBRARY libprotobuf.a libprotobuf)
 if(LINUX)
   find_package(ALSA REQUIRED)
-  find_package(DBus REQUIRED)
+  pkg_check_modules(DBUS REQUIRED dbus-1)
 else(LINUX)
   find_package(ALSA)
-  find_package(DBus)
+  pkg_check_modules(DBUS dbus-1)
 endif(LINUX)
-if(ALSA_FOUND)
-  set(HAVE_ALSA ON)
+if (NOT APPLE)
+  find_package(X11)
 endif()
-find_package(X11)
 if(X11_FOUND)
   set(HAVE_X11 ON)
 endif()
@@ -103,22 +103,23 @@ pkg_check_modules(LIBXINE libxine)
 pkg_check_modules(LIBVLC libvlc)
 pkg_check_modules(PHONON phonon4qt5)
 pkg_check_modules(SQLITE REQUIRED sqlite3>=3.7)
-find_package(OpenGL REQUIRED)
-pkg_check_modules(CHROMAPRINT REQUIRED libchromaprint)
 pkg_check_modules(LIBPULSE libpulse)
+pkg_check_modules(CHROMAPRINT libchromaprint)
 pkg_check_modules(LIBGPOD libgpod-1.0>=0.7.92)
 pkg_check_modules(LIBMTP libmtp>=1.0)
-pkg_check_modules(IMOBILEDEVICE libimobiledevice-1.0)
-pkg_check_modules(USBMUXD libusbmuxd)
-pkg_check_modules(PLIST libplist)
+pkg_check_modules(LIBIMOBILEDEVICE libimobiledevice-1.0)
+pkg_check_modules(LIBUSBMUXD libusbmuxd)
+pkg_check_modules(LIBPLIST libplist)
+pkg_check_modules(LIBDEEZER libdeezer)
+pkg_check_modules(LIBDZMEDIA libdzmedia)
 
 if(WIN32)
   find_package(ZLIB REQUIRED)
 endif(WIN32)
 
 # QT
-set(QT_MIN_VERSION 5.6.0)
-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Concurrent Widgets Network Sql OpenGL Xml)
+set(QT_MIN_VERSION 5.5.1)
+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Concurrent Widgets Network Sql Xml)
 if(X11_FOUND)
   find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras)
 endif()
@@ -129,8 +130,11 @@ endif()
 if(APPLE)
   find_package(Qt5 REQUIRED COMPONENTS MacExtras)
 endif()
+if(WIN32)
+  find_package(Qt5 REQUIRED COMPONENTS WinExtras)
+endif()
 
-set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::Sql Qt5::OpenGL Qt5::Xml)
+set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::Sql Qt5::Xml)
 
 if(DBUS_FOUND)
   set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::DBus)
@@ -141,27 +145,39 @@ endif()
 if(APPLE)
   set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::MacExtras)
 endif()
-
-# Don't try to use webkit if their include directories couldn't be found.
-if (NOT QT_QTWEBKIT_INCLUDE_DIR)
-  set (QT_USE_QTWEBKIT 0)
-endif (NOT QT_QTWEBKIT_INCLUDE_DIR)
+if(WIN32)
+  set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::WinExtras)
+endif()
 
 # TAGLIB
 pkg_check_modules(TAGLIB taglib)
-# Only use system taglib if it's greater than 1.11.1 because of audio file detection by content.
-# But let the user override as strawberry will still compile and work without.
+# Only use system taglib if it's greater than 1.11.1
+# There is a bug in version 1.11.1 corrupting Ogg files, see: https://github.com/taglib/taglib/issues/864
+# If you decide to use the systems taglib, make sure it has been patched with the following commit:
+# https://github.com/taglib/taglib/commit/9336c82da3a04552168f208cd7a5fa4646701ea4
+# The current taglib in 3rdparty also has the following features used by strawberry:
+# - Audio file detection by content.
+# - DSF and DSDIFF support
+#
 if (TAGLIB_VERSION VERSION_GREATER 1.11.1 OR WIN32)
   option(USE_SYSTEM_TAGLIB "Use system taglib" ON)
 else()
   option(USE_SYSTEM_TAGLIB "Use system taglib" OFF)
 endif()
 if (TAGLIB_FOUND AND USE_SYSTEM_TAGLIB)
-  message(STATUS "Using system taglib library")
+  if (TAGLIB_VERSION VERSION_GREATER 1.11.1 OR WIN32)
+    message(STATUS "Using system taglib library")
+  else()
+    message(WARNING "Using system taglib library. Version 1.11.1 or less has a bug corrupting Ogg files, make sure your systems version has been patched!")
+  endif()
   set(CMAKE_REQUIRED_INCLUDES "${TAGLIB_INCLUDE_DIRS}")
   set(CMAKE_REQUIRED_LIBRARIES "${TAGLIB_LIBRARIES}")
   set(CMAKE_REQUIRED_INCLUDES)
   set(CMAKE_REQUIRED_LIBRARIES)
+  find_path(HAVE_TAGLIB_DSFFILE_H taglib/dsffile.h)
+  if(HAVE_TAGLIB_DSFFILE_H)
+    set(HAVE_TAGLIB_DSFFILE ON)
+  endif(HAVE_TAGLIB_DSFFILE_H)
 else()
   message(STATUS "Using builtin taglib library")
   set(TAGLIB_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/3rdparty/taglib/headers/taglib/;${CMAKE_BINARY_DIR}/3rdparty/taglib/headers/")
@@ -169,6 +185,7 @@ else()
   set(TAGLIB_LIBRARIES tag)
   add_subdirectory(3rdparty/utf8-cpp)
   add_subdirectory(3rdparty/taglib)
+  set(HAVE_TAGLIB_DSFFILE ON)
 endif()
 
 # LASTFM
@@ -179,9 +196,6 @@ if(LASTFM5_INCLUDE_DIRS AND LASTFM51_INCLUDE_DIRS)
   set(HAVE_LIBLASTFM1 ON)
 endif()
 
-# CHECK INCLUDES
-CHECK_INCLUDE_FILES(chromaprint.h CHROMAPRINT_H)
-
 # Use system sha2 if it's available
 find_path(SHA2_INCLUDE_DIRS sha2.h)
 find_library(SHA2_LIBRARIES sha2)
@@ -200,9 +214,9 @@ endif()
 option(USE_SYSTEM_QTSINGLEAPPLICATION "Use system QtSingleApplication library" OFF)
 if(USE_SYSTEM_QTSINGLEAPPLICATION)
   message(STATUS "Using system QtSingleApplication library")
-  find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES QtSolutions)
-  find_library(QTSINGLEAPPLICATION_LIBRARIES QtSolutions_SingleApplication-2.6)
-  find_library(QTSINGLECOREAPPLICATION_LIBRARIES QtSolutions_SingleCoreApplication-2.6)
+  find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES qt5/QtSolutions)
+  find_library(QTSINGLEAPPLICATION_LIBRARIES Qt5Solutions_SingleApplication-2.6)
+  find_library(QTSINGLECOREAPPLICATION_LIBRARIES Qt5Solutions_SingleCoreApplication-2.6)
 else(USE_SYSTEM_QTSINGLEAPPLICATION)
   message(STATUS "Using builtin QtSingleApplication library")
   add_subdirectory(3rdparty/qtsingleapplication)
@@ -214,11 +228,11 @@ endif(USE_SYSTEM_QTSINGLEAPPLICATION)
 option(USE_SYSTEM_QXT "Use system Qxt library" OFF)
 if (USE_SYSTEM_QXT)
   message(STATUS "Using system Qxt library")
-  find_path(QXTCORE_INCLUDE_DIRS qxtglobal.h PATH_SUFFIXES QxtCore)
-  find_path(QXTGUI_INCLUDE_DIRS qxtglobalshortcut.h PATH_SUFFIXES QxtGui)
+  find_path(QXTCORE_INCLUDE_DIRS qxtglobal.h PATH_SUFFIXES qt5/QxtCore)
+  find_path(QXTGUI_INCLUDE_DIRS qxtglobalshortcut.h PATH_SUFFIXES qt5/QxtWidgets)
   set(QXT_INCLUDE_DIRS ${QXTCORE_INCLUDE_DIRS} ${QXTGUI_INCLUDE_DIRS})
   # We only need its header. We don't need to link to QxtCore.
-  find_library(QXT_LIBRARIES QxtGui)
+  find_library(QXT_LIBRARIES QxtWidgets-qt5)
 else (USE_SYSTEM_QXT)
   message(STATUS "Using builtin Qxt library")
   add_definitions(-DQXT_STATIC -DBUILD_QXT_GUI -DBUILD_QXT_CORE)
@@ -233,11 +247,6 @@ endif (USE_SYSTEM_QXT)
 set(QOCOA_LIBRARIES Qocoa)
 add_subdirectory(3rdparty/qocoa)
 
-# Windows
-if (WIN32)
-  add_subdirectory(3rdparty/qtwin)
-endif (WIN32)
-
 if (APPLE)
   find_library(SPARKLE Sparkle)
   add_subdirectory(3rdparty/SPMediaKeyTap)
@@ -257,6 +266,14 @@ if(WIN32)
   option(ENABLE_WIN32_CONSOLE "Show the windows console even outside Debug mode" OFF)
 endif(WIN32)
 
+optional_component(ALSA ON "ALSA integration"
+  DEPENDS "alsa" ALSA_FOUND
+)
+
+optional_component(LIBPULSE ON "Pulse audio integration"
+  DEPENDS "libpulse" LIBPULSE_FOUND
+)
+
 optional_component(DBUS ON "D-Bus support"
   DEPENDS "D-Bus" DBUS_FOUND
 )
@@ -277,38 +294,34 @@ optional_component(VLC ON "Engine: VLC backend"
   DEPENDS "libvlc" LIBVLC_FOUND
 )
 
-optional_component(PHONON OFF "Engine: Phonon backend"
+optional_component(PHONON OFF "Engine: Phonon backend (UNSTABLE)"
   DEPENDS "phonon4qt5" PHONON_FOUND
 )
 
+if (WIN32)
+  optional_component(DEEZER ON "Engine: Deezer backend"
+    DEPENDS "libdeezer" LIBDEEZER_FOUND
+  )
+else ()
+  optional_component(DEEZER ON "Engine: Deezer backend"
+    DEPENDS "Linux" LINUX
+    DEPENDS "libdeezer" LIBDEEZER_FOUND
+    DEPENDS "libpulse" LIBPULSE_FOUND
+  )
+endif()
+
+optional_component(LIBLASTFM ON "Last.fm album cover provider"
+  DEPENDS "liblastfm" LASTFM5_LIBRARIES LASTFM5_INCLUDE_DIRS
+)
+
+optional_component(CHROMAPRINT ON "Chromaprint support / Tag fetching from Musicbrainz"
+  DEPENDS "chromaprint" CHROMAPRINT_FOUND
+)
+
 optional_component(AUDIOCD ON "Devices: Audio CD support"
   DEPENDS "libcdio" CDIO_FOUND
 )
 
-optional_component(LIBGPOD ON "Devices: iPod classic support"
-  DEPENDS "libgpod" LIBGPOD_FOUND
-)
-
-optional_component(GIO ON "Devices: GIO device backend"
-  DEPENDS "libgio" GIO_FOUND
-  DEPENDS "Unix or Windows" "NOT APPLE"
-)
-
-optional_component(IMOBILEDEVICE ON "Devices: iPod Touch, iPhone, iPad support"
-  DEPENDS "libimobiledevice" IMOBILEDEVICE_FOUND
-  DEPENDS "libplist" PLIST_FOUND
-  DEPENDS "libusbmuxd" USBMUXD_FOUND
-  DEPENDS "iPod classic support" HAVE_LIBGPOD
-)
-
-optional_component(LIBMTP ON "Devices: MTP support"
-  DEPENDS "libmtp" LIBMTP_FOUND
-)
-
-optional_component(LIBLASTFM ON "Last.fm album cover provider"
-  DEPENDS "liblastfm" LASTFM5_LIBRARIES LASTFM5_INCLUDE_DIRS
-)
-
 optional_component(DEVICEKIT ON "Devices: DeviceKit backend"
   DEPENDS "D-Bus support" DBUS_FOUND
 )
@@ -317,8 +330,24 @@ optional_component(UDISKS2 ON "Devices: UDisks2 backend"
   DEPENDS "D-Bus support" DBUS_FOUND
 )
 
-optional_component(LIBPULSE ON "Pulse audio integration"
-  DEPENDS "libpulse" LIBPULSE_FOUND
+optional_component(GIO ON "Devices: GIO device backend"
+  DEPENDS "libgio" GIO_FOUND
+  DEPENDS "Unix or Windows" "NOT APPLE"
+)
+
+optional_component(LIBGPOD ON "Devices: iPod classic support"
+  DEPENDS "libgpod" LIBGPOD_FOUND
+)
+
+optional_component(LIBMTP ON "Devices: MTP support"
+  DEPENDS "libmtp" LIBMTP_FOUND
+)
+
+optional_component(IMOBILEDEVICE ON "Devices: iPod Touch, iPhone, iPad support"
+  DEPENDS "libimobiledevice" LIBIMOBILEDEVICE_FOUND
+  DEPENDS "libplist" LIBPLIST_FOUND
+  DEPENDS "libusbmuxd" LIBUSBMUXD_FOUND
+  DEPENDS "iPod classic support" LIBGPOD_FOUND
 )
 
 optional_component(SPARKLE ON "Sparkle integration"
@@ -326,6 +355,23 @@ optional_component(SPARKLE ON "Sparkle integration"
   DEPENDS "Sparkle" SPARKLE
 )
 
+optional_component(STREAM_TIDAL ON "Streaming: Tidal support")
+
+if (LIBDZMEDIA_FOUND OR LIBDEEZER_FOUND)
+  optional_component(STREAM_DEEZER ON "Streaming: Deezer support")
+else()
+  optional_component(STREAM_DEEZER OFF "Streaming: Deezer support")
+endif()
+
+optional_component(DZMEDIA ON "DZMedia"
+  DEPENDS "libdzmedia" LIBDZMEDIA_FOUND
+  DEPENDS "Deezer support" HAVE_STREAM_DEEZER
+)
+
+if (HAVE_STREAM_DEEZER AND NOT HAVE_DZMEDIA AND NOT HAVE_DEEZER)
+  message(STATUS "Deezer is enabled, but not DZMedia or Deezer engine, only preview streams will be available.")
+endif()
+
 #if(IMOBILEDEVICE_FOUND AND PLIST_FOUND)
   #add_subdirectory(ext/gstafc)
 #endif(IMOBILEDEVICE_FOUND AND PLIST_FOUND)
@@ -342,7 +388,7 @@ include_directories(${GLIB_INCLUDE_DIRS})
 include_directories(${GLIBCONFIG_INCLUDE_DIRS})
 include_directories(${TAGLIB_INCLUDE_DIRS})
 
-if(ENABLE_IMOBILEDEVICE AND IMOBILEDEVICE_VERSION VERSION_GREATER 1.1.1)
+if(HAVE_IMOBILEDEVICE AND LIBIMOBILEDEVICE_VERSION VERSION_GREATER 1.1.1)
   set(IMOBILEDEVICE_USES_UDIDS ON)
 endif()
 
@@ -364,6 +410,8 @@ add_custom_target(uninstall
 
 # Show a summary of what we have enabled
 summary_show()
-if(NOT HAVE_GSTREAMER AND NOT HAVE_XINE AND NOT HAVE_VLC AND NOT HAVE_PHONON)
-  message(FATAL_ERROR "You need to enable either GStreamer, Xine, VLC or Phonon to compile!")
+if(NOT HAVE_GSTREAMER AND NOT HAVE_XINE AND NOT HAVE_VLC AND NOT HAVE_PHONON AND NOT HAVE_DEEZER)
+  message(FATAL_ERROR "You need to have either GStreamer, Xine, VLC, Phonon or Deezer to compile!")
+elseif(NOT HAVE_GSTREAMER)
+  message(WARNING "GStreamer is the only engine that is fully implemented. Using other engines is possible but not recommended.")
 endif()

Changelog

@@ -2,6 +2,76 @@ Strawberry Music Player
 =======================
 ChangeLog
 
+Version 0.4.2:
+
+    * Updated AppStream data file to newer specifications
+    * Fixed Deezer engine to use quality setting
+    * Removed unneeded dependency Qt5OpenGL
+    * Removed obsolete xine warning and engine reinitialization
+    * Added ALSA as optional component in cmake
+    * Fixed bug in playlist columns setting all visible
+    * Added option to reset playlist columns
+    * Fixed/Improved console logging
+    * Added queue to play next option
+    * (Windows) Corrected uninstalled files on x64 installer
+    * (MacOS) Fixed poor performance
+
+Version 0.4.1:
+
+    * Fixed crash in analyzer
+    * Fixed trying to use systray even if the desktop had no systray
+    * Fixed Tidal login loop bug
+    * Added Deezer support
+    * New improved fancy tabwidget
+    * Fixed bug not loading engine settings
+    * Moved queue manager into tabbar for easier access
+    * Fixed crash when changing appearance colors
+    * Improved error handling between player and engine
+    * Added setting to allow continue to the next song in the playlist based on error
+    * Improved Xine engine code
+    * Moved some settings
+    * Updated builtin taglib
+    * Added AppStream data file
+    * Fixed compiling with Qt 5 versions of system QtSingleApplication and Qxt library
+
+Version 0.3.3:
+
+    * Fixed Tidal login
+
+Version 0.3.2:
+
+    * Fixed search error not shown in Tidal search
+    * Added URL handler for Tidal, now retrieving URL's when playing instead of when searching
+    * Fixed bug in pipeline not setting url
+    * Fixed bug setting wrong temporary metadata
+    * Removed device module from windows, since it's not implemented for windows
+    * Added support for both ALSA hw and plughw
+    * Added option to change url stream scheme for Tidal
+    * Added encoding of Tidal token in the source code
+    * Added encoding of Tidal password in the configuration
+
+Version 0.3.1:
+
+    * Added new lyrics provider with lyrics from AudD and API Seeds
+    * New improved context widget with albums and lyrics
+    * Fixed playing and context widget getting stuck in play mode when there was an error
+    * Changed icons for artists in collection, tidal and cover manager
+    * Removed "search" icon from "Search automatically" checkbox (right click) that looked ugly
+    * Removed some unused widgets from the src/widgets directory
+    * Fixed initial size of window and side panel
+    * Fixed saving window size correctly
+    * Added Tidal support
+    * Disabled Amazon cover provider because of revoked API key
+    * Removed broken xine fader
+    * Made chromeprint optional
+    * Added missing names to about dialog
+    * Made xine enabled only for window debug
+    * Removed dead code
+    * Added DSF and DSDIFF/DFF support
+    * Fixed tagreader crash when saving tags to MP3 files
+    * Added support for reading/writing lyrics to tags
+    * Fixed saving tags (APE) for WavPack files
+
 Version 0.2.1:
 
     * Fixed crash with newer Qt
@@ -27,7 +97,7 @@ Version 0.1.4:
 Version 0.1.3:
     * Audio file detection by content
     * Added builtin taglib to 3rdparty to support detecting audio by content instead of just file extension
-    * Removed unneeded bulitin qsqlite from 3rdparty
+    * Removed unneeded qsqlite from 3rdparty
     * Added sqldrivers\qsqlite.dll for windows build
     * Replaced incorrect DLL libgstdirectsoundsink.dll (from gst 1.12.4) instead of libgstdirectsound.dll (from gst 1.14.0) for windows build
     * Fixed git versioning

Dockerfile

@@ -0,0 +1,17 @@
+from opensuse:tumbleweed
+
+run zypper --non-interactive --gpg-auto-import-keys ref
+run zypper --non-interactive --gpg-auto-import-keys dup -l -y
+
+run zypper --non-interactive --gpg-auto-import-keys install \
+    lsb-release git tar make cmake gcc gcc-c++ pkg-config \
+    glibc-devel glib2-devel glib2-tools dbus-1-devel alsa-devel libpulse-devel libnotify-devel \
+    boost-devel protobuf-devel sqlite3-devel taglib-devel \
+    gstreamer-devel gstreamer-plugins-base-devel libxine-devel vlc-devel \
+    libQt5Core-devel libQt5Gui-devel libQt5Widgets-devel libQt5Concurrent-devel libQt5Network-devel libQt5Sql-devel \
+    libqt5-qtx11extras-devel libQt5Gui-private-headers-devel libqt5-qtbase-common-devel liblastfm-qt5-devel \
+    libcdio-devel libgpod-devel libplist-devel libmtp-devel libusbmuxd-devel libchromaprint-devel
+
+run mkdir -p /usr/src/app
+workdir /usr/src/app
+copy . /usr/src/app

README.md

@@ -1,22 +1,33 @@
-:strawberry: Strawberry Music Player
+:strawberry: Strawberry Music Player [![Build Status](https://travis-ci.org/jonaski/strawberry.svg?branch=master)](https://travis-ci.org/jonaski/strawberry)
+[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=FRJUYV5QP6HW8)
 =======================
 
-Strawberry is a audio player and music collection organizer. It is a fork of Clementine created in 2013 with a diffrent goal.
-It's written in C++ and Qt 5. The name is inspired by the band Strawbs.
+Strawberry is a audio player and music collection organizer. It is a fork of Clementine released in 2018 aimed at music collectors, audio enthusiasts and audiophiles. The name is inspired by the band Strawbs. It's based on a heavily modified version of Clementine created in 2012-2013. It's written in C++ and Qt 5.
+
+  * Website: http://www.strawbs.org/
+  * Github: https://github.com/jonaski/strawberry
+  * Buildbot: http://buildbot.strawbs.net/
+  * Latest builds: http://builds.strawbs.org/
 
 ### :heavy_check_mark: Features:
 
   * Play and organize music
+  * Supports WAV, FLAC, WavPack, DSF, DSDIFF, Ogg Vorbis, Speex, MPC, TrueAudio, AIFF, MP4, MP3 and ASF
+  * Audio CD playback
   * Native desktop notifications
   * Playlists in multiple formats
+  * Advanced audio output and device configuration for bit-perfect playback on Linux
   * Edit tags on music files
   * Fetch tags from MusicBrainz
-  * Album cover art from Lastfm, Musicbrainz, Discogs and Amazon
+  * Album cover art from Last.fm, Musicbrainz and Discogs
+  * Song lyrics from AudD and API Seeds
   * Support for multiple backends
+  * Audio analyzer
+  * Equalizer
   * Transfer music to iPod, iPhone, MTP or mass-storage USB player
+  * Integrated Tidal and Deezer support
 
-It has so far been tested to work on Linux, OpenBSD and Windows (cross compiled using mingw).
-
+It has so far been tested to work on Linux, OpenBSD, MacOs and Windows.
 
 ### :heavy_exclamation_mark: Requirements
 
@@ -28,7 +39,8 @@ To build Strawberry from source you need the following installed on your system
 * [GCC](https://gcc.gnu.org/) or [clang](https://clang.llvm.org/) compiler
 * [Protobuf library and compiler](https://developers.google.com/protocol-buffers/)
 * [Boost development headers](https://www.boost.org/)
-* [Qt 5 with components Core, Widgets, Network, Sql, Xml, OpenGL, Concurrent, Test, WebKitWidget, X11Extras and DBus](https://www.qt.io/)
+* [Qt 5 with components Core, Gui, Widgets, Concurrent, Network, Sql and Xml](https://www.qt.io/)
+* [Qt 5 components X11Extras and DBus for Linux/BSD, MacExtras for MacOs and WinExtras for Windows](https://www.qt.io/)
 * [SQLite3](https://www.sqlite.org)
 * [TagLib 1.11.1 or higher](http://taglib.org/)
 * [Chromaprint library](https://acoustid.org/chromaprint)
@@ -36,9 +48,13 @@ To build Strawberry from source you need the following installed on your system
 * [DBus (linux)](https://www.freedesktop.org/wiki/Software/dbus/)
 * [PulseAudio (linux optional)](https://www.freedesktop.org/wiki/Software/PulseAudio/?)
 
-Either GStreamer, Xine or VLC engine is required, but only GStreamer is fully implemented so far.
+Either GStreamer, Xine, VLC, Deezer or Phonon engine is required, but only GStreamer is fully implemented so far.
 You should also install the gstreamer plugins base and good, and optionally bad and ugly.
 
+Deezer streams with full songs are encrypted and only urls for preview streams (MP3) are exposed by the API.
+Full length songs requires the use of deezers own engine (Deezer SDK) or the dzmedia library (I dont have it).
+Deezer SDK can be found here: https://build-repo.deezer.com/native_sdk/deezer-native-sdk-v1.2.10.zip
+
 Optional:
 
 * The Qt 5 LastFM library is required for fetching album covers from LastFM.
@@ -61,5 +77,12 @@ Optional:
     sudo make install
 
     (dont change to the source directory, if you created the build directory inside the source directory type: cmake .. instead).
-    
 
+### :computer:	Screenshot
+
+
+![Browse](https://www.strawbs.org/pictures/screenshot-002-large.png)
+
+### :moneybag: Donate
+
+[![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=FRJUYV5QP6HW8)

cmake/Deb.cmake

@@ -0,0 +1,6 @@
+add_custom_target(deb
+  #COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/dist/debian ${CMAKE_BINARY_DIR}/debian
+  COMMAND cp -r -p ${CMAKE_SOURCE_DIR}/dist/debian ${CMAKE_BINARY_DIR}/
+  COMMAND dpkg-buildpackage -b -d -uc -us
+  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+)

cmake/FindDBus.cmake

@@ -1,43 +0,0 @@
-if(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR)
-	# Already in cache, be silent
-	set(DBUS_FIND_QUIETLY TRUE)	
-endif(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR)
-
-set(DBUS_LIBRARY)
-set(DBUS_INCLUDE_DIR)
-set(DBUS_ARCH_INCLUDE_DIR)
-
-FIND_PATH(DBUS_INCLUDE_DIR dbus/dbus.h
-	/usr/include
-	/usr/include/dbus-1.0
-	/usr/local/include
-	/usr/local/include/dbus-1.0
-)
-
-FIND_PATH(DBUS_ARCH_INCLUDE_DIR dbus/dbus-arch-deps.h
-	/usr/lib/include
-	/usr/lib/dbus-1.0/include
-	/usr/lib64/include
-	/usr/lib64/dbus-1.0/include
-	/usr/local/lib/include
-	/usr/local/lib/dbus-1.0/include
-	/usr/local/lib64/include
-	/usr/local/lib64/dbus-1.0/include
-)
-
-FIND_LIBRARY(DBUS_LIBRARY NAMES dbus-1 dbus
-	PATHS
-	/usr/lib
-	/usr/lib64
-	/usr/local/lib
-	/usr/local/lib64
-)
-
-if(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR)
-   MESSAGE(STATUS "D-Bus found: includes in ${DBUS_INCLUDE_DIR}, library in ${DBUS_LIBRARY}")
-   set(DBUS_FOUND TRUE)
-else(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR)
-   MESSAGE(STATUS "D-Bus not found")
-endif(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR)
-
-MARK_AS_ADVANCED(DBUS_INCLUDE_DIR DBUS_LIBRARY DBUS_ARCH_INCLUDE_DIR)

cmake/Rpm.cmake

@@ -1,12 +1,66 @@
-set(RPMBUILD_DIR ~/rpmbuild CACHE STRING "Rpmbuild directory, for the rpm target")
-set(MOCK_COMMAND mock CACHE STRING "Command to use for running mock")
-set(MOCK_CHROOT suse-x86_64 CACHE STRING "Chroot to use when building an rpm with mock")
-set(RPM_DISTRO suse CACHE STRING "Suffix of the rpm file")
-set(RPM_ARCH x86_64 CACHE STRING "Architecture of the rpm file")
+find_program(LSB_RELEASE_EXEC lsb_release)
+find_program(RPMBUILD_EXEC rpmbuild)
 
-add_custom_target(rpm
-  COMMAND ${CMAKE_SOURCE_DIR}/dist/scripts/maketarball.sh
-  COMMAND ${CMAKE_COMMAND} -E copy strawberry-${STRAWBERRY_VERSION_PACKAGE}.tar.xz ${RPMBUILD_DIR}/SOURCES/
-  COMMAND rpmbuild -bs ${CMAKE_SOURCE_DIR}/dist/rpm/strawberry.spec
-  COMMAND rpmbuild -bb ${CMAKE_SOURCE_DIR}/dist/rpm/strawberry.spec
-)
+if (LSB_RELEASE_EXEC AND RPMBUILD_EXEC)
+  execute_process(COMMAND /bin/sh "-c" "${LSB_RELEASE_EXEC} -is | tr '[:upper:]' '[:lower:]' | cut -d' ' -f1"
+    OUTPUT_VARIABLE DIST_NAME
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  execute_process(COMMAND /bin/sh "-c" "${LSB_RELEASE_EXEC} -ds | tr '[:upper:]' '[:lower:]' | sed 's/\"//g' | cut -d' ' -f2"
+    OUTPUT_VARIABLE DIST_RELEASE
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  execute_process(COMMAND /bin/sh "-c" "${LSB_RELEASE_EXEC} -ds | tr '[:upper:]' '[:lower:]' | sed 's/\"//g' | sed 's/\\.//g' | cut -d' ' -f3"
+    OUTPUT_VARIABLE DIST_VERSION
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  if (DIST_NAME)
+    message(STATUS "Distro Name: ${DIST_NAME}")
+    if (DIST_RELEASE)
+      message(STATUS "Distro Release: ${DIST_RELEASE}")
+    endif()
+    if (DIST_VERSION)
+      message(STATUS "Distro Version: ${DIST_VERSION}")
+    endif()
+    set(RPM_ARCH x86_64 CACHE STRING "Architecture of the rpm file")
+    set(RPMBUILD_DIR ~/rpmbuild CACHE STRING "Rpmbuild directory, for the rpm target")
+    if (${DIST_NAME} STREQUAL "opensuse")
+      if (DIST_RELEASE)
+        if (${DIST_RELEASE} STREQUAL "leap")
+          if (DIST_VERSION)
+            set(RPM_DISTRO "lp${DIST_VERSION}" CACHE STRING "Suffix of the rpm file")
+          else()
+            set(RPM_DISTRO ${DIST_RELEASE} CACHE STRING "Suffix of the rpm file")
+          endif()
+        elseif (${DIST_RELEASE} STREQUAL "tumbleweed")
+          set(RPM_DISTRO ${DIST_RELEASE} CACHE STRING "Suffix of the rpm file")
+        else ()
+          set(RPM_DISTRO ${DIST_NAME} CACHE STRING "Suffix of the rpm file")
+        endif()
+      else()
+        set(RPM_DISTRO ${DIST_NAME} CACHE STRING "Suffix of the rpm file")
+      endif()
+      add_custom_target(rpm
+        COMMAND ${CMAKE_SOURCE_DIR}/dist/scripts/maketarball.sh
+        COMMAND ${CMAKE_COMMAND} -E copy strawberry-${STRAWBERRY_VERSION_PACKAGE}.tar.xz ${RPMBUILD_DIR}/SOURCES/
+        COMMAND ${RPMBUILD_EXEC} -bs ${CMAKE_SOURCE_DIR}/dist/opensuse/strawberry.spec
+        COMMAND ${RPMBUILD_EXEC} -bb ${CMAKE_SOURCE_DIR}/dist/opensuse/strawberry.spec
+      )
+    elseif (${DIST_NAME} STREQUAL "fedora")
+      if (DIST_VERSION)
+        set(RPM_DISTRO "fc${DIST_VERSION}" CACHE STRING "Suffix of the rpm file")
+      else ()
+        set(RPM_DISTRO ${DIST_NAME} CACHE STRING "Suffix of the rpm file")
+      endif()
+      add_custom_target(rpm
+        COMMAND ${CMAKE_SOURCE_DIR}/dist/scripts/maketarball.sh
+        COMMAND ${CMAKE_COMMAND} -E copy strawberry-${STRAWBERRY_VERSION_PACKAGE}.tar.xz ${RPMBUILD_DIR}/SOURCES/
+        COMMAND rpmbuild -bs ${CMAKE_SOURCE_DIR}/dist/fedora/strawberry.spec
+        COMMAND rpmbuild -bb ${CMAKE_SOURCE_DIR}/dist/fedora/strawberry.spec
+      )
+    else()
+      set(RPM_DISTRO ${DIST_NAME} CACHE STRING "Suffix of the rpm file")
+    endif()
+    message(STATUS "RPM Suffix: ${RPM_DISTRO}")
+  endif()
+endif()

cmake/Summary.cmake

@@ -50,7 +50,7 @@ function(optional_component name default description)
   set(current_dep_name)
   set(missing_deps)
 
-  foreach(arg ${ARGN}) 
+  foreach(arg ${ARGN})
     if(${next_arg_is_dep_name})
       set(current_dep_name "${arg}")
       set(next_arg_is_dep_name FALSE)

cmake/Version.cmake

@@ -1,20 +1,18 @@
 set(STRAWBERRY_VERSION_MAJOR 0)
-set(STRAWBERRY_VERSION_MINOR 2)
-set(STRAWBERRY_VERSION_PATCH 1)
+set(STRAWBERRY_VERSION_MINOR 4)
+set(STRAWBERRY_VERSION_PATCH 2)
 #set(STRAWBERRY_VERSION_PRERELEASE rc1)
 
 set(INCLUDE_GIT_REVISION OFF)
 
-if (WIN32)
-  set(INCLUDE_GIT_REVISION OFF)
-endif()
-
 set(majorminorpatch "${STRAWBERRY_VERSION_MAJOR}.${STRAWBERRY_VERSION_MINOR}.${STRAWBERRY_VERSION_PATCH}")
 
 set(STRAWBERRY_VERSION_DISPLAY "${majorminorpatch}")
+set(STRAWBERRY_VERSION_PACKAGE "${majorminorpatch}")
 set(STRAWBERRY_VERSION_RPM_V   "${majorminorpatch}")
 set(STRAWBERRY_VERSION_RPM_R   "1")
-set(STRAWBERRY_VERSION_PACKAGE "${majorminorpatch}")
+set(STRAWBERRY_VERSION_PAC_V   "${majorminorpatch}")
+set(STRAWBERRY_VERSION_PAC_R   "1")
 
 if(${STRAWBERRY_VERSION_PATCH} EQUAL "0")
   set(STRAWBERRY_VERSION_DISPLAY "${STRAWBERRY_VERSION_MAJOR}.${STRAWBERRY_VERSION_MINOR}")
@@ -26,10 +24,11 @@ if(STRAWBERRY_VERSION_PRERELEASE)
   set(STRAWBERRY_VERSION_PACKAGE "${STRAWBERRY_VERSION_PACKAGE}${STRAWBERRY_VERSION_PRERELEASE}")
 endif(STRAWBERRY_VERSION_PRERELEASE)
 
-if(INCLUDE_GIT_REVISION)
+
+if(INCLUDE_GIT_REVISION AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
 
   find_program(GIT_EXECUTABLE git)
-  if(GIT_EXECUTABLE-NOTFOUND)
+  if(NOT GIT_EXECUTABLE OR GIT_EXECUTABLE-NOTFOUND)
     message(FATAL_ERROR "Missing GIT executable." )
   endif()
 
@@ -56,6 +55,14 @@ if(INCLUDE_GIT_REVISION)
     message(FATAL_ERROR "GIT command failed to get revision string '${GIT_REVISION}'")
   endif()
 
+endif()
+
+if(FORCE_GIT_REVISION)
+  set(GIT_REVISION ${FORCE_GIT_REVISION})
+endif()
+
+if(GIT_REVISION)
+
   string(REGEX REPLACE "^(.+)-([0-9]+)-(g[a-f0-9]+)$" "\\1;\\2;\\3" GIT_PARTS ${GIT_REVISION})
 
   if(NOT GIT_PARTS)
@@ -77,10 +84,13 @@ if(INCLUDE_GIT_REVISION)
   set(STRAWBERRY_VERSION_PACKAGE "${GIT_TAGNAME}.${GIT_COMMITCOUNT}.${GIT_SHA1}")
   set(STRAWBERRY_VERSION_RPM_V   "${GIT_TAGNAME}")
   set(STRAWBERRY_VERSION_RPM_R   "2.${GIT_COMMITCOUNT}.${GIT_SHA1}")
+  set(STRAWBERRY_VERSION_PAC_V   "${GIT_TAGNAME}")
+  set(STRAWBERRY_VERSION_PAC_R   "${GIT_COMMITCOUNT}")
 
 endif()
 
 message(STATUS "Strawberry Version:")
 message(STATUS "Display:  ${STRAWBERRY_VERSION_DISPLAY}")
 message(STATUS "Package:  ${STRAWBERRY_VERSION_PACKAGE}")
-message(STATUS "Rpm:      ${STRAWBERRY_VERSION_RPM_V}-${STRAWBERRY_VERSION_RPM_R}")
+message(STATUS "RPM:      ${STRAWBERRY_VERSION_RPM_V}-${STRAWBERRY_VERSION_RPM_R}")
+message(STATUS "PAC:      ${STRAWBERRY_VERSION_PAC_V}-${STRAWBERRY_VERSION_PAC_R}")

data/data.qrc

@@ -1,12 +1,14 @@
 <RCC>
     <qresource prefix="/">
         <file>schema/schema.sql</file>
+        <file>schema/schema-1.sql</file>
+        <file>schema/schema-2.sql</file>
+        <file>schema/schema-3.sql</file>
         <file>schema/device-schema.sql</file>
-        <file>style/mainwindow.css</file>
-        <file>style/statusview.css</file>
+        <file>style/strawberry.css</file>
         <file>misc/playing_tooltip.txt</file>
+        <file>misc/oauthsuccess.html</file>
         <file>pictures/strawberry.png</file>
-        <file>pictures/strawbs-transparent.png</file>
         <file>pictures/noalbumart.png</file>
         <file>pictures/nomusic.png</file>
         <file>pictures/musicbrainz.png</file>
@@ -25,456 +27,7 @@
         <file>pictures/osd_background.png</file>
         <file>pictures/osd_shadow_corner.png</file>
         <file>pictures/osd_shadow_edge.png</file>
-        <file>icons/128x128/albums.png</file>
-        <file>icons/128x128/alsa.png</file>
-        <file>icons/128x128/application-exit.png</file>
-        <file>icons/128x128/applications-internet.png</file>
-        <file>icons/128x128/bluetooth.png</file>
-        <file>icons/128x128/cdcase.png</file>
-        <file>icons/128x128/cd.png</file>
-        <file>icons/128x128/configure.png</file>
-        <file>icons/128x128/device-ipod-nano.png</file>
-        <file>icons/128x128/device-ipod.png</file>
-        <file>icons/128x128/device-phone.png</file>
-        <file>icons/128x128/device.png</file>
-        <file>icons/128x128/device-usb-drive.png</file>
-        <file>icons/128x128/device-usb-flash.png</file>
-        <file>icons/128x128/dialog-error.png</file>
-        <file>icons/128x128/dialog-information.png</file>
-        <file>icons/128x128/dialog-ok-apply.png</file>
-        <file>icons/128x128/dialog-password.png</file>
-        <file>icons/128x128/dialog-warning.png</file>
-        <file>icons/128x128/document-download.png</file>
-        <file>icons/128x128/document-new.png</file>
-        <file>icons/128x128/document-open-folder.png</file>
-        <file>icons/128x128/document-open.png</file>
-        <file>icons/128x128/document-save.png</file>
-        <file>icons/128x128/document-search.png</file>
-        <file>icons/128x128/download.png</file>
-        <file>icons/128x128/edit-clear-list.png</file>
-        <file>icons/128x128/edit-clear-locationbar-ltr.png</file>
-        <file>icons/128x128/edit-copy.png</file>
-        <file>icons/128x128/edit-delete.png</file>
-        <file>icons/128x128/edit-find.png</file>
-        <file>icons/128x128/edit-redo.png</file>
-        <file>icons/128x128/edit-rename.png</file>
-        <file>icons/128x128/edit-undo.png</file>
-        <file>icons/128x128/electrocompaniet.png</file>
-        <file>icons/128x128/equalizer.png</file>
-        <file>icons/128x128/folder-new.png</file>
-        <file>icons/128x128/folder.png</file>
-        <file>icons/128x128/folder-sound.png</file>
-        <file>icons/128x128/footsteps.png</file>
-        <file>icons/128x128/go-down.png</file>
-        <file>icons/128x128/go-home.png</file>
-        <file>icons/128x128/go-jump.png</file>
-        <file>icons/128x128/go-next.png</file>
-        <file>icons/128x128/go-previous.png</file>
-        <file>icons/128x128/go-up.png</file>
-        <file>icons/128x128/gstreamer.png</file>
-        <file>icons/128x128/guitar.png</file>
-        <file>icons/128x128/headset.png</file>
-        <file>icons/128x128/help-hint.png</file>
-        <file>icons/128x128/intel.png</file>
-        <file>icons/128x128/jack.png</file>
-        <file>icons/128x128/keyboard.png</file>
-        <file>icons/128x128/list-add.png</file>
-        <file>icons/128x128/list-remove.png</file>
-        <file>icons/128x128/mcintosh-player.png</file>
-        <file>icons/128x128/mcintosh-text.png</file>
-        <file>icons/128x128/media-eject.png</file>
-        <file>icons/128x128/media-forward.png</file>
-        <file>icons/128x128/media-pause.png</file>
-        <file>icons/128x128/media-play.png</file>
-        <file>icons/128x128/media-rewind.png</file>
-        <file>icons/128x128/media-stop.png</file>
-        <file>icons/128x128/nvidia.png</file>
-        <file>icons/128x128/play2.png</file>
-        <file>icons/128x128/realtek.png</file>
-        <file>icons/128x128/search.png</file>
-        <file>icons/128x128/soundcard2.png</file>
-        <file>icons/128x128/soundcard.png</file>
-        <file>icons/128x128/speaker.png</file>
-        <file>icons/128x128/star-grey.png</file>
-        <file>icons/128x128/star.png</file>
-        <file>icons/128x128/strawberry-panel-grey.png</file>
-        <file>icons/128x128/strawberry-panel.png</file>
-        <file>icons/128x128/strawberry.png</file>
-        <file>icons/128x128/strawberry.svg</file>
-        <file>icons/128x128/tools-wizard.png</file>
-        <file>icons/128x128/view-choose.png</file>
-        <file>icons/128x128/view-fullscreen.png</file>
-        <file>icons/128x128/view-media-lyrics.png</file>
-        <file>icons/128x128/view-media-playlist.png</file>
-        <file>icons/128x128/view-media-visualization.png</file>
-        <file>icons/128x128/view-refresh.png</file>
-        <file>icons/128x128/vinyl.png</file>
-        <file>icons/128x128/vlc.png</file>
-        <file>icons/128x128/xine.png</file>
-        <file>icons/128x128/zoom-in.png</file>
-        <file>icons/128x128/zoom-out.png</file>
-        <file>icons/64x64/albums.png</file>
-        <file>icons/64x64/alsa.png</file>
-        <file>icons/64x64/application-exit.png</file>
-        <file>icons/64x64/applications-internet.png</file>
-        <file>icons/64x64/bluetooth.png</file>
-        <file>icons/64x64/cdcase.png</file>
-        <file>icons/64x64/cd.png</file>
-        <file>icons/64x64/configure.png</file>
-        <file>icons/64x64/device-ipod-nano.png</file>
-        <file>icons/64x64/device-ipod.png</file>
-        <file>icons/64x64/device-phone.png</file>
-        <file>icons/64x64/device.png</file>
-        <file>icons/64x64/device-usb-drive.png</file>
-        <file>icons/64x64/device-usb-flash.png</file>
-        <file>icons/64x64/dialog-error.png</file>
-        <file>icons/64x64/dialog-information.png</file>
-        <file>icons/64x64/dialog-ok-apply.png</file>
-        <file>icons/64x64/dialog-password.png</file>
-        <file>icons/64x64/dialog-warning.png</file>
-        <file>icons/64x64/document-download.png</file>
-        <file>icons/64x64/document-new.png</file>
-        <file>icons/64x64/document-open-folder.png</file>
-        <file>icons/64x64/document-open.png</file>
-        <file>icons/64x64/document-save.png</file>
-        <file>icons/64x64/document-search.png</file>
-        <file>icons/64x64/download.png</file>
-        <file>icons/64x64/edit-clear-list.png</file>
-        <file>icons/64x64/edit-clear-locationbar-ltr.png</file>
-        <file>icons/64x64/edit-copy.png</file>
-        <file>icons/64x64/edit-delete.png</file>
-        <file>icons/64x64/edit-find.png</file>
-        <file>icons/64x64/edit-redo.png</file>
-        <file>icons/64x64/edit-rename.png</file>
-        <file>icons/64x64/edit-undo.png</file>
-        <file>icons/64x64/electrocompaniet.png</file>
-        <file>icons/64x64/equalizer.png</file>
-        <file>icons/64x64/folder-new.png</file>
-        <file>icons/64x64/folder.png</file>
-        <file>icons/64x64/folder-sound.png</file>
-        <file>icons/64x64/footsteps.png</file>
-        <file>icons/64x64/go-down.png</file>
-        <file>icons/64x64/go-home.png</file>
-        <file>icons/64x64/go-jump.png</file>
-        <file>icons/64x64/go-next.png</file>
-        <file>icons/64x64/go-previous.png</file>
-        <file>icons/64x64/go-up.png</file>
-        <file>icons/64x64/gstreamer.png</file>
-        <file>icons/64x64/guitar.png</file>
-        <file>icons/64x64/headset.png</file>
-        <file>icons/64x64/help-hint.png</file>
-        <file>icons/64x64/intel.png</file>
-        <file>icons/64x64/jack.png</file>
-        <file>icons/64x64/keyboard.png</file>
-        <file>icons/64x64/list-add.png</file>
-        <file>icons/64x64/list-remove.png</file>
-        <file>icons/64x64/mcintosh-player.png</file>
-        <file>icons/64x64/mcintosh-text.png</file>
-        <file>icons/64x64/media-eject.png</file>
-        <file>icons/64x64/media-forward.png</file>
-        <file>icons/64x64/media-pause.png</file>
-        <file>icons/64x64/media-play.png</file>
-        <file>icons/64x64/media-rewind.png</file>
-        <file>icons/64x64/media-stop.png</file>
-        <file>icons/64x64/nvidia.png</file>
-        <file>icons/64x64/play2.png</file>
-        <file>icons/64x64/pulseaudio.png</file>
-        <file>icons/64x64/realtek.png</file>
-        <file>icons/64x64/search.png</file>
-        <file>icons/64x64/soundcard2.png</file>
-        <file>icons/64x64/soundcard.png</file>
-        <file>icons/64x64/speaker.png</file>
-        <file>icons/64x64/star-grey.png</file>
-        <file>icons/64x64/star.png</file>
-        <file>icons/64x64/strawberry-panel-grey.png</file>
-        <file>icons/64x64/strawberry-panel.png</file>
-        <file>icons/64x64/strawberry.png</file>
-        <file>icons/64x64/tools-wizard.png</file>
-        <file>icons/64x64/view-choose.png</file>
-        <file>icons/64x64/view-fullscreen.png</file>
-        <file>icons/64x64/view-media-lyrics.png</file>
-        <file>icons/64x64/view-media-playlist.png</file>
-        <file>icons/64x64/view-media-visualization.png</file>
-        <file>icons/64x64/view-refresh.png</file>
-        <file>icons/64x64/vinyl.png</file>
-        <file>icons/64x64/vlc.png</file>
-        <file>icons/64x64/xine.png</file>
-        <file>icons/64x64/zoom-in.png</file>
-        <file>icons/64x64/zoom-out.png</file>
-        <file>icons/48x48/albums.png</file>
-        <file>icons/48x48/alsa.png</file>
-        <file>icons/48x48/application-exit.png</file>
-        <file>icons/48x48/applications-internet.png</file>
-        <file>icons/48x48/bluetooth.png</file>
-        <file>icons/48x48/cdcase.png</file>
-        <file>icons/48x48/cd.png</file>
-        <file>icons/48x48/configure.png</file>
-        <file>icons/48x48/device-ipod-nano.png</file>
-        <file>icons/48x48/device-ipod.png</file>
-        <file>icons/48x48/device-phone.png</file>
-        <file>icons/48x48/device.png</file>
-        <file>icons/48x48/device-usb-drive.png</file>
-        <file>icons/48x48/device-usb-flash.png</file>
-        <file>icons/48x48/dialog-error.png</file>
-        <file>icons/48x48/dialog-information.png</file>
-        <file>icons/48x48/dialog-ok-apply.png</file>
-        <file>icons/48x48/dialog-password.png</file>
-        <file>icons/48x48/dialog-warning.png</file>
-        <file>icons/48x48/document-download.png</file>
-        <file>icons/48x48/document-new.png</file>
-        <file>icons/48x48/document-open-folder.png</file>
-        <file>icons/48x48/document-open.png</file>
-        <file>icons/48x48/document-save.png</file>
-        <file>icons/48x48/document-search.png</file>
-        <file>icons/48x48/download.png</file>
-        <file>icons/48x48/edit-clear-list.png</file>
-        <file>icons/48x48/edit-clear-locationbar-ltr.png</file>
-        <file>icons/48x48/edit-copy.png</file>
-        <file>icons/48x48/edit-delete.png</file>
-        <file>icons/48x48/edit-find.png</file>
-        <file>icons/48x48/edit-redo.png</file>
-        <file>icons/48x48/edit-rename.png</file>
-        <file>icons/48x48/edit-undo.png</file>
-        <file>icons/48x48/electrocompaniet.png</file>
-        <file>icons/48x48/equalizer.png</file>
-        <file>icons/48x48/folder-new.png</file>
-        <file>icons/48x48/folder.png</file>
-        <file>icons/48x48/folder-sound.png</file>
-        <file>icons/48x48/footsteps.png</file>
-        <file>icons/48x48/go-down.png</file>
-        <file>icons/48x48/go-home.png</file>
-        <file>icons/48x48/go-jump.png</file>
-        <file>icons/48x48/go-next.png</file>
-        <file>icons/48x48/go-previous.png</file>
-        <file>icons/48x48/go-up.png</file>
-        <file>icons/48x48/gstreamer.png</file>
-        <file>icons/48x48/guitar.png</file>
-        <file>icons/48x48/headset.png</file>
-        <file>icons/48x48/help-hint.png</file>
-        <file>icons/48x48/intel.png</file>
-        <file>icons/48x48/jack.png</file>
-        <file>icons/48x48/keyboard.png</file>
-        <file>icons/48x48/list-add.png</file>
-        <file>icons/48x48/list-remove.png</file>
-        <file>icons/48x48/mcintosh-player.png</file>
-        <file>icons/48x48/mcintosh.png</file>
-        <file>icons/48x48/mcintosh-text.png</file>
-        <file>icons/48x48/media-eject.png</file>
-        <file>icons/48x48/media-forward.png</file>
-        <file>icons/48x48/media-pause.png</file>
-        <file>icons/48x48/media-playlist-repeat.png</file>
-        <file>icons/48x48/media-playlist-shuffle.png</file>
-        <file>icons/48x48/media-play.png</file>
-        <file>icons/48x48/media-rewind.png</file>
-        <file>icons/48x48/media-stop.png</file>
-        <file>icons/48x48/nvidia.png</file>
-        <file>icons/48x48/play2.png</file>
-        <file>icons/48x48/pulseaudio.png</file>
-        <file>icons/48x48/realtek.png</file>
-        <file>icons/48x48/search.png</file>
-        <file>icons/48x48/soundcard2.png</file>
-        <file>icons/48x48/soundcard.png</file>
-        <file>icons/48x48/speaker.png</file>
-        <file>icons/48x48/star-grey.png</file>
-        <file>icons/48x48/star.png</file>
-        <file>icons/48x48/strawberry-panel-grey.png</file>
-        <file>icons/48x48/strawberry-panel.png</file>
-        <file>icons/48x48/strawberry.png</file>
-        <file>icons/48x48/tools-wizard.png</file>
-        <file>icons/48x48/view-choose.png</file>
-        <file>icons/48x48/view-fullscreen.png</file>
-        <file>icons/48x48/view-media-lyrics.png</file>
-        <file>icons/48x48/view-media-playlist.png</file>
-        <file>icons/48x48/view-media-visualization.png</file>
-        <file>icons/48x48/view-refresh.png</file>
-        <file>icons/48x48/vinyl.png</file>
-        <file>icons/48x48/vlc.png</file>
-        <file>icons/48x48/xine.png</file>
-        <file>icons/48x48/zoom-in.png</file>
-        <file>icons/48x48/zoom-out.png</file>
-        <file>icons/32x32/albums.png</file>
-        <file>icons/32x32/alsa.png</file>
-        <file>icons/32x32/application-exit.png</file>
-        <file>icons/32x32/applications-internet.png</file>
-        <file>icons/32x32/bluetooth.png</file>
-        <file>icons/32x32/cdcase.png</file>
-        <file>icons/32x32/cd.png</file>
-        <file>icons/32x32/configure.png</file>
-        <file>icons/32x32/device-ipod-nano.png</file>
-        <file>icons/32x32/device-ipod.png</file>
-        <file>icons/32x32/device-phone.png</file>
-        <file>icons/32x32/device.png</file>
-        <file>icons/32x32/device-usb-drive.png</file>
-        <file>icons/32x32/device-usb-flash.png</file>
-        <file>icons/32x32/dialog-error.png</file>
-        <file>icons/32x32/dialog-information.png</file>
-        <file>icons/32x32/dialog-ok-apply.png</file>
-        <file>icons/32x32/dialog-password.png</file>
-        <file>icons/32x32/dialog-warning.png</file>
-        <file>icons/32x32/document-download.png</file>
-        <file>icons/32x32/document-new.png</file>
-        <file>icons/32x32/document-open-folder.png</file>
-        <file>icons/32x32/document-open.png</file>
-        <file>icons/32x32/document-save.png</file>
-        <file>icons/32x32/document-search.png</file>
-        <file>icons/32x32/download.png</file>
-        <file>icons/32x32/edit-clear-list.png</file>
-        <file>icons/32x32/edit-clear-locationbar-ltr.png</file>
-        <file>icons/32x32/edit-copy.png</file>
-        <file>icons/32x32/edit-delete.png</file>
-        <file>icons/32x32/edit-find.png</file>
-        <file>icons/32x32/edit-redo.png</file>
-        <file>icons/32x32/edit-rename.png</file>
-        <file>icons/32x32/edit-undo.png</file>
-        <file>icons/32x32/electrocompaniet.png</file>
-        <file>icons/32x32/equalizer.png</file>
-        <file>icons/32x32/folder-new.png</file>
-        <file>icons/32x32/folder.png</file>
-        <file>icons/32x32/folder-sound.png</file>
-        <file>icons/32x32/footsteps.png</file>
-        <file>icons/32x32/go-down.png</file>
-        <file>icons/32x32/go-home.png</file>
-        <file>icons/32x32/go-jump.png</file>
-        <file>icons/32x32/go-next.png</file>
-        <file>icons/32x32/go-previous.png</file>
-        <file>icons/32x32/go-up.png</file>
-        <file>icons/32x32/gstreamer.png</file>
-        <file>icons/32x32/guitar.png</file>
-        <file>icons/32x32/headset.png</file>
-        <file>icons/32x32/help-hint.png</file>
-        <file>icons/32x32/intel.png</file>
-        <file>icons/32x32/jack.png</file>
-        <file>icons/32x32/keyboard.png</file>
-        <file>icons/32x32/list-add.png</file>
-        <file>icons/32x32/list-remove.png</file>
-        <file>icons/32x32/mcintosh-player.png</file>
-        <file>icons/32x32/mcintosh.png</file>
-        <file>icons/32x32/mcintosh-text.png</file>
-        <file>icons/32x32/media-eject.png</file>
-        <file>icons/32x32/media-forward.png</file>
-        <file>icons/32x32/media-pause.png</file>
-        <file>icons/32x32/media-playlist-repeat.png</file>
-        <file>icons/32x32/media-playlist-shuffle.png</file>
-        <file>icons/32x32/media-play.png</file>
-        <file>icons/32x32/media-rewind.png</file>
-        <file>icons/32x32/media-stop.png</file>
-        <file>icons/32x32/nvidia.png</file>
-        <file>icons/32x32/play2.png</file>
-        <file>icons/32x32/pulseaudio.png</file>
-        <file>icons/32x32/realtek.png</file>
-        <file>icons/32x32/search.png</file>
-        <file>icons/32x32/soundcard2.png</file>
-        <file>icons/32x32/soundcard.png</file>
-        <file>icons/32x32/speaker.png</file>
-        <file>icons/32x32/star-grey.png</file>
-        <file>icons/32x32/star.png</file>
-        <file>icons/32x32/strawberry-panel-grey.png</file>
-        <file>icons/32x32/strawberry-panel.png</file>
-        <file>icons/32x32/strawberry.png</file>
-        <file>icons/32x32/strawberry.svg</file>
-        <file>icons/32x32/tools-wizard.png</file>
-        <file>icons/32x32/view-choose.png</file>
-        <file>icons/32x32/view-fullscreen.png</file>
-        <file>icons/32x32/view-media-lyrics.png</file>
-        <file>icons/32x32/view-media-playlist.png</file>
-        <file>icons/32x32/view-media-visualization.png</file>
-        <file>icons/32x32/view-refresh.png</file>
-        <file>icons/32x32/vinyl.png</file>
-        <file>icons/32x32/vlc.png</file>
-        <file>icons/32x32/xine.png</file>
-        <file>icons/32x32/zoom-in.png</file>
-        <file>icons/32x32/zoom-out.png</file>
-        <file>icons/22x22/albums.png</file>
-        <file>icons/22x22/alsa.png</file>
-        <file>icons/22x22/application-exit.png</file>
-        <file>icons/22x22/applications-internet.png</file>
-        <file>icons/22x22/bluetooth.png</file>
-        <file>icons/22x22/cdcase.png</file>
-        <file>icons/22x22/cd.png</file>
-        <file>icons/22x22/configure.png</file>
-        <file>icons/22x22/device-ipod-nano.png</file>
-        <file>icons/22x22/device-ipod.png</file>
-        <file>icons/22x22/device-phone.png</file>
-        <file>icons/22x22/device.png</file>
-        <file>icons/22x22/device-usb-drive.png</file>
-        <file>icons/22x22/device-usb-flash.png</file>
-        <file>icons/22x22/dialog-error.png</file>
-        <file>icons/22x22/dialog-information.png</file>
-        <file>icons/22x22/dialog-ok-apply.png</file>
-        <file>icons/22x22/dialog-password.png</file>
-        <file>icons/22x22/dialog-warning.png</file>
-        <file>icons/22x22/document-download.png</file>
-        <file>icons/22x22/document-new.png</file>
-        <file>icons/22x22/document-open-folder.png</file>
-        <file>icons/22x22/document-open.png</file>
-        <file>icons/22x22/document-save.png</file>
-        <file>icons/22x22/document-search.png</file>
-        <file>icons/22x22/download.png</file>
-        <file>icons/22x22/edit-clear-list.png</file>
-        <file>icons/22x22/edit-clear-locationbar-ltr.png</file>
-        <file>icons/22x22/edit-copy.png</file>
-        <file>icons/22x22/edit-delete.png</file>
-        <file>icons/22x22/edit-find.png</file>
-        <file>icons/22x22/edit-redo.png</file>
-        <file>icons/22x22/edit-rename.png</file>
-        <file>icons/22x22/edit-undo.png</file>
-        <file>icons/22x22/electrocompaniet.png</file>
-        <file>icons/22x22/equalizer.png</file>
-        <file>icons/22x22/folder-new.png</file>
-        <file>icons/22x22/folder.png</file>
-        <file>icons/22x22/folder-sound.png</file>
-        <file>icons/22x22/footsteps.png</file>
-        <file>icons/22x22/go-down.png</file>
-        <file>icons/22x22/go-home.png</file>
-        <file>icons/22x22/go-jump.png</file>
-        <file>icons/22x22/go-next.png</file>
-        <file>icons/22x22/go-previous.png</file>
-        <file>icons/22x22/go-up.png</file>
-        <file>icons/22x22/gstreamer.png</file>
-        <file>icons/22x22/guitar.png</file>
-        <file>icons/22x22/headset.png</file>
-        <file>icons/22x22/help-hint.png</file>
-        <file>icons/22x22/intel.png</file>
-        <file>icons/22x22/jack.png</file>
-        <file>icons/22x22/keyboard.png</file>
-        <file>icons/22x22/list-add.png</file>
-        <file>icons/22x22/list-remove.png</file>
-        <file>icons/22x22/mcintosh-player.png</file>
-        <file>icons/22x22/mcintosh.png</file>
-        <file>icons/22x22/mcintosh-text.png</file>
-        <file>icons/22x22/media-eject.png</file>
-        <file>icons/22x22/media-forward.png</file>
-        <file>icons/22x22/media-pause.png</file>
-        <file>icons/22x22/media-playlist-repeat.png</file>
-        <file>icons/22x22/media-playlist-shuffle.png</file>
-        <file>icons/22x22/media-play.png</file>
-        <file>icons/22x22/media-rewind.png</file>
-        <file>icons/22x22/media-stop.png</file>
-        <file>icons/22x22/nvidia.png</file>
-        <file>icons/22x22/play2.png</file>
-        <file>icons/22x22/pulseaudio.png</file>
-        <file>icons/22x22/realtek.png</file>
-        <file>icons/22x22/search.png</file>
-        <file>icons/22x22/soundcard2.png</file>
-        <file>icons/22x22/soundcard.png</file>
-        <file>icons/22x22/speaker.png</file>
-        <file>icons/22x22/star-grey.png</file>
-        <file>icons/22x22/star.png</file>
-        <file>icons/22x22/strawberry-panel-grey.png</file>
-        <file>icons/22x22/strawberry-panel.png</file>
-        <file>icons/22x22/strawberry.png</file>
-        <file>icons/22x22/strawberry.svg</file>
-        <file>icons/22x22/tools-wizard.png</file>
-        <file>icons/22x22/view-choose.png</file>
-        <file>icons/22x22/view-fullscreen.png</file>
-        <file>icons/22x22/view-media-lyrics.png</file>
-        <file>icons/22x22/view-media-playlist.png</file>
-        <file>icons/22x22/view-media-visualization.png</file>
-        <file>icons/22x22/view-refresh.png</file>
-        <file>icons/22x22/vinyl.png</file>
-        <file>icons/22x22/vlc.png</file>
-        <file>icons/22x22/xine.png</file>
-        <file>icons/22x22/zoom-in.png</file>
-        <file>icons/22x22/zoom-out.png</file>
+        <file>pictures/deezer.png</file>
+	<file>fonts/HumongousofEternitySt.ttf</file>
     </qresource>
 </RCC>

data/icons.qrc

@@ -1,4 +1,444 @@
 <RCC>
-<qresource prefix="/">
-</qresource>
+    <qresource prefix="/">
+        <file>icons/128x128/albums.png</file>
+        <file>icons/128x128/alsa.png</file>
+        <file>icons/128x128/application-exit.png</file>
+        <file>icons/128x128/applications-internet.png</file>
+        <file>icons/128x128/bluetooth.png</file>
+        <file>icons/128x128/cdcase.png</file>
+        <file>icons/128x128/cd.png</file>
+        <file>icons/128x128/configure.png</file>
+        <file>icons/128x128/device-ipod-nano.png</file>
+        <file>icons/128x128/device-ipod.png</file>
+        <file>icons/128x128/device-phone.png</file>
+        <file>icons/128x128/device.png</file>
+        <file>icons/128x128/device-usb-drive.png</file>
+        <file>icons/128x128/device-usb-flash.png</file>
+        <file>icons/128x128/dialog-error.png</file>
+        <file>icons/128x128/dialog-information.png</file>
+        <file>icons/128x128/dialog-ok-apply.png</file>
+        <file>icons/128x128/dialog-password.png</file>
+        <file>icons/128x128/dialog-warning.png</file>
+        <file>icons/128x128/document-download.png</file>
+        <file>icons/128x128/document-new.png</file>
+        <file>icons/128x128/document-open-folder.png</file>
+        <file>icons/128x128/document-open.png</file>
+        <file>icons/128x128/document-save.png</file>
+        <file>icons/128x128/document-search.png</file>
+        <file>icons/128x128/download.png</file>
+        <file>icons/128x128/edit-clear-list.png</file>
+        <file>icons/128x128/edit-clear-locationbar-ltr.png</file>
+        <file>icons/128x128/edit-copy.png</file>
+        <file>icons/128x128/edit-delete.png</file>
+        <file>icons/128x128/edit-find.png</file>
+        <file>icons/128x128/edit-redo.png</file>
+        <file>icons/128x128/edit-rename.png</file>
+        <file>icons/128x128/edit-undo.png</file>
+        <file>icons/128x128/electrocompaniet.png</file>
+        <file>icons/128x128/equalizer.png</file>
+        <file>icons/128x128/folder-new.png</file>
+        <file>icons/128x128/folder.png</file>
+        <file>icons/128x128/folder-sound.png</file>
+        <file>icons/128x128/footsteps.png</file>
+        <file>icons/128x128/go-down.png</file>
+        <file>icons/128x128/go-home.png</file>
+        <file>icons/128x128/go-jump.png</file>
+        <file>icons/128x128/go-next.png</file>
+        <file>icons/128x128/go-previous.png</file>
+        <file>icons/128x128/go-up.png</file>
+        <file>icons/128x128/gstreamer.png</file>
+        <file>icons/128x128/headset.png</file>
+        <file>icons/128x128/help-hint.png</file>
+        <file>icons/128x128/intel.png</file>
+        <file>icons/128x128/jack.png</file>
+        <file>icons/128x128/keyboard.png</file>
+        <file>icons/128x128/list-add.png</file>
+        <file>icons/128x128/list-remove.png</file>
+        <file>icons/128x128/mcintosh-player.png</file>
+        <file>icons/128x128/mcintosh-text.png</file>
+        <file>icons/128x128/media-eject.png</file>
+        <file>icons/128x128/media-forward.png</file>
+        <file>icons/128x128/media-pause.png</file>
+        <file>icons/128x128/media-play.png</file>
+        <file>icons/128x128/media-rewind.png</file>
+        <file>icons/128x128/media-stop.png</file>
+        <file>icons/128x128/nvidia.png</file>
+        <file>icons/128x128/play2.png</file>
+        <file>icons/128x128/realtek.png</file>
+        <file>icons/128x128/search.png</file>
+        <file>icons/128x128/soundcard.png</file>
+        <file>icons/128x128/speaker.png</file>
+        <file>icons/128x128/star-grey.png</file>
+        <file>icons/128x128/star.png</file>
+        <file>icons/128x128/strawberry.png</file>
+        <file>icons/128x128/strawberry.svg</file>
+        <file>icons/128x128/tools-wizard.png</file>
+        <file>icons/128x128/view-choose.png</file>
+        <file>icons/128x128/view-fullscreen.png</file>
+        <file>icons/128x128/view-media-lyrics.png</file>
+        <file>icons/128x128/view-media-playlist.png</file>
+        <file>icons/128x128/view-media-visualization.png</file>
+        <file>icons/128x128/view-refresh.png</file>
+        <file>icons/128x128/vinyl.png</file>
+        <file>icons/128x128/vlc.png</file>
+        <file>icons/128x128/xine.png</file>
+        <file>icons/128x128/zoom-in.png</file>
+        <file>icons/128x128/zoom-out.png</file>
+        <file>icons/128x128/tidal.png</file>
+        <file>icons/128x128/deezer.png</file>
+        <file>icons/64x64/albums.png</file>
+        <file>icons/64x64/alsa.png</file>
+        <file>icons/64x64/application-exit.png</file>
+        <file>icons/64x64/applications-internet.png</file>
+        <file>icons/64x64/bluetooth.png</file>
+        <file>icons/64x64/cdcase.png</file>
+        <file>icons/64x64/cd.png</file>
+        <file>icons/64x64/configure.png</file>
+        <file>icons/64x64/device-ipod-nano.png</file>
+        <file>icons/64x64/device-ipod.png</file>
+        <file>icons/64x64/device-phone.png</file>
+        <file>icons/64x64/device.png</file>
+        <file>icons/64x64/device-usb-drive.png</file>
+        <file>icons/64x64/device-usb-flash.png</file>
+        <file>icons/64x64/dialog-error.png</file>
+        <file>icons/64x64/dialog-information.png</file>
+        <file>icons/64x64/dialog-ok-apply.png</file>
+        <file>icons/64x64/dialog-password.png</file>
+        <file>icons/64x64/dialog-warning.png</file>
+        <file>icons/64x64/document-download.png</file>
+        <file>icons/64x64/document-new.png</file>
+        <file>icons/64x64/document-open-folder.png</file>
+        <file>icons/64x64/document-open.png</file>
+        <file>icons/64x64/document-save.png</file>
+        <file>icons/64x64/document-search.png</file>
+        <file>icons/64x64/download.png</file>
+        <file>icons/64x64/edit-clear-list.png</file>
+        <file>icons/64x64/edit-clear-locationbar-ltr.png</file>
+        <file>icons/64x64/edit-copy.png</file>
+        <file>icons/64x64/edit-delete.png</file>
+        <file>icons/64x64/edit-find.png</file>
+        <file>icons/64x64/edit-redo.png</file>
+        <file>icons/64x64/edit-rename.png</file>
+        <file>icons/64x64/edit-undo.png</file>
+        <file>icons/64x64/electrocompaniet.png</file>
+        <file>icons/64x64/equalizer.png</file>
+        <file>icons/64x64/folder-new.png</file>
+        <file>icons/64x64/folder.png</file>
+        <file>icons/64x64/folder-sound.png</file>
+        <file>icons/64x64/footsteps.png</file>
+        <file>icons/64x64/go-down.png</file>
+        <file>icons/64x64/go-home.png</file>
+        <file>icons/64x64/go-jump.png</file>
+        <file>icons/64x64/go-next.png</file>
+        <file>icons/64x64/go-previous.png</file>
+        <file>icons/64x64/go-up.png</file>
+        <file>icons/64x64/gstreamer.png</file>
+        <file>icons/64x64/headset.png</file>
+        <file>icons/64x64/help-hint.png</file>
+        <file>icons/64x64/intel.png</file>
+        <file>icons/64x64/jack.png</file>
+        <file>icons/64x64/keyboard.png</file>
+        <file>icons/64x64/list-add.png</file>
+        <file>icons/64x64/list-remove.png</file>
+        <file>icons/64x64/mcintosh-player.png</file>
+        <file>icons/64x64/mcintosh-text.png</file>
+        <file>icons/64x64/media-eject.png</file>
+        <file>icons/64x64/media-forward.png</file>
+        <file>icons/64x64/media-pause.png</file>
+        <file>icons/64x64/media-play.png</file>
+        <file>icons/64x64/media-rewind.png</file>
+        <file>icons/64x64/media-stop.png</file>
+        <file>icons/64x64/nvidia.png</file>
+        <file>icons/64x64/play2.png</file>
+        <file>icons/64x64/pulseaudio.png</file>
+        <file>icons/64x64/realtek.png</file>
+        <file>icons/64x64/search.png</file>
+        <file>icons/64x64/soundcard.png</file>
+        <file>icons/64x64/speaker.png</file>
+        <file>icons/64x64/star-grey.png</file>
+        <file>icons/64x64/star.png</file>
+        <file>icons/64x64/strawberry.png</file>
+        <file>icons/64x64/tools-wizard.png</file>
+        <file>icons/64x64/view-choose.png</file>
+        <file>icons/64x64/view-fullscreen.png</file>
+        <file>icons/64x64/view-media-lyrics.png</file>
+        <file>icons/64x64/view-media-playlist.png</file>
+        <file>icons/64x64/view-media-visualization.png</file>
+        <file>icons/64x64/view-refresh.png</file>
+        <file>icons/64x64/vinyl.png</file>
+        <file>icons/64x64/vlc.png</file>
+        <file>icons/64x64/xine.png</file>
+        <file>icons/64x64/zoom-in.png</file>
+        <file>icons/64x64/zoom-out.png</file>
+        <file>icons/64x64/tidal.png</file>
+        <file>icons/64x64/deezer.png</file>
+        <file>icons/48x48/albums.png</file>
+        <file>icons/48x48/alsa.png</file>
+        <file>icons/48x48/application-exit.png</file>
+        <file>icons/48x48/applications-internet.png</file>
+        <file>icons/48x48/bluetooth.png</file>
+        <file>icons/48x48/cdcase.png</file>
+        <file>icons/48x48/cd.png</file>
+        <file>icons/48x48/configure.png</file>
+        <file>icons/48x48/device-ipod-nano.png</file>
+        <file>icons/48x48/device-ipod.png</file>
+        <file>icons/48x48/device-phone.png</file>
+        <file>icons/48x48/device.png</file>
+        <file>icons/48x48/device-usb-drive.png</file>
+        <file>icons/48x48/device-usb-flash.png</file>
+        <file>icons/48x48/dialog-error.png</file>
+        <file>icons/48x48/dialog-information.png</file>
+        <file>icons/48x48/dialog-ok-apply.png</file>
+        <file>icons/48x48/dialog-password.png</file>
+        <file>icons/48x48/dialog-warning.png</file>
+        <file>icons/48x48/document-download.png</file>
+        <file>icons/48x48/document-new.png</file>
+        <file>icons/48x48/document-open-folder.png</file>
+        <file>icons/48x48/document-open.png</file>
+        <file>icons/48x48/document-save.png</file>
+        <file>icons/48x48/document-search.png</file>
+        <file>icons/48x48/download.png</file>
+        <file>icons/48x48/edit-clear-list.png</file>
+        <file>icons/48x48/edit-clear-locationbar-ltr.png</file>
+        <file>icons/48x48/edit-copy.png</file>
+        <file>icons/48x48/edit-delete.png</file>
+        <file>icons/48x48/edit-find.png</file>
+        <file>icons/48x48/edit-redo.png</file>
+        <file>icons/48x48/edit-rename.png</file>
+        <file>icons/48x48/edit-undo.png</file>
+        <file>icons/48x48/electrocompaniet.png</file>
+        <file>icons/48x48/equalizer.png</file>
+        <file>icons/48x48/folder-new.png</file>
+        <file>icons/48x48/folder.png</file>
+        <file>icons/48x48/folder-sound.png</file>
+        <file>icons/48x48/footsteps.png</file>
+        <file>icons/48x48/go-down.png</file>
+        <file>icons/48x48/go-home.png</file>
+        <file>icons/48x48/go-jump.png</file>
+        <file>icons/48x48/go-next.png</file>
+        <file>icons/48x48/go-previous.png</file>
+        <file>icons/48x48/go-up.png</file>
+        <file>icons/48x48/gstreamer.png</file>
+        <file>icons/48x48/headset.png</file>
+        <file>icons/48x48/help-hint.png</file>
+        <file>icons/48x48/intel.png</file>
+        <file>icons/48x48/jack.png</file>
+        <file>icons/48x48/keyboard.png</file>
+        <file>icons/48x48/list-add.png</file>
+        <file>icons/48x48/list-remove.png</file>
+        <file>icons/48x48/mcintosh-player.png</file>
+        <file>icons/48x48/mcintosh.png</file>
+        <file>icons/48x48/mcintosh-text.png</file>
+        <file>icons/48x48/media-eject.png</file>
+        <file>icons/48x48/media-forward.png</file>
+        <file>icons/48x48/media-pause.png</file>
+        <file>icons/48x48/media-playlist-repeat.png</file>
+        <file>icons/48x48/media-playlist-shuffle.png</file>
+        <file>icons/48x48/media-play.png</file>
+        <file>icons/48x48/media-rewind.png</file>
+        <file>icons/48x48/media-stop.png</file>
+        <file>icons/48x48/nvidia.png</file>
+        <file>icons/48x48/play2.png</file>
+        <file>icons/48x48/pulseaudio.png</file>
+        <file>icons/48x48/realtek.png</file>
+        <file>icons/48x48/search.png</file>
+        <file>icons/48x48/soundcard.png</file>
+        <file>icons/48x48/speaker.png</file>
+        <file>icons/48x48/star-grey.png</file>
+        <file>icons/48x48/star.png</file>
+        <file>icons/48x48/strawberry.png</file>
+        <file>icons/48x48/tools-wizard.png</file>
+        <file>icons/48x48/view-choose.png</file>
+        <file>icons/48x48/view-fullscreen.png</file>
+        <file>icons/48x48/view-media-lyrics.png</file>
+        <file>icons/48x48/view-media-playlist.png</file>
+        <file>icons/48x48/view-media-visualization.png</file>
+        <file>icons/48x48/view-refresh.png</file>
+        <file>icons/48x48/vinyl.png</file>
+        <file>icons/48x48/vlc.png</file>
+        <file>icons/48x48/xine.png</file>
+        <file>icons/48x48/zoom-in.png</file>
+        <file>icons/48x48/zoom-out.png</file>
+	<file>icons/48x48/tidal.png</file>
+        <file>icons/32x32/albums.png</file>
+        <file>icons/32x32/alsa.png</file>
+        <file>icons/32x32/application-exit.png</file>
+        <file>icons/32x32/applications-internet.png</file>
+        <file>icons/32x32/bluetooth.png</file>
+        <file>icons/32x32/cdcase.png</file>
+        <file>icons/32x32/cd.png</file>
+        <file>icons/32x32/configure.png</file>
+        <file>icons/32x32/device-ipod-nano.png</file>
+        <file>icons/32x32/device-ipod.png</file>
+        <file>icons/32x32/device-phone.png</file>
+        <file>icons/32x32/device.png</file>
+        <file>icons/32x32/device-usb-drive.png</file>
+        <file>icons/32x32/device-usb-flash.png</file>
+        <file>icons/32x32/dialog-error.png</file>
+        <file>icons/32x32/dialog-information.png</file>
+        <file>icons/32x32/dialog-ok-apply.png</file>
+        <file>icons/32x32/dialog-password.png</file>
+        <file>icons/32x32/dialog-warning.png</file>
+        <file>icons/32x32/document-download.png</file>
+        <file>icons/32x32/document-new.png</file>
+        <file>icons/32x32/document-open-folder.png</file>
+        <file>icons/32x32/document-open.png</file>
+        <file>icons/32x32/document-save.png</file>
+        <file>icons/32x32/document-search.png</file>
+        <file>icons/32x32/download.png</file>
+        <file>icons/32x32/edit-clear-list.png</file>
+        <file>icons/32x32/edit-clear-locationbar-ltr.png</file>
+        <file>icons/32x32/edit-copy.png</file>
+        <file>icons/32x32/edit-delete.png</file>
+        <file>icons/32x32/edit-find.png</file>
+        <file>icons/32x32/edit-redo.png</file>
+        <file>icons/32x32/edit-rename.png</file>
+        <file>icons/32x32/edit-undo.png</file>
+        <file>icons/32x32/electrocompaniet.png</file>
+        <file>icons/32x32/equalizer.png</file>
+        <file>icons/32x32/folder-new.png</file>
+        <file>icons/32x32/folder.png</file>
+        <file>icons/32x32/folder-sound.png</file>
+        <file>icons/32x32/footsteps.png</file>
+        <file>icons/32x32/go-down.png</file>
+        <file>icons/32x32/go-home.png</file>
+        <file>icons/32x32/go-jump.png</file>
+        <file>icons/32x32/go-next.png</file>
+        <file>icons/32x32/go-previous.png</file>
+        <file>icons/32x32/go-up.png</file>
+        <file>icons/32x32/gstreamer.png</file>
+        <file>icons/32x32/headset.png</file>
+        <file>icons/32x32/help-hint.png</file>
+        <file>icons/32x32/intel.png</file>
+        <file>icons/32x32/jack.png</file>
+        <file>icons/32x32/keyboard.png</file>
+        <file>icons/32x32/list-add.png</file>
+        <file>icons/32x32/list-remove.png</file>
+        <file>icons/32x32/mcintosh-player.png</file>
+        <file>icons/32x32/mcintosh.png</file>
+        <file>icons/32x32/mcintosh-text.png</file>
+        <file>icons/32x32/media-eject.png</file>
+        <file>icons/32x32/media-forward.png</file>
+        <file>icons/32x32/media-pause.png</file>
+        <file>icons/32x32/media-playlist-repeat.png</file>
+        <file>icons/32x32/media-playlist-shuffle.png</file>
+        <file>icons/32x32/media-play.png</file>
+        <file>icons/32x32/media-rewind.png</file>
+        <file>icons/32x32/media-stop.png</file>
+        <file>icons/32x32/nvidia.png</file>
+        <file>icons/32x32/play2.png</file>
+        <file>icons/32x32/pulseaudio.png</file>
+        <file>icons/32x32/realtek.png</file>
+        <file>icons/32x32/search.png</file>
+        <file>icons/32x32/soundcard.png</file>
+        <file>icons/32x32/speaker.png</file>
+        <file>icons/32x32/star-grey.png</file>
+        <file>icons/32x32/star.png</file>
+        <file>icons/32x32/strawberry.png</file>
+        <file>icons/32x32/strawberry.svg</file>
+        <file>icons/32x32/tools-wizard.png</file>
+        <file>icons/32x32/view-choose.png</file>
+        <file>icons/32x32/view-fullscreen.png</file>
+        <file>icons/32x32/view-media-lyrics.png</file>
+        <file>icons/32x32/view-media-playlist.png</file>
+        <file>icons/32x32/view-media-visualization.png</file>
+        <file>icons/32x32/view-refresh.png</file>
+        <file>icons/32x32/vinyl.png</file>
+        <file>icons/32x32/vlc.png</file>
+        <file>icons/32x32/xine.png</file>
+        <file>icons/32x32/zoom-in.png</file>
+        <file>icons/32x32/zoom-out.png</file>
+        <file>icons/32x32/tidal.png</file>
+        <file>icons/32x32/deezer.png</file>
+        <file>icons/22x22/albums.png</file>
+        <file>icons/22x22/alsa.png</file>
+        <file>icons/22x22/application-exit.png</file>
+        <file>icons/22x22/applications-internet.png</file>
+        <file>icons/22x22/bluetooth.png</file>
+        <file>icons/22x22/cdcase.png</file>
+        <file>icons/22x22/cd.png</file>
+        <file>icons/22x22/configure.png</file>
+        <file>icons/22x22/device-ipod-nano.png</file>
+        <file>icons/22x22/device-ipod.png</file>
+        <file>icons/22x22/device-phone.png</file>
+        <file>icons/22x22/device.png</file>
+        <file>icons/22x22/device-usb-drive.png</file>
+        <file>icons/22x22/device-usb-flash.png</file>
+        <file>icons/22x22/dialog-error.png</file>
+        <file>icons/22x22/dialog-information.png</file>
+        <file>icons/22x22/dialog-ok-apply.png</file>
+        <file>icons/22x22/dialog-password.png</file>
+        <file>icons/22x22/dialog-warning.png</file>
+        <file>icons/22x22/document-download.png</file>
+        <file>icons/22x22/document-new.png</file>
+        <file>icons/22x22/document-open-folder.png</file>
+        <file>icons/22x22/document-open.png</file>
+        <file>icons/22x22/document-save.png</file>
+        <file>icons/22x22/document-search.png</file>
+        <file>icons/22x22/download.png</file>
+        <file>icons/22x22/edit-clear-list.png</file>
+        <file>icons/22x22/edit-clear-locationbar-ltr.png</file>
+        <file>icons/22x22/edit-copy.png</file>
+        <file>icons/22x22/edit-delete.png</file>
+        <file>icons/22x22/edit-find.png</file>
+        <file>icons/22x22/edit-redo.png</file>
+        <file>icons/22x22/edit-rename.png</file>
+        <file>icons/22x22/edit-undo.png</file>
+        <file>icons/22x22/electrocompaniet.png</file>
+        <file>icons/22x22/equalizer.png</file>
+        <file>icons/22x22/folder-new.png</file>
+        <file>icons/22x22/folder.png</file>
+        <file>icons/22x22/folder-sound.png</file>
+        <file>icons/22x22/footsteps.png</file>
+        <file>icons/22x22/go-down.png</file>
+        <file>icons/22x22/go-home.png</file>
+        <file>icons/22x22/go-jump.png</file>
+        <file>icons/22x22/go-next.png</file>
+        <file>icons/22x22/go-previous.png</file>
+        <file>icons/22x22/go-up.png</file>
+        <file>icons/22x22/gstreamer.png</file>
+        <file>icons/22x22/headset.png</file>
+        <file>icons/22x22/help-hint.png</file>
+        <file>icons/22x22/intel.png</file>
+        <file>icons/22x22/jack.png</file>
+        <file>icons/22x22/keyboard.png</file>
+        <file>icons/22x22/list-add.png</file>
+        <file>icons/22x22/list-remove.png</file>
+        <file>icons/22x22/mcintosh-player.png</file>
+        <file>icons/22x22/mcintosh.png</file>
+        <file>icons/22x22/mcintosh-text.png</file>
+        <file>icons/22x22/media-eject.png</file>
+        <file>icons/22x22/media-forward.png</file>
+        <file>icons/22x22/media-pause.png</file>
+        <file>icons/22x22/media-playlist-repeat.png</file>
+        <file>icons/22x22/media-playlist-shuffle.png</file>
+        <file>icons/22x22/media-play.png</file>
+        <file>icons/22x22/media-rewind.png</file>
+        <file>icons/22x22/media-stop.png</file>
+        <file>icons/22x22/nvidia.png</file>
+        <file>icons/22x22/play2.png</file>
+        <file>icons/22x22/pulseaudio.png</file>
+        <file>icons/22x22/realtek.png</file>
+        <file>icons/22x22/search.png</file>
+        <file>icons/22x22/soundcard.png</file>
+        <file>icons/22x22/speaker.png</file>
+        <file>icons/22x22/star-grey.png</file>
+        <file>icons/22x22/star.png</file>
+        <file>icons/22x22/strawberry.png</file>
+        <file>icons/22x22/strawberry.svg</file>
+        <file>icons/22x22/tools-wizard.png</file>
+        <file>icons/22x22/view-choose.png</file>
+        <file>icons/22x22/view-fullscreen.png</file>
+        <file>icons/22x22/view-media-lyrics.png</file>
+        <file>icons/22x22/view-media-playlist.png</file>
+        <file>icons/22x22/view-media-visualization.png</file>
+        <file>icons/22x22/view-refresh.png</file>
+        <file>icons/22x22/vinyl.png</file>
+        <file>icons/22x22/vlc.png</file>
+        <file>icons/22x22/xine.png</file>
+        <file>icons/22x22/zoom-in.png</file>
+        <file>icons/22x22/zoom-out.png</file>
+        <file>icons/22x22/tidal.png</file>
+        <file>icons/22x22/deezer.png</file>
+    </qresource>
 </RCC>

data/misc/oauthsuccess.html

@@ -0,0 +1,41 @@
+<!doctype html>
+<html>
+  <head>
+    <link href="http://www.strawbs.org/favicon.ico" rel="shortcut icon">
+    <title>tr("Return to Strawberry")</title>
+
+    <style>
+      #container {
+        margin: 6em auto 0px auto;
+        max-width: 400px;
+        font-family: 'arial regular', arial, sans-serif;
+      }
+
+      #container img {
+        width: 16px;
+        height: 16px;
+        float: left;
+        margin-right: 0.5em;
+      }
+
+      #container h1 {
+        margin: 0px 0px 0.75em 0px;
+        font-size: 16px;
+      }
+
+      #container p {
+        margin-top: 0px;
+        margin-left: 10px;
+        font-size: 13px;
+      }
+    </style>
+  </head>
+
+  <body>
+    <div id="container">
+      <h1>tr("Success!")</h1>
+      <img src="data:image/png;base64,@IMAGE_DATA@"/>
+      <p>tr("Please close your browser and return to Strawberry.")</p>
+    </div>
+  </body>
+</html>

data/schema/device-schema.sql

@@ -11,8 +11,6 @@ CREATE TABLE device_%deviceid_subdirectories (
 
 CREATE TABLE device_%deviceid_songs (
 
-  /* Metadata from taglib */
-
   title TEXT NOT NULL,
   album TEXT NOT NULL,
   artist TEXT NOT NULL,
@@ -27,6 +25,7 @@ CREATE TABLE device_%deviceid_songs (
   performer TEXT NOT NULL,
   grouping TEXT NOT NULL,
   comment TEXT NOT NULL,
+  lyrics TEXT NOT NULL,
 
   beginning INTEGER NOT NULL DEFAULT 0,
   length INTEGER NOT NULL DEFAULT 0,
@@ -35,8 +34,7 @@ CREATE TABLE device_%deviceid_songs (
   samplerate INTEGER NOT NULL DEFAULT 0,
   bitdepth INTEGER NOT NULL DEFAULT 0,
 
-  /* Information about the file on disk */
-
+  source INTEGER NOT NULL DEFAULT 0,
   directory_id INTEGER NOT NULL,
   filename TEXT NOT NULL,
   filetype INTEGER NOT NULL DEFAULT 0,
@@ -45,8 +43,6 @@ CREATE TABLE device_%deviceid_songs (
   ctime INTEGER NOT NULL,
   unavailable INTEGER DEFAULT 0,
 
-  /* Other */
-
   playcount INTEGER NOT NULL DEFAULT 0,
   skipcount INTEGER NOT NULL DEFAULT 0,
   lastplayed INTEGER NOT NULL DEFAULT 0,
@@ -61,7 +57,7 @@ CREATE TABLE device_%deviceid_songs (
 
   effective_albumartist TEXT,
   effective_originalyear INTEGER NOT NULL DEFAULT 0,
-  
+
   cue_path TEXT
 
 );