Release 0.8.2

Fixes #557

.circleci/config.yml

@@ -0,0 +1,504 @@
+version: 2.1
+commands:
+
+  cmake:
+    description: Configure build
+    steps:
+      - run:
+          name: Configure build
+          command: cmake ..
+          working_directory: build
+
+
+  build_source:
+    description: Create source tarball
+    steps:
+      - run:
+          name: Create source tarball
+          command: ../dist/scripts/maketarball.sh
+          working_directory: build
+
+
+  build_rpm:
+    description: Build RPM
+    steps:
+      - run:
+          name: Create RPM build sources directories
+          command: mkdir -p ~/rpmbuild/SOURCES /usr/src/packages/SOURCES
+      - run:
+          name: Copy source tarball 1
+          command: cp strawberry-*.tar.xz ~/rpmbuild/SOURCES/
+          working_directory: build
+      - run:
+          name: Copy source tarball 2
+          command: cp strawberry-*.tar.xz /usr/src/packages/SOURCES/
+          working_directory: build
+      - run:
+          name: Build RPM
+          command: rpmbuild -ba ../dist/unix/strawberry.spec
+          working_directory: build
+
+
+  build_deb:
+    description: Build Deb
+    steps:
+      - run:
+          name: make deb
+          command: dpkg-buildpackage -b -d -uc -us -nc -j2
+
+
+  install_opensuse_dependencies:
+    description: Install openSUSE dependencies
+    steps:
+      - run:
+          name: Update packages
+          command: zypper --non-interactive --gpg-auto-import-keys ref
+      - run:
+          name: Install openSUSE dependencies
+          command: >
+            zypper --non-interactive --gpg-auto-import-keys install
+            lsb-release
+            rpm-build
+            git
+            tar
+            make
+            cmake
+            gcc
+            gcc-c++
+            gettext-tools
+            glibc-devel
+            libboost_headers-devel
+            boost-devel
+            glib2-devel
+            glib2-tools
+            dbus-1-devel
+            alsa-devel
+            libnotify-devel
+            libgnutls-devel
+            protobuf-devel
+            sqlite3-devel
+            libpulse-devel
+            gstreamer-devel
+            gstreamer-plugins-base-devel
+            vlc-devel
+            libQt5Core-devel
+            libQt5Gui-devel
+            libQt5Widgets-devel
+            libQt5Concurrent-devel
+            libQt5Network-devel
+            libQt5Sql-devel
+            libQt5DBus-devel
+            libQt5Test-devel
+            libqt5-qtx11extras-devel
+            libqt5-qtbase-common-devel
+            libQt5Sql5-sqlite
+            libqt5-linguist-devel
+            libcdio-devel
+            libgpod-devel
+            libmtp-devel
+            libchromaprint-devel
+            desktop-file-utils
+            update-desktop-files
+            appstream-glib
+            hicolor-icon-theme
+
+
+  install_fedora_dependencies:
+    description: Install Fedora dependencies
+    steps:
+      - run:
+          name: Update packages
+          command: yum update --assumeyes
+      - run:
+          name: Upgrade packages
+          command: yum upgrade --assumeyes
+      - run:
+          name: Install Fedora dependencies
+          command: >
+            dnf install --assumeyes
+            @development-tools
+            redhat-lsb-core
+            git
+            glibc
+            gcc-c++
+            rpmdevtools
+            make
+            cmake
+            pkgconfig
+            glib
+            man
+            tar
+            gettext
+            openssh
+            boost-devel
+            dbus-devel
+            protobuf-devel
+            protobuf-compiler
+            sqlite-devel
+            alsa-lib-devel
+            pulseaudio-libs-devel
+            libnotify-devel
+            gnutls-devel
+            qt5-qtbase-devel
+            qt5-qtx11extras-devel
+            qt5-qttools-devel
+            gstreamer1-devel
+            gstreamer1-plugins-base-devel
+            taglib-devel
+            libcdio-devel
+            libgpod-devel
+            libmtp-devel
+            libchromaprint-devel
+            fftw-devel
+            desktop-file-utils
+            libappstream-glib
+            hicolor-icon-theme
+
+
+  install_centos_dependencies:
+    description: Install CentOS dependencies
+    steps:
+      - run:
+          name: Install epel-release
+          command: dnf install -y epel-release
+      - run:
+          name: Install epel-release-latest-8.noarch.rpm
+          command: dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
+      - run:
+          name: Install config-manager
+          command: dnf install -y 'dnf-command(config-manager)'
+      - run:
+          name: PowerTools
+          command: dnf config-manager --set-enabled PowerTools
+      - run:
+          name: DNF Clean All
+          command: dnf clean all
+      - run:
+          name: Update packages
+          command: dnf update -y
+      - run:
+          name: Install CentOS dependencies
+          command: >
+            dnf install -y
+            glibc
+            gcc-c++
+            make
+            libtool
+            cmake3
+            rpmdevtools
+            redhat-lsb-core
+            git
+            man
+            tar
+            gettext
+            boost-devel
+            fuse-devel
+            dbus-devel
+            libnotify-devel
+            gnutls-devel
+            sqlite-devel
+            protobuf-devel
+            protobuf-compiler
+            alsa-lib-devel
+            pulseaudio-libs-devel
+            qt5-devel
+            qt5-qtbase-devel
+            qt5-qtx11extras-devel
+            qt5-qttools-devel
+            fftw-devel
+            libchromaprint-devel
+            libcdio-devel
+            libgpod-devel
+            libmtp-devel
+            libjpeg-devel
+            cairo-devel
+            dbus-x11
+            xorg-x11-server-Xvfb
+            xorg-x11-xauth
+            vim-common
+            desktop-file-utils
+            libappstream-glib
+            appstream-data
+            hicolor-icon-theme
+            python3-pip
+            python3-devel
+            gstreamer1-devel
+            gstreamer1-plugins-base-devel
+
+
+  install_debian_dependencies:
+    description: Install Debian dependencies
+    steps:
+      - run:
+          name: Install Debian dependencies
+          command: >
+            apt-get update && apt-get install -y
+            build-essential
+            dh-make
+            ssh
+            git
+            make
+            cmake
+            gcc
+            pkg-config
+            fakeroot
+            gettext
+            lsb-release
+            libglib2.0-dev
+            dpkg-dev
+            libdbus-1-dev
+            libboost-dev
+            libprotobuf-dev
+            protobuf-compiler
+            libsqlite3-dev
+            libgnutls28-dev
+            libasound2-dev
+            libpulse-dev
+            qtbase5-dev
+            qtbase5-dev-tools
+            qtbase5-private-dev
+            libqt5x11extras5-dev
+            qttools5-dev
+            libgstreamer1.0-dev
+            libgstreamer-plugins-base1.0-dev
+            gstreamer1.0-alsa
+            gstreamer1.0-pulseaudio
+            libchromaprint-dev
+            libfftw3-dev
+            libcdio-dev
+            libmtp-dev
+            libgpod-dev
+
+
+  install_ubuntu_dependencies:
+    description: Install Ubuntu dependencies
+    steps:
+      - run:
+          name: Setup environment
+          command: |
+            echo 'export DEBIAN_FRONTEND=noninteractive' >> $BASH_ENV
+            source $BASH_ENV
+      - run:
+          name: Install Ubuntu dependencies
+          command: >
+            apt-get update && apt-get install -y
+            build-essential
+            dh-make
+            ssh
+            git
+            make
+            cmake
+            pkg-config
+            gcc
+            fakeroot
+            wget
+            curl
+            gettext
+            lsb-release
+            dpkg-dev
+            libglib2.0-dev
+            libboost-dev
+            libdbus-1-dev
+            libprotobuf-dev
+            protobuf-compiler
+            libsqlite3-dev
+            libgnutls28-dev
+            libasound2-dev
+            libpulse-dev
+            qtbase5-dev
+            qtbase5-dev-tools
+            qtbase5-private-dev
+            libqt5x11extras5-dev
+            qttools5-dev
+            libgstreamer1.0-dev
+            libgstreamer-plugins-base1.0-dev
+            libgstreamer-plugins-good1.0-dev
+            gstreamer1.0-alsa
+            gstreamer1.0-pulseaudio
+            libchromaprint-dev
+            libfftw3-dev
+            libcdio-dev
+            libmtp-dev
+            libgpod-dev
+
+
+jobs:
+
+  build_source:
+    docker:
+      - image: opensuse/leap:15.1
+    steps:
+      - install_opensuse_dependencies
+      - checkout
+      - cmake
+      - build_source
+
+
+  build_opensuse_lp151:
+    docker:
+      - image: opensuse/leap:15.1
+    environment:
+      RPM_BUILD_NCPUS: "2"
+    steps:
+      - install_opensuse_dependencies
+      - checkout
+      - cmake
+      - build_source
+      - build_rpm
+
+  build_opensuse_lp152:
+    docker:
+      - image: opensuse/leap:15.2
+    environment:
+      RPM_BUILD_NCPUS: "2"
+    steps:
+      - install_opensuse_dependencies
+      - checkout
+      - cmake
+      - build_source
+      - build_rpm
+
+
+  build_fedora_31:
+    docker:
+      - image: fedora:31
+    environment:
+      RPM_BUILD_NCPUS: "2"
+    steps:
+      - install_fedora_dependencies
+      - checkout
+      - cmake
+      - build_source
+      - build_rpm
+
+  build_fedora_32:
+    docker:
+      - image: fedora:32
+    environment:
+      RPM_BUILD_NCPUS: "2"
+    steps:
+      - install_fedora_dependencies
+      - checkout
+      - cmake
+      - build_source
+      - build_rpm
+
+
+  build_centos_8:
+    docker:
+      - image: centos:8
+    environment:
+      RPM_BUILD_NCPUS: "2"
+    steps:
+      - install_centos_dependencies
+      - checkout
+      - cmake
+      - build_source
+      - build_rpm
+
+
+  build_debian_buster:
+    docker:
+      - image: debian:buster
+    steps:
+      - install_debian_dependencies
+      - checkout
+      - cmake
+      - build_deb
+
+  build_debian_bullseye:
+    docker:
+      - image: debian:bullseye
+    steps:
+      - install_debian_dependencies
+      - checkout
+      - cmake
+      - build_deb
+
+
+  build_ubuntu_bionic:
+    docker:
+      - image: ubuntu:bionic
+    steps:
+      - install_ubuntu_dependencies
+      - checkout
+      - cmake
+      - build_deb
+
+  build_ubuntu_focal:
+    docker:
+      - image: ubuntu:focal
+    steps:
+      - install_ubuntu_dependencies
+      - checkout
+      - cmake
+      - build_deb
+
+  build_ubuntu_groovy:
+    docker:
+      - image: ubuntu:groovy
+    steps:
+      - install_ubuntu_dependencies
+      - checkout
+      - cmake
+      - build_deb
+
+workflows:
+  version: 2
+  build_all:
+    jobs:
+
+      - build_source:
+          filters:
+            tags:
+              only: /.*/
+
+
+      - build_opensuse_lp151:
+          filters:
+            tags:
+              only: /.*/
+      - build_opensuse_lp152:
+          filters:
+            tags:
+              only: /.*/
+
+
+      - build_fedora_31:
+          filters:
+            tags:
+              only: /.*/
+      - build_fedora_32:
+          filters:
+            tags:
+              only: /.*/
+
+
+      - build_centos_8:
+          filters:
+            tags:
+              only: /.*/
+
+
+      - build_debian_buster:
+          filters:
+            tags:
+              only: /.*/
+      - build_debian_bullseye:
+          filters:
+            tags:
+              only: /.*/
+
+
+      - build_ubuntu_bionic:
+          filters:
+            tags:
+              only: /.*/
+      - build_ubuntu_focal:
+          filters:
+            tags:
+              only: /.*/
+      - build_ubuntu_groovy:
+          filters:
+            tags:
+              only: /.*/

.clang-format

@@ -0,0 +1,105 @@
+BasedOnStyle: Chromium
+Language: Cpp
+Standard: Cpp11
+AccessModifierOffset: -1
+AlignAfterOpenBracket: false
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignConsecutiveMacros: true
+AlignEscapedNewlines: true
+AlignOperands: false
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: false
+AllowAllConstructorInitializersOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: true
+AllowShortIfStatementsOnASingleLine: true
+AllowShortLambdasOnASingleLine: true
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: No
+BinPackArguments: true
+BinPackParameters: true
+BreakBeforeBraces: false
+BreakBeforeBinaryOperators: false
+BreakBeforeBraces: Stroustrup
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializers: BeforeColon
+BreakInheritanceList: BeforeColon
+BreakStringLiterals: false
+ColumnLimit: 0
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 2
+Cpp11BracedListStyle: false
+DeriveLineEnding: true
+DerivePointerAlignment: true
+DisableFormat: false
+ExperimentalAutoDetectBinPacking: true
+FixNamespaceComments: true
+IncludeBlocks: Preserve
+IndentCaseLabels: true
+IndentGotoLabels: true
+IndentPPDirectives: AfterHash
+IndentWidth: 2
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: true
+MaxEmptyLinesToKeep: 100
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: false
+PenaltyBreakAssignment: 0
+PenaltyBreakBeforeFirstCallParameter: 0
+PenaltyBreakComment: 0
+PenaltyBreakFirstLessLess: 0
+PenaltyBreakString: 0
+PenaltyBreakTemplateDeclaration: 0
+PenaltyExcessCharacter: 0
+PenaltyReturnTypeOnItsOwnLine: 0
+PointerAlignment: Right
+ReflowComments: false
+SortIncludes: false
+SortUsingDeclarations: false
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: true
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 2
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: true
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+UseCRLF: false
+UseTab: Never
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterFunction: false
+  AfterCaseLabel: false
+  AfterStruct: false
+  AfterClass: false
+  AfterEnum: false
+  AfterUnion: false
+  AfterControlStatement: Never
+  AfterNamespace: false
+  AfterObjCDeclaration: false
+  AfterExternBlock: false
+  BeforeCatch: false
+  BeforeElse: true
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: jonaski

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,34 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+For technical issues, questions and feature suggestions/requests please use the forum on https://forum.strawberrymusicplayer.org/
+
+Check the Changelog to see if the issue is already fixed:
+https://github.com/strawberrymusicplayer/strawberry/blob/master/Changelog
+
+If it's fixed, try the latest development build from: https://builds.strawberrymusicplayer.org/
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots:**
+If applicable, add screenshots to help explain your problem.
+
+**System Information:**
+ - Operating system:
+ - Strawberry Version:
+
+**Additional context**
+Add any other context about the problem here.

.gitignore

@@ -1,80 +1,121 @@
 # This file is used to ignore files which are generated
 # ----------------------------------------------------------------------------
 
-*~
-*.autosave
-*.a
-*.core
-*.moc
+# Build
+build/
+bin/
+
+# CMake
+CMakeLists.txt.user
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Makefile*
+Testing
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+_deps
+
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
 *.o
 *.obj
-*.orig
-*.rej
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
 *.so
 *.so.*
-*_pch.h.cpp
-*_resource.rc
-*.qm
-.#*
-*.*#
-core
-!core/
-tags
-.DS_Store
-.directory
-*.debug
-Makefile*
-*.prl
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
 *.app
+
+# Dump files
+*.core
+*.stackdump
+
+# Qt
+*build-*
 moc_*.cpp
-ui_*.h
+moc_*.h
 qrc_*.cpp
-Thumbs.db
-*.res
-*.rc
-/.qmake.cache
-/.qmake.stash
-*.spec
-*.nsi
-*.plist
-maketarball.sh
-dist/macos/create-dmg.sh
-dist/debian/changelog
-dist/pacman/PKGBUILD
+ui_*.h
+*.moc
+*.qm
 
-# qtcreator generated files
-*.pro.user*
+# QtCreator
+CMakeLists.txt.user*
+*.pro.user
+*.pro.user.*
+*creator.user*
+target_wrapper.*
+compile_commands.json
 
-# xemacs temporary files
+*.kdev4
+*.vscode
+*.code-workspace
+*.sublime-workspace
+
+# Temporary files
+*~
+*.autosave
+*.orig
+*.rej
+.*.kate-swp
+.swp.*
+.*.swp
 *.flc
 
-# Vim temporary files
-.*.swp
-
-# Visual Studio generated files
-*.ib_pdb_index
-*.idb
-*.ilk
-*.pdb
-*.sln
-*.suo
-*.vcproj
-*vcproj.*.*.user
-*.ncb
-*.sdf
-*.opensdf
-*.vcxproj
-*vcxproj.*
+# Directory files
+.directory
+.DS_Store
+Thumbs.db
 
 # MinGW generated files
 *.Debug
 *.Release
 
-# Python byte code
-*.pyc
+# Package files
+*.spec
+*.nsi
+*.plist
 
-# Binaries
-# --------
-*.dll
-*.exe
+# Stuff in dist
+maketarball.sh
+changelog
+PKGBUILD
 
+# Translations
+translations.pot
+zanata.xml
+.zanata-cache/
+
+# Snap
+parts/
+prime/
+stage/
+*.snap
+/snap/.snapcraft/
+/*_source.tar.bz2

.travis.yml

@@ -1,51 +1,47 @@
 sudo: required
 language: C++
 os:
-  - linux
   - osx
-services:
-  - docker
 compiler:
   - gcc
-  - clang
 
 before_install:
-  - echo $DEPLOY_KEY_ENC | base64 --decode | openssl aes-256-cbc -K $encrypted_83a41ac424a6_key -iv $encrypted_83a41ac424a6_iv -out ~/.ssh/id_rsa -d
-  - chmod 600 ~/.ssh/id_rsa
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-      docker build -f Dockerfile -t strawberry-build .;
-      docker run --name build -itd strawberry-build /bin/bash;
-      docker exec build git clone https://github.com/jonaski/strawberry;
-    fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      git fetch --unshallow;
-      git pull;
-      brew update;
-      brew unlink python;
-      brew install glib pkgconfig protobuf protobuf-c qt;
-      brew install sqlite --with-fts;
-      brew install gstreamer gst-plugins-base;
-      brew install gst-plugins-good --with-flac;
-      brew install gst-plugins-bad gst-plugins-ugly gst-libav;
-      brew install chromaprint;
-      brew install libcdio libmtp libimobiledevice libplist;
-      export Qt5_DIR=/usr/local/opt/qt5/lib/cmake;
-      ls /usr/local/lib/gstreamer-1.0;
+  - if ! [ "$DEPLOY_KEY_ENC" == "" ]; then
+      echo $DEPLOY_KEY_ENC | base64 --decode | openssl aes-256-cbc -K $encrypted_83a41ac424a6_key -iv $encrypted_83a41ac424a6_iv -out ~/.ssh/id_rsa -d ;
+      chmod 600 ~/.ssh/id_rsa ;
     fi
+  - git fetch --unshallow
+  - git pull
+  - brew update
+  - travis_wait 120 brew upgrade || echo "Failed"
+  - travis_wait 120 brew upgrade || echo "Failed"
+  - brew install glib pkgconfig libffi protobuf protobuf-c qt gettext gnutls fftw sqlite chromaprint zlib taglib
+  - brew install gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav
+  - brew install libcdio libmtp
+  - brew install create-dmg
+  - brew cask install sparkle
+  - sudo ln -s /usr/local/Caskroom/sparkle/$(ls /usr/local/Caskroom/sparkle | head -n1)/Sparkle.framework /Library/Frameworks/Sparkle.framework
+  - sudo ln -s /usr/local/Caskroom/sparkle/$(ls /usr/local/Caskroom/sparkle | head -n1)/Sparkle.framework.dSYM /Library/Frameworks/Sparkle.framework.dSYM
+  - export Qt5_DIR=/usr/local/opt/qt5/lib/cmake
+  - export Qt5LinguistTools_DIR=/usr/local/opt/qt5/lib/cmake/Qt5LinguistTools
+  - ls /usr/local/lib/gstreamer-1.0
 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 .. -DUSE_BUNDLE=ON -DENABLE_STREAM_DEEZER=ON ; fi
+  - mkdir build
+  - cd build
+  - cmake .. -DUSE_BUNDLE=ON
 script:
-- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker exec build make -C build -j8 ; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      make -j8;
-      sudo make install;
-      sudo ../dist/macos/macdeploy.py strawberry.app;
-      ../dist/macos/create-dmg.sh strawberry.app;
-  fi
+  - make -j8
+  - make install
+  - make dmg
 after_success:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ls -lh strawberry.dmg; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$TRAVIS_BRANCH" == "master" ]]; then rsync -e "ssh -o StrictHostKeyChecking=no" -va strawberry*.dmg travis@echoes.jkvinge.net:/home/travis/builds/macos; fi
+  - ls -lh strawberry*.dmg
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC_FOR_BUILD" == "gcc" ]] && [ -f ~/.ssh/id_rsa ]; then
+      if [[ "$TRAVIS_BRANCH" == "master" ]]; then
+        rsync -e "ssh -o StrictHostKeyChecking=no" -va strawberry*.dmg travis@echoes.jkvinge.net:/home/travis/builds/macos/highsierra/;
+      elif [[ "$TRAVIS_BRANCH" == "macos" ]]; then
+        rsync -e "ssh -o StrictHostKeyChecking=no" -va strawberry*.dmg travis@echoes.jkvinge.net:/home/travis/builds/macos/highsierra/;
+      fi
+    fi
 
 branches:
   except:

3rdparty/README.md

@@ -7,28 +7,11 @@ This is a small static library used by Strawberry to prevent it from starting tw
 If the user tries to start strawberry twice, the main window will maximize instead of starting another instance.
 If you dynamically link to your systems version, you'll need two versions, one defined as QApplication and
 one as a QCoreApplication.
-It is included here because it is normally not packaged by distros, and is also used on macOS and Windows.
+It is included here because it is not packed by distros and is also used on macOS and Windows.
 
 URL: https://github.com/itay-grudev/SingleApplication
 
 
-qocoa
------
-This is a small static library currently used for the search fields above the collection, playlist and in
-the cover manager. It is slightly modified from original version, so it should not be used as a dynamic
-library.
-The plan in the long run is to replace it with something else.
-
-URL: https://github.com/mikemcquaid/Qocoa
-
-
-SPMediaKeyTap
--------------
-
-This is used for macOS only to enable strawberry to grab global shortcuts and can safely be deleted on other
-platforms.
-
-
 taglib
 ------
 
@@ -36,11 +19,11 @@ TagLib is a library for reading and editing the meta-data of several popular aud
 by Strawberry to identify audio files. It is important that it is kept up-to-date for Strawberry to function
 correctly.
 
-It is kept in 3rdparty because there currently is no offical release of TagLib with the features and bugfixes
+It is kept in 3rdparty because there currently is no official release of TagLib with the features and bugfixes
 that are in the official repository. And also because some distros use older, or unpatched versions.
-This version is a unmodified copy of commit 5cb589a (sha: 5cb589a5b82c13ba8f0542e5e79629da7645cb3c).
 
-Also, there is a bug in version 1.11.1 corrupting Ogg files, see: https://github.com/taglib/taglib/issues/864
+There is a bug in the latest 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
 
@@ -54,6 +37,6 @@ URL: https://github.com/taglib/taglib
 utf8-cpp
 --------
 
-This is 2 header files used by taglib, but kept in a seperate directory because it is maintained by others.
+This is 2 header files used by taglib, but kept in a separate directory because it is maintained by others.
 
 URL: http://utfcpp.sourceforge.net/

3rdparty/SPMediaKeyTap/CMakeLists.txt

@@ -1,13 +0,0 @@
-set(SPMEDIAKEY-SOURCES
-  SPMediaKeyTap.m
-  SPInvocationGrabbing/NSObject+SPInvocationGrabbing.m
-)
-
-set(SPMEDIAKEY-HEADERS
-  SPMediaKeyTap.h
-  SPInvocationGrabbing/NSObject+SPInvocationGrabbing.h
-)
-
-ADD_LIBRARY(SPMediaKeyTap STATIC
-  ${SPMEDIAKEY-SOURCES}
-)

3rdparty/SPMediaKeyTap/LICENSE

@@ -1,8 +0,0 @@
-Copyright (c) 2011, Joachim Bengtsson
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Neither the name of the organization 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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.

3rdparty/SPMediaKeyTap/README.md

@@ -1,12 +0,0 @@
-SPMediaKeyTap
-=============
-
-`SPMediaKeyTap` abstracts a `CGEventHook` and other nastiness in order to give you a relatively simple API to receive media key events (prev/next/playpause, on F7 to F9 on modern MacBook Pros) exclusively, without them reaching other applications like iTunes. `SPMediaKeyTap` is clever enough to resign its exclusive lock on media keys by looking for which application was active most recently: if that application is in `SPMediaKeyTap`'s whitelist, it will resign the keys. This is similar to the behavior of Apple's applications collaborating on media key handling exclusivity, but unfortunately, Apple are not exposing any APIs allowing third-parties to join in on this collaboration.
-
-For now, the whitelist is just a hardcoded array in `+[SPMediaKeyTap defaultMediaKeyUserBundleIdentifiers]`. If your app starts using `SPMediaKeyTap`, please [mail me](mailto:nevyn@spotify.com) your bundle ID, and I'll include it in the canonical repository. This is a bad solution; a better solution would be to use distributed notifications to collaborate in creating this whitelist at runtime. Hopefully someone'll have the time and energy to write this soon. 
-
-In `Example/SPMediaKeyTapExampleAppDelegate.m` is an example of both how you use `SPMediaKeyTap`, and how you handle the semi-private `NSEvent` subtypes involved in media keys, including on how to fall back to non-event tap handling of these events.
-
-`SPMediaKeyTap` and other `CGEventHook`s on the event type `NSSystemDefined` is known to interfere with each other and applications doing weird stuff with mouse input, because mouse clicks are also part of the `NSSystemDefined` category. The single issue we have had reported here at Spotify is Adobe Fireworks, in which item selection stops working with `SPMediaKeyTap` is active.
-
-`SPMediaKeyTap` requires 10.5 to work, and disables itself on 10.4.

3rdparty/SPMediaKeyTap/SPInvocationGrabbing/NSObject+SPInvocationGrabbing.h

@@ -1,30 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface SPInvocationGrabber : NSObject {
-    id _object;
-    NSInvocation *_invocation;
-    int frameCount;
-    char **frameStrings;
-    BOOL backgroundAfterForward;
-    BOOL onMainAfterForward;
-    BOOL waitUntilDone;
-}
--(id)initWithObject:(id)obj;
--(id)initWithObject:(id)obj stacktraceSaving:(BOOL)saveStack;
-@property (readonly, retain, nonatomic) id object;
-@property (readonly, retain, nonatomic) NSInvocation *invocation;
-@property BOOL backgroundAfterForward;
-@property BOOL onMainAfterForward;
-@property BOOL waitUntilDone;
--(void)invoke; // will release object and invocation
--(void)printBacktrace;
--(void)saveBacktrace;
-@end
-
-@interface NSObject (SPInvocationGrabbing)
--(id)grab;
--(id)invokeAfter:(NSTimeInterval)delta;
--(id)nextRunloop;
--(id)inBackground;
--(id)onMainAsync:(BOOL)async;
-@end

3rdparty/SPMediaKeyTap/SPInvocationGrabbing/NSObject+SPInvocationGrabbing.m

@@ -1,128 +0,0 @@
-#import "NSObject+SPInvocationGrabbing.h"
-#import <execinfo.h>
-
-#pragma mark Invocation grabbing
-@interface SPInvocationGrabber ()
-@property (readwrite, retain, nonatomic) id object;
-@property (readwrite, retain, nonatomic) NSInvocation *invocation;
-
-@end
-
-@implementation SPInvocationGrabber
-- (id)initWithObject:(id)obj;
-{
-	return [self initWithObject:obj stacktraceSaving:YES];
-}
-
--(id)initWithObject:(id)obj stacktraceSaving:(BOOL)saveStack;
-{
-	self.object = obj;
-
-	if(saveStack)
-		[self saveBacktrace];
-
-	return self;
-}
--(void)dealloc;
-{
-	free(frameStrings);
-	self.object = nil;
-	self.invocation = nil;
-	[super dealloc];
-}
-@synthesize invocation = _invocation, object = _object;
-
-@synthesize backgroundAfterForward, onMainAfterForward, waitUntilDone;
-- (void)runInBackground;
-{
-	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-	@try {
-		[self invoke];
-	}
-	@finally {
-		[pool drain];
-	}
-}
-
-
-- (void)forwardInvocation:(NSInvocation *)anInvocation {
-	[anInvocation retainArguments];
-	anInvocation.target = _object;
-	self.invocation = anInvocation;
-	
-	if(backgroundAfterForward)
-		[NSThread detachNewThreadSelector:@selector(runInBackground) toTarget:self withObject:nil];
-	else if(onMainAfterForward)
-        [self performSelectorOnMainThread:@selector(invoke) withObject:nil waitUntilDone:waitUntilDone];
-}
-- (NSMethodSignature *)methodSignatureForSelector:(SEL)inSelector {
-	NSMethodSignature *signature = [super methodSignatureForSelector:inSelector];
-	if (signature == NULL)
-		signature = [_object methodSignatureForSelector:inSelector];
-    
-	return signature;
-}
-
-- (void)invoke;
-{
-
-	@try {
-		[_invocation invoke];
-	}
-	@catch (NSException * e) {
-		NSLog(@"SPInvocationGrabber's target raised %@:\n\t%@\nInvocation was originally scheduled at:", e.name, e);
-		[self printBacktrace];
-		printf("\n");
-		[e raise];
-	}
-
-	self.invocation = nil;
-	self.object = nil;
-}
-
--(void)saveBacktrace;
-{
-  void *backtraceFrames[128];
-  frameCount = backtrace(&backtraceFrames[0], 128);
-  frameStrings = backtrace_symbols(&backtraceFrames[0], frameCount);
-}
--(void)printBacktrace;
-{
-  int x;
-  for(x = 3; x < frameCount; x++) {
-    if(frameStrings[x] == NULL) { break; }
-    printf("%s\n", frameStrings[x]);
-  }
-}
-@end
-
-@implementation NSObject (SPInvocationGrabbing)
--(id)grab;
-{
-	return [[[SPInvocationGrabber alloc] initWithObject:self] autorelease];
-}
--(id)invokeAfter:(NSTimeInterval)delta;
-{
-	id grabber = [self grab];
-	[NSTimer scheduledTimerWithTimeInterval:delta target:grabber selector:@selector(invoke) userInfo:nil repeats:NO];
-	return grabber;
-}
-- (id)nextRunloop;
-{
-	return [self invokeAfter:0];
-}
--(id)inBackground;
-{
-    SPInvocationGrabber *grabber = [self grab];
-	grabber.backgroundAfterForward = YES;
-	return grabber;
-}
--(id)onMainAsync:(BOOL)async;
-{
-    SPInvocationGrabber *grabber = [self grab];
-	grabber.onMainAfterForward = YES;
-    grabber.waitUntilDone = !async;
-	return grabber;
-}
-
-@end

3rdparty/SPMediaKeyTap/SPInvocationGrabbing/gistfile3.m

@@ -1,28 +0,0 @@
-// A
-+(UIView*)flashAt:(CGRect)r in:(UIView*)parent color:(UIColor*)color;
-{
-	float duration = 0.5;
-	UIView *flash = [[[UIView alloc] initWithFrame:r] autorelease];
-	flash.backgroundColor = color;
-	[parent addSubview:flash];
-	[[flash invokeAfter:duration+0.1] removeFromSuperview];
-		
-	[UIView beginAnimations:@"SPFlash" context:NULL];
-	[UIView setAnimationDuration:duration];
-	flash.alpha = 0.0;
-	[UIView commitAnimations];
-	return flash;
-}
-
-// B
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-	
-	// Force the animation to happen by calling this method again after a small
-	// delay - see http://blog.instapaper.com/post/53568356
-	[[self nextRunloop] delayedTableViewDidSelectRowAtIndexPath: indexPath];
-}
-
-// C
-[[tableView invokeAfter:0.15] selectRowAtIndexPath:indexPath animated:YES scrollPosition:UITableViewScrollPositionNone];
-[[tableView invokeAfter:0.30] deselectRowAtIndexPath:indexPath animated:YES];
-[[tableView invokeAfter:0.45] selectRowAtIndexPath:indexPath animated:YES scrollPosition:UITableViewScrollPositionNone];

3rdparty/SPMediaKeyTap/SPInvocationGrabbing/gistfile4.m

@@ -1,12 +0,0 @@
-@interface MyClass : NSObject
--(BOOL)areTheNewViewersGoneYet:(Duck*)duck;
-@end
-...
-MyClass *myInstance = [[MyClass alloc] init];
-id invocationGrabber = [[[SPInvocationGrabber alloc] initWithTarget:myInstance] autorelease];
-
-
-[invocationGrabber areTheNewViewersGoneYet:[Duck yellowDuck]]; // line 9
-
-
-NSInvocation *invocationForAreTheNewViewersGoneYet = [invocationGrabber invocation];

3rdparty/SPMediaKeyTap/SPInvocationGrabbing/main.m

@@ -1,38 +0,0 @@
-#import <Cocoa/Cocoa.h>
-#import "NSObject+SPInvocationGrabbing.h"
-
-@interface Foo : NSObject {
-    int a;
-}
--(void)startIt;
--(void)theBackgroundStuff;
--(void)theForegroundStuff;
-@end
-
-@implementation Foo
--(void)startIt;
-{
-    NSLog(@"Starting out on the main thread...");
-    a = 3;
-    [[self inBackground] theBackgroundStuff];
-}
--(void)theBackgroundStuff;
-{
-    NSLog(@"Woah, this is a background thread!");
-    a += 6;
-    [[self onMainAsync:YES] theForegroundStuff];
-}
--(void)theForegroundStuff;
-{
-    NSLog(@"Hey presto: %d", a);
-}
-@end
-
-int main() {
-    NSAutoreleasePool *pool = [NSAutoreleasePool new];
-    Foo *foo = [Foo new];
-    [foo startIt];
-    [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:1]];
-    [pool release];
-    return 0;
-}

3rdparty/SPMediaKeyTap/SPMediaKeyTap.h

@@ -1,34 +0,0 @@
-#include <Cocoa/Cocoa.h>
-#import <IOKit/hidsystem/ev_keymap.h>
-#import <Carbon/Carbon.h>
-
-// http://overooped.com/post/2593597587/mediakeys
-
-#define SPSystemDefinedEventMediaKeys 8
-
-@interface SPMediaKeyTap : NSObject {
-	EventHandlerRef _app_switching_ref;
-	EventHandlerRef _app_terminating_ref;
-	CFMachPortRef _eventPort;
-	CFRunLoopSourceRef _eventPortSource;
-	CFRunLoopRef _tapThreadRL;
-	BOOL _shouldInterceptMediaKeyEvents;
-	id _delegate;
-	// The app that is frontmost in this list owns media keys
-	NSMutableArray *_mediaKeyAppList;
-}
-+ (NSArray*)defaultMediaKeyUserBundleIdentifiers;
-
--(id)initWithDelegate:(id)delegate;
-
-+(BOOL)usesGlobalMediaKeyTap;
--(void)startWatchingMediaKeys;
--(void)stopWatchingMediaKeys;
--(void)handleAndReleaseMediaKeyEvent:(NSEvent *)event;
-@end
-
-@interface NSObject (SPMediaKeyTapDelegate)
--(void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event;
-@end
-
-extern NSString *kMediaKeyUsingBundleIdentifiersDefaultsKey;

3rdparty/SPMediaKeyTap/SPMediaKeyTap.m

@@ -1,300 +0,0 @@
-// Copyright (c) 2010 Spotify AB
-#import "SPMediaKeyTap.h"
-#import "SPInvocationGrabbing/NSObject+SPInvocationGrabbing.h" // https://gist.github.com/511181, in submodule
-
-@interface SPMediaKeyTap ()
--(BOOL)shouldInterceptMediaKeyEvents;
--(void)setShouldInterceptMediaKeyEvents:(BOOL)newSetting;
--(void)startWatchingAppSwitching;
--(void)stopWatchingAppSwitching;
--(void)eventTapThread;
-@end
-static SPMediaKeyTap *singleton = nil;
-
-static pascal OSStatus appSwitched (EventHandlerCallRef nextHandler, EventRef evt, void* userData);
-static pascal OSStatus appTerminated (EventHandlerCallRef nextHandler, EventRef evt, void* userData);
-static CGEventRef tapEventCallback(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon);
-
-
-// Inspired by http://gist.github.com/546311
-
-@implementation SPMediaKeyTap
-
-#pragma mark -
-#pragma mark Setup and teardown
--(id)initWithDelegate:(id)delegate;
-{
-	_delegate = delegate;
-	[self startWatchingAppSwitching];
-	singleton = self;
-	_mediaKeyAppList = [NSMutableArray new];
-	return self;
-}
--(void)dealloc;
-{
-	[self stopWatchingMediaKeys];
-	[self stopWatchingAppSwitching];
-	[_mediaKeyAppList release];
-	[super dealloc];
-}
-
--(void)startWatchingAppSwitching;
-{
-	// Listen to "app switched" event, so that we don't intercept media keys if we
-	// weren't the last "media key listening" app to be active
-	EventTypeSpec eventType = { kEventClassApplication, kEventAppFrontSwitched };
-    OSStatus err = InstallApplicationEventHandler(NewEventHandlerUPP(appSwitched), 1, &eventType, self, &_app_switching_ref);
-	assert(err == noErr);
-	
-	eventType.eventKind = kEventAppTerminated;
-    err = InstallApplicationEventHandler(NewEventHandlerUPP(appTerminated), 1, &eventType, self, &_app_terminating_ref);
-	assert(err == noErr);
-}
--(void)stopWatchingAppSwitching;
-{
-	if(!_app_switching_ref) return;
-	RemoveEventHandler(_app_switching_ref);
-	_app_switching_ref = NULL;
-}
-
--(void)startWatchingMediaKeys;{
-	[self setShouldInterceptMediaKeyEvents:YES];
-	
-	// Add an event tap to intercept the system defined media key events
-	_eventPort = CGEventTapCreate(kCGSessionEventTap,
-								  kCGHeadInsertEventTap,
-								  kCGEventTapOptionDefault,
-								  CGEventMaskBit(NX_SYSDEFINED),
-								  tapEventCallback,
-								  self);
-	assert(_eventPort != NULL);
-	
-    _eventPortSource = CFMachPortCreateRunLoopSource(kCFAllocatorSystemDefault, _eventPort, 0);
-	assert(_eventPortSource != NULL);
-	
-	// Let's do this in a separate thread so that a slow app doesn't lag the event tap
-	[NSThread detachNewThreadSelector:@selector(eventTapThread) toTarget:self withObject:nil];
-}
--(void)stopWatchingMediaKeys;
-{
-	// TODO<nevyn>: Shut down thread, remove event tap port and source
-}
-
-#pragma mark -
-#pragma mark Accessors
-
-+(BOOL)usesGlobalMediaKeyTap
-{
-#ifdef _DEBUG
-	// breaking in gdb with a key tap inserted sometimes locks up all mouse and keyboard input forever, forcing reboot
-	return NO;
-#else
-	// XXX(nevyn): MediaKey event tap doesn't work on 10.4, feel free to figure out why if you have the energy.
-	return floor(NSAppKitVersionNumber) >= 949/*NSAppKitVersionNumber10_5*/;
-#endif
-}
-
-+ (NSArray*)defaultMediaKeyUserBundleIdentifiers;
-{
-	return [NSArray arrayWithObjects:
-		[[NSBundle mainBundle] bundleIdentifier], // your app
-		@"com.spotify.client",
-		@"com.apple.iTunes",
-		@"com.apple.QuickTimePlayerX",
-		@"com.apple.quicktimeplayer",
-		@"com.apple.iWork.Keynote",
-		@"com.apple.iPhoto",
-		@"org.videolan.vlc",
-		@"com.apple.Aperture",
-		@"com.plexsquared.Plex",
-		@"com.soundcloud.desktop",
-		@"com.macromedia.fireworks", // the tap messes up their mouse input
-		nil
-	];
-}
-
-
--(BOOL)shouldInterceptMediaKeyEvents;
-{
-	BOOL shouldIntercept = NO;
-	@synchronized(self) {
-		shouldIntercept = _shouldInterceptMediaKeyEvents;
-	}
-	return shouldIntercept;
-}
-
--(void)pauseTapOnTapThread:(BOOL)yeahno;
-{
-	CGEventTapEnable(self->_eventPort, yeahno);
-}
--(void)setShouldInterceptMediaKeyEvents:(BOOL)newSetting;
-{
-	BOOL oldSetting;
-	@synchronized(self) {
-		oldSetting = _shouldInterceptMediaKeyEvents;
-		_shouldInterceptMediaKeyEvents = newSetting;
-	}
-	if(_tapThreadRL && oldSetting != newSetting) {
-		id grab = [self grab];
-		[grab pauseTapOnTapThread:newSetting];
-		NSTimer *timer = [NSTimer timerWithTimeInterval:0 invocation:[grab invocation] repeats:NO];
-		CFRunLoopAddTimer(_tapThreadRL, (CFRunLoopTimerRef)timer, kCFRunLoopCommonModes);
-	}
-}
-
-#pragma mark 
-#pragma mark -
-#pragma mark Event tap callbacks
-
-// Note: method called on background thread
-
-static CGEventRef tapEventCallback2(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon)
-{
-	SPMediaKeyTap *self = refcon;
-
-    if(type == kCGEventTapDisabledByTimeout) {
-		NSLog(@"Media key event tap was disabled by timeout");
-		CGEventTapEnable(self->_eventPort, TRUE);
-		return event;
-	} else if(type == kCGEventTapDisabledByUserInput) {
-		// Was disabled manually by -[pauseTapOnTapThread]
-		return event;
-	}
-	NSEvent *nsEvent = nil;
-	@try {
-		nsEvent = [NSEvent eventWithCGEvent:event];
-	}
-	@catch (NSException * e) {
-		NSLog(@"Strange CGEventType: %d: %@", type, e);
-		assert(0);
-		return event;
-	}
-
-	if (type != NX_SYSDEFINED || [nsEvent subtype] != SPSystemDefinedEventMediaKeys)
-		return event;
-
-	int keyCode = (([nsEvent data1] & 0xFFFF0000) >> 16);
-	if (keyCode != NX_KEYTYPE_PLAY && keyCode != NX_KEYTYPE_FAST && keyCode != NX_KEYTYPE_REWIND)
-		return event;
-
-	if (![self shouldInterceptMediaKeyEvents])
-		return event;
-	
-	[nsEvent retain]; // matched in handleAndReleaseMediaKeyEvent:
-	[self performSelectorOnMainThread:@selector(handleAndReleaseMediaKeyEvent:) withObject:nsEvent waitUntilDone:NO];
-	
-	return NULL;
-}
-
-static CGEventRef tapEventCallback(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon)
-{
-	NSAutoreleasePool *pool = [NSAutoreleasePool new];
-	CGEventRef ret = tapEventCallback2(proxy, type, event, refcon);
-	[pool drain];
-	return ret;
-}
-
-
-// event will have been retained in the other thread
--(void)handleAndReleaseMediaKeyEvent:(NSEvent *)event {
-	[event autorelease];
-	
-	[_delegate mediaKeyTap:self receivedMediaKeyEvent:event];
-}
-
-
--(void)eventTapThread;
-{
-	_tapThreadRL = CFRunLoopGetCurrent();
-	CFRunLoopAddSource(_tapThreadRL, _eventPortSource, kCFRunLoopCommonModes);
-	CFRunLoopRun();
-}
-
-#pragma mark Task switching callbacks
-
-NSString *kMediaKeyUsingBundleIdentifiersDefaultsKey = @"SPApplicationsNeedingMediaKeys";
-
-
--(void)mediaKeyAppListChanged;
-{
-	if([_mediaKeyAppList count] == 0) return;
-	
-	/*NSLog(@"--");
-	int i = 0;
-	for (NSValue *psnv in _mediaKeyAppList) {
-		ProcessSerialNumber psn; [psnv getValue:&psn];
-		NSDictionary *processInfo = [(id)ProcessInformationCopyDictionary(
-			&psn,
-			kProcessDictionaryIncludeAllInformationMask
-		) autorelease];
-		NSString *bundleIdentifier = [processInfo objectForKey:(id)kCFBundleIdentifierKey];
-		NSLog(@"%d: %@", i++, bundleIdentifier);
-	}*/
-	
-    ProcessSerialNumber mySerial, topSerial;
-	GetCurrentProcess(&mySerial);
-	[[_mediaKeyAppList objectAtIndex:0] getValue:&topSerial];
-
-	Boolean same;
-	OSErr err = SameProcess(&mySerial, &topSerial, &same);
-	[self setShouldInterceptMediaKeyEvents:(err == noErr && same)];	
-
-}
--(void)appIsNowFrontmost:(ProcessSerialNumber)psn;
-{
-	NSValue *psnv = [NSValue valueWithBytes:&psn objCType:@encode(ProcessSerialNumber)];
-	
-	NSDictionary *processInfo = [(id)ProcessInformationCopyDictionary(
-		&psn,
-		kProcessDictionaryIncludeAllInformationMask
-	) autorelease];
-	NSString *bundleIdentifier = [processInfo objectForKey:(id)kCFBundleIdentifierKey];
-
-	NSArray *whitelistIdentifiers = [[NSUserDefaults standardUserDefaults] arrayForKey:kMediaKeyUsingBundleIdentifiersDefaultsKey];
-	if(![whitelistIdentifiers containsObject:bundleIdentifier]) return;
-
-	[_mediaKeyAppList removeObject:psnv];
-	[_mediaKeyAppList insertObject:psnv atIndex:0];
-	[self mediaKeyAppListChanged];
-}
--(void)appTerminated:(ProcessSerialNumber)psn;
-{
-	NSValue *psnv = [NSValue valueWithBytes:&psn objCType:@encode(ProcessSerialNumber)];
-	[_mediaKeyAppList removeObject:psnv];
-	[self mediaKeyAppListChanged];
-}
-
-static pascal OSStatus appSwitched (EventHandlerCallRef nextHandler, EventRef evt, void* userData)
-{
-	SPMediaKeyTap *self = (id)userData;
-
-    ProcessSerialNumber newSerial;
-    GetFrontProcess(&newSerial);
-	
-	[self appIsNowFrontmost:newSerial];
-		
-    return CallNextEventHandler(nextHandler, evt);
-}
-
-static pascal OSStatus appTerminated (EventHandlerCallRef nextHandler, EventRef evt, void* userData)
-{
-	SPMediaKeyTap *self = (id)userData;
-	
-	ProcessSerialNumber deadPSN;
-
-	GetEventParameter(
-		evt, 
-		kEventParamProcessID, 
-		typeProcessSerialNumber, 
-		NULL, 
-		sizeof(deadPSN), 
-		NULL, 
-		&deadPSN
-	);
-
-	
-	[self appTerminated:deadPSN];
-    return CallNextEventHandler(nextHandler, evt);
-}
-
-@end

3rdparty/SPMediaKeyTap/SPMediaKeyTapDelegate.m

@@ -1,25 +0,0 @@
--(void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event;
-{
-	assert([event type] == NSSystemDefined && [event subtype] == SPSystemDefinedEventMediaKeys);
-
-	int keyCode = (([event data1] & 0xFFFF0000) >> 16);
-	int keyFlags = ([event data1] & 0x0000FFFF);
-	int keyState = (((keyFlags & 0xFF00) >> 8)) == 0xA;
-	int keyRepeat = (keyFlags & 0x1);
-		
-	if (keyState == 1 && windowController != NULL) {
-		
-		
-		switch (keyCode) {
-				
-			case NX_KEYTYPE_PLAY:
-...				return;
-				
-			case NX_KEYTYPE_FAST:
-...				return;
-				
-			case NX_KEYTYPE_REWIND:
-...				return;
-		}
-	}
-}

3rdparty/qocoa/CMakeLists.txt

@@ -1,35 +0,0 @@
-cmake_minimum_required(VERSION 2.8.11)
-set(CMAKE_CXX_STANDARD 11)
-
-set(SOURCES)
-
-set(HEADERS
-    qsearchfield.h
-    qbutton.h
-    qprogressindicatorspinning.h
-)
-
-qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-
-if(APPLE)
-    list(APPEND SOURCES
-        qsearchfield_mac.mm
-        qbutton_mac.mm
-        qprogressindicatorspinning_mac.mm
-    )
-else()
-    list(APPEND SOURCES
-        qsearchfield_nonmac.cpp
-        qbutton_nonmac.cpp
-        qprogressindicatorspinning_nonmac.cpp
-    )
-    set(RESOURCES
-        qsearchfield_nonmac.qrc
-        qprogressindicatorspinning_nonmac.qrc
-    )
-    qt5_add_resources(RESOURCES_SOURCES ${RESOURCES})
-endif()
-
-add_library(Qocoa STATIC ${SOURCES} ${MOC_SOURCES} ${RESOURCES_SOURCES})
-target_link_libraries(Qocoa ${QT_LIBRARIES})
-

3rdparty/qocoa/README.md

@@ -1,38 +0,0 @@
-# Qocoa
-Qocoa is a collection of Qt wrappers for OSX's Cocoa widgets.
-
-## Features
-- basic fallback to sensible Qt types on non-OSX platforms
-- shared class headers which expose no implementation details
-- typical Qt signal/slot-based API
-- trivial to import into projects (class header/implementation, [single shared global header](https://github.com/mikemcquaid/Qocoa/blob/master/qocoa_mac.h))
-
-## Building
-```
-git clone git://github.com/mikemcquaid/Qocoa.git
-cd Qocoa
-qmake # or cmake .
-make
-```
-
-## Status
-I'm not personally working on this any more but will accept pull-requests.
-
-[![Build Status](https://travis-ci.org/MikeMcQuaid/Qocoa.svg?branch=master)](https://travis-ci.org/MikeMcQuaid/Qocoa)
-
-## Usage
-For each class you want to use copy the [`qocoa_mac.h`](https://github.com/mikemcquaid/Qocoa/blob/master/qocoa_mac.h), `$CLASS.h`, `$CLASS_mac.*` and `$CLASS_nonmac.*` files into your source tree and add them to your buildsystem. Examples are provided for [CMake](https://github.com/mikemcquaid/Qocoa/blob/master/CMakeLists.txt) and [QMake](https://github.com/mikemcquaid/Qocoa/blob/master/Qocoa.pro).
-
-## Contact
-[Mike McQuaid](mailto:mike@mikemcquaid.com)
-
-## License
-Qocoa is licensed under the [MIT License](http://en.wikipedia.org/wiki/MIT_License).
-The full license text is available in [LICENSE.txt](https://github.com/mikemcquaid/Qocoa/blob/master/LICENSE.txt).
-
-Magnifier and EditClear icons taken from [QtCreator](http://qt-project.org/) and are licensed under the [LGPL](http://www.gnu.org/copyleft/lesser.html).
-
-Other icons are taken from the [Oxygen Project](http://www.oxygen-icons.org/) and are licensed under the [Creative Commons Attribution-ShareAlike 3.0 License](http://creativecommons.org/licenses/by-sa/3.0/).
-
-## Gallery
-![Qocoa Gallery](https://github.com/mikemcquaid/Qocoa/raw/master/gallery.png)

3rdparty/qocoa/TODO.md

@@ -1,13 +0,0 @@
-Widgets I hope to implement (or at least investigate):
-
-- NSTokenField
-- NSSegmentedControl
-- NSLevelIndicator
-- NSPathControl
-- NSSlider (Circular)
-- NSSplitView
-- NSTextFinder
-- NSOutlineView in an NSScrollView (Source List)
-- NSDrawer
-- PDFView
-- WebView

3rdparty/qocoa/qbutton.h

@@ -1,49 +0,0 @@
-#ifndef QBUTTON_H
-#define QBUTTON_H
-
-#include <QWidget>
-#include <QPointer>
-
-class QButtonPrivate;
-class QButton : public QWidget
-{
-    Q_OBJECT
-public:
-    // Matches NSBezelStyle
-    enum BezelStyle {
-       Rounded           = 1,
-       RegularSquare     = 2,
-       Disclosure        = 5,
-       ShadowlessSquare  = 6,
-       Circular          = 7,
-       TexturedSquare    = 8,
-       HelpButton        = 9,
-       SmallSquare       = 10,
-       TexturedRounded   = 11,
-       RoundRect         = 12,
-       Recessed          = 13,
-       RoundedDisclosure = 14,
-#ifdef __MAC_10_7
-       Inline            = 15
-#endif
-    };
-
-    explicit QButton(QWidget *parent, BezelStyle bezelStyle = Rounded);
-
-public slots:
-    void setText(const QString &text);
-    void setImage(const QPixmap &image);
-    void setChecked(bool checked);
-
-public:
-    void setCheckable(bool checkable);
-    bool isChecked();
-
-signals:
-    void clicked(bool checked = false);
-
-private:
-    friend class QButtonPrivate;
-    QPointer<QButtonPrivate> pimpl;
-};
-#endif // QBUTTON_H

3rdparty/qocoa/qbutton_mac.mm

@@ -1,229 +0,0 @@
-/*
-Copyright (C) 2011 by Mike McQuaid
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-#include "qbutton.h"
-
-#include "qocoa_mac.h"
-
-#import "Foundation/NSAutoreleasePool.h"
-#import "AppKit/NSButton.h"
-#import "AppKit/NSFont.h"
-
-class QButtonPrivate : public QObject
-{
-public:
-    QButtonPrivate(QButton *qButton, NSButton *nsButton, QButton::BezelStyle bezelStyle)
-        : QObject(qButton), qButton(qButton), nsButton(nsButton)
-    {
-        switch(bezelStyle) {
-            case QButton::Disclosure:
-            case QButton::Circular:
-#ifdef __MAC_10_7
-            case QButton::Inline:
-#endif
-            case QButton::RoundedDisclosure:
-            case QButton::HelpButton:
-                [nsButton setTitle:@""];
-            default:
-                break;
-        }
-
-        NSFont* font = 0;
-        switch(bezelStyle) {
-            case QButton::RoundRect:
-                font = [NSFont fontWithName:@"Lucida Grande" size:12];
-                break;
-
-            case QButton::Recessed:
-                font = [NSFont fontWithName:@"Lucida Grande Bold" size:12];
-                break;
-
-#ifdef __MAC_10_7
-            case QButton::Inline:
-                font = [NSFont boldSystemFontOfSize:[NSFont systemFontSizeForControlSize:NSSmallControlSize]];
-                break;
-#endif
-
-            default:
-                font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSRegularControlSize]];
-                break;
-        }
-        [nsButton setFont:font];
-
-        switch(bezelStyle) {
-            case QButton::Rounded:
-                qButton->setMinimumWidth(40);
-                qButton->setFixedHeight(24);
-                qButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-                break;
-            case QButton::RegularSquare:
-            case QButton::TexturedSquare:
-                qButton->setMinimumSize(14, 23);
-                qButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-                break;
-            case QButton::ShadowlessSquare:
-                qButton->setMinimumSize(5, 25);
-                qButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-                break;
-            case QButton::SmallSquare:
-                qButton->setMinimumSize(4, 21);
-                qButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-                break;
-            case QButton::TexturedRounded:
-                qButton->setMinimumSize(10, 22);
-                qButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-                break;
-            case QButton::RoundRect:
-            case QButton::Recessed:
-                qButton->setMinimumWidth(16);
-                qButton->setFixedHeight(18);
-                qButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-                break;
-            case QButton::Disclosure:
-                qButton->setMinimumWidth(13);
-                qButton->setFixedHeight(13);
-                qButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-                break;
-            case QButton::Circular:
-                qButton->setMinimumSize(16, 16);
-                qButton->setMaximumHeight(40);
-                qButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-                break;
-            case QButton::HelpButton:
-            case QButton::RoundedDisclosure:
-                qButton->setMinimumWidth(22);
-                qButton->setFixedHeight(22);
-                qButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-                break;
-#ifdef __MAC_10_7
-            case QButton::Inline:
-                qButton->setMinimumWidth(10);
-                qButton->setFixedHeight(16);
-                qButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-                break;
-#endif
-        }
-
-        switch(bezelStyle) {
-            case QButton::Recessed:
-                [nsButton setButtonType:NSPushOnPushOffButton];
-            case QButton::Disclosure:
-                [nsButton setButtonType:NSOnOffButton];
-            default:
-                [nsButton setButtonType:NSMomentaryPushInButton];
-        }
-
-        [nsButton setBezelStyle:(__bridge NSBezelStyle)bezelStyle];
-    }
-
-    void clicked()
-    {
-        emit qButton->clicked(qButton->isChecked());
-    }
-
-    ~QButtonPrivate() {
-        [[nsButton target] release];
-        [nsButton setTarget:nil];
-    }
-
-    QButton *qButton;
-    NSButton *nsButton;
-};
-
-@interface QButtonTarget : NSObject
-{
-@public
-    QPointer<QButtonPrivate> pimpl;
-}
--(void)clicked;
-@end
-
-@implementation QButtonTarget
--(void)clicked {
-    Q_ASSERT(pimpl);
-    if (pimpl)
-        pimpl->clicked();
-}
-@end
-
-QButton::QButton(QWidget *parent, BezelStyle bezelStyle) : QWidget(parent)
-{
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
-    NSButton *button = [[NSButton alloc] init];
-    pimpl = new QButtonPrivate(this, button, bezelStyle);
-
-    QButtonTarget *target = [[QButtonTarget alloc] init];
-    target->pimpl = pimpl;
-    [button setTarget:target];
-
-    [button setAction:@selector(clicked)];
-
-    setupLayout(button, this);
-
-    [button release];
-
-    [pool drain];
-}
-
-void QButton::setText(const QString &text)
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return;
-
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-    [pimpl->nsButton setTitle:fromQString(text)];
-    [pool drain];
-}
-
-void QButton::setImage(const QPixmap &image)
-{
-    Q_ASSERT(pimpl);
-    if (pimpl)
-        [pimpl->nsButton setImage:fromQPixmap(image)];
-}
-
-void QButton::setChecked(bool checked)
-{
-    Q_ASSERT(pimpl);
-    if (pimpl)
-        [pimpl->nsButton setState:checked];
-}
-
-void QButton::setCheckable(bool checkable)
-{
-    const NSInteger cellMask = checkable ? NSChangeBackgroundCellMask : NSNoCellMask;
-
-    Q_ASSERT(pimpl);
-    if (pimpl)
-        [[pimpl->nsButton cell] setShowsStateBy:cellMask];
-}
-
-bool QButton::isChecked()
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return false;
-
-    return [pimpl->nsButton state];
-}

3rdparty/qocoa/qbutton_nonmac.cpp

@@ -1,89 +0,0 @@
-/*
-Copyright (C) 2011 by Mike McQuaid
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-#include "qbutton.h"
-
-#include <QToolBar>
-#include <QToolButton>
-#include <QPushButton>
-#include <QVBoxLayout>
-
-class QButtonPrivate : public QObject
-{
-public:
-    QButtonPrivate(QButton *button, QAbstractButton *abstractButton)
-        : QObject(button), abstractButton(abstractButton) {}
-    QPointer<QAbstractButton> abstractButton;
-};
-
-QButton::QButton(QWidget *parent, BezelStyle) : QWidget(parent)
-{
-    QAbstractButton *button = 0;
-    if (qobject_cast<QToolBar*>(parent))
-        button = new QToolButton(this);
-    else
-        button = new QPushButton(this);
-    connect(button, SIGNAL(clicked()),
-            this, SIGNAL(clicked()));
-    pimpl = new QButtonPrivate(this, button);
-
-    QVBoxLayout *layout = new QVBoxLayout(this);
-    layout->setMargin(0);
-    layout->addWidget(button);
-}
-
-void QButton::setText(const QString &text)
-{
-    Q_ASSERT(pimpl);
-    if (pimpl)
-        pimpl->abstractButton->setText(text);
-}
-
-void QButton::setImage(const QPixmap &image)
-{
-    Q_ASSERT(pimpl);
-    if (pimpl)
-        pimpl->abstractButton->setIcon(image);
-}
-
-void QButton::setChecked(bool checked)
-{
-    Q_ASSERT(pimpl);
-    if (pimpl)
-        pimpl->abstractButton->setChecked(checked);
-}
-
-void QButton::setCheckable(bool checkable)
-{
-    Q_ASSERT(pimpl);
-    if (pimpl)
-        pimpl->abstractButton->setCheckable(checkable);
-}
-
-bool QButton::isChecked()
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return false;
-
-    return pimpl->abstractButton->isChecked();
-}

3rdparty/qocoa/qocoa_mac.h

@@ -1,56 +0,0 @@
-/*
-Copyright (C) 2011 by Mike McQuaid
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-#include <AppKit/NSImage.h>
-#include <Foundation/NSString.h>
-#include <QString>
-#include <QBoxLayout>
-#include <QtMacExtras>
-#include <QMacCocoaViewContainer>
-
-static inline NSString* fromQString(const QString &string)
-{
-    const QByteArray utf8 = string.toUtf8();
-    const char* cString = utf8.constData();
-    return [[NSString alloc] initWithUTF8String:cString];
-}
-
-static inline QString toQString(NSString *string)
-{
-    if (!string)
-        return QString();
-    return QString::fromUtf8([string UTF8String]);
-}
-
-static inline NSImage* fromQPixmap(const QPixmap &pixmap)
-{
-    CGImageRef cgImage = QtMac::toCGImageRef(pixmap);
-    return [[NSImage alloc] initWithCGImage:cgImage size:NSZeroSize];
-}
-
-static inline void setupLayout(NSView *cocoaView, QWidget *parent)
-{
-    parent->setAttribute(Qt::WA_NativeWindow);
-    QVBoxLayout *layout = new QVBoxLayout(parent);
-    layout->setMargin(0);
-    layout->addWidget(new QMacCocoaViewContainer(cocoaView, parent));
-}

3rdparty/qocoa/qprogressindicatorspinning.h

@@ -1,29 +0,0 @@
-#ifndef QPROGRESSINDICATORSPINNING_H
-#define QPROGRESSINDICATORSPINNING_H
-
-#include <QWidget>
-#include <QPointer>
-
-class QProgressIndicatorSpinningPrivate;
-class QProgressIndicatorSpinning : public QWidget
-{
-    Q_OBJECT
-public:
-    // Matches NSProgressIndicatorThickness
-    enum Thickness {
-       Default = 14,
-       Small   = 10,
-       Large   = 18,
-       Aqua    = 12
-    };
-
-    explicit QProgressIndicatorSpinning(QWidget *parent,
-                                        Thickness thickness = Default);
-public slots:
-    void animate(bool animate = true);
-private:
-    friend class QProgressIndicatorSpinningPrivate;
-    QPointer<QProgressIndicatorSpinningPrivate> pimpl;
-};
-
-#endif // QPROGRESSINDICATORSPINNING_H

3rdparty/qocoa/qprogressindicatorspinning_mac.mm

@@ -1,70 +0,0 @@
-/*
-Copyright (C) 2011 by Mike McQuaid
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-#include "qprogressindicatorspinning.h"
-
-#include "qocoa_mac.h"
-
-#import "Foundation/NSAutoreleasePool.h"
-#import "AppKit/NSProgressIndicator.h"
-
-class QProgressIndicatorSpinningPrivate : public QObject
-{
-public:
-    QProgressIndicatorSpinningPrivate(QProgressIndicatorSpinning *qProgressIndicatorSpinning,
-                                      NSProgressIndicator *nsProgressIndicator)
-        : QObject(qProgressIndicatorSpinning), nsProgressIndicator(nsProgressIndicator) {}
-
-    NSProgressIndicator *nsProgressIndicator;
-};
-
-QProgressIndicatorSpinning::QProgressIndicatorSpinning(QWidget *parent,
-                                                       Thickness thickness)
-    : QWidget(parent)
-{
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
-    NSProgressIndicator *progress = [[NSProgressIndicator alloc] init];
-    [progress setStyle:NSProgressIndicatorSpinningStyle];
-
-    pimpl = new QProgressIndicatorSpinningPrivate(this, progress);
-
-    setupLayout(progress, this);
-
-    setFixedSize(thickness, thickness);
-
-    [progress release];
-
-    [pool drain];
-}
-
-void QProgressIndicatorSpinning::animate(bool animate)
-{
-    Q_ASSERT(pimpl);
-    if (!pimpl)
-        return;
-
-    if (animate)
-        [pimpl->nsProgressIndicator startAnimation:nil];
-    else
-        [pimpl->nsProgressIndicator stopAnimation:nil];
-}

3rdparty/qocoa/qprogressindicatorspinning_nonmac.cpp

@@ -1,72 +0,0 @@
-/*
-Copyright (C) 2011 by Mike McQuaid
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-#include "qprogressindicatorspinning.h"
-
-#include <QVBoxLayout>
-#include <QMovie>
-#include <QLabel>
-
-class QProgressIndicatorSpinningPrivate : public QObject
-{
-public:
-    QProgressIndicatorSpinningPrivate(QProgressIndicatorSpinning *qProgressIndicatorSpinning,
-                                      QMovie *movie)
-        : QObject(qProgressIndicatorSpinning), movie(movie) {}
-
-    QPointer<QMovie> movie;
-};
-
-QProgressIndicatorSpinning::QProgressIndicatorSpinning(QWidget *parent,
-                                                       Thickness thickness)
-    : QWidget(parent)
-{
-    QVBoxLayout *layout = new QVBoxLayout(this);
-    layout->setMargin(0);
-
-    QSize size(thickness, thickness);
-    QMovie *movie = new QMovie(this);
-    movie->setFileName(":/Qocoa/qprogressindicatorspinning_nonmac.gif");
-    movie->setScaledSize(size);
-    // Roughly match OSX speed.
-    movie->setSpeed(200);
-    pimpl = new QProgressIndicatorSpinningPrivate(this, movie);
-
-    QLabel *label = new QLabel(this);
-    label->setMovie(movie);
-
-    layout->addWidget(label);
-    setFixedSize(size);
-}
-
-
-void QProgressIndicatorSpinning::animate(bool animate)
-{
-    Q_ASSERT(pimpl && pimpl->movie);
-    if (!(pimpl && pimpl->movie))
-        return;
-
-    if (animate)
-        pimpl->movie->start();
-    else
-        pimpl->movie->stop();
-}

3rdparty/qocoa/qprogressindicatorspinning_nonmac.qrc

@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/Qocoa">
-        <file>qprogressindicatorspinning_nonmac.gif</file>
-    </qresource>
-</RCC>

3rdparty/qocoa/qsearchfield_nonmac.qrc

@@ -1,7 +0,0 @@
-<RCC>
-    <qresource prefix="/Qocoa">
-        <file>qsearchfield_nonmac_clear.png</file>
-        <file>qsearchfield_nonmac_magnifier_menu.png</file>
-        <file>qsearchfield_nonmac_magnifier.png</file>
-    </qresource>
-</RCC>

3rdparty/singleapplication/CMakeLists.txt

@@ -1,14 +1,55 @@
-cmake_minimum_required(VERSION 2.8.11)
-set(CMAKE_CXX_STANDARD 11)
+cmake_minimum_required(VERSION 3.0)
+
+include(CheckIncludeFiles)
+include(CheckFunctionExists)
+
+if(CMAKE_VERSION VERSION_GREATER 3.0)
+  check_function_exists(geteuid HAVE_GETEUID)
+  check_function_exists(getpwuid HAVE_GETPWUID)
+endif()
 
 set(SINGLEAPP-SOURCES singleapplication.cpp singleapplication_p.cpp)
 set(SINGLEAPP-MOC-HEADERS singleapplication.h singleapplication_p.h)
-QT5_WRAP_CPP(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS})
-ADD_LIBRARY(singleapplication STATIC ${SINGLEAPP-SOURCES} ${SINGLEAPP-SOURCES-MOC})
-target_link_libraries(singleapplication Qt5::Core Qt5::Widgets Qt5::Network)
+if(BUILD_WITH_QT6)
+  qt6_wrap_cpp(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS})
+else()
+  qt5_wrap_cpp(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS})
+endif()
+add_library(singleapplication STATIC ${SINGLEAPP-SOURCES} ${SINGLEAPP-SOURCES-MOC})
+target_include_directories(singleapplication SYSTEM PRIVATE
+  ${QtCore_INCLUDE_DIRS}
+  ${QtWidgets_INCLUDE_DIRS}
+  ${QtNetwork_INCLUDE_DIRS}
+)
+target_include_directories(singleapplication PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+target_link_libraries(singleapplication PRIVATE
+  ${QtCore_LIBRARIES}
+  ${QtWidgets_LIBRARIES}
+  ${QtNetwork_LIBRARIES}
+)
 
 set(SINGLECOREAPP-SOURCES singlecoreapplication.cpp singlecoreapplication_p.cpp)
 set(SINGLECOREAPP-MOC-HEADERS singlecoreapplication.h singlecoreapplication_p.h)
-QT5_WRAP_CPP(SINGLECOREAPP-SOURCES-MOC ${SINGLECOREAPP-MOC-HEADERS})
-ADD_LIBRARY(singlecoreapplication STATIC ${SINGLECOREAPP-SOURCES} ${SINGLECOREAPP-SOURCES-MOC})
-target_link_libraries(singlecoreapplication Qt5::Core Qt5::Widgets Qt5::Network)
+if(BUILD_WITH_QT6)
+  qt6_wrap_cpp(SINGLECOREAPP-SOURCES-MOC ${SINGLECOREAPP-MOC-HEADERS})
+else()
+  qt5_wrap_cpp(SINGLECOREAPP-SOURCES-MOC ${SINGLECOREAPP-MOC-HEADERS})
+endif()
+add_library(singlecoreapplication STATIC ${SINGLECOREAPP-SOURCES} ${SINGLECOREAPP-SOURCES-MOC})
+target_include_directories(singlecoreapplication SYSTEM PRIVATE
+  ${QtCore_INCLUDE_DIRS}
+  ${QtNetwork_INCLUDE_DIRS}
+)
+target_include_directories(singlecoreapplication PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+target_link_libraries(singlecoreapplication PRIVATE
+  ${QtCore_LIBRARIES}
+  ${QtNetwork_LIBRARIES}
+)
+
+configure_file(config.h.in "${CMAKE_CURRENT_BINARY_DIR}/config.h")

3rdparty/singleapplication/config.h.in

@@ -0,0 +1,2 @@
+#cmakedefine HAVE_GETEUID
+#cmakedefine HAVE_GETPWUID

3rdparty/singleapplication/singleapplication.cpp

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) Itay Grudev 2015 - 2018
+// Copyright (c) Itay Grudev 2015 - 2020
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,156 +20,250 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+//
+//  W A R N I N G !!!
+//  -----------------
+//
+// This is a modified version of SingleApplication,
+// The original version is at:
+//
+// https://github.com/itay-grudev/SingleApplication
+//
+//
+
+#include <cstdlib>
+#include <limits>
+
+#include <QtGlobal>
 #include <QApplication>
-#include <QtCore/QTime>
-#include <QtCore/QThread>
-#include <QtCore/QDateTime>
-#include <QtCore/QByteArray>
-#include <QtCore/QSharedMemory>
+#include <QThread>
+#include <QSharedMemory>
+#include <QLocalSocket>
+#include <QByteArray>
+#include <QElapsedTimer>
+#include <QtDebug>
 
 #include "singleapplication.h"
 #include "singleapplication_p.h"
 
 /**
- * @brief Constructor. Checks and fires up LocalServer or closes the program
- * if another instance already exists
+ * @brief Constructor. Checks and fires up LocalServer or closes the program if another instance already exists
  * @param argc
  * @param argv
- * @param {bool} allowSecondaryInstances
+ * @param allowSecondary Whether to enable secondary instance support
+ * @param options Optional flags to toggle specific behaviour
+ * @param timeout Maximum time blocking functions are allowed during app load
  */
 SingleApplication::SingleApplication(int &argc, char *argv[], bool allowSecondary, Options options, int timeout)
-    : app_t( argc, argv ), d_ptr( new SingleApplicationPrivate( this ) )
-{
+    : app_t(argc, argv),
+      d_ptr(new SingleApplicationPrivate(this)) {
+
   Q_D(SingleApplication);
 
   // Store the current mode of the program
-    d->options = options;
+  d->options_ = options;
 
-    // Generating an application ID used for identifying the shared memory
-    // block and QLocalServer
+  // Generating an application ID used for identifying the shared memory block and QLocalServer
   d->genBlockServerName();
 
+  // To mitigate QSharedMemory issues with large amount of processes attempting to attach at the same time
+  d->randomSleep();
+
 #ifdef Q_OS_UNIX
-    // By explicitly attaching it and then deleting it we make sure that the
-    // memory is deleted even after the process has crashed on Unix.
-    d->memory = new QSharedMemory( d->blockServerName );
-    d->memory->attach();
-    delete d->memory;
+  // By explicitly attaching it and then deleting it we make sure that the memory is deleted even after the process has crashed on Unix.
+  d->memory_ = new QSharedMemory(d->blockServerName_);
+  d->memory_->attach();
+  delete d->memory_;
 #endif
+
   // Guarantee thread safe behaviour with a shared memory block.
-    d->memory = new QSharedMemory( d->blockServerName );
+  d->memory_ = new QSharedMemory(d->blockServerName_);
 
   // Create a shared memory block
-    if( d->memory->create( sizeof( InstancesInfo ) ) ) {
+  if (d->memory_->create(sizeof(InstancesInfo))) {
     // Initialize the shared memory block
-        d->memory->lock();
+    if (!d->memory_->lock()) {
+      qCritical() << "SingleApplication: Unable to lock memory block after create.";
+      abortSafely();
+    }
     d->initializeMemoryBlock();
-        d->memory->unlock();
-    } else {
+  }
+  else {
+    if (d->memory_->error() == QSharedMemory::AlreadyExists) {
       // Attempt to attach to the memory segment
-        if( ! d->memory->attach() ) {
+      if (!d->memory_->attach()) {
         qCritical() << "SingleApplication: Unable to attach to shared memory block.";
-            qCritical() << d->memory->errorString();
-            delete d;
-            ::exit( EXIT_FAILURE );
+        abortSafely();
+      }
+      if (!d->memory_->lock()) {
+        qCritical() << "SingleApplication: Unable to lock memory block after attach.";
+        abortSafely();
+      }
+    }
+    else {
+      qCritical() << "SingleApplication: Unable to create block.";
+      abortSafely();
     }
   }
 
-    InstancesInfo* inst = static_cast<InstancesInfo*>( d->memory->data() );
-    QTime time;
+  InstancesInfo *inst = static_cast<InstancesInfo*>(d->memory_->data());
+  QElapsedTimer time;
   time.start();
 
   // Make sure the shared memory block is initialised and in consistent state
-    while( true ) {
-        d->memory->lock();
-
+  forever {
+    // If the shared memory block's checksum is valid continue
     if (d->blockChecksum() == inst->checksum) break;
 
+    // If more than 5s have elapsed, assume the primary instance crashed and assume it's position
     if (time.elapsed() > 5000) {
       qWarning() << "SingleApplication: Shared memory block has been in an inconsistent state from more than 5s. Assuming primary instance failure.";
       d->initializeMemoryBlock();
     }
 
-        d->memory->unlock();
-
-        // Random sleep here limits the probability of a collision between two racing apps
-        qsrand( QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max() );
-        QThread::sleep( 8 + static_cast <unsigned long>( static_cast <float>( qrand() ) / RAND_MAX * 10 ) );
+    // Otherwise wait for a random period and try again.
+    // The random sleep here limits the probability of a collision between two racing apps and allows the app to initialise faster
+    if (!d->memory_->unlock()) {
+      qDebug() << "SingleApplication: Unable to unlock memory for random wait.";
+      qDebug() << d->memory_->errorString();
+    }
+    d->randomSleep();
+    if (!d->memory_->lock()) {
+      qCritical() << "SingleApplication: Unable to lock memory after random wait.";
+      abortSafely();
+    }
   }
 
   if (inst->primary == false) {
     d->startPrimary();
-        d->memory->unlock();
+    if (!d->memory_->unlock()) {
+      qDebug() << "SingleApplication: Unable to unlock memory after primary start.";
+      qDebug() << d->memory_->errorString();
+    }
     return;
   }
 
   // Check if another instance can be started
   if (allowSecondary) {
-        inst->secondary += 1;
-        inst->checksum = d->blockChecksum();
-        d->instanceNumber = inst->secondary;
     d->startSecondary();
-        if( d->options & Mode::SecondaryNotification ) {
+    if (d->options_ & Mode::SecondaryNotification) {
       d->connectToPrimary(timeout, SingleApplicationPrivate::SecondaryInstance);
     }
-        d->memory->unlock();
+    if (!d->memory_->unlock()) {
+      qDebug() << "SingleApplication: Unable to unlock memory after secondary start.";
+      qDebug() << d->memory_->errorString();
+    }
     return;
   }
 
-    d->memory->unlock();
+  if (!d->memory_->unlock()) {
+    qDebug() << "SingleApplication: Unable to unlock memory at end of execution.";
+    qDebug() << d->memory_->errorString();
+  }
 
   d->connectToPrimary(timeout, SingleApplicationPrivate::NewInstance);
 
   delete d;
 
   ::exit(EXIT_SUCCESS);
+
 }
 
-/**
- * @brief Destructor
- */
-SingleApplication::~SingleApplication()
-{
+SingleApplication::~SingleApplication() {
   Q_D(SingleApplication);
   delete d;
 }
 
-bool SingleApplication::isPrimary()
-{
+/**
+ * Checks if the current application instance is primary.
+ * @return Returns true if the instance is primary, false otherwise.
+ */
+bool SingleApplication::isPrimary() {
   Q_D(SingleApplication);
-    return d->server != nullptr;
+  return d->server_ != nullptr;
 }
 
-bool SingleApplication::isSecondary()
-{
+/**
+ * Checks if the current application instance is secondary.
+ * @return Returns true if the instance is secondary, false otherwise.
+ */
+bool SingleApplication::isSecondary() {
   Q_D(SingleApplication);
-    return d->server == nullptr;
+  return d->server_ == nullptr;
 }
 
-quint32 SingleApplication::instanceId()
-{
+/**
+ * Allows you to identify an instance by returning unique consecutive instance ids.
+ * It is reset when the first (primary) instance of your app starts and only incremented afterwards.
+ * @return Returns a unique instance id.
+ */
+quint32 SingleApplication::instanceId() {
   Q_D(SingleApplication);
-    return d->instanceNumber;
+  return d->instanceNumber_;
 }
 
-qint64 SingleApplication::primaryPid()
-{
+/**
+ * Returns the OS PID (Process Identifier) of the process running the primary instance.
+ * Especially useful when SingleApplication is coupled with OS. specific APIs.
+ * @return Returns the primary instance PID.
+ */
+qint64 SingleApplication::primaryPid() {
   Q_D(SingleApplication);
   return d->primaryPid();
 }
 
-bool SingleApplication::sendMessage( QByteArray message, int timeout )
-{
+/**
+ * Returns the username the primary instance is running as.
+ * @return Returns the username the primary instance is running as.
+ */
+QString SingleApplication::primaryUser() {
+  Q_D(SingleApplication);
+  return d->primaryUser();
+}
+
+/**
+ * Returns the username the current instance is running as.
+ * @return Returns the username the current instance is running as.
+ */
+QString SingleApplication::currentUser() {
+  Q_D(SingleApplication);
+  return d->getUsername();
+}
+
+/**
+ * Sends message to the Primary Instance.
+ * @param message The message to send.
+ * @param timeout the maximum timeout in milliseconds for blocking functions.
+ * @return true if the message was sent successfuly, false otherwise.
+ */
+bool SingleApplication::sendMessage(QByteArray message, int timeout) {
+
   Q_D(SingleApplication);
 
   // Nobody to connect to
   if (isPrimary()) return false;
 
   // Make sure the socket is connected
-    d->connectToPrimary( timeout,  SingleApplicationPrivate::Reconnect );
+  if (!d->connectToPrimary(timeout, SingleApplicationPrivate::Reconnect))
+    return false;
 
-    d->socket->write( message );
-    bool dataWritten = d->socket->flush();
-    d->socket->waitForBytesWritten( timeout );
+  d->socket_->write(message);
+  const bool dataWritten = d->socket_->waitForBytesWritten(timeout);
+  d->socket_->flush();
   return dataWritten;
+
+}
+
+/**
+ * Cleans up the shared memory block and exits with a failure.
+ * This function halts program execution.
+ */
+void SingleApplication::abortSafely() {
+
+  Q_D(SingleApplication);
+
+  qCritical() << "SingleApplication: " << d->memory_->error() << d->memory_->errorString();
+  delete d;
+  ::exit(EXIT_FAILURE);
+
 }

3rdparty/singleapplication/singleapplication.h

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) Itay Grudev 2015 - 2018
+// Copyright (c) Itay Grudev 2015 - 2020
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,22 +20,32 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+//
+//  W A R N I N G !!!
+//  -----------------
+//
+// This is a modified version of SingleApplication,
+// The original version is at:
+//
+// https://github.com/itay-grudev/SingleApplication
+//
+//
+
 #ifndef SINGLEAPPLICATION_H
 #define SINGLEAPPLICATION_H
 
-#include <QtCore/QtGlobal>
+#include <QtGlobal>
 #include <QApplication>
-#include <QtNetwork/QLocalSocket>
+#include <QFlags>
+#include <QByteArray>
 
 class SingleApplicationPrivate;
 
 /**
- * @brief The SingleApplication class handles multipe instances of the same
- * Application
- * @see QCoreApplication
+ * @brief The SingleApplication class handles multipe instances of the same Application
+ * @see QApplication
  */
-class SingleApplication : public QApplication
-{
+class SingleApplication : public QApplication {
   Q_OBJECT
 
   typedef QApplication app_t;
@@ -69,7 +79,7 @@ public:
    * if there is already a primary instance.
    * @arg {Mode} mode - Whether for the SingleApplication block to be applied
    * User wide or System wide.
-     * @arg {int} timeout - Timeout to wait in miliseconds.
+   * @arg {int} timeout - Timeout to wait in milliseconds.
    * @note argc and argv may be changed as Qt removes arguments that it
    * recognizes
    * @note Mode::SecondaryNotification only works if set on both the primary
@@ -81,7 +91,7 @@ public:
    * @see See the corresponding QAPPLICATION_CLASS constructor for reference
    */
   explicit SingleApplication(int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 1000);
-    ~SingleApplication();
+  ~SingleApplication() override;
 
   /**
    * @brief Returns if the instance is the primary instance
@@ -107,6 +117,18 @@ public:
    */
   qint64 primaryPid();
 
+  /**
+   * @brief Returns the username of the user running the primary instance
+   * @returns {QString}
+   */
+  QString primaryUser();
+
+  /**
+   * @brief Returns the username of the current user
+   * @returns {QString}
+   */
+  QString currentUser();
+
   /**
    * @brief Sends a message to the primary instance. Returns true on success.
    * @param {int} timeout - Timeout for connecting
@@ -114,15 +136,16 @@ public:
    * @note sendMessage() will return false if invoked from the primary
    * instance.
    */
-    bool sendMessage( QByteArray message, int timeout = 100 );
+  bool sendMessage(QByteArray message, int timeout = 1000);
 
-Q_SIGNALS:
+ signals:
   void instanceStarted();
   void receivedMessage(quint32 instanceId, QByteArray message);
 
  private:
   SingleApplicationPrivate *d_ptr;
   Q_DECLARE_PRIVATE(SingleApplication)
+  void abortSafely();
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(SingleApplication::Options)

3rdparty/singleapplication/singleapplication_p.cpp

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) Itay Grudev 2015 - 2018
+// Copyright (c) Itay Grudev 2015 - 2020
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -24,23 +24,42 @@
 //  W A R N I N G !!!
 //  -----------------
 //
-// This file is not part of the SingleApplication API. It is used purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or may even be removed.
+// This is a modified version of SingleApplication,
+// The original version is at:
 //
+// https://github.com/itay-grudev/SingleApplication
+//
+//
+
+#include "config.h"
+
+#include <QtGlobal>
 
 #include <cstdlib>
 #include <cstddef>
 
-#include <QtCore/QDir>
-#include <QtCore/QProcess>
-#include <QtCore/QByteArray>
-#include <QtCore/QSemaphore>
-#include <QtCore/QDataStream>
-#include <QtCore/QStandardPaths>
-#include <QtCore/QCryptographicHash>
-#include <QtNetwork/QLocalServer>
-#include <QtNetwork/QLocalSocket>
+#ifdef Q_OS_UNIX
+#  include <unistd.h>
+#  include <sys/types.h>
+#  include <pwd.h>
+#endif
+
+#include <QObject>
+#include <QThread>
+#include <QIODevice>
+#include <QSharedMemory>
+#include <QByteArray>
+#include <QDataStream>
+#include <QCryptographicHash>
+#include <QLocalServer>
+#include <QLocalSocket>
+#include <QDir>
+#include <QElapsedTimer>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+#  include <QRandomGenerator>
+#else
+#  include <QDateTime>
+#endif
 
 #include "singleapplication.h"
 #include "singleapplication_p.h"
@@ -50,49 +69,89 @@
 #  include <lmcons.h>
 #endif
 
-SingleApplicationPrivate::SingleApplicationPrivate( SingleApplication *q_ptr )
-    : q_ptr( q_ptr )
-{
-    server = nullptr;
-    socket = nullptr;
-    memory = nullptr;
-    instanceNumber = -1;
+SingleApplicationPrivate::SingleApplicationPrivate(SingleApplication *ptr)
+    : q_ptr(ptr),
+      memory_(nullptr),
+      socket_(nullptr),
+      server_(nullptr),
+      instanceNumber_(-1) {}
+
+SingleApplicationPrivate::~SingleApplicationPrivate() {
+
+  if (socket_ != nullptr) {
+    socket_->close();
+    delete socket_;
+    socket_ = nullptr;
   }
 
-SingleApplicationPrivate::~SingleApplicationPrivate()
-{
-    if( socket != nullptr ) {
-        socket->close();
-        delete socket;
-    }
-
-    memory->lock();
-    InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
-    if( server != nullptr ) {
-        server->close();
-        delete server;
+  if (memory_ != nullptr) {
+    memory_->lock();
+    InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+    if (server_ != nullptr) {
+      server_->close();
+      delete server_;
       inst->primary = false;
       inst->primaryPid = -1;
+      inst->primaryUser[0] = '\0';
       inst->checksum = blockChecksum();
     }
-    memory->unlock();
+    memory_->unlock();
 
-    delete memory;
+    delete memory_;
+    memory_ = nullptr;
   }
 
-void SingleApplicationPrivate::genBlockServerName()
-{
+}
+
+QString SingleApplicationPrivate::getUsername() {
+
+#ifdef Q_OS_UNIX
+  QString username;
+#if defined(HAVE_GETEUID) && defined(HAVE_GETPWUID)
+  struct passwd *pw = getpwuid(geteuid());
+  if (pw) {
+    username = QString::fromLocal8Bit(pw->pw_name);
+  }
+#endif
+  if (username.isEmpty()) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+    username = qEnvironmentVariable("USER");
+#else
+    username = QString::fromLocal8Bit(qgetenv("USER"));
+#endif
+  }
+  return username;
+#endif
+
+#ifdef Q_OS_WIN
+  wchar_t username[UNLEN + 1];
+  // Specifies size of the buffer on input
+  DWORD usernameLength = UNLEN + 1;
+  if (GetUserNameW(username, &usernameLength)) {
+    return QString::fromWCharArray(username);
+  }
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+  return qEnvironmentVariable("USERNAME");
+#else
+  return QString::fromLocal8Bit(qgetenv("USERNAME"));
+#endif
+#endif
+
+}
+
+void SingleApplicationPrivate::genBlockServerName() {
+
   QCryptographicHash appData(QCryptographicHash::Sha256);
   appData.addData("SingleApplication", 17);
   appData.addData(SingleApplication::app_t::applicationName().toUtf8());
   appData.addData(SingleApplication::app_t::organizationName().toUtf8());
   appData.addData(SingleApplication::app_t::organizationDomain().toUtf8());
 
-    if( ! (options & SingleApplication::Mode::ExcludeAppVersion) ) {
+  if (!(options_ & SingleApplication::Mode::ExcludeAppVersion)) {
     appData.addData(SingleApplication::app_t::applicationVersion().toUtf8());
   }
 
-    if( ! (options & SingleApplication::Mode::ExcludeAppPath) ) {
+  if (!(options_ & SingleApplication::Mode::ExcludeAppPath)) {
 #ifdef Q_OS_WIN
     appData.addData(SingleApplication::app_t::applicationFilePath().toLower().toUtf8());
 #else
@@ -101,186 +160,184 @@ void SingleApplicationPrivate::genBlockServerName()
   }
 
   // User level block requires a user specific data in the hash
-    if( options & SingleApplication::Mode::User ) {
-#ifdef Q_OS_WIN
-        wchar_t username [ UNLEN + 1 ];
-        // Specifies size of the buffer on input
-        DWORD usernameLength = UNLEN + 1;
-        if( GetUserNameW( username, &usernameLength ) ) {
-            appData.addData( QString::fromWCharArray(username).toUtf8() );
-        } else {
-            appData.addData( QStandardPaths::standardLocations( QStandardPaths::HomeLocation ).join("").toUtf8() );
-        }
-#endif
-#ifdef Q_OS_UNIX
-        QProcess process;
-        process.start( "whoami" );
-        if( process.waitForFinished( 100 ) &&
-            process.exitCode() == QProcess::NormalExit) {
-            appData.addData( process.readLine() );
-        } else {
-            appData.addData(
-                QDir(
-                    QStandardPaths::standardLocations( QStandardPaths::HomeLocation ).first()
-                ).absolutePath().toUtf8()
-            );
-        }
-#endif
+  if (options_ & SingleApplication::Mode::User) {
+    appData.addData(getUsername().toUtf8());
   }
 
-    // Replace the backslash in RFC 2045 Base64 [a-zA-Z0-9+/=] to comply with
-    // server naming requirements.
-    blockServerName = appData.result().toBase64().replace("/", "_");
+  // Replace the backslash in RFC 2045 Base64 [a-zA-Z0-9+/=] to comply with server naming requirements.
+  blockServerName_ = appData.result().toBase64().replace("/", "_");
+
 }
 
-void SingleApplicationPrivate::initializeMemoryBlock()
-{
-    InstancesInfo* inst = static_cast<InstancesInfo*>( memory->data() );
+void SingleApplicationPrivate::initializeMemoryBlock() {
+
+  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
   inst->primary = false;
   inst->secondary = 0;
   inst->primaryPid = -1;
+  inst->primaryUser[0] = '\0';
   inst->checksum = blockChecksum();
+
 }
 
-void SingleApplicationPrivate::startPrimary()
-{
+void SingleApplicationPrivate::startPrimary() {
+
   Q_Q(SingleApplication);
 
-    // Successful creation means that no main process exists
-    // So we start a QLocalServer to listen for connections
-    QLocalServer::removeServer( blockServerName );
-    server = new QLocalServer();
-
-    // Restrict access to the socket according to the
-    // SingleApplication::Mode::User flag on User level or no restrictions
-    if( options & SingleApplication::Mode::User ) {
-      server->setSocketOptions( QLocalServer::UserAccessOption );
-    } else {
-      server->setSocketOptions( QLocalServer::WorldAccessOption );
-    }
-
-    server->listen( blockServerName );
-    QObject::connect(
-        server,
-        &QLocalServer::newConnection,
-        this,
-        &SingleApplicationPrivate::slotConnectionEstablished
-    );
-
   // Reset the number of connections
-    InstancesInfo* inst = static_cast <InstancesInfo*>( memory->data() );
+  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
 
   inst->primary = true;
   inst->primaryPid = q->applicationPid();
+  qstrncpy(inst->primaryUser, getUsername().toUtf8().data(), sizeof(inst->primaryUser));
   inst->checksum = blockChecksum();
+  instanceNumber_ = 0;
+  // Successful creation means that no main process exists
+  // So we start a QLocalServer to listen for connections
+  QLocalServer::removeServer(blockServerName_);
+  server_ = new QLocalServer();
 
-    instanceNumber = 0;
+  // Restrict access to the socket according to the SingleApplication::Mode::User flag on User level or no restrictions
+  if (options_ & SingleApplication::Mode::User) {
+    server_->setSocketOptions(QLocalServer::UserAccessOption);
+  }
+  else {
+    server_->setSocketOptions(QLocalServer::WorldAccessOption);
   }
 
-void SingleApplicationPrivate::startSecondary()
-{
+  server_->listen(blockServerName_);
+  QObject::connect(server_, &QLocalServer::newConnection, this, &SingleApplicationPrivate::slotConnectionEstablished);
+
 }
 
-void SingleApplicationPrivate::connectToPrimary( int msecs, ConnectionType connectionType )
-{
-    // Connect to the Local Server of the Primary Instance if not already
-    // connected.
-    if( socket == nullptr ) {
-        socket = new QLocalSocket();
+void SingleApplicationPrivate::startSecondary() {
+
+  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+
+  inst->secondary += 1;
+  inst->checksum = blockChecksum();
+  instanceNumber_ = inst->secondary;
+
 }
 
-    // If already connected - we are done;
-    if( socket->state() == QLocalSocket::ConnectedState )
-        return;
+bool SingleApplicationPrivate::connectToPrimary(int timeout, ConnectionType connectionType) {
 
-    // If not connect
-    if( socket->state() == QLocalSocket::UnconnectedState ||
-        socket->state() == QLocalSocket::ClosingState ) {
-        socket->connectToServer( blockServerName );
+  QElapsedTimer time;
+  time.start();
+
+  // Connect to the Local Server of the Primary Instance if not already connected.
+  if (socket_ == nullptr) {
+    socket_ = new QLocalSocket();
   }
 
-    // Wait for being connected
-    if( socket->state() == QLocalSocket::ConnectingState ) {
-        socket->waitForConnected( msecs );
+  if (socket_->state() == QLocalSocket::ConnectedState) return true;
+
+  if (socket_->state() != QLocalSocket::ConnectedState) {
+
+    forever {
+      randomSleep();
+
+      if (socket_->state() != QLocalSocket::ConnectingState)
+        socket_->connectToServer(blockServerName_);
+
+      if (socket_->state() == QLocalSocket::ConnectingState) {
+        socket_->waitForConnected(timeout - time.elapsed());
+      }
+
+      // If connected break out of the loop
+      if (socket_->state() == QLocalSocket::ConnectedState) break;
+
+      // If elapsed time since start is longer than the method timeout return
+      if (time.elapsed() >= timeout) return false;
+    }
   }
 
   // Initialisation message according to the SingleApplication protocol
-    if( socket->state() == QLocalSocket::ConnectedState ) {
-        // Notify the parent that a new instance had been started;
   QByteArray initMsg;
   QDataStream writeStream(&initMsg, QIODevice::WriteOnly);
+  writeStream.setVersion(QDataStream::Qt_5_8);
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-        writeStream.setVersion(QDataStream::Qt_5_6);
+  writeStream << blockServerName_.toLatin1();
+  writeStream << static_cast<quint8>(connectionType);
+  writeStream << instanceNumber_;
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+  quint16 checksum = qChecksum(QByteArray(initMsg,  static_cast<quint32>(initMsg.length())));
+#else
+  quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
 #endif
 
-        writeStream << blockServerName.toLatin1();
-        writeStream << static_cast<quint8>(connectionType);
-        writeStream << instanceNumber;
-        quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
   writeStream << checksum;
 
   // The header indicates the message length that follows
   QByteArray header;
   QDataStream headerStream(&header, QIODevice::WriteOnly);
-
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-        headerStream.setVersion(QDataStream::Qt_5_6);
-#endif
+  headerStream.setVersion(QDataStream::Qt_5_8);
   headerStream << static_cast<quint64>(initMsg.length());
 
-        socket->write( header );
-        socket->write( initMsg );
-        socket->flush();
-        socket->waitForBytesWritten( msecs );
-    }
+  socket_->write(header);
+  socket_->write(initMsg);
+  bool result = socket_->waitForBytesWritten(timeout - time.elapsed());
+  socket_->flush();
+
+  return result;
+
 }
 
-quint16 SingleApplicationPrivate::blockChecksum()
-{
-    return qChecksum(
-       static_cast <const char *>( memory->data() ),
-       offsetof( InstancesInfo, checksum )
-   );
+quint16 SingleApplicationPrivate::blockChecksum() {
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+  quint16 checksum = qChecksum(QByteArray(static_cast<const char*>(memory_->constData()), offsetof(InstancesInfo, checksum)));
+#else
+  quint16 checksum = qChecksum(static_cast<const char*>(memory_->constData()), offsetof(InstancesInfo, checksum));
+#endif
+
+  return checksum;
+
 }
 
-qint64 SingleApplicationPrivate::primaryPid()
-{
-    qint64 pid;
+qint64 SingleApplicationPrivate::primaryPid() {
 
-    memory->lock();
-    InstancesInfo* inst = static_cast<InstancesInfo*>( memory->data() );
-    pid = inst->primaryPid;
-    memory->unlock();
+  memory_->lock();
+  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+  qint64 pid = inst->primaryPid;
+  memory_->unlock();
 
   return pid;
+
+}
+
+QString SingleApplicationPrivate::primaryUser() {
+
+  memory_->lock();
+  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+  QByteArray username = inst->primaryUser;
+  memory_->unlock();
+
+  return QString::fromUtf8(username);
+
 }
 
 /**
  * @brief Executed when a connection has been made to the LocalServer
  */
-void SingleApplicationPrivate::slotConnectionEstablished()
-{
-    QLocalSocket *nextConnSocket = server->nextPendingConnection();
-    connectionMap.insert(nextConnSocket, ConnectionInfo());
+void SingleApplicationPrivate::slotConnectionEstablished() {
 
-    QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose,
-        [nextConnSocket, this]() {
-            auto &info = connectionMap[nextConnSocket];
+  QLocalSocket *nextConnSocket = server_->nextPendingConnection();
+  connectionMap_.insert(nextConnSocket, ConnectionInfo());
+
+  QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, [nextConnSocket, this]() {
+    auto &info = connectionMap_[nextConnSocket];
     Q_EMIT this->slotClientConnectionClosed(nextConnSocket, info.instanceId);
-        }
-    );
+  });
 
-    QObject::connect(nextConnSocket, &QLocalSocket::disconnected,
-        [nextConnSocket, this](){
-            connectionMap.remove(nextConnSocket);
+  QObject::connect(nextConnSocket, &QLocalSocket::disconnected, [nextConnSocket, this]() {
+    connectionMap_.remove(nextConnSocket);
     nextConnSocket->deleteLater();
-        }
-    );
+  });
 
-    QObject::connect(nextConnSocket, &QLocalSocket::readyRead,
-        [nextConnSocket, this]() {
-            auto &info = connectionMap[nextConnSocket];
+  QObject::connect(nextConnSocket, &QLocalSocket::readyRead, [nextConnSocket, this]() {
+    auto &info = connectionMap_[nextConnSocket];
     switch (info.stage) {
       case StageHeader:
         readInitMessageHeader(nextConnSocket);
@@ -294,58 +351,53 @@ void SingleApplicationPrivate::slotConnectionEstablished()
       default:
         break;
     };
-        }
-    );
+  });
+
 }
 
-void SingleApplicationPrivate::readInitMessageHeader( QLocalSocket *sock )
-{
-    if (!connectionMap.contains( sock )) {
+void SingleApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
+
+  if (!connectionMap_.contains(sock)) {
     return;
   }
 
-    if( sock->bytesAvailable() < ( qint64 )sizeof( quint64 ) ) {
+  if (sock->bytesAvailable() < static_cast<qint64>(sizeof(quint64))) {
     return;
   }
 
   QDataStream headerStream(sock);
-
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-    headerStream.setVersion( QDataStream::Qt_5_6 );
-#endif
+  headerStream.setVersion(QDataStream::Qt_5_8);
 
   // Read the header to know the message length
   quint64 msgLen = 0;
   headerStream >> msgLen;
-    ConnectionInfo &info = connectionMap[sock];
+  ConnectionInfo &info = connectionMap_[sock];
   info.stage = StageBody;
   info.msgLen = msgLen;
 
-    if ( sock->bytesAvailable() >= (qint64) msgLen ) {
+  if (sock->bytesAvailable() >= static_cast<qint64>(msgLen)) {
     readInitMessageBody(sock);
   }
+
 }
 
-void SingleApplicationPrivate::readInitMessageBody( QLocalSocket *sock )
-{
+void SingleApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
+
   Q_Q(SingleApplication);
 
-    if (!connectionMap.contains( sock )) {
+  if (!connectionMap_.contains(sock)) {
     return;
   }
 
-    ConnectionInfo &info = connectionMap[sock];
-    if( sock->bytesAvailable() < ( qint64 )info.msgLen ) {
+  ConnectionInfo &info = connectionMap_[sock];
+  if (sock->bytesAvailable() < static_cast<qint64>(info.msgLen)) {
     return;
   }
 
   // Read the message body
   QByteArray msgBytes = sock->read(info.msgLen);
   QDataStream readStream(msgBytes);
-
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-    readStream.setVersion( QDataStream::Qt_5_6 );
-#endif
+  readStream.setVersion(QDataStream::Qt_5_8);
 
   // server name
   QByteArray latin1Name;
@@ -365,11 +417,13 @@ void SingleApplicationPrivate::readInitMessageBody( QLocalSocket *sock )
   quint16 msgChecksum = 0;
   readStream >> msgChecksum;
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+  const quint16 actualChecksum = qChecksum(QByteArray(msgBytes, static_cast<quint32>(msgBytes.length() - sizeof(quint16))));
+#else
   const quint16 actualChecksum = qChecksum(msgBytes.constData(), static_cast<quint32>(msgBytes.length() - sizeof(quint16)));
+#endif
 
-    bool isValid = readStream.status() == QDataStream::Ok &&
-                   QLatin1String(latin1Name) == blockServerName &&
-                   msgChecksum == actualChecksum;
+  bool isValid = readStream.status() == QDataStream::Ok && QLatin1String(latin1Name) == blockServerName_ && msgChecksum == actualChecksum;
 
   if (!isValid) {
     sock->close();
@@ -379,26 +433,38 @@ void SingleApplicationPrivate::readInitMessageBody( QLocalSocket *sock )
   info.instanceId = instanceId;
   info.stage = StageConnected;
 
-    if( connectionType == NewInstance ||
-        ( connectionType == SecondaryInstance &&
-          options & SingleApplication::Mode::SecondaryNotification ) )
-    {
+  if (connectionType == NewInstance || (connectionType == SecondaryInstance && options_ & SingleApplication::Mode::SecondaryNotification)) {
     Q_EMIT q->instanceStarted();
   }
 
   if (sock->bytesAvailable() > 0) {
     Q_EMIT this->slotDataAvailable(sock, instanceId);
   }
+
 }
 
-void SingleApplicationPrivate::slotDataAvailable( QLocalSocket *dataSocket, quint32 instanceId )
-{
+void SingleApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, const quint32 instanceId) {
+
   Q_Q(SingleApplication);
   Q_EMIT q->receivedMessage(instanceId, dataSocket->readAll());
+
 }
 
-void SingleApplicationPrivate::slotClientConnectionClosed( QLocalSocket *closedSocket, quint32 instanceId )
-{
-    if( closedSocket->bytesAvailable() > 0 )
+void SingleApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSocket, const quint32 instanceId) {
+
+  if (closedSocket->bytesAvailable() > 0) {
     Q_EMIT slotDataAvailable(closedSocket, instanceId);
   }
+
+}
+
+void SingleApplicationPrivate::randomSleep() {
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+  QThread::msleep(QRandomGenerator::global()->bounded(8u, 18u));
+#else
+  qsrand(QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max());
+  QThread::msleep(8 + static_cast<unsigned long>(static_cast<float>(qrand()) / RAND_MAX * 10));
+#endif
+
+}

3rdparty/singleapplication/singleapplication_p.h

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) Itay Grudev 2015 - 2016
+// Copyright (c) Itay Grudev 2015 - 2020
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -24,29 +24,37 @@
 //  W A R N I N G !!!
 //  -----------------
 //
-// This file is not part of the SingleApplication API. It is used purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or may even be removed.
+// This is a modified version of SingleApplication,
+// The original version is at:
+//
+// https://github.com/itay-grudev/SingleApplication
+//
 //
 
 #ifndef SINGLEAPPLICATION_P_H
 #define SINGLEAPPLICATION_P_H
 
-#include <QtCore/QSharedMemory>
-#include <QtNetwork/QLocalServer>
-#include <QtNetwork/QLocalSocket>
+#include <QtGlobal>
+#include <QObject>
+#include <QString>
+#include <QMap>
+
 #include "singleapplication.h"
 
+class QLocalServer;
+class QLocalSocket;
+class QSharedMemory;
+
 struct InstancesInfo {
   bool primary;
   quint32 secondary;
   qint64 primaryPid;
+  char primaryUser[128];
   quint16 checksum;
 };
 
 struct ConnectionInfo {
-    explicit ConnectionInfo() :
-        msgLen(0), instanceId(0), stage(0) {}
+  explicit ConnectionInfo() : msgLen(0), instanceId(0), stage(0) {}
   qint64 msgLen;
   quint32 instanceId;
   quint8 stage;
@@ -54,6 +62,7 @@ struct ConnectionInfo {
 
 class SingleApplicationPrivate : public QObject {
   Q_OBJECT
+
  public:
   enum ConnectionType : quint8 {
     InvalidConnection = 0,
@@ -68,32 +77,35 @@ public:
   };
   Q_DECLARE_PUBLIC(SingleApplication)
 
-    SingleApplicationPrivate( SingleApplication *q_ptr );
-     ~SingleApplicationPrivate();
+  explicit SingleApplicationPrivate(SingleApplication *ptr);
+  ~SingleApplicationPrivate() override;
 
+  QString getUsername();
   void genBlockServerName();
   void initializeMemoryBlock();
   void startPrimary();
   void startSecondary();
-    void connectToPrimary(int msecs, ConnectionType connectionType );
+  bool connectToPrimary(const int msecs, const ConnectionType connectionType);
   quint16 blockChecksum();
   qint64 primaryPid();
+  QString primaryUser();
   void readInitMessageHeader(QLocalSocket *socket);
   void readInitMessageBody(QLocalSocket *socket);
+  void randomSleep();
 
   SingleApplication *q_ptr;
-    QSharedMemory *memory;
-    QLocalSocket *socket;
-    QLocalServer *server;
-    quint32 instanceNumber;
-    QString blockServerName;
-    SingleApplication::Options options;
-    QMap<QLocalSocket*, ConnectionInfo> connectionMap;
+  QSharedMemory *memory_;
+  QLocalSocket *socket_;
+  QLocalServer *server_;
+  quint32 instanceNumber_;
+  QString blockServerName_;
+  SingleApplication::Options options_;
+  QMap<QLocalSocket*, ConnectionInfo> connectionMap_;
 
-public Q_SLOTS:
+ public slots:
   void slotConnectionEstablished();
-    void slotDataAvailable( QLocalSocket*, quint32 );
-    void slotClientConnectionClosed( QLocalSocket*, quint32 );
+  void slotDataAvailable(QLocalSocket*, const quint32);
+  void slotClientConnectionClosed(QLocalSocket*, const quint32);
 };
 
 #endif  // SINGLEAPPLICATION_P_H

3rdparty/singleapplication/singlecoreapplication.cpp

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) Itay Grudev 2015 - 2018
+// Copyright (c) Itay Grudev 2015 - 2020
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,156 +20,250 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+//
+//  W A R N I N G !!!
+//  -----------------
+//
+// This is a modified version of SingleApplication,
+// The original version is at:
+//
+// https://github.com/itay-grudev/SingleApplication
+//
+//
+
+#include <cstdlib>
+#include <limits>
+
+#include <QtGlobal>
 #include <QCoreApplication>
-#include <QtCore/QTime>
-#include <QtCore/QThread>
-#include <QtCore/QDateTime>
-#include <QtCore/QByteArray>
-#include <QtCore/QSharedMemory>
+#include <QThread>
+#include <QSharedMemory>
+#include <QLocalSocket>
+#include <QByteArray>
+#include <QElapsedTimer>
+#include <QtDebug>
 
 #include "singlecoreapplication.h"
 #include "singlecoreapplication_p.h"
 
 /**
- * @brief Constructor. Checks and fires up LocalServer or closes the program
- * if another instance already exists
+ * @brief Constructor. Checks and fires up LocalServer or closes the program if another instance already exists
  * @param argc
  * @param argv
- * @param {bool} allowSecondaryInstances
+ * @param allowSecondary Whether to enable secondary instance support
+ * @param options Optional flags to toggle specific behaviour
+ * @param timeout Maximum time blocking functions are allowed during app load
  */
 SingleCoreApplication::SingleCoreApplication(int &argc, char *argv[], bool allowSecondary, Options options, int timeout)
-    : app_t( argc, argv ), d_ptr( new SingleCoreApplicationPrivate( this ) )
-{
+    : app_t(argc, argv),
+      d_ptr(new SingleCoreApplicationPrivate(this)) {
+
   Q_D(SingleCoreApplication);
 
   // Store the current mode of the program
-    d->options = options;
+  d->options_ = options;
 
-    // Generating an application ID used for identifying the shared memory
-    // block and QLocalServer
+  // Generating an application ID used for identifying the shared memory block and QLocalServer
   d->genBlockServerName();
 
+  // To mitigate QSharedMemory issues with large amount of processes attempting to attach at the same time
+  d->randomSleep();
+
 #ifdef Q_OS_UNIX
-    // By explicitly attaching it and then deleting it we make sure that the
-    // memory is deleted even after the process has crashed on Unix.
-    d->memory = new QSharedMemory( d->blockServerName );
-    d->memory->attach();
-    delete d->memory;
+  // By explicitly attaching it and then deleting it we make sure that the memory is deleted even after the process has crashed on Unix.
+  d->memory_ = new QSharedMemory(d->blockServerName_);
+  d->memory_->attach();
+  delete d->memory_;
 #endif
+
   // Guarantee thread safe behaviour with a shared memory block.
-    d->memory = new QSharedMemory( d->blockServerName );
+  d->memory_ = new QSharedMemory(d->blockServerName_);
 
   // Create a shared memory block
-    if( d->memory->create( sizeof( InstancesInfo ) ) ) {
+  if (d->memory_->create(sizeof(InstancesInfo))) {
     // Initialize the shared memory block
-        d->memory->lock();
+    if (!d->memory_->lock()) {
+      qCritical() << "SingleCoreApplication: Unable to lock memory block after create.";
+      abortSafely();
+    }
     d->initializeMemoryBlock();
-        d->memory->unlock();
-    } else {
+  }
+  else {
+    if (d->memory_->error() == QSharedMemory::AlreadyExists) {
       // Attempt to attach to the memory segment
-        if( ! d->memory->attach() ) {
+      if (!d->memory_->attach()) {
         qCritical() << "SingleCoreApplication: Unable to attach to shared memory block.";
-            qCritical() << d->memory->errorString();
-            delete d;
-            ::exit( EXIT_FAILURE );
+        abortSafely();
+      }
+      if (!d->memory_->lock()) {
+        qCritical() << "SingleCoreApplication: Unable to lock memory block after attach.";
+        abortSafely();
+      }
+    }
+    else {
+      qCritical() << "SingleCoreApplication: Unable to create block.";
+      abortSafely();
     }
   }
 
-    InstancesInfo* inst = static_cast<InstancesInfo*>( d->memory->data() );
-    QTime time;
+  InstancesInfo *inst = static_cast<InstancesInfo*>(d->memory_->data());
+  QElapsedTimer time;
   time.start();
 
   // Make sure the shared memory block is initialised and in consistent state
-    while( true ) {
-        d->memory->lock();
-
+  forever {
+    // If the shared memory block's checksum is valid continue
     if (d->blockChecksum() == inst->checksum) break;
 
+    // If more than 5s have elapsed, assume the primary instance crashed and assume it's position
     if (time.elapsed() > 5000) {
       qWarning() << "SingleCoreApplication: Shared memory block has been in an inconsistent state from more than 5s. Assuming primary instance failure.";
       d->initializeMemoryBlock();
     }
 
-        d->memory->unlock();
-
-        // Random sleep here limits the probability of a collision between two racing apps
-        qsrand( QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max() );
-        QThread::sleep( 8 + static_cast <unsigned long>( static_cast <float>( qrand() ) / RAND_MAX * 10 ) );
+    // Otherwise wait for a random period and try again.
+    // The random sleep here limits the probability of a collision between two racing apps and allows the app to initialise faster
+    if (!d->memory_->unlock()) {
+      qDebug() << "SingleCoreApplication: Unable to unlock memory for random wait.";
+      qDebug() << d->memory_->errorString();
+    }
+    d->randomSleep();
+    if (!d->memory_->lock()) {
+      qCritical() << "SingleCoreApplication: Unable to lock memory after random wait.";
+      abortSafely();
+    }
   }
 
   if (inst->primary == false) {
     d->startPrimary();
-        d->memory->unlock();
+    if (!d->memory_->unlock()) {
+      qDebug() << "SingleCoreApplication: Unable to unlock memory after primary start.";
+      qDebug() << d->memory_->errorString();
+    }
     return;
   }
 
   // Check if another instance can be started
   if (allowSecondary) {
-        inst->secondary += 1;
-        inst->checksum = d->blockChecksum();
-        d->instanceNumber = inst->secondary;
     d->startSecondary();
-        if( d->options & Mode::SecondaryNotification ) {
+    if (d->options_ & Mode::SecondaryNotification) {
       d->connectToPrimary(timeout, SingleCoreApplicationPrivate::SecondaryInstance);
     }
-        d->memory->unlock();
+    if (!d->memory_->unlock()) {
+      qDebug() << "SingleCoreApplication: Unable to unlock memory after secondary start.";
+      qDebug() << d->memory_->errorString();
+    }
     return;
   }
 
-    d->memory->unlock();
+  if (!d->memory_->unlock()) {
+    qDebug() << "SingleCoreApplication: Unable to unlock memory at end of execution.";
+    qDebug() << d->memory_->errorString();
+  }
 
   d->connectToPrimary(timeout, SingleCoreApplicationPrivate::NewInstance);
 
   delete d;
 
   ::exit(EXIT_SUCCESS);
+
 }
 
-/**
- * @brief Destructor
- */
-SingleCoreApplication::~SingleCoreApplication()
-{
+SingleCoreApplication::~SingleCoreApplication() {
   Q_D(SingleCoreApplication);
   delete d;
 }
 
-bool SingleCoreApplication::isPrimary()
-{
+/**
+ * Checks if the current application instance is primary.
+ * @return Returns true if the instance is primary, false otherwise.
+ */
+bool SingleCoreApplication::isPrimary() {
   Q_D(SingleCoreApplication);
-    return d->server != nullptr;
+  return d->server_ != nullptr;
 }
 
-bool SingleCoreApplication::isSecondary()
-{
+/**
+ * Checks if the current application instance is secondary.
+ * @return Returns true if the instance is secondary, false otherwise.
+ */
+bool SingleCoreApplication::isSecondary() {
   Q_D(SingleCoreApplication);
-    return d->server == nullptr;
+  return d->server_ == nullptr;
 }
 
-quint32 SingleCoreApplication::instanceId()
-{
+/**
+ * Allows you to identify an instance by returning unique consecutive instance ids.
+ * It is reset when the first (primary) instance of your app starts and only incremented afterwards.
+ * @return Returns a unique instance id.
+ */
+quint32 SingleCoreApplication::instanceId() {
   Q_D(SingleCoreApplication);
-    return d->instanceNumber;
+  return d->instanceNumber_;
 }
 
-qint64 SingleCoreApplication::primaryPid()
-{
+/**
+ * Returns the OS PID (Process Identifier) of the process running the primary instance.
+ * Especially useful when SingleCoreApplication is coupled with OS. specific APIs.
+ * @return Returns the primary instance PID.
+ */
+qint64 SingleCoreApplication::primaryPid() {
   Q_D(SingleCoreApplication);
   return d->primaryPid();
 }
 
-bool SingleCoreApplication::sendMessage( QByteArray message, int timeout )
-{
+/**
+ * Returns the username the primary instance is running as.
+ * @return Returns the username the primary instance is running as.
+ */
+QString SingleCoreApplication::primaryUser() {
+  Q_D(SingleCoreApplication);
+  return d->primaryUser();
+}
+
+/**
+ * Returns the username the current instance is running as.
+ * @return Returns the username the current instance is running as.
+ */
+QString SingleCoreApplication::currentUser() {
+  Q_D(SingleCoreApplication);
+  return d->getUsername();
+}
+
+/**
+ * Sends message to the Primary Instance.
+ * @param message The message to send.
+ * @param timeout the maximum timeout in milliseconds for blocking functions.
+ * @return true if the message was sent successfuly, false otherwise.
+ */
+bool SingleCoreApplication::sendMessage(QByteArray message, int timeout) {
+
   Q_D(SingleCoreApplication);
 
   // Nobody to connect to
   if (isPrimary()) return false;
 
   // Make sure the socket is connected
-    d->connectToPrimary( timeout,  SingleCoreApplicationPrivate::Reconnect );
+  if (!d->connectToPrimary(timeout, SingleCoreApplicationPrivate::Reconnect))
+    return false;
 
-    d->socket->write( message );
-    bool dataWritten = d->socket->flush();
-    d->socket->waitForBytesWritten( timeout );
+  d->socket_->write(message);
+  const bool dataWritten = d->socket_->waitForBytesWritten(timeout);
+  d->socket_->flush();
   return dataWritten;
+
+}
+
+/**
+ * Cleans up the shared memory block and exits with a failure.
+ * This function halts program execution.
+ */
+void SingleCoreApplication::abortSafely() {
+
+  Q_D(SingleCoreApplication);
+
+  qCritical() << "SingleCoreApplication: " << d->memory_->error() << d->memory_->errorString();
+  delete d;
+  ::exit(EXIT_FAILURE);
+
 }

3rdparty/singleapplication/singlecoreapplication.h

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) Itay Grudev 2015 - 2018
+// Copyright (c) Itay Grudev 2015 - 2020
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,22 +20,32 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+//
+//  W A R N I N G !!!
+//  -----------------
+//
+// This is a modified version of SingleApplication,
+// The original version is at:
+//
+// https://github.com/itay-grudev/SingleApplication
+//
+//
+
 #ifndef SINGLECOREAPPLICATION_H
 #define SINGLECOREAPPLICATION_H
 
-#include <QtCore/QtGlobal>
+#include <QtGlobal>
 #include <QCoreApplication>
-#include <QtNetwork/QLocalSocket>
+#include <QFlags>
+#include <QByteArray>
 
 class SingleCoreApplicationPrivate;
 
 /**
- * @brief The SingleCoreApplication class handles multipe instances of the same
- * Application
+ * @brief The SingleCoreApplication class handles multipe instances of the same Application
  * @see QCoreApplication
  */
-class SingleCoreApplication : public QCoreApplication
-{
+class SingleCoreApplication : public QCoreApplication {
   Q_OBJECT
 
   typedef QCoreApplication app_t;
@@ -69,7 +79,7 @@ public:
    * if there is already a primary instance.
    * @arg {Mode} mode - Whether for the SingleCoreApplication block to be applied
    * User wide or System wide.
-     * @arg {int} timeout - Timeout to wait in miliseconds.
+   * @arg {int} timeout - Timeout to wait in milliseconds.
    * @note argc and argv may be changed as Qt removes arguments that it
    * recognizes
    * @note Mode::SecondaryNotification only works if set on both the primary
@@ -78,10 +88,9 @@ public:
    * operations. It does not guarantee that the SingleCoreApplication
    * initialisation will be completed in given time, though is a good hint.
    * Usually 4*timeout would be the worst case (fail) scenario.
-     * @see See the corresponding QAPPLICATION_CLASS constructor for reference
    */
-    explicit SingleCoreApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 1000 );
-    ~SingleCoreApplication();
+  explicit SingleCoreApplication(int &argc, char *argv[], const bool allowSecondary = false, const Options options = Mode::User, const int timeout = 1000);
+  ~SingleCoreApplication() override;
 
   /**
    * @brief Returns if the instance is the primary instance
@@ -107,6 +116,18 @@ public:
    */
   qint64 primaryPid();
 
+  /**
+   * @brief Returns the username of the user running the primary instance
+   * @returns {QString}
+   */
+  QString primaryUser();
+
+  /**
+   * @brief Returns the username of the current user
+   * @returns {QString}
+   */
+  QString currentUser();
+
   /**
    * @brief Sends a message to the primary instance. Returns true on success.
    * @param {int} timeout - Timeout for connecting
@@ -114,15 +135,16 @@ public:
    * @note sendMessage() will return false if invoked from the primary
    * instance.
    */
-    bool sendMessage( QByteArray message, int timeout = 100 );
+  bool sendMessage(QByteArray message, int timeout = 1000);
 
-Q_SIGNALS:
+ signals:
   void instanceStarted();
   void receivedMessage(quint32 instanceId, QByteArray message);
 
  private:
   SingleCoreApplicationPrivate *d_ptr;
   Q_DECLARE_PRIVATE(SingleCoreApplication)
+  void abortSafely();
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(SingleCoreApplication::Options)

3rdparty/singleapplication/singlecoreapplication_p.cpp

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) Itay Grudev 2015 - 2018
+// Copyright (c) Itay Grudev 2015 - 2020
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -24,23 +24,42 @@
 //  W A R N I N G !!!
 //  -----------------
 //
-// This file is not part of the SingleCoreApplication API. It is used purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or may even be removed.
+// This is a modified version of SingleApplication,
+// The original version is at:
 //
+// https://github.com/itay-grudev/SingleApplication
+//
+//
+
+#include "config.h"
+
+#include <QtGlobal>
 
 #include <cstdlib>
 #include <cstddef>
 
-#include <QtCore/QDir>
-#include <QtCore/QProcess>
-#include <QtCore/QByteArray>
-#include <QtCore/QSemaphore>
-#include <QtCore/QDataStream>
-#include <QtCore/QStandardPaths>
-#include <QtCore/QCryptographicHash>
-#include <QtNetwork/QLocalServer>
-#include <QtNetwork/QLocalSocket>
+#ifdef Q_OS_UNIX
+#  include <unistd.h>
+#  include <sys/types.h>
+#  include <pwd.h>
+#endif
+
+#include <QObject>
+#include <QThread>
+#include <QIODevice>
+#include <QSharedMemory>
+#include <QByteArray>
+#include <QDataStream>
+#include <QCryptographicHash>
+#include <QLocalServer>
+#include <QLocalSocket>
+#include <QDir>
+#include <QElapsedTimer>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+#  include <QRandomGenerator>
+#else
+#  include <QDateTime>
+#endif
 
 #include "singlecoreapplication.h"
 #include "singlecoreapplication_p.h"
@@ -50,49 +69,89 @@
 #  include <lmcons.h>
 #endif
 
-SingleCoreApplicationPrivate::SingleCoreApplicationPrivate( SingleCoreApplication *q_ptr )
-    : q_ptr( q_ptr )
-{
-    server = nullptr;
-    socket = nullptr;
-    memory = nullptr;
-    instanceNumber = -1;
+SingleCoreApplicationPrivate::SingleCoreApplicationPrivate(SingleCoreApplication *ptr)
+    : q_ptr(ptr),
+      memory_(nullptr),
+      socket_(nullptr),
+      server_(nullptr),
+      instanceNumber_(-1) {}
+
+SingleCoreApplicationPrivate::~SingleCoreApplicationPrivate() {
+
+  if (socket_ != nullptr) {
+    socket_->close();
+    delete socket_;
+    socket_ = nullptr;
   }
 
-SingleCoreApplicationPrivate::~SingleCoreApplicationPrivate()
-{
-    if( socket != nullptr ) {
-        socket->close();
-        delete socket;
-    }
-
-    memory->lock();
-    InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
-    if( server != nullptr ) {
-        server->close();
-        delete server;
+  if (memory_ != nullptr) {
+    memory_->lock();
+    InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+    if (server_ != nullptr) {
+      server_->close();
+      delete server_;
       inst->primary = false;
       inst->primaryPid = -1;
+      inst->primaryUser[0] = '\0';
       inst->checksum = blockChecksum();
     }
-    memory->unlock();
+    memory_->unlock();
 
-    delete memory;
+    delete memory_;
+    memory_ = nullptr;
   }
 
-void SingleCoreApplicationPrivate::genBlockServerName()
-{
+}
+
+QString SingleCoreApplicationPrivate::getUsername() {
+
+#ifdef Q_OS_UNIX
+  QString username;
+#if defined(HAVE_GETEUID) && defined(HAVE_GETPWUID)
+  struct passwd *pw = getpwuid(geteuid());
+  if (pw) {
+    username = QString::fromLocal8Bit(pw->pw_name);
+  }
+#endif
+  if (username.isEmpty()) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+    username = qEnvironmentVariable("USER");
+#else
+    username = QString::fromLocal8Bit(qgetenv("USER"));
+#endif
+  }
+  return username;
+#endif
+
+#ifdef Q_OS_WIN
+  wchar_t username[UNLEN + 1];
+  // Specifies size of the buffer on input
+  DWORD usernameLength = UNLEN + 1;
+  if (GetUserNameW(username, &usernameLength)) {
+    return QString::fromWCharArray(username);
+  }
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+  return qEnvironmentVariable("USERNAME");
+#else
+  return QString::fromLocal8Bit(qgetenv("USERNAME"));
+#endif
+#endif
+
+}
+
+void SingleCoreApplicationPrivate::genBlockServerName() {
+
   QCryptographicHash appData(QCryptographicHash::Sha256);
   appData.addData("SingleApplication", 17);
   appData.addData(SingleCoreApplication::app_t::applicationName().toUtf8());
   appData.addData(SingleCoreApplication::app_t::organizationName().toUtf8());
   appData.addData(SingleCoreApplication::app_t::organizationDomain().toUtf8());
 
-    if( ! (options & SingleCoreApplication::Mode::ExcludeAppVersion) ) {
+  if (!(options_ & SingleCoreApplication::Mode::ExcludeAppVersion)) {
     appData.addData(SingleCoreApplication::app_t::applicationVersion().toUtf8());
   }
 
-    if( ! (options & SingleCoreApplication::Mode::ExcludeAppPath) ) {
+  if (!(options_ & SingleCoreApplication::Mode::ExcludeAppPath)) {
 #ifdef Q_OS_WIN
     appData.addData(SingleCoreApplication::app_t::applicationFilePath().toLower().toUtf8());
 #else
@@ -101,186 +160,184 @@ void SingleCoreApplicationPrivate::genBlockServerName()
   }
 
   // User level block requires a user specific data in the hash
-    if( options & SingleCoreApplication::Mode::User ) {
-#ifdef Q_OS_WIN
-        wchar_t username [ UNLEN + 1 ];
-        // Specifies size of the buffer on input
-        DWORD usernameLength = UNLEN + 1;
-        if( GetUserNameW( username, &usernameLength ) ) {
-            appData.addData( QString::fromWCharArray(username).toUtf8() );
-        } else {
-            appData.addData( QStandardPaths::standardLocations( QStandardPaths::HomeLocation ).join("").toUtf8() );
-        }
-#endif
-#ifdef Q_OS_UNIX
-        QProcess process;
-        process.start( "whoami" );
-        if( process.waitForFinished( 100 ) &&
-            process.exitCode() == QProcess::NormalExit) {
-            appData.addData( process.readLine() );
-        } else {
-            appData.addData(
-                QDir(
-                    QStandardPaths::standardLocations( QStandardPaths::HomeLocation ).first()
-                ).absolutePath().toUtf8()
-            );
-        }
-#endif
+  if (options_ & SingleCoreApplication::Mode::User) {
+    appData.addData(getUsername().toUtf8());
   }
 
-    // Replace the backslash in RFC 2045 Base64 [a-zA-Z0-9+/=] to comply with
-    // server naming requirements.
-    blockServerName = appData.result().toBase64().replace("/", "_");
+  // Replace the backslash in RFC 2045 Base64 [a-zA-Z0-9+/=] to comply with server naming requirements.
+  blockServerName_ = appData.result().toBase64().replace("/", "_");
+
 }
 
-void SingleCoreApplicationPrivate::initializeMemoryBlock()
-{
-    InstancesInfo* inst = static_cast<InstancesInfo*>( memory->data() );
+void SingleCoreApplicationPrivate::initializeMemoryBlock() {
+
+  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
   inst->primary = false;
   inst->secondary = 0;
   inst->primaryPid = -1;
+  inst->primaryUser[0] = '\0';
   inst->checksum = blockChecksum();
+
 }
 
-void SingleCoreApplicationPrivate::startPrimary()
-{
+void SingleCoreApplicationPrivate::startPrimary() {
+
   Q_Q(SingleCoreApplication);
 
-    // Successful creation means that no main process exists
-    // So we start a QLocalServer to listen for connections
-    QLocalServer::removeServer( blockServerName );
-    server = new QLocalServer();
-
-    // Restrict access to the socket according to the
-    // SingleCoreApplication::Mode::User flag on User level or no restrictions
-    if( options & SingleCoreApplication::Mode::User ) {
-      server->setSocketOptions( QLocalServer::UserAccessOption );
-    } else {
-      server->setSocketOptions( QLocalServer::WorldAccessOption );
-    }
-
-    server->listen( blockServerName );
-    QObject::connect(
-        server,
-        &QLocalServer::newConnection,
-        this,
-        &SingleCoreApplicationPrivate::slotConnectionEstablished
-    );
-
   // Reset the number of connections
-    InstancesInfo* inst = static_cast <InstancesInfo*>( memory->data() );
+  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
 
   inst->primary = true;
   inst->primaryPid = q->applicationPid();
+  qstrncpy(inst->primaryUser, getUsername().toUtf8().data(), sizeof(inst->primaryUser));
   inst->checksum = blockChecksum();
+  instanceNumber_ = 0;
+  // Successful creation means that no main process exists
+  // So we start a QLocalServer to listen for connections
+  QLocalServer::removeServer(blockServerName_);
+  server_ = new QLocalServer();
 
-    instanceNumber = 0;
+  // Restrict access to the socket according to the SingleCoreApplication::Mode::User flag on User level or no restrictions
+  if (options_ & SingleCoreApplication::Mode::User) {
+    server_->setSocketOptions(QLocalServer::UserAccessOption);
+  }
+  else {
+    server_->setSocketOptions(QLocalServer::WorldAccessOption);
   }
 
-void SingleCoreApplicationPrivate::startSecondary()
-{
+  server_->listen(blockServerName_);
+  QObject::connect(server_, &QLocalServer::newConnection, this, &SingleCoreApplicationPrivate::slotConnectionEstablished);
+
 }
 
-void SingleCoreApplicationPrivate::connectToPrimary( int msecs, ConnectionType connectionType )
-{
-    // Connect to the Local Server of the Primary Instance if not already
-    // connected.
-    if( socket == nullptr ) {
-        socket = new QLocalSocket();
+void SingleCoreApplicationPrivate::startSecondary() {
+
+  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+
+  inst->secondary += 1;
+  inst->checksum = blockChecksum();
+  instanceNumber_ = inst->secondary;
+
 }
 
-    // If already connected - we are done;
-    if( socket->state() == QLocalSocket::ConnectedState )
-        return;
+bool SingleCoreApplicationPrivate::connectToPrimary(int timeout, ConnectionType connectionType) {
 
-    // If not connect
-    if( socket->state() == QLocalSocket::UnconnectedState ||
-        socket->state() == QLocalSocket::ClosingState ) {
-        socket->connectToServer( blockServerName );
+  QElapsedTimer time;
+  time.start();
+
+  // Connect to the Local Server of the Primary Instance if not already connected.
+  if (socket_ == nullptr) {
+    socket_ = new QLocalSocket();
   }
 
-    // Wait for being connected
-    if( socket->state() == QLocalSocket::ConnectingState ) {
-        socket->waitForConnected( msecs );
+  if (socket_->state() == QLocalSocket::ConnectedState) return true;
+
+  if (socket_->state() != QLocalSocket::ConnectedState) {
+
+    forever {
+      randomSleep();
+
+      if (socket_->state() != QLocalSocket::ConnectingState)
+        socket_->connectToServer(blockServerName_);
+
+      if (socket_->state() == QLocalSocket::ConnectingState) {
+        socket_->waitForConnected(timeout - time.elapsed());
+      }
+
+      // If connected break out of the loop
+      if (socket_->state() == QLocalSocket::ConnectedState) break;
+
+      // If elapsed time since start is longer than the method timeout return
+      if (time.elapsed() >= timeout) return false;
+    }
   }
 
   // Initialisation message according to the SingleCoreApplication protocol
-    if( socket->state() == QLocalSocket::ConnectedState ) {
-        // Notify the parent that a new instance had been started;
   QByteArray initMsg;
   QDataStream writeStream(&initMsg, QIODevice::WriteOnly);
+  writeStream.setVersion(QDataStream::Qt_5_8);
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-        writeStream.setVersion(QDataStream::Qt_5_6);
+  writeStream << blockServerName_.toLatin1();
+  writeStream << static_cast<quint8>(connectionType);
+  writeStream << instanceNumber_;
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+  quint16 checksum = qChecksum(QByteArray(initMsg,  static_cast<quint32>(initMsg.length())));
+#else
+  quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
 #endif
 
-        writeStream << blockServerName.toLatin1();
-        writeStream << static_cast<quint8>(connectionType);
-        writeStream << instanceNumber;
-        quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
   writeStream << checksum;
 
   // The header indicates the message length that follows
   QByteArray header;
   QDataStream headerStream(&header, QIODevice::WriteOnly);
-
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-        headerStream.setVersion(QDataStream::Qt_5_6);
-#endif
+  headerStream.setVersion(QDataStream::Qt_5_8);
   headerStream << static_cast<quint64>(initMsg.length());
 
-        socket->write( header );
-        socket->write( initMsg );
-        socket->flush();
-        socket->waitForBytesWritten( msecs );
-    }
+  socket_->write(header);
+  socket_->write(initMsg);
+  bool result = socket_->waitForBytesWritten(timeout - time.elapsed());
+  socket_->flush();
+
+  return result;
+
 }
 
-quint16 SingleCoreApplicationPrivate::blockChecksum()
-{
-    return qChecksum(
-       static_cast <const char *>( memory->data() ),
-       offsetof( InstancesInfo, checksum )
-   );
+quint16 SingleCoreApplicationPrivate::blockChecksum() {
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+  quint16 checksum = qChecksum(QByteArray(static_cast<const char*>(memory_->constData()), offsetof(InstancesInfo, checksum)));
+#else
+  quint16 checksum = qChecksum(static_cast<const char*>(memory_->constData()), offsetof(InstancesInfo, checksum));
+#endif
+
+  return checksum;
+
 }
 
-qint64 SingleCoreApplicationPrivate::primaryPid()
-{
-    qint64 pid;
+qint64 SingleCoreApplicationPrivate::primaryPid() {
 
-    memory->lock();
-    InstancesInfo* inst = static_cast<InstancesInfo*>( memory->data() );
-    pid = inst->primaryPid;
-    memory->unlock();
+  memory_->lock();
+  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+  qint64 pid = inst->primaryPid;
+  memory_->unlock();
 
   return pid;
+
+}
+
+QString SingleCoreApplicationPrivate::primaryUser() {
+
+  memory_->lock();
+  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+  QByteArray username = inst->primaryUser;
+  memory_->unlock();
+
+  return QString::fromUtf8(username);
+
 }
 
 /**
  * @brief Executed when a connection has been made to the LocalServer
  */
-void SingleCoreApplicationPrivate::slotConnectionEstablished()
-{
-    QLocalSocket *nextConnSocket = server->nextPendingConnection();
-    connectionMap.insert(nextConnSocket, ConnectionInfo());
+void SingleCoreApplicationPrivate::slotConnectionEstablished() {
 
-    QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose,
-        [nextConnSocket, this]() {
-            auto &info = connectionMap[nextConnSocket];
+  QLocalSocket *nextConnSocket = server_->nextPendingConnection();
+  connectionMap_.insert(nextConnSocket, ConnectionInfo());
+
+  QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, [nextConnSocket, this]() {
+    auto &info = connectionMap_[nextConnSocket];
     Q_EMIT this->slotClientConnectionClosed(nextConnSocket, info.instanceId);
-        }
-    );
+  });
 
-    QObject::connect(nextConnSocket, &QLocalSocket::disconnected,
-        [nextConnSocket, this](){
-            connectionMap.remove(nextConnSocket);
+  QObject::connect(nextConnSocket, &QLocalSocket::disconnected, [nextConnSocket, this]() {
+    connectionMap_.remove(nextConnSocket);
     nextConnSocket->deleteLater();
-        }
-    );
+  });
 
-    QObject::connect(nextConnSocket, &QLocalSocket::readyRead,
-        [nextConnSocket, this]() {
-            auto &info = connectionMap[nextConnSocket];
+  QObject::connect(nextConnSocket, &QLocalSocket::readyRead, [nextConnSocket, this]() {
+    auto &info = connectionMap_[nextConnSocket];
     switch (info.stage) {
       case StageHeader:
         readInitMessageHeader(nextConnSocket);
@@ -294,58 +351,53 @@ void SingleCoreApplicationPrivate::slotConnectionEstablished()
       default:
         break;
     };
-        }
-    );
+  });
+
 }
 
-void SingleCoreApplicationPrivate::readInitMessageHeader( QLocalSocket *sock )
-{
-    if (!connectionMap.contains( sock )) {
+void SingleCoreApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
+
+  if (!connectionMap_.contains(sock)) {
     return;
   }
 
-    if( sock->bytesAvailable() < ( qint64 )sizeof( quint64 ) ) {
+  if (sock->bytesAvailable() < static_cast<qint64>(sizeof(quint64))) {
     return;
   }
 
   QDataStream headerStream(sock);
-
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-    headerStream.setVersion( QDataStream::Qt_5_6 );
-#endif
+  headerStream.setVersion(QDataStream::Qt_5_8);
 
   // Read the header to know the message length
   quint64 msgLen = 0;
   headerStream >> msgLen;
-    ConnectionInfo &info = connectionMap[sock];
+  ConnectionInfo &info = connectionMap_[sock];
   info.stage = StageBody;
   info.msgLen = msgLen;
 
-    if ( sock->bytesAvailable() >= (qint64) msgLen ) {
+  if (sock->bytesAvailable() >= static_cast<qint64>(msgLen)) {
     readInitMessageBody(sock);
   }
+
 }
 
-void SingleCoreApplicationPrivate::readInitMessageBody( QLocalSocket *sock )
-{
+void SingleCoreApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
+
   Q_Q(SingleCoreApplication);
 
-    if (!connectionMap.contains( sock )) {
+  if (!connectionMap_.contains(sock)) {
     return;
   }
 
-    ConnectionInfo &info = connectionMap[sock];
-    if( sock->bytesAvailable() < ( qint64 )info.msgLen ) {
+  ConnectionInfo &info = connectionMap_[sock];
+  if (sock->bytesAvailable() < static_cast<qint64>(info.msgLen)) {
     return;
   }
 
   // Read the message body
   QByteArray msgBytes = sock->read(info.msgLen);
   QDataStream readStream(msgBytes);
-
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-    readStream.setVersion( QDataStream::Qt_5_6 );
-#endif
+  readStream.setVersion(QDataStream::Qt_5_8);
 
   // server name
   QByteArray latin1Name;
@@ -365,11 +417,13 @@ void SingleCoreApplicationPrivate::readInitMessageBody( QLocalSocket *sock )
   quint16 msgChecksum = 0;
   readStream >> msgChecksum;
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+  const quint16 actualChecksum = qChecksum(QByteArray(msgBytes, static_cast<quint32>(msgBytes.length() - sizeof(quint16))));
+#else
   const quint16 actualChecksum = qChecksum(msgBytes.constData(), static_cast<quint32>(msgBytes.length() - sizeof(quint16)));
+#endif
 
-    bool isValid = readStream.status() == QDataStream::Ok &&
-                   QLatin1String(latin1Name) == blockServerName &&
-                   msgChecksum == actualChecksum;
+  bool isValid = readStream.status() == QDataStream::Ok && QLatin1String(latin1Name) == blockServerName_ && msgChecksum == actualChecksum;
 
   if (!isValid) {
     sock->close();
@@ -379,26 +433,38 @@ void SingleCoreApplicationPrivate::readInitMessageBody( QLocalSocket *sock )
   info.instanceId = instanceId;
   info.stage = StageConnected;
 
-    if( connectionType == NewInstance ||
-        ( connectionType == SecondaryInstance &&
-          options & SingleCoreApplication::Mode::SecondaryNotification ) )
-    {
+  if (connectionType == NewInstance || (connectionType == SecondaryInstance && options_ & SingleCoreApplication::Mode::SecondaryNotification)) {
     Q_EMIT q->instanceStarted();
   }
 
   if (sock->bytesAvailable() > 0) {
     Q_EMIT this->slotDataAvailable(sock, instanceId);
   }
+
 }
 
-void SingleCoreApplicationPrivate::slotDataAvailable( QLocalSocket *dataSocket, quint32 instanceId )
-{
+void SingleCoreApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, const quint32 instanceId) {
+
   Q_Q(SingleCoreApplication);
   Q_EMIT q->receivedMessage(instanceId, dataSocket->readAll());
+
 }
 
-void SingleCoreApplicationPrivate::slotClientConnectionClosed( QLocalSocket *closedSocket, quint32 instanceId )
-{
-    if( closedSocket->bytesAvailable() > 0 )
+void SingleCoreApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSocket, const quint32 instanceId) {
+
+  if (closedSocket->bytesAvailable() > 0) {
     Q_EMIT slotDataAvailable(closedSocket, instanceId);
   }
+
+}
+
+void SingleCoreApplicationPrivate::randomSleep() {
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+  QThread::msleep(QRandomGenerator::global()->bounded(8u, 18u));
+#else
+  qsrand(QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max());
+  QThread::msleep(8 + static_cast<unsigned long>(static_cast<float>(qrand()) / RAND_MAX * 10));
+#endif
+
+}

3rdparty/singleapplication/singlecoreapplication_p.h

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) Itay Grudev 2015 - 2016
+// Copyright (c) Itay Grudev 2015 - 2020
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -24,29 +24,37 @@
 //  W A R N I N G !!!
 //  -----------------
 //
-// This file is not part of the SingleCoreApplication API. It is used purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or may even be removed.
+// This is a modified version of SingleApplication,
+// The original version is at:
+//
+// https://github.com/itay-grudev/SingleApplication
+//
 //
 
 #ifndef SINGLECOREAPPLICATION_P_H
 #define SINGLECOREAPPLICATION_P_H
 
-#include <QtCore/QSharedMemory>
-#include <QtNetwork/QLocalServer>
-#include <QtNetwork/QLocalSocket>
+#include <QtGlobal>
+#include <QObject>
+#include <QString>
+#include <QMap>
+
 #include "singlecoreapplication.h"
 
+class QLocalServer;
+class QLocalSocket;
+class QSharedMemory;
+
 struct InstancesInfo {
   bool primary;
   quint32 secondary;
   qint64 primaryPid;
+  char primaryUser[128];
   quint16 checksum;
 };
 
 struct ConnectionInfo {
-    explicit ConnectionInfo() :
-        msgLen(0), instanceId(0), stage(0) {}
+  explicit ConnectionInfo() : msgLen(0), instanceId(0), stage(0) {}
   qint64 msgLen;
   quint32 instanceId;
   quint8 stage;
@@ -54,6 +62,7 @@ struct ConnectionInfo {
 
 class SingleCoreApplicationPrivate : public QObject {
   Q_OBJECT
+
  public:
   enum ConnectionType : quint8 {
     InvalidConnection = 0,
@@ -68,32 +77,35 @@ public:
   };
   Q_DECLARE_PUBLIC(SingleCoreApplication)
 
-    SingleCoreApplicationPrivate( SingleCoreApplication *q_ptr );
-     ~SingleCoreApplicationPrivate();
+  explicit SingleCoreApplicationPrivate(SingleCoreApplication *ptr);
+  ~SingleCoreApplicationPrivate() override;
 
+  QString getUsername();
   void genBlockServerName();
   void initializeMemoryBlock();
   void startPrimary();
   void startSecondary();
-    void connectToPrimary(int msecs, ConnectionType connectionType );
+  bool connectToPrimary(const int msecs, const ConnectionType connectionType);
   quint16 blockChecksum();
   qint64 primaryPid();
+  QString primaryUser();
   void readInitMessageHeader(QLocalSocket *socket);
   void readInitMessageBody(QLocalSocket *socket);
+  void randomSleep();
 
   SingleCoreApplication *q_ptr;
-    QSharedMemory *memory;
-    QLocalSocket *socket;
-    QLocalServer *server;
-    quint32 instanceNumber;
-    QString blockServerName;
-    SingleCoreApplication::Options options;
-    QMap<QLocalSocket*, ConnectionInfo> connectionMap;
+  QSharedMemory *memory_;
+  QLocalSocket *socket_;
+  QLocalServer *server_;
+  quint32 instanceNumber_;
+  QString blockServerName_;
+  SingleCoreApplication::Options options_;
+  QMap<QLocalSocket*, ConnectionInfo> connectionMap_;
 
-public Q_SLOTS:
+ public slots:
   void slotConnectionEstablished();
-    void slotDataAvailable( QLocalSocket*, quint32 );
-    void slotClientConnectionClosed( QLocalSocket*, quint32 );
+  void slotDataAvailable(QLocalSocket*, const quint32);
+  void slotClientConnectionClosed(QLocalSocket*, const quint32);
 };
 
 #endif  // SINGLECOREAPPLICATION_P_H

3rdparty/taglib/CMakeLists.txt

@@ -1,6 +1,4 @@
-cmake_minimum_required(VERSION 2.8.11)
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-delete-non-virtual-dtor")
+cmake_minimum_required(VERSION 3.0)
 
 set(TAGLIB_SOVERSION_CURRENT  17)
 set(TAGLIB_SOVERSION_REVISION 0)
@@ -10,65 +8,24 @@ math(EXPR TAGLIB_SOVERSION_MAJOR "${TAGLIB_SOVERSION_CURRENT} - ${TAGLIB_SOVERSI
 math(EXPR TAGLIB_SOVERSION_MINOR "${TAGLIB_SOVERSION_AGE}")
 math(EXPR TAGLIB_SOVERSION_PATCH "${TAGLIB_SOVERSION_REVISION}")
 
-include(TestBigEndian)
-test_big_endian(IS_BIG_ENDIAN)
+include(ConfigureChecks.cmake)
+set(TESTS_DIR "${CMAKE_SOURCE_DIR}/tests/taglib/")
+configure_file(taglib-config.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/taglib-config.h")
 
-if(NOT IS_BIG_ENDIAN)
-  add_definitions(-DSYSTEM_BYTEORDER=1)
-else()
-  add_definitions(-DSYSTEM_BYTEORDER=2)
-endif()
-
-configure_file(taglib_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_config.h)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}/toolkit
-  ${CMAKE_CURRENT_SOURCE_DIR}/asf
-  ${CMAKE_CURRENT_SOURCE_DIR}/mpeg
-  ${CMAKE_CURRENT_SOURCE_DIR}/ogg
-  ${CMAKE_CURRENT_SOURCE_DIR}/ogg/flac
-  ${CMAKE_CURRENT_SOURCE_DIR}/flac
-  ${CMAKE_CURRENT_SOURCE_DIR}/mpc
-  ${CMAKE_CURRENT_SOURCE_DIR}/mp4
-  ${CMAKE_CURRENT_SOURCE_DIR}/ogg/vorbis
-  ${CMAKE_CURRENT_SOURCE_DIR}/ogg/speex
-  ${CMAKE_CURRENT_SOURCE_DIR}/ogg/opus
-  ${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v2
-  ${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v2/frames
-  ${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v1
-  ${CMAKE_CURRENT_SOURCE_DIR}/ape
-  ${CMAKE_CURRENT_SOURCE_DIR}/wavpack
-  ${CMAKE_CURRENT_SOURCE_DIR}/trueaudio
-  ${CMAKE_CURRENT_SOURCE_DIR}/riff
-  ${CMAKE_CURRENT_SOURCE_DIR}/riff/aiff
-  ${CMAKE_CURRENT_SOURCE_DIR}/riff/wav
-  ${CMAKE_CURRENT_SOURCE_DIR}/mod
-  ${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
-)
-
-if(ZLIB_FOUND)
-  include_directories(${ZLIB_INCLUDE_DIR})
-elseif(HAVE_ZLIB_SOURCE)
-  include_directories(${ZLIB_SOURCE})
-endif()
+add_definitions(-DHAVE_CONFIG_H)
+add_definitions(-DTAGLIB_STATIC)
 
 set(tag_HDRS
   tag.h
   fileref.h
   audioproperties.h
   taglib_export.h
-  ${CMAKE_CURRENT_BINARY_DIR}/taglib_config.h
   toolkit/taglib.h
   toolkit/tstring.h
   toolkit/tlist.h
   toolkit/tlist.tcc
   toolkit/tstringlist.h
+  toolkit/tstringhandler.h
   toolkit/tbytevector.h
   toolkit/tbytevectorlist.h
   toolkit/tbytevectorstream.h
@@ -77,6 +34,8 @@ set(tag_HDRS
   toolkit/tfilestream.h
   toolkit/tmap.h
   toolkit/tmap.tcc
+  toolkit/tpicture.h
+  toolkit/tpicturemap.h
   toolkit/tpropertymap.h
   toolkit/trefcounter.h
   toolkit/tdebuglistener.h
@@ -86,6 +45,7 @@ set(tag_HDRS
   mpeg/xingheader.h
   mpeg/id3v1/id3v1tag.h
   mpeg/id3v1/id3v1genres.h
+  mpeg/id3v2/id3v2.h
   mpeg/id3v2/id3v2extendedheader.h
   mpeg/id3v2/id3v2frame.h
   mpeg/id3v2/id3v2header.h
@@ -335,8 +295,10 @@ set(dsdiff_SRCS
 )
 
 set(toolkit_SRCS
+  toolkit/taglib.cpp
   toolkit/tstring.cpp
   toolkit/tstringlist.cpp
+  toolkit/tstringhandler.cpp
   toolkit/tbytevector.cpp
   toolkit/tbytevectorlist.cpp
   toolkit/tbytevectorstream.cpp
@@ -344,28 +306,40 @@ set(toolkit_SRCS
   toolkit/tfile.cpp
   toolkit/tfilestream.cpp
   toolkit/tdebug.cpp
+  toolkit/tpicture.cpp
+  toolkit/tpicturemap.cpp
   toolkit/tpropertymap.cpp
   toolkit/trefcounter.cpp
   toolkit/tdebuglistener.cpp
   toolkit/tzlib.cpp
 )
 
-if(HAVE_ZLIB_SOURCE)
-  set(zlib_SRCS
-    ${ZLIB_SOURCE}/adler32.c
-    ${ZLIB_SOURCE}/crc32.c
-    ${ZLIB_SOURCE}/inffast.c
-    ${ZLIB_SOURCE}/inflate.c
-    ${ZLIB_SOURCE}/inftrees.c
-    ${ZLIB_SOURCE}/zutil.c
-  )
-endif()
-
 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} ${dsf_SRCS} ${dsdiff_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}
+  ${dsf_SRCS}
+  ${dsdiff_SRCS}
   ${zlib_SRCS}
   tag.cpp
   tagunion.cpp
@@ -376,9 +350,40 @@ set(tag_LIB_SRCS
 
 add_library(tag STATIC ${tag_LIB_SRCS} ${tag_HDRS})
 
-if(HAVE_ZLIB AND NOT HAVE_ZLIB_SOURCE)
-  target_link_libraries(tag ${ZLIB_LIBRARIES})
-endif()
+target_include_directories(tag PRIVATE
+  ${ZLIB_INCLUDE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/toolkit
+  ${CMAKE_CURRENT_SOURCE_DIR}/asf
+  ${CMAKE_CURRENT_SOURCE_DIR}/mpeg
+  ${CMAKE_CURRENT_SOURCE_DIR}/ogg
+  ${CMAKE_CURRENT_SOURCE_DIR}/ogg/flac
+  ${CMAKE_CURRENT_SOURCE_DIR}/flac
+  ${CMAKE_CURRENT_SOURCE_DIR}/mpc
+  ${CMAKE_CURRENT_SOURCE_DIR}/mp4
+  ${CMAKE_CURRENT_SOURCE_DIR}/ogg/vorbis
+  ${CMAKE_CURRENT_SOURCE_DIR}/ogg/speex
+  ${CMAKE_CURRENT_SOURCE_DIR}/ogg/opus
+  ${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v2
+  ${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v2/frames
+  ${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v1
+  ${CMAKE_CURRENT_SOURCE_DIR}/ape
+  ${CMAKE_CURRENT_SOURCE_DIR}/wavpack
+  ${CMAKE_CURRENT_SOURCE_DIR}/trueaudio
+  ${CMAKE_CURRENT_SOURCE_DIR}/riff
+  ${CMAKE_CURRENT_SOURCE_DIR}/riff/aiff
+  ${CMAKE_CURRENT_SOURCE_DIR}/riff/wav
+  ${CMAKE_CURRENT_SOURCE_DIR}/mod
+  ${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
+)
+
+target_link_libraries(tag PRIVATE ${ZLIB_LIBRARIES})
 
 set_target_properties(tag PROPERTIES
   VERSION ${TAGLIB_SOVERSION_MAJOR}.${TAGLIB_SOVERSION_MINOR}.${TAGLIB_SOVERSION_PATCH}
@@ -395,4 +400,3 @@ foreach(header ${tag_HDRS})
     COPYONLY
   )
 endforeach()
-

3rdparty/taglib/ConfigureChecks.cmake

@@ -0,0 +1,216 @@
+include(CheckLibraryExists)
+include(CheckTypeSize)
+include(CheckCXXCompilerFlag)
+include(CheckCXXSourceCompiles)
+
+# Check if the size of numeric types are suitable.
+
+check_type_size("short" SIZEOF_SHORT)
+if(NOT SIZEOF_SHORT EQUAL 2)
+  message(FATAL_ERROR "TagLib requires that short is 16-bit wide.")
+endif()
+
+check_type_size("int" SIZEOF_INT)
+if(NOT SIZEOF_INT EQUAL 4)
+  message(FATAL_ERROR "TagLib requires that int is 32-bit wide.")
+endif()
+
+check_type_size("long long" SIZEOF_LONGLONG)
+if(NOT SIZEOF_LONGLONG EQUAL 8)
+  message(FATAL_ERROR "TagLib requires that long long is 64-bit wide.")
+endif()
+
+check_type_size("wchar_t" SIZEOF_WCHAR_T)
+if(SIZEOF_WCHAR_T LESS 2)
+  message(FATAL_ERROR "TagLib requires that wchar_t is sufficient to store a UTF-16 char.")
+endif()
+
+check_type_size("float" SIZEOF_FLOAT)
+if(NOT SIZEOF_FLOAT EQUAL 4)
+  message(FATAL_ERROR "TagLib requires that float is 32-bit wide.")
+endif()
+
+check_type_size("double" SIZEOF_DOUBLE)
+if(NOT SIZEOF_DOUBLE EQUAL 8)
+  message(FATAL_ERROR "TagLib requires that double is 64-bit wide.")
+endif()
+
+# Determine which kind of atomic operations your compiler supports.
+
+check_cxx_source_compiles("
+  #include <atomic>
+  int main() {
+    std::atomic_int x(1);
+    ++x;
+    --x;
+    return 0;
+  }
+" HAVE_STD_ATOMIC)
+
+if(NOT HAVE_STD_ATOMIC)
+  check_cxx_source_compiles("
+    int main() {
+      volatile int x;
+      __sync_add_and_fetch(&x, 1);
+      int y = __sync_sub_and_fetch(&x, 1);
+      return 0;
+    }
+  " HAVE_GCC_ATOMIC)
+
+  if(NOT HAVE_GCC_ATOMIC)
+    check_cxx_source_compiles("
+      #include <libkern/OSAtomic.h>
+      int main() {
+        volatile int32_t x;
+        OSAtomicIncrement32Barrier(&x);
+        int32_t y = OSAtomicDecrement32Barrier(&x);
+        return 0;
+      }
+    " HAVE_MAC_ATOMIC)
+
+    if(NOT HAVE_MAC_ATOMIC)
+      check_cxx_source_compiles("
+        #include <windows.h>
+        int main() {
+          volatile LONG x;
+          InterlockedIncrement(&x);
+          LONG y = InterlockedDecrement(&x);
+          return 0;
+        }
+      " HAVE_WIN_ATOMIC)
+
+      if(NOT HAVE_WIN_ATOMIC)
+        check_cxx_source_compiles("
+          #include <ia64intrin.h>
+          int main() {
+            volatile int x;
+            __sync_add_and_fetch(&x, 1);
+            int y = __sync_sub_and_fetch(&x, 1);
+            return 0;
+          }
+        " HAVE_IA64_ATOMIC)
+      endif()
+    endif()
+  endif()
+endif()
+
+# Determine which kind of byte swap functions your compiler supports.
+
+check_cxx_source_compiles("
+  int main() {
+    __builtin_bswap16(0);
+    __builtin_bswap32(0);
+    __builtin_bswap64(0);
+    return 0;
+  }
+" HAVE_GCC_BYTESWAP)
+
+if(NOT HAVE_GCC_BYTESWAP)
+  check_cxx_source_compiles("
+    #include <byteswap.h>
+    int main() {
+      __bswap_16(0);
+      __bswap_32(0);
+      __bswap_64(0);
+      return 0;
+    }
+  " HAVE_GLIBC_BYTESWAP)
+
+  if(NOT HAVE_GLIBC_BYTESWAP)
+    check_cxx_source_compiles("
+      #include <stdlib.h>
+      int main() {
+        _byteswap_ushort(0);
+        _byteswap_ulong(0);
+        _byteswap_uint64(0);
+        return 0;
+      }
+    " HAVE_MSC_BYTESWAP)
+
+    if(NOT HAVE_MSC_BYTESWAP)
+      check_cxx_source_compiles("
+        #include <libkern/OSByteOrder.h>
+        int main() {
+          OSSwapInt16(0);
+          OSSwapInt32(0);
+          OSSwapInt64(0);
+          return 0;
+        }
+      " HAVE_MAC_BYTESWAP)
+
+      if(NOT HAVE_MAC_BYTESWAP)
+        check_cxx_source_compiles("
+          #include <sys/endian.h>
+          int main() {
+            swap16(0);
+            swap32(0);
+            swap64(0);
+            return 0;
+          }
+        " HAVE_OPENBSD_BYTESWAP)
+      endif()
+    endif()
+  endif()
+endif()
+
+# Determine whether your compiler supports some safer version of vsprintf.
+
+check_cxx_source_compiles("
+  #include <cstdio>
+  #include <cstdarg>
+  int main() {
+    char buf[20];
+    va_list args;
+    vsnprintf(buf, 20, \"%d\", args);
+    return 0;
+  }
+" HAVE_VSNPRINTF)
+
+if(NOT HAVE_VSNPRINTF)
+  check_cxx_source_compiles("
+    #include <cstdio>
+    #include <cstdarg>
+    int main() {
+      char buf[20];
+      va_list args;
+      vsprintf_s(buf, \"%d\", args);
+      return 0;
+    }
+  " HAVE_VSPRINTF_S)
+endif()
+
+# Determine whether your compiler supports ISO _strdup.
+
+check_cxx_source_compiles("
+  #include <cstring>
+  int main() {
+    _strdup(0);
+    return 0;
+  }
+" HAVE_ISO_STRDUP)
+
+# Determine whether zlib is installed.
+
+if(NOT ZLIB_SOURCE)
+  find_package(ZLIB)
+  if(ZLIB_FOUND)
+    set(HAVE_ZLIB 1)
+  else()
+    set(HAVE_ZLIB 0)
+  endif()
+endif()
+
+# Determine whether CppUnit is installed.
+
+if(BUILD_TESTS AND NOT BUILD_SHARED_LIBS)
+  find_package(CppUnit)
+  if(NOT CppUnit_FOUND)
+    message(STATUS "CppUnit not found, disabling tests.")
+    set(BUILD_TESTS OFF)
+  endif()
+endif()
+
+# Detect WinRT mode
+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+  set(PLATFORM WINRT 1)
+endif()

3rdparty/taglib/ape/apefile.cpp

@@ -31,125 +31,103 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevector.h>
-#include <tstring.h>
-#include <tdebug.h>
-#include <tagunion.h>
-#include <id3v1tag.h>
-#include <id3v2header.h>
-#include <tpropertymap.h>
-#include <tagutils.h>
+#include <memory>
+
+#include "tbytevector.h"
+#include "tstring.h"
+#include "tdebug.h"
+#include "tagunion.h"
+#include "id3v1tag.h"
+#include "id3v2header.h"
+#include "tpropertymap.h"
+#include "tagutils.h"
 
 #include "apefile.h"
 #include "apetag.h"
 #include "apefooter.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
-namespace
-{
-  enum { ApeAPEIndex = 0, ApeID3v1Index = 1 };
+namespace {
+enum { ApeAPEIndex = 0,
+  ApeID3v1Index = 1 };
 }
 
-class APE::File::FilePrivate
-{
+class APE::File::FilePrivate {
  public:
-  FilePrivate() :
-    APELocation(-1),
+  FilePrivate() : APELocation(-1),
                   APESize(0),
                   ID3v1Location(-1),
-    ID3v2Header(0),
                   ID3v2Location(-1),
-    ID3v2Size(0),
-    properties(0) {}
+                  ID3v2Size(0) {}
 
-  ~FilePrivate()
-  {
-    delete ID3v2Header;
-    delete properties;
-  }
+  long long APELocation;
+  long long APESize;
 
-  long APELocation;
-  long APESize;
+  long long ID3v1Location;
 
-  long ID3v1Location;
+  std::unique_ptr<ID3v2::Header> ID3v2Header;
+  long long ID3v2Location;
+  long long ID3v2Size;
 
-  ID3v2::Header *ID3v2Header;
-  long ID3v2Location;
-  long ID3v2Size;
+  DoubleTagUnion tag;
 
-  TagUnion tag;
-
-  Properties *properties;
+  std::unique_ptr<AudioProperties> properties;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // static members
 ////////////////////////////////////////////////////////////////////////////////
 
-bool APE::File::isSupported(IOStream *stream)
-{
+bool APE::File::isSupported(IOStream *stream) {
   // An APE file has an ID "MAC " somewhere. An ID3v2 tag may precede.
 
   const ByteVector buffer = Utils::readHeader(stream, bufferSize(), true);
-  return (buffer.find("MAC ") >= 0);
+  return (buffer.find("MAC ") == 0);
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-APE::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
-  TagLib::File(file),
-  d(new FilePrivate())
-{
+APE::File::File(FileName file, bool readProperties, AudioProperties::ReadStyle) : Strawberry_TagLib::TagLib::File(file), d(new FilePrivate()) {
+
   if (isOpen())
     read(readProperties);
+
 }
 
-APE::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle) :
-  TagLib::File(stream),
-  d(new FilePrivate())
-{
+APE::File::File(IOStream *stream, bool readProperties, AudioProperties::ReadStyle) : Strawberry_TagLib::TagLib::File(stream), d(new FilePrivate()) {
+
   if (isOpen())
     read(readProperties);
+
 }
 
-APE::File::~File()
-{
+APE::File::~File() {
   delete d;
 }
 
-TagLib::Tag *APE::File::tag() const
-{
+Strawberry_TagLib::TagLib::Tag *APE::File::tag() const {
   return &d->tag;
 }
 
-PropertyMap APE::File::properties() const
-{
-  return d->tag.properties();
-}
+PropertyMap APE::File::setProperties(const PropertyMap &properties) {
 
-void APE::File::removeUnsupportedProperties(const StringList &properties)
-{
-  d->tag.removeUnsupportedProperties(properties);
-}
-
-PropertyMap APE::File::setProperties(const PropertyMap &properties)
-{
   if (ID3v1Tag())
     ID3v1Tag()->setProperties(properties);
 
   return APETag(true)->setProperties(properties);
+
 }
 
-APE::Properties *APE::File::audioProperties() const
-{
-  return d->properties;
+APE::AudioProperties *APE::File::audioProperties() const {
+  return d->properties.get();
 }
 
-bool APE::File::save()
-{
+bool APE::File::save() {
+
   if (readOnly()) {
     debug("APE::File::save() -- File is read only.");
     return false;
@@ -218,37 +196,35 @@ bool APE::File::save()
   }
 
   return true;
+
 }
 
-ID3v1::Tag *APE::File::ID3v1Tag(bool create)
-{
+ID3v1::Tag *APE::File::ID3v1Tag(bool create) {
   return d->tag.access<ID3v1::Tag>(ApeID3v1Index, create);
 }
 
-APE::Tag *APE::File::APETag(bool create)
-{
+APE::Tag *APE::File::APETag(bool create) {
   return d->tag.access<APE::Tag>(ApeAPEIndex, create);
 }
 
-void APE::File::strip(int tags)
-{
+void APE::File::strip(int tags) {
+
   if (tags & ID3v1)
-    d->tag.set(ApeID3v1Index, 0);
+    d->tag.set(ApeID3v1Index, nullptr);
 
   if (tags & APE)
-    d->tag.set(ApeAPEIndex, 0);
+    d->tag.set(ApeAPEIndex, nullptr);
 
   if (!ID3v1Tag())
     APETag(true);
+
 }
 
-bool APE::File::hasAPETag() const
-{
+bool APE::File::hasAPETag() const {
   return (d->APELocation >= 0);
 }
 
-bool APE::File::hasID3v1Tag() const
-{
+bool APE::File::hasID3v1Tag() const {
   return (d->ID3v1Location >= 0);
 }
 
@@ -256,15 +232,15 @@ bool APE::File::hasID3v1Tag() const
 // private members
 ////////////////////////////////////////////////////////////////////////////////
 
-void APE::File::read(bool readProperties)
-{
+void APE::File::read(bool readProperties) {
+
   // Look for an ID3v2 tag
 
   d->ID3v2Location = Utils::findID3v2(this);
 
   if (d->ID3v2Location >= 0) {
     seek(d->ID3v2Location);
-    d->ID3v2Header = new ID3v2::Header(readBlock(ID3v2::Header::size()));
+    d->ID3v2Header.reset(new ID3v2::Header(readBlock(ID3v2::Header::size())));
     d->ID3v2Size = d->ID3v2Header->completeTagSize();
   }
 
@@ -292,7 +268,7 @@ void APE::File::read(bool readProperties)
 
   if (readProperties) {
 
-    long streamLength;
+    long long streamLength;
 
     if (d->APELocation >= 0)
       streamLength = d->APELocation;
@@ -309,6 +285,7 @@ void APE::File::read(bool readProperties)
       seek(0);
     }
 
-    d->properties = new Properties(this, streamLength);
+    d->properties.reset(new AudioProperties(this, streamLength));
   }
+
 }

3rdparty/taglib/ape/apefile.h

@@ -38,20 +38,25 @@
 #include "taglib_export.h"
 #include "apeproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
 class Tag;
 
-  namespace ID3v1 { class Tag; }
-  namespace APE { class Tag; }
+namespace ID3v1 {
+class Tag;
+}
+namespace APE {
+class Tag;
+}
 
 //! An implementation of APE metadata
 
 /*!
  * This is implementation of APE metadata.
  *
-   * This supports ID3v1 and APE (v1 and v2) style comments as well as reading stream
-   * properties from the file.
+ * This supports ID3v1 and APE (v1 and v2) style comments as well as reading stream properties from the file.
+ *
  */
 
 namespace APE {
@@ -61,16 +66,14 @@ namespace TagLib {
 /*!
  * This implements and provides an interface for APE 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 APE files.
+ * the abstract TagLib::File API as well as providing some additional information specific to APE files.
+ *
  */
 
-    class TAGLIB_EXPORT File : public TagLib::File
-    {
+class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File {
  public:
   /*!
-       * This set of flags is used for various operations and is suitable for
-       * being OR-ed together.
+   * This set of flags is used for various operations and is suitable for being OR-ed together.
    */
   enum TagTypes {
     //! Empty set.  Matches no tag types.
@@ -84,62 +87,45 @@ namespace TagLib {
   };
 
   /*!
-       * Constructs an APE file from \a file.  If \a readProperties is true the
-       * file's audio properties will also be read.
+   * Constructs an APE 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);
+  explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
 
   /*!
-       * Constructs an APE file from \a stream.  If \a readProperties is true the
-       * file's audio properties will also be read.
+   * Constructs an APE 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 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);
+  explicit File(IOStream *stream, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
 
   /*!
    * Destroys this instance of the File.
    */
-      virtual ~File();
+  ~File() override;
 
   /*!
-       * Returns the Tag for this file.  This will be an APE tag, an ID3v1 tag
-       * or a combination of the two.
+   * Returns the Tag for this file.  This will be an APE tag, an ID3v1 tag or a combination of the two.
    */
-      virtual TagLib::Tag *tag() const;
-
-      /*!
-       * Implements the unified property interface -- export function.
-       * If the file contains both an APE and an ID3v1 tag, only APE
-       * will be converted to the PropertyMap.
-       */
-      PropertyMap properties() const;
-
-      /*!
-       * Removes unsupported properties. Forwards to the actual Tag's
-       * removeUnsupportedProperties() function.
-       */
-      void removeUnsupportedProperties(const StringList &properties);
+  Strawberry_TagLib::TagLib::Tag *tag() const override;
 
   /*!
    * Implements the unified property interface -- import function.
-       * Creates an APEv2 tag if necessary. A potentially existing ID3v1
-       * tag will be updated as well.
+   * Creates an APEv2 tag if necessary.
+   * A potentially existing ID3v1 tag will be updated as well.
    */
-      PropertyMap setProperties(const PropertyMap &);
+  PropertyMap setProperties(const PropertyMap&) override;
 
   /*!
-       * Returns the APE::Properties for this file.  If no audio properties
-       * were read then this will return a null pointer.
+   * Returns the APE::AudioProperties for this file.
+   * If no audio properties were read then this will return a null pointer.
    */
-      virtual Properties *audioProperties() const;
+  AudioProperties *audioProperties() const override;
 
   /*!
    * Saves the file.
@@ -147,22 +133,19 @@ namespace TagLib {
    * \note According to the official Monkey's Audio SDK, an APE file
    * can only have either ID3V1 or APE tags, so a parameter is used here.
    */
-      virtual bool save();
+  bool save() override;
 
   /*!
    * Returns a pointer to the ID3v1 tag of the file.
    *
-       * If \a create is false (the default) this may return a null pointer
-       * if there is no valid ID3v1 tag.  If \a create is true it will create
-       * an ID3v1 tag if one does not exist and returns a valid pointer.
+   * If \a create is false (the default) this may return a null pointer if there is no valid ID3v1 tag.
+   * If \a create is true it will create an ID3v1 tag if one does not exist and returns a valid pointer.
    *
-       * \note This may return a valid pointer regardless of whether or not the
-       * file on disk has an ID3v1 tag.  Use hasID3v1Tag() to check if the file
-       * on disk actually has an ID3v1 tag.
+   * \note This may return a valid pointer regardless of whether or not the file on disk has an ID3v1 tag.
+   * Use hasID3v1Tag() to check if the file on disk actually has an ID3v1 tag.
    *
-       * \note The Tag <b>is still</b> owned by the MPEG::File and should not be
-       * deleted by the user.  It will be deleted when the file (object) is
-       * destroyed.
+   * \note The Tag <b>is still</b> owned by the MPEG::File and should not be deleted by the user.
+   * It will be deleted when the file (object) is destroyed.
    *
    * \see hasID3v1Tag()
    */
@@ -171,28 +154,24 @@ namespace TagLib {
   /*!
    * Returns a pointer to the APE tag of the file.
    *
-       * If \a create is false (the default) this may return a null pointer
-       * if there is no valid APE tag.  If \a create is true it will create
-       * an APE tag if one does not exist and returns a valid pointer.
+   * If \a create is false (the default) this may return a null pointer if there is no valid APE tag.
+   * If \a create is true it will create an APE tag if one does not exist and returns a valid pointer.
    *
-       * \note This may return a valid pointer regardless of whether or not the
-       * file on disk has an APE tag.  Use hasAPETag() to check if the file
-       * on disk actually has an APE tag.
+   * \note This may return a valid pointer regardless of whether or not the file on disk has an APE tag.
+   * Use hasAPETag() to check if the file on disk actually has an APE tag.
    *
-       * \note The Tag <b>is still</b> owned by the MPEG::File and should not be
-       * deleted by the user.  It will be deleted when the file (object) is
-       * destroyed.
+   * \note The Tag <b>is still</b> owned by the MPEG::File and should not be deleted by the user.
+   * It will be deleted when the file (object) is destroyed.
    *
    * \see hasAPETag()
    */
   APE::Tag *APETag(bool create = false);
 
   /*!
-       * This will remove the tags that match the OR-ed together TagTypes from the
-       * file.  By default it removes all tags.
+   * This will remove the tags that match the OR-ed together TagTypes from the file.
+   * By default it removes all tags.
    *
-       * \note This will also invalidate pointers to the tags
-       * as their memory will be freed.
+   * \note This will also invalidate pointers to the tags as their memory will be freed.
    * \note In order to make the removal permanent save() still needs to be called
    */
   void strip(int tags = AllTags);
@@ -212,11 +191,10 @@ namespace TagLib {
   bool hasID3v1Tag() const;
 
   /*!
-       * Returns whether or not the given \a stream can be opened as an APE
-       * file.
+   * Returns whether or not the given \a stream can be opened as an APE file.
    *
-       * \note This method is designed to do a quick check.  The result may
-       * not necessarily be correct.
+   * \note This method is designed to do a quick check.
+   * The result may not necessarily be correct.
    */
   static bool isSupported(IOStream *stream);
 
@@ -229,7 +207,8 @@ namespace TagLib {
   class FilePrivate;
   FilePrivate *d;
 };
-  }
-}
+}  // namespace APE
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/ape/apefooter.cpp

@@ -27,19 +27,17 @@
 #include <iostream>
 #include <bitset>
 
-#include <tstring.h>
-#include <tdebug.h>
+#include "tstring.h"
+#include "tdebug.h"
 
 #include "apefooter.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace APE;
 
-class APE::Footer::FooterPrivate
-{
+class APE::Footer::FooterPrivate {
  public:
-  FooterPrivate() :
-    version(0),
+  FooterPrivate() : version(0),
                     footerPresent(true),
                     headerPresent(false),
                     isHeader(false),
@@ -61,13 +59,11 @@ public:
 // static members
 ////////////////////////////////////////////////////////////////////////////////
 
-unsigned int APE::Footer::size()
-{
+unsigned int APE::Footer::size() {
   return 32;
 }
 
-ByteVector APE::Footer::fileIdentifier()
-{
+ByteVector APE::Footer::fileIdentifier() {
   return ByteVector("APETAGEX");
 }
 
@@ -75,99 +71,83 @@ ByteVector APE::Footer::fileIdentifier()
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-APE::Footer::Footer() :
-  d(new FooterPrivate())
-{
+APE::Footer::Footer() : d(new FooterPrivate()) {
 }
 
-APE::Footer::Footer(const ByteVector &data) :
-  d(new FooterPrivate())
-{
+APE::Footer::Footer(const ByteVector &data) : d(new FooterPrivate()) {
   parse(data);
 }
 
-APE::Footer::~Footer()
-{
+APE::Footer::~Footer() {
   delete d;
 }
 
-unsigned int APE::Footer::version() const
-{
+unsigned int APE::Footer::version() const {
   return d->version;
 }
 
-bool APE::Footer::headerPresent() const
-{
+bool APE::Footer::headerPresent() const {
   return d->headerPresent;
 }
 
-bool APE::Footer::footerPresent() const
-{
+bool APE::Footer::footerPresent() const {
   return d->footerPresent;
 }
 
-bool APE::Footer::isHeader() const
-{
+bool APE::Footer::isHeader() const {
   return d->isHeader;
 }
 
-void APE::Footer::setHeaderPresent(bool b) const
-{
+void APE::Footer::setHeaderPresent(bool b) const {
   d->headerPresent = b;
 }
 
-unsigned int APE::Footer::itemCount() const
-{
+unsigned int APE::Footer::itemCount() const {
   return d->itemCount;
 }
 
-void APE::Footer::setItemCount(unsigned int s)
-{
+void APE::Footer::setItemCount(unsigned int s) {
   d->itemCount = s;
 }
 
-unsigned int APE::Footer::tagSize() const
-{
+unsigned int APE::Footer::tagSize() const {
   return d->tagSize;
 }
 
-unsigned int APE::Footer::completeTagSize() const
-{
+unsigned int APE::Footer::completeTagSize() const {
   if (d->headerPresent)
     return d->tagSize + size();
   else
     return d->tagSize;
 }
 
-void APE::Footer::setTagSize(unsigned int s)
-{
+void APE::Footer::setTagSize(unsigned int s) {
   d->tagSize = s;
 }
 
-void APE::Footer::setData(const ByteVector &data)
-{
+void APE::Footer::setData(const ByteVector &data) {
   parse(data);
 }
 
-ByteVector APE::Footer::renderFooter() const
-{
+ByteVector APE::Footer::renderFooter() const {
   return render(false);
 }
 
-ByteVector APE::Footer::renderHeader() const
-{
+ByteVector APE::Footer::renderHeader() const {
+
   if (!d->headerPresent)
     return ByteVector();
   else
     return render(true);
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // protected members
 ////////////////////////////////////////////////////////////////////////////////
 
-void APE::Footer::parse(const ByteVector &data)
-{
+void APE::Footer::parse(const ByteVector &data) {
+
   if (data.size() < size())
     return;
 
@@ -175,19 +155,19 @@ void APE::Footer::parse(const ByteVector &data)
 
   // Read the version number
 
-  d->version = data.toUInt(8, false);
+  d->version = data.toUInt32LE(8);
 
   // Read the tag size
 
-  d->tagSize = data.toUInt(12, false);
+  d->tagSize = data.toUInt32LE(12);
 
   // Read the item count
 
-  d->itemCount = data.toUInt(16, false);
+  d->itemCount = data.toUInt32LE(16);
 
   // Read the flags
 
-  std::bitset<32> flags(TAGLIB_CONSTRUCT_BITSET(data.toUInt(20, false)));
+  std::bitset<32> flags(TAGLIB_CONSTRUCT_BITSET(data.toUInt32LE(20)));
 
   d->headerPresent = flags[31];
   d->footerPresent = !flags[30];
@@ -195,8 +175,8 @@ void APE::Footer::parse(const ByteVector &data)
 
 }
 
-ByteVector APE::Footer::render(bool isHeader) const
-{
+ByteVector APE::Footer::render(bool isHeader) const {
+
   ByteVector v;
 
   // add the file identifier -- "APETAGEX"
@@ -206,15 +186,15 @@ ByteVector APE::Footer::render(bool isHeader) const
   // add the version number -- we always render a 2.000 tag regardless of what
   // the tag originally was.
 
-  v.append(ByteVector::fromUInt(2000, false));
+  v.append(ByteVector::fromUInt32LE(2000));
 
   // add the tag size
 
-  v.append(ByteVector::fromUInt(d->tagSize, false));
+  v.append(ByteVector::fromUInt32LE(d->tagSize));
 
   // add the item count
 
-  v.append(ByteVector::fromUInt(d->itemCount, false));
+  v.append(ByteVector::fromUInt32LE(d->itemCount));
 
   // render and add the flags
 
@@ -224,11 +204,12 @@ ByteVector APE::Footer::render(bool isHeader) const
   flags[30] = false;  // footer is always present
   flags[29] = isHeader;
 
-  v.append(ByteVector::fromUInt(flags.to_ulong(), false));
+  v.append(ByteVector::fromUInt32LE(flags.to_ulong()));
 
   // add the reserved 64bit
 
-  v.append(ByteVector::fromLongLong(0));
+  v.append(ByteVector::fromUInt64BE(0));
 
   return v;
+
 }

3rdparty/taglib/ape/apefooter.h

@@ -29,6 +29,7 @@
 #include "tbytevector.h"
 #include "taglib_export.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
 namespace APE {
@@ -36,25 +37,24 @@ namespace TagLib {
 //! An implementation of APE footers
 
 /*!
-     * This class implements APE footers (and headers). It attempts to follow, both
-     * semantically and programmatically, the structure specified in
-     * the APE v2.0 standard.  The API is based on the properties of APE footer and
-     * headers specified there.
+ * This class implements APE footers (and headers).
+ * It attempts to follow, both semantically and programmatically,
+ * the structure specified in the APE v2.0 standard.
+ * The API is based on the properties of APE footer and headers specified there.
+ *
  */
 
-    class TAGLIB_EXPORT Footer
-    {
+class TAGLIB_EXPORT Footer {
  public:
   /*!
    * Constructs an empty APE footer.
    */
-      Footer();
+  explicit Footer();
 
   /*!
-       * Constructs an APE footer based on \a data.  parse() is called
-       * immediately.
+   * Constructs an APE footer based on \a data.  parse() is called immediately.
    */
-      Footer(const ByteVector &data);
+  explicit Footer(const ByteVector &data);
 
   /*!
    * Destroys the footer.
@@ -98,7 +98,8 @@ namespace TagLib {
   void setItemCount(unsigned int s);
 
   /*!
-       * Returns the tag size in bytes.  This is the size of the frame content and footer.
+   * Returns the tag size in bytes.
+   * This is the size of the frame content and footer.
    * The size of the \e entire tag will be this plus the header size, if present.
    *
    * \see completeTagSize()
@@ -142,15 +143,15 @@ namespace TagLib {
   ByteVector renderFooter() const;
 
   /*!
-       * Renders the header corresponding to the footer. If headerPresent is
-       * set to false, it returns an empty ByteVector.
+   * Renders the header corresponding to the footer.
+   * If headerPresent is set to false, it returns an empty ByteVector.
    */
   ByteVector renderHeader() const;
 
  protected:
   /*!
-       * Called by setData() to parse the footer data.  It makes this information
-       * available through the public API.
+   * Called by setData() to parse the footer data.
+   * It makes this information available through the public API.
    */
   void parse(const ByteVector &data);
 
@@ -167,7 +168,8 @@ namespace TagLib {
   FooterPrivate *d;
 };
 
-  }
-}
+}  // namespace APE
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/ape/apeitem.cpp

@@ -23,20 +23,18 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevectorlist.h>
-#include <tdebug.h>
+#include <memory>
+
+#include "tbytevectorlist.h"
+#include "tdebug.h"
 
 #include "apeitem.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace APE;
 
-class APE::Item::ItemPrivate
-{
-public:
-  ItemPrivate() :
-    type(Text),
-    readOnly(false) {}
+struct ItemData {
+  ItemData() : type(Item::Text), readOnly(false) {}
 
   Item::ItemTypes type;
   String key;
@@ -45,203 +43,174 @@ public:
   bool readOnly;
 };
 
+class APE::Item::ItemPrivate {
+ public:
+  ItemPrivate() : data(new ItemData()) {}
+
+  std::shared_ptr<ItemData> data;
+};
+
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-APE::Item::Item() :
-  d(new ItemPrivate())
-{
+APE::Item::Item() : d(new ItemPrivate()) {}
+
+APE::Item::Item(const String &key, const String &value) : d(new ItemPrivate()) {
+  d->data->key = key;
+  d->data->text.append(value);
 }
 
-APE::Item::Item(const String &key, const String &value) :
-  d(new ItemPrivate())
-{
-  d->key = key;
-  d->text.append(value);
+APE::Item::Item(const String &key, const StringList &values) : d(new ItemPrivate()) {
+  d->data->key = key;
+  d->data->text = values;
 }
 
-APE::Item::Item(const String &key, const StringList &values) :
-  d(new ItemPrivate())
-{
-  d->key = key;
-  d->text = values;
-}
-
-APE::Item::Item(const String &key, const ByteVector &value, bool binary) :
-  d(new ItemPrivate())
-{
-  d->key = key;
+APE::Item::Item(const String &key, const ByteVector &value, bool binary) : d(new ItemPrivate()) {
+  d->data->key = key;
   if (binary) {
-    d->type = Binary;
-    d->value = value;
+    d->data->type = Binary;
+    d->data->value = value;
   }
   else {
-    d->text.append(value);
-  }
+    d->data->text.append(value);
   }
 
-APE::Item::Item(const Item &item) :
-  d(new ItemPrivate(*item.d))
-{
 }
 
-APE::Item::~Item()
-{
+APE::Item::Item(const Item &item) : d(new ItemPrivate(*item.d)) {}
+
+APE::Item::~Item() {
   delete d;
 }
 
-Item &APE::Item::operator=(const Item &item)
-{
+Item &APE::Item::operator=(const Item &item) {
+
   Item(item).swap(*this);
   return *this;
+
 }
 
-void APE::Item::swap(Item &item)
-{
+void APE::Item::swap(Item &item) {
+
   using std::swap;
 
   swap(d, item.d);
+
 }
 
-void APE::Item::setReadOnly(bool readOnly)
-{
-  d->readOnly = readOnly;
+void APE::Item::setReadOnly(bool readOnly) {
+  d->data->readOnly = readOnly;
 }
 
-bool APE::Item::isReadOnly() const
-{
-  return d->readOnly;
+bool APE::Item::isReadOnly() const {
+  return d->data->readOnly;
 }
 
-void APE::Item::setType(APE::Item::ItemTypes val)
-{
-  d->type = val;
+void APE::Item::setType(APE::Item::ItemTypes val) {
+  d->data->type = val;
 }
 
-APE::Item::ItemTypes APE::Item::type() const
-{
-  return d->type;
+APE::Item::ItemTypes APE::Item::type() const {
+  return d->data->type;
 }
 
-String APE::Item::key() const
-{
-  return d->key;
+String APE::Item::key() const {
+  return d->data->key;
 }
 
-ByteVector APE::Item::binaryData() const
-{
-  return d->value;
+ByteVector APE::Item::binaryData() const {
+  return d->data->value;
 }
 
-void APE::Item::setBinaryData(const ByteVector &value)
-{
-  d->type = Binary;
-  d->value = value;
-  d->text.clear();
+void APE::Item::setBinaryData(const ByteVector &value) {
+  d->data->type = Binary;
+  d->data->value = value;
+  d->data->text.clear();
 }
 
-ByteVector APE::Item::value() const
-{
-  // This seems incorrect as it won't be actually rendering the value to keep it
-  // up to date.
-
-  return d->value;
+void APE::Item::setKey(const String &key) {
+  d->data->key = key;
 }
 
-void APE::Item::setKey(const String &key)
-{
-  d->key = key;
+void APE::Item::setValue(const String &value) {
+  d->data->type = Text;
+  d->data->text = value;
+  d->data->value.clear();
 }
 
-void APE::Item::setValue(const String &value)
-{
-  d->type = Text;
-  d->text = value;
-  d->value.clear();
+void APE::Item::setValues(const StringList &value) {
+  d->data->type = Text;
+  d->data->text = value;
+  d->data->value.clear();
 }
 
-void APE::Item::setValues(const StringList &value)
-{
-  d->type = Text;
-  d->text = value;
-  d->value.clear();
+void APE::Item::appendValue(const String &value) {
+  d->data->type = Text;
+  d->data->text.append(value);
+  d->data->value.clear();
 }
 
-void APE::Item::appendValue(const String &value)
-{
-  d->type = Text;
-  d->text.append(value);
-  d->value.clear();
+void APE::Item::appendValues(const StringList &values) {
+  d->data->type = Text;
+  d->data->text.append(values);
+  d->data->value.clear();
 }
 
-void APE::Item::appendValues(const StringList &values)
-{
-  d->type = Text;
-  d->text.append(values);
-  d->value.clear();
-}
-
-int APE::Item::size() const
-{
-  int result = 8 + d->key.size() + 1;
-  switch(d->type) {
+int APE::Item::size() const {
+  size_t result = 8 + d->data->key.size() + 1;
+  switch (d->data->type) {
     case Text:
-      if(!d->text.isEmpty()) {
-        StringList::ConstIterator it = d->text.begin();
+      if (!d->data->text.isEmpty()) {
+        StringList::ConstIterator it = d->data->text.begin();
 
         result += it->data(String::UTF8).size();
         it++;
-        for(; it != d->text.end(); ++it)
+        for (; it != d->data->text.end(); ++it)
           result += 1 + it->data(String::UTF8).size();
       }
       break;
 
     case Binary:
     case Locator:
-      result += d->value.size();
+      result += d->data->value.size();
       break;
   }
   return result;
+
 }
 
-StringList APE::Item::toStringList() const
-{
-  return d->text;
+StringList APE::Item::values() const {
+  return d->data->text;
 }
 
-StringList APE::Item::values() const
-{
-  return d->text;
-}
-
-String APE::Item::toString() const
-{
-  if(d->type == Text && !isEmpty())
-    return d->text.front();
+String APE::Item::toString() const {
+  if (d->data->type == Text && !isEmpty())
+    return d->data->text.front();
   else
     return String();
+
 }
 
-bool APE::Item::isEmpty() const
-{
-  switch(d->type) {
+bool APE::Item::isEmpty() const {
+  switch (d->data->type) {
     case Text:
-      if(d->text.isEmpty())
+      if (d->data->text.isEmpty())
         return true;
-      if(d->text.size() == 1 && d->text.front().isEmpty())
+      if (d->data->text.size() == 1 && d->data->text.front().isEmpty())
         return true;
       return false;
     case Binary:
     case Locator:
-      return d->value.isEmpty();
+      return d->data->value.isEmpty();
     default:
       return false;
   }
+
 }
 
-void APE::Item::parse(const ByteVector &data)
-{
+void APE::Item::parse(const ByteVector &data) {
+
   // 11 bytes is the minimum size for an APE item
 
   if (data.size() < 11) {
@@ -249,53 +218,54 @@ void APE::Item::parse(const ByteVector &data)
     return;
   }
 
-  const unsigned int valueLength  = data.toUInt(0, false);
-  const unsigned int flags        = data.toUInt(4, false);
+  const unsigned int valueLength = data.toUInt32LE(0);
+  const unsigned int flags = data.toUInt32LE(4);
 
   // An item key can contain ASCII characters from 0x20 up to 0x7E, not UTF-8.
   // We assume that the validity of the given key has been checked.
 
-  d->key = String(&data[8], String::Latin1);
+  d->data->key = String(&data[8], String::Latin1);
 
-  const ByteVector value = data.mid(8 + d->key.size() + 1, valueLength);
+  const ByteVector value = data.mid(8 + d->data->key.size() + 1, valueLength);
 
   setReadOnly(flags & 1);
   setType(ItemTypes((flags >> 1) & 3));
 
-  if(Text == d->type)
-    d->text = StringList(ByteVectorList::split(value, '\0'), String::UTF8);
+  if (Text == d->data->type)
+    d->data->text = StringList(ByteVectorList::split(value, '\0'), String::UTF8);
   else
-    d->value = value;
+    d->data->value = value;
 }
 
-ByteVector APE::Item::render() const
-{
+ByteVector APE::Item::render() const {
+
   ByteVector data;
-  unsigned int flags = ((d->readOnly) ? 1 : 0) | (d->type << 1);
+  unsigned int flags = ((d->data->readOnly) ? 1 : 0) | (d->data->type << 1);
   ByteVector value;
 
   if (isEmpty())
     return data;
 
-  if(d->type == Text) {
-    StringList::ConstIterator it = d->text.begin();
+  if (d->data->type == Text) {
+    StringList::ConstIterator it = d->data->text.begin();
 
     value.append(it->data(String::UTF8));
     it++;
-    for(; it != d->text.end(); ++it) {
+    for (; it != d->data->text.end(); ++it) {
       value.append('\0');
       value.append(it->data(String::UTF8));
     }
-    d->value = value;
+    d->data->value = value;
   }
   else
-    value.append(d->value);
+    value.append(d->data->value);
 
-  data.append(ByteVector::fromUInt(value.size(), false));
-  data.append(ByteVector::fromUInt(flags, false));
-  data.append(d->key.data(String::Latin1));
+  data.append(ByteVector::fromUInt32LE(value.size()));
+  data.append(ByteVector::fromUInt32LE(flags));
+  data.append(d->data->key.data(String::Latin1));
   data.append(ByteVector('\0'));
   data.append(value);
 
   return data;
+
 }

3rdparty/taglib/ape/apeitem.h

@@ -30,8 +30,8 @@
 #include "tstring.h"
 #include "tstringlist.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
-
 namespace APE {
 
 //! An implementation of APE-items
@@ -39,8 +39,7 @@ namespace TagLib {
 /*!
  * This class provides the features of items in the APEv2 standard.
  */
-    class TAGLIB_EXPORT Item
-    {
+class TAGLIB_EXPORT Item {
  public:
   /*!
    * Enum of types an Item can have. The value of 3 is reserved.
@@ -56,24 +55,23 @@ namespace TagLib {
   /*!
    * Constructs an empty item.
    */
-      Item();
-
-      /*!
-       * Constructs a text item with \a key and \a value.
-       */
-      // BIC: Remove this, StringList has a constructor from a single string
-      Item(const String &key, const String &value);
+  explicit Item();
 
   /*!
    * Constructs a text item with \a key and \a values.
    */
-      Item(const String &key, const StringList &values);
+  explicit Item(const String &key, const String &values);
+
+  /*!
+   * Constructs a text item with \a key and \a values.
+   */
+  explicit Item(const String &key, const StringList &values);
 
   /*!
    * Constructs an item with \a key and \a value.
    * If \a binary is true a Binary item will be created, otherwise \a value will be interpreted as text
    */
-      Item(const String &key, const ByteVector &value, bool binary);
+  explicit Item(const String &key, const ByteVector &value, bool binary);
 
   /*!
    * Construct an item as a copy of \a item.
@@ -112,11 +110,6 @@ namespace TagLib {
    */
   void setBinaryData(const ByteVector &value);
 
-#ifndef DO_NOT_DOCUMENT
-      /* Remove in next binary incompatible release */
-      ByteVector value() const;
-#endif
-
   /*!
    * Sets the key for the item to \a key.
    */
@@ -130,8 +123,7 @@ namespace TagLib {
   void setValue(const String &value);
 
   /*!
-       * Sets the text value of the item to the list of values in \a value and clears
-       * any previous contents.
+   * Sets the text value of the item to the list of values in \a value and clears any previous contents.
    *
    * \see toStringList()
    */
@@ -157,20 +149,13 @@ namespace TagLib {
   int size() const;
 
   /*!
-       * Returns the value as a single string.  In case of multiple strings,
-       * the first is returned.  If the data type is not \a Text, always returns
-       * an empty String.
+   * Returns the value as a single string.  In case of multiple strings, the first is returned.
+   * If the data type is not \a Text, always returns an empty String.
    */
   String toString() const;
 
-#ifndef DO_NOT_DOCUMENT
-      /* Remove in next binary incompatible release */
-      StringList toStringList() const;
-#endif
-
   /*!
-       * Returns the list of text values.  If the data type is not \a Text, always
-       * returns an empty StringList.
+   * Returns the list of text values.  If the data type is not \a Text, always returns an empty StringList.
    */
   StringList values() const;
 
@@ -215,10 +200,8 @@ namespace TagLib {
   class ItemPrivate;
   ItemPrivate *d;
 };
-  }
-
-}
+}  // namespace APE
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif
-
-

3rdparty/taglib/ape/apeproperties.cpp

@@ -27,22 +27,20 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tstring.h>
-#include <tdebug.h>
-#include <bitset>
+#include "tstring.h"
+#include "tdebug.h"
+
 #include "id3v2tag.h"
 #include "apeproperties.h"
 #include "apefile.h"
 #include "apetag.h"
 #include "apefooter.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
-class APE::Properties::PropertiesPrivate
-{
+class APE::AudioProperties::AudioPropertiesPrivate {
  public:
-  PropertiesPrivate() :
-    length(0),
+  explicit AudioPropertiesPrivate() : length(0),
                                       bitrate(0),
                                       sampleRate(0),
                                       channels(0),
@@ -63,67 +61,43 @@ public:
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-APE::Properties::Properties(File *, ReadStyle style) :
-  AudioProperties(style),
-  d(new PropertiesPrivate())
-{
-  debug("APE::Properties::Properties() -- This constructor is no longer used.");
-}
-
-APE::Properties::Properties(File *file, long streamLength, ReadStyle style) :
-  AudioProperties(style),
-  d(new PropertiesPrivate())
-{
+APE::AudioProperties::AudioProperties(File *file, long long streamLength, ReadStyle) : Strawberry_TagLib::TagLib::AudioProperties(), d(new AudioPropertiesPrivate()) {
   read(file, streamLength);
 }
 
-APE::Properties::~Properties()
-{
+APE::AudioProperties::~AudioProperties() {
   delete d;
 }
 
-int APE::Properties::length() const
-{
-  return lengthInSeconds();
-}
-
-int APE::Properties::lengthInSeconds() const
-{
+int APE::AudioProperties::lengthInSeconds() const {
   return d->length / 1000;
 }
 
-int APE::Properties::lengthInMilliseconds() const
-{
+int APE::AudioProperties::lengthInMilliseconds() const {
   return d->length;
 }
 
-int APE::Properties::bitrate() const
-{
+int APE::AudioProperties::bitrate() const {
   return d->bitrate;
 }
 
-int APE::Properties::sampleRate() const
-{
+int APE::AudioProperties::sampleRate() const {
   return d->sampleRate;
 }
 
-int APE::Properties::channels() const
-{
+int APE::AudioProperties::channels() const {
   return d->channels;
 }
 
-int APE::Properties::version() const
-{
+int APE::AudioProperties::version() const {
   return d->version;
 }
 
-int APE::Properties::bitsPerSample() const
-{
+int APE::AudioProperties::bitsPerSample() const {
   return d->bitsPerSample;
 }
 
-unsigned int APE::Properties::sampleFrames() const
-{
+unsigned int APE::AudioProperties::sampleFrames() const {
   return d->sampleFrames;
 }
 
@@ -131,21 +105,19 @@ unsigned int APE::Properties::sampleFrames() const
 // private members
 ////////////////////////////////////////////////////////////////////////////////
 
-namespace
-{
-  int headerVersion(const ByteVector &header)
-  {
+namespace {
+int headerVersion(const ByteVector &header) {
   if (header.size() < 6 || !header.startsWith("MAC "))
     return -1;
 
-    return header.toUShort(4, false);
-  }
+  return header.toUInt16LE(4);
 }
+}  // namespace
+
+void APE::AudioProperties::read(File *file, long long streamLength) {
 
-void APE::Properties::read(File *file, long streamLength)
-{
   // First, we assume that the file pointer is set at the first descriptor.
-  long offset = file->tell();
+  long long offset = file->tell();
   int version = headerVersion(file->readBlock(6));
 
   // Next, we look for the descriptor.
@@ -156,7 +128,7 @@ void APE::Properties::read(File *file, long streamLength)
   }
 
   if (version < 0) {
-    debug("APE::Properties::read() -- APE descriptor not found");
+    debug("APE::AudioProperties::read() -- APE descriptor not found");
     return;
   }
 
@@ -172,19 +144,20 @@ void APE::Properties::read(File *file, long streamLength)
     d->length = static_cast<int>(length + 0.5);
     d->bitrate = static_cast<int>(streamLength * 8.0 / length + 0.5);
   }
+
 }
 
-void APE::Properties::analyzeCurrent(File *file)
-{
+void APE::AudioProperties::analyzeCurrent(File *file) {
+
   // Read the descriptor
   file->seek(2, File::Current);
   const ByteVector descriptor = file->readBlock(44);
   if (descriptor.size() < 44) {
-    debug("APE::Properties::analyzeCurrent() -- descriptor is too short.");
+    debug("APE::AudioProperties::analyzeCurrent() -- descriptor is too short.");
     return;
   }
 
-  const unsigned int descriptorBytes = descriptor.toUInt(0, false);
+  const unsigned int descriptorBytes = descriptor.toUInt32LE(0);
 
   if ((descriptorBytes - 52) > 0)
     file->seek(descriptorBytes - 52, File::Current);
@@ -192,39 +165,40 @@ void APE::Properties::analyzeCurrent(File *file)
   // Read the header
   const ByteVector header = file->readBlock(24);
   if (header.size() < 24) {
-    debug("APE::Properties::analyzeCurrent() -- MAC header is too short.");
+    debug("APE::AudioProperties::analyzeCurrent() -- MAC header is too short.");
     return;
   }
 
   // Get the APE info
-  d->channels      = header.toShort(18, false);
-  d->sampleRate    = header.toUInt(20, false);
-  d->bitsPerSample = header.toShort(16, false);
+  d->channels = header.toUInt16LE(18);
+  d->sampleRate = header.toUInt32LE(20);
+  d->bitsPerSample = header.toUInt16LE(16);
 
-  const unsigned int totalFrames = header.toUInt(12, false);
+  const unsigned int totalFrames = header.toUInt32LE(12);
   if (totalFrames == 0)
     return;
 
-  const unsigned int blocksPerFrame   = header.toUInt(4, false);
-  const unsigned int finalFrameBlocks = header.toUInt(8, false);
+  const unsigned int blocksPerFrame = header.toUInt32LE(4);
+  const unsigned int finalFrameBlocks = header.toUInt32LE(8);
   d->sampleFrames = (totalFrames - 1) * blocksPerFrame + finalFrameBlocks;
+
 }
 
-void APE::Properties::analyzeOld(File *file)
-{
+void APE::AudioProperties::analyzeOld(File *file) {
+
   const ByteVector header = file->readBlock(26);
   if (header.size() < 26) {
-    debug("APE::Properties::analyzeOld() -- MAC header is too short.");
+    debug("APE::AudioProperties::analyzeOld() -- MAC header is too short.");
     return;
   }
 
-  const unsigned int totalFrames = header.toUInt(18, false);
+  const unsigned int totalFrames = header.toUInt32LE(18);
 
   // Fail on 0 length APE files (catches non-finalized APE files)
   if (totalFrames == 0)
     return;
 
-  const short compressionLevel = header.toShort(0, false);
+  const short compressionLevel = header.toUInt32LE(0);
   unsigned int blocksPerFrame;
   if (d->version >= 3950)
     blocksPerFrame = 73728 * 4;
@@ -234,19 +208,20 @@ void APE::Properties::analyzeOld(File *file)
     blocksPerFrame = 9216;
 
   // Get the APE info
-  d->channels   = header.toShort(4, false);
-  d->sampleRate = header.toUInt(6, false);
+  d->channels = header.toUInt16LE(4);
+  d->sampleRate = header.toUInt32LE(6);
 
-  const unsigned int finalFrameBlocks = header.toUInt(22, false);
+  const unsigned int finalFrameBlocks = header.toUInt32LE(22);
   d->sampleFrames = (totalFrames - 1) * blocksPerFrame + finalFrameBlocks;
 
   // Get the bit depth from the RIFF-fmt chunk.
   file->seek(16, File::Current);
   const ByteVector fmt = file->readBlock(28);
   if (fmt.size() < 28 || !fmt.startsWith("WAVEfmt ")) {
-    debug("APE::Properties::analyzeOld() -- fmt header is too short.");
+    debug("APE::AudioProperties::analyzeOld() -- fmt header is too short.");
     return;
   }
 
-  d->bitsPerSample = fmt.toShort(26, false);
+  d->bitsPerSample = fmt.toUInt16LE(26);
+
 }

3rdparty/taglib/ape/apeproperties.h

@@ -33,8 +33,8 @@
 #include "taglib_export.h"
 #include "audioproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
-
 namespace APE {
 
 class File;
@@ -42,73 +42,50 @@ namespace TagLib {
 //! An implementation of audio property reading for APE
 
 /*!
-     * This reads the data from an APE stream found in the AudioProperties
-     * API.
+ * This reads the data from an APE stream found in the AudioProperties API.
  */
 
-    class TAGLIB_EXPORT Properties : public AudioProperties
-    {
+class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
  public:
-      /*!
-       * Create an instance of APE::Properties with the data read from the
-       * APE::File \a file.
-       *
-       * \deprecated
-       */
-      Properties(File *file, ReadStyle style = Average);
 
   /*!
-       * Create an instance of APE::Properties with the data read from the
-       * APE::File \a file.
+  * Create an instance of APE::AudioProperties with the data read from the APE::File \a file.
    */
-      Properties(File *file, long streamLength, ReadStyle style = Average);
+  explicit AudioProperties(File *file, long long streamLength, ReadStyle style = Average);
 
   /*!
-       * Destroys this APE::Properties instance.
+   * Destroys this APE::AudioProperties instance.
    */
-      virtual ~Properties();
+  ~AudioProperties() override;
 
   /*!
-       * Returns the length of the file in seconds.  The length is rounded down to
-       * the nearest whole second.
-       *
-       * \note This method is just an alias of lengthInSeconds().
-       *
-       * \deprecated
-       */
-      virtual int length() const;
-
-      /*!
-       * Returns the length of the file in seconds.  The length is rounded down to
-       * the nearest whole second.
+   * Returns the length of the file in seconds.  The length is rounded down to the nearest whole second.
    *
    * \see lengthInMilliseconds()
    */
-      // BIC: make virtual
-      int lengthInSeconds() const;
+  int lengthInSeconds() const override;
 
   /*!
    * Returns the length of the file in milliseconds.
    *
    * \see lengthInSeconds()
    */
-      // BIC: make virtual
-      int lengthInMilliseconds() const;
+  int lengthInMilliseconds() const override;
 
   /*!
    * Returns the average bit rate of the file in kb/s.
    */
-      virtual int bitrate() const;
+  int bitrate() const override;
 
   /*!
    * Returns the sample rate in Hz.
    */
-      virtual int sampleRate() const;
+  int sampleRate() const override;
 
   /*!
    * Returns the number of audio channels.
    */
-      virtual int channels() const;
+  int channels() const override;
 
   /*!
    * Returns the number of bits per audio sample.
@@ -126,18 +103,16 @@ namespace TagLib {
   int version() const;
 
  private:
-      Properties(const Properties &);
-      Properties &operator=(const Properties &);
-
-      void read(File *file, long streamLength);
+  void read(File *file, long long streamLength);
 
   void analyzeCurrent(File *file);
   void analyzeOld(File *file);
 
-      class PropertiesPrivate;
-      PropertiesPrivate *d;
+  class AudioPropertiesPrivate;
+  AudioPropertiesPrivate *d;
 };
-  }
-}
+}  // namespace APE
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/ape/apetag.cpp

@@ -31,28 +31,28 @@
 #  define WANT_CLASS_INSTANTIATION_OF_MAP (1)
 #endif
 
-#include <tfile.h>
-#include <tstring.h>
-#include <tmap.h>
-#include <tpropertymap.h>
-#include <tdebug.h>
-#include <tutils.h>
+#include "tfile.h"
+#include "tstring.h"
+#include "tmap.h"
+#include "tpicturemap.h"
+#include "tpropertymap.h"
+#include "tdebug.h"
+#include "tutils.h"
 
 #include "apetag.h"
 #include "apefooter.h"
 #include "apeitem.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace APE;
 
-namespace
-{
+namespace {
 const unsigned int MinKeyLength = 2;
 const unsigned int MaxKeyLength = 255;
 
-  bool isKeyValid(const ByteVector &key)
-  {
-    const char *invalidKeys[] = { "ID3", "TAG", "OGGS", "MP+", 0 };
+bool isKeyValid(const ByteVector &key) {
+
+  const char *invalidKeys[] = { "ID3", "TAG", "OGGS", "MP+", nullptr };
 
   // only allow printable ASCII including space (32..126)
 
@@ -63,24 +63,21 @@ namespace
   }
 
   const String upperKey = String(key).upper();
-    for(size_t i = 0; invalidKeys[i] != 0; ++i) {
+  for (size_t i = 0; invalidKeys[i] != nullptr; ++i) {
     if (upperKey == invalidKeys[i])
       return false;
   }
 
   return true;
 }
-}
+}  // namespace
 
-class APE::Tag::TagPrivate
-{
+class APE::Tag::TagPrivate {
  public:
-  TagPrivate() :
-    file(0),
-    footerLocation(0) {}
+  TagPrivate() : file(nullptr), footerLocation(0) {}
 
   File *file;
-  long footerLocation;
+  long long footerLocation;
 
   Footer footer;
   ItemListMap itemListMap;
@@ -90,124 +87,207 @@ public:
 // public methods
 ////////////////////////////////////////////////////////////////////////////////
 
-APE::Tag::Tag() :
-  TagLib::Tag(),
-  d(new TagPrivate())
-{
-}
+APE::Tag::Tag() : d(new TagPrivate()) {}
+
+APE::Tag::Tag(Strawberry_TagLib::TagLib::File *file, long long footerLocation) : d(new TagPrivate()) {
 
-APE::Tag::Tag(TagLib::File *file, long footerLocation) :
-  TagLib::Tag(),
-  d(new TagPrivate())
-{
   d->file = file;
   d->footerLocation = footerLocation;
 
   read();
 }
 
-APE::Tag::~Tag()
-{
+APE::Tag::~Tag() {
   delete d;
 }
 
-ByteVector APE::Tag::fileIdentifier()
-{
+ByteVector APE::Tag::fileIdentifier() {
   return ByteVector::fromCString("APETAGEX");
 }
 
-String APE::Tag::title() const
-{
+String APE::Tag::title() const {
+
   if (d->itemListMap["TITLE"].isEmpty())
     return String();
   return d->itemListMap["TITLE"].values().toString();
+
 }
 
-String APE::Tag::artist() const
-{
+String APE::Tag::artist() const {
+
   if (d->itemListMap["ARTIST"].isEmpty())
     return String();
   return d->itemListMap["ARTIST"].values().toString();
+
 }
 
-String APE::Tag::album() const
-{
+String APE::Tag::album() const {
+
   if (d->itemListMap["ALBUM"].isEmpty())
     return String();
   return d->itemListMap["ALBUM"].values().toString();
+
 }
 
-String APE::Tag::comment() const
-{
+String APE::Tag::comment() const {
+
   if (d->itemListMap["COMMENT"].isEmpty())
     return String();
   return d->itemListMap["COMMENT"].values().toString();
+
 }
 
-String APE::Tag::genre() const
-{
+String APE::Tag::genre() const {
+
   if (d->itemListMap["GENRE"].isEmpty())
     return String();
   return d->itemListMap["GENRE"].values().toString();
+
 }
 
-unsigned int APE::Tag::year() const
-{
+unsigned int APE::Tag::year() const {
+
   if (d->itemListMap["YEAR"].isEmpty())
     return 0;
   return d->itemListMap["YEAR"].toString().toInt();
+
 }
 
-unsigned int APE::Tag::track() const
-{
+unsigned int APE::Tag::track() const {
+
   if (d->itemListMap["TRACK"].isEmpty())
     return 0;
   return d->itemListMap["TRACK"].toString().toInt();
+
 }
 
-void APE::Tag::setTitle(const String &s)
-{
+Strawberry_TagLib::TagLib::PictureMap APE::Tag::pictures() const {
+
+  PictureMap map;
+  if (d->itemListMap.contains(FRONT_COVER)) {
+    Item front = d->itemListMap[FRONT_COVER];
+    if (Item::Binary == front.type()) {
+      ByteVector picture = front.binaryData();
+      const size_t index = picture.find('\0');
+      if (index < picture.size()) {
+        ByteVector desc = picture.mid(0, index + 1);
+        String mime = "image/jpeg";
+        ByteVector data = picture.mid(index + 1);
+        Picture p(data, Picture::FrontCover, mime, desc);
+        map.insert(p);
+      }
+    }
+  }
+
+  if (d->itemListMap.contains(BACK_COVER)) {
+    Item back = d->itemListMap[BACK_COVER];
+    if (Item::Binary == back.type()) {
+      ByteVector picture = back.binaryData();
+      const size_t index = picture.find('\0');
+      if (index < picture.size()) {
+        ByteVector desc = picture.mid(0, index + 1);
+        String mime = "image/jpeg";
+        ByteVector data = picture.mid(index + 1);
+        Picture p(data, Picture::BackCover, mime, desc);
+        map.insert(p);
+      }
+    }
+  }
+
+  return PictureMap(map);
+
+}
+
+void APE::Tag::setTitle(const String &s) {
   addValue("TITLE", s, true);
 }
 
-void APE::Tag::setArtist(const String &s)
-{
+void APE::Tag::setArtist(const String &s) {
   addValue("ARTIST", s, true);
 }
 
-void APE::Tag::setAlbum(const String &s)
-{
+void APE::Tag::setAlbum(const String &s) {
   addValue("ALBUM", s, true);
 }
 
-void APE::Tag::setComment(const String &s)
-{
+void APE::Tag::setComment(const String &s) {
   addValue("COMMENT", s, true);
 }
 
-void APE::Tag::setGenre(const String &s)
-{
+void APE::Tag::setGenre(const String &s) {
   addValue("GENRE", s, true);
 }
 
-void APE::Tag::setYear(unsigned int i)
-{
+void APE::Tag::setYear(unsigned int i) {
+
   if (i == 0)
     removeItem("YEAR");
   else
     addValue("YEAR", String::number(i), true);
+
 }
 
-void APE::Tag::setTrack(unsigned int i)
-{
+void APE::Tag::setTrack(unsigned int i) {
+
   if (i == 0)
     removeItem("TRACK");
   else
     addValue("TRACK", String::number(i), true);
+
 }
 
-namespace
-{
+void APE::Tag::setPictures(const PictureMap &l) {
+
+  removeItem(FRONT_COVER);
+  removeItem(BACK_COVER);
+
+  for (PictureMap::ConstIterator pictureMapIt = l.begin(); pictureMapIt != l.end(); ++pictureMapIt) {
+    Picture::Type type = pictureMapIt->first;
+    if (Picture::FrontCover != type && Picture::BackCover != type) {
+      std::cout << "APE: Trying to add a picture with wrong type" << std::endl;
+      continue;
+    }
+
+    const char *id;
+    switch (type) {
+      case Picture::FrontCover:
+        id = FRONT_COVER;
+        break;
+      case Picture::BackCover:
+        id = BACK_COVER;
+        break;
+      default:
+        id = FRONT_COVER;
+        break;
+    }
+
+    PictureList list = pictureMapIt->second;
+    for (PictureList::ConstIterator pictureListIt = list.begin(); pictureListIt != list.end(); ++pictureListIt) {
+      Picture picture = *pictureListIt;
+      if (d->itemListMap.contains(id)) {
+        std::cout << "APE: Already added a picture of type "
+                  << id
+                  << " '"
+                  << picture.description()
+                  << "' "
+                  << "and next are being ignored"
+                  << std::endl;
+        break;
+      }
+
+      ByteVector data = picture.description().data(String::Latin1).append('\0').append(picture.data());
+
+      Item item;
+      item.setKey(id);
+      item.setType(Item::Binary);
+      item.setBinaryData(data);
+      setItem(item.key(), item);
+    }
+  }
+
+}
+
+namespace {
 // conversions of tag keys between what we use in PropertyMap and what's usual
 // for APE tags
 //                                    usual,         APE
@@ -217,10 +297,10 @@ namespace
   { "DISCNUMBER", "DISC" },
   { "REMIXER", "MIXARTIST" } };
 const size_t keyConversionsSize = sizeof(keyConversions) / sizeof(keyConversions[0]);
-}
+}  // namespace
+
+PropertyMap APE::Tag::properties() const {
 
-PropertyMap APE::Tag::properties() const
-{
   PropertyMap properties;
   ItemListMap::ConstIterator it = itemListMap().begin();
   for (; it != itemListMap().end(); ++it) {
@@ -236,21 +316,23 @@ PropertyMap APE::Tag::properties() const
         if (tagName == keyConversions[i][1])
           tagName = keyConversions[i][0];
       }
-      properties[tagName].append(it->second.toStringList());
+      properties[tagName].append(it->second.values());
     }
   }
   return properties;
+
 }
 
-void APE::Tag::removeUnsupportedProperties(const StringList &properties)
-{
+void APE::Tag::removeUnsupportedProperties(const StringList &properties) {
+
   StringList::ConstIterator it = properties.begin();
   for (; it != properties.end(); ++it)
     removeItem(*it);
+
 }
 
-PropertyMap APE::Tag::setProperties(const PropertyMap &origProps)
-{
+PropertyMap APE::Tag::setProperties(const PropertyMap &origProps) {
+
   PropertyMap properties(origProps);  // make a local copy that can be modified
 
   // see comment in properties()
@@ -295,31 +377,29 @@ PropertyMap APE::Tag::setProperties(const PropertyMap &origProps)
   return invalid;
 }
 
-bool APE::Tag::checkKey(const String &key)
-{
+bool APE::Tag::checkKey(const String &key) {
+
   if (key.size() < MinKeyLength || key.size() > MaxKeyLength)
     return false;
 
   return isKeyValid(key.data(String::UTF8));
+
 }
 
-APE::Footer *APE::Tag::footer() const
-{
+APE::Footer *APE::Tag::footer() const {
   return &d->footer;
 }
 
-const APE::ItemListMap& APE::Tag::itemListMap() const
-{
+const APE::ItemListMap &APE::Tag::itemListMap() const {
   return d->itemListMap;
 }
 
-void APE::Tag::removeItem(const String &key)
-{
+void APE::Tag::removeItem(const String &key) {
   d->itemListMap.erase(key.upper());
 }
 
-void APE::Tag::addValue(const String &key, const String &value, bool replace)
-{
+void APE::Tag::addValue(const String &key, const String &value, bool replace) {
+
   if (replace)
     removeItem(key);
 
@@ -335,30 +415,32 @@ void APE::Tag::addValue(const String &key, const String &value, bool replace)
     it->second.appendValue(value);
   else
     setItem(key, Item(key, value));
+
 }
 
-void APE::Tag::setData(const String &key, const ByteVector &value)
-{
+void APE::Tag::setData(const String &key, const ByteVector &value) {
+
   removeItem(key);
 
   if (value.isEmpty())
     return;
 
   setItem(key, Item(key, value, true));
+
 }
 
-void APE::Tag::setItem(const String &key, const Item &item)
-{
+void APE::Tag::setItem(const String &key, const Item &item) {
+
   if (!checkKey(key)) {
     debug("APE::Tag::setItem() - Couldn't set an item due to an invalid key.");
     return;
   }
 
   d->itemListMap[key.upper()] = item;
+
 }
 
-bool APE::Tag::isEmpty() const
-{
+bool APE::Tag::isEmpty() const {
   return d->itemListMap.isEmpty();
 }
 
@@ -366,8 +448,8 @@ bool APE::Tag::isEmpty() const
 // protected methods
 ////////////////////////////////////////////////////////////////////////////////
 
-void APE::Tag::read()
-{
+void APE::Tag::read() {
+
   if (d->file && d->file->isValid()) {
 
     d->file->seek(d->footerLocation);
@@ -380,10 +462,11 @@ void APE::Tag::read()
     d->file->seek(d->footerLocation + Footer::size() - d->footer.tagSize());
     parse(d->file->readBlock(d->footer.tagSize() - Footer::size()));
   }
+
 }
 
-ByteVector APE::Tag::render() const
-{
+ByteVector APE::Tag::render() const {
+
   ByteVector data;
   unsigned int itemCount = 0;
 
@@ -397,32 +480,30 @@ ByteVector APE::Tag::render() const
   d->footer.setHeaderPresent(true);
 
   return d->footer.renderHeader() + data + d->footer.renderFooter();
+
 }
 
-void APE::Tag::parse(const ByteVector &data)
-{
+void APE::Tag::parse(const ByteVector &data) {
+
   // 11 bytes is the minimum size for an APE item
 
   if (data.size() < 11)
     return;
 
-  unsigned int pos = 0;
+  size_t pos = 0;
 
   for (unsigned int i = 0; i < d->footer.itemCount() && pos <= data.size() - 11; i++) {
 
-    const int nullPos = data.find('\0', pos + 8);
-    if(nullPos < 0) {
+    const size_t nullPos = data.find('\0', pos + 8);
+    if (nullPos == ByteVector::npos()) {
       debug("APE::Tag::parse() - Couldn't find a key/value separator. Stopped parsing.");
       return;
     }
 
-    const unsigned int keyLength = nullPos - pos - 8;
-    const unsigned int valLegnth = data.toUInt(pos, false);
+    const size_t keyLength = nullPos - pos - 8;
+    const size_t valLegnth = data.toUInt32LE(pos);
 
-    if(keyLength >= MinKeyLength
-      && keyLength <= MaxKeyLength
-      && isKeyValid(data.mid(pos + 8, keyLength)))
-    {
+    if (keyLength >= MinKeyLength && keyLength <= MaxKeyLength && isKeyValid(data.mid(pos + 8, keyLength))) {
       APE::Item item;
       item.parse(data.mid(pos));
 
@@ -434,4 +515,5 @@ void APE::Tag::parse(const ByteVector &data)
 
     pos += keyLength + valLegnth + 9;
   }
+
 }

3rdparty/taglib/ape/apetag.h

@@ -34,6 +34,10 @@
 
 #include "apeitem.h"
 
+#define FRONT_COVER "COVER ART (FRONT)"
+#define BACK_COVER  "COVER ART (BACK)"
+
+namespace Strawberry_TagLib {
 namespace TagLib {
 
 class File;
@@ -49,85 +53,91 @@ namespace TagLib {
  *
  * \see APE::Tag::itemListMap()
  */
-    typedef Map<const String, Item> ItemListMap;
+typedef Map<String, Item> ItemListMap;
 
 
 //! An APE tag implementation
 
-    class TAGLIB_EXPORT Tag : public TagLib::Tag
-    {
+class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag {
  public:
   /*!
    * Create an APE tag with default values.
    */
-      Tag();
+  explicit Tag();
 
   /*!
    * Create an APE tag and parse the data in \a file with APE footer at
    * \a tagOffset.
    */
-      Tag(TagLib::File *file, long footerLocation);
+  explicit Tag(Strawberry_TagLib::TagLib::File *file, long long footerLocation);
 
   /*!
    * Destroys this Tag instance.
    */
-      virtual ~Tag();
+  ~Tag() override;
 
   /*!
-       * Renders the in memory values to a ByteVector suitable for writing to
-       * the file.
+   * Renders the in memory values to a ByteVector suitable for writing to the file.
    */
   ByteVector render() const;
 
   /*!
-       * Returns the string "APETAGEX" suitable for usage in locating the tag in a
-       * file.
+   * Returns the string "APETAGEX" suitable for usage in locating the tag in a file.
    */
   static ByteVector fileIdentifier();
 
   // Reimplementations.
 
-      virtual String title() const;
-      virtual String artist() const;
-      virtual String album() const;
-      virtual String comment() const;
-      virtual String genre() const;
-      virtual unsigned int year() const;
-      virtual unsigned int track() const;
+  String title() const override;
+  String artist() const override;
+  String album() const override;
+  String comment() const override;
+  String genre() const override;
+  unsigned int year() const override;
+  unsigned int track() const override;
 
-      virtual void setTitle(const String &s);
-      virtual void setArtist(const String &s);
-      virtual void setAlbum(const String &s);
-      virtual void setComment(const String &s);
-      virtual void setGenre(const String &s);
-      virtual void setYear(unsigned int i);
-      virtual void setTrack(unsigned int i);
+  /**
+   * @brief pictures
+   * According to :
+   * http://www.hydrogenaud.io/forums/index.php?showtopic=40603&st=50&p=504669&#entry504669
+   * http://git.videolan.org/?p=vlc.git;a=blob;f=modules/meta_engine/taglib.cpp
+   * @return
+   */
+  PictureMap pictures() const override;
+
+  void setTitle(const String &s) override;
+  void setArtist(const String &s) override;
+  void setAlbum(const String &s) override;
+  void setComment(const String &s) override;
+  void setGenre(const String &s) override;
+  void setYear(unsigned int i) override;
+  void setTrack(unsigned int i) override;
+  void setPictures(const PictureMap &l) override;
 
   /*!
    * Implements the unified tag dictionary interface -- export function.
    * APE tags are perfectly compatible with the dictionary interface because they
-       * support both arbitrary tag names and multiple values. Currently only
-       * APE items of type *Text* are handled by the dictionary interface; all *Binary*
+   * support both arbitrary tag names and multiple values.
+   * Currently only APE items of type *Text* are handled by the dictionary interface; all *Binary*
    * and *Locator* items will be put into the unsupportedData list and can be
-       * deleted on request using removeUnsupportedProperties(). The same happens
-       * to Text items if their key is invalid for PropertyMap (which should actually
-       * never happen).
+   * deleted on request using removeUnsupportedProperties().
+   * The same happens to Text items if their key is invalid for PropertyMap (which should actually never happen).
    *
    * The only conversion done by this export function is to rename the APE tags
-       * TRACK to TRACKNUMBER, YEAR to DATE, and ALBUM ARTIST to ALBUMARTIST, respectively,
-       * in order to be compliant with the names used in other formats.
+   * TRACK to TRACKNUMBER, YEAR to DATE, and ALBUM ARTIST to ALBUMARTIST,
+   * respectively, in order to be compliant with the names used in other formats.
    */
-      PropertyMap properties() const;
+  PropertyMap properties() const override;
 
-      void removeUnsupportedProperties(const StringList &properties);
+  void removeUnsupportedProperties(const StringList &properties) override;
 
   /*!
-       * Implements the unified tag dictionary interface -- import function. The same
-       * comments as for the export function apply; additionally note that the APE tag
+   * Implements the unified tag dictionary interface -- import function.
+   * The same comments as for the export function apply; additionally note that the APE tag
    * specification requires keys to have between 2 and 16 printable ASCII characters
    * with the exception of the fixed strings "ID3", "TAG", "OGGS", and "MP+".
    */
-      PropertyMap setProperties(const PropertyMap &);
+  PropertyMap setProperties(const PropertyMap &) override;
 
   /*!
    * Check if the given String is a valid APE tag key.
@@ -140,8 +150,8 @@ namespace TagLib {
   Footer *footer() const;
 
   /*!
-       * Returns a reference to the item list map.  This is an ItemListMap of
-       * all of the items in the tag.
+   * Returns a reference to the item list map.
+   * This is an ItemListMap of all of the items in the tag.
    *
    * This is the most powerful structure for accessing the items of the tag.
    *
@@ -159,32 +169,29 @@ namespace TagLib {
   void removeItem(const String &key);
 
   /*!
-       * Adds to the text item specified by \a key the data \a value.  If \a replace
-       * is true, then all of the other values on the same key will be removed
-       * first.  If a binary item exists for \a key it will be removed first.
+   * Adds to the text item specified by \a key the data \a value.
+   * If \a replace is true, then all of the other values on the same key will be removed first.
+   * If a binary item exists for \a key it will be removed first.
    */
   void addValue(const String &key, const String &value, bool replace = true);
 
   /*!
   * Set the binary data for the key specified by \a item to \a value
-      * This will convert the item to type \a Binary if it isn't already and
-      * all of the other values on the same key will be removed.
+  * This will convert the item to type \a Binary if it isn't already and all of the other values on the same key will be removed.
   */
   void setData(const String &key, const ByteVector &value);
 
   /*!
-       * Sets the \a key item to the value of \a item. If an item with the \a key is already
-       * present, it will be replaced.
+   * Sets the \a key item to the value of \a item. If an item with the \a key is already present, it will be replaced.
    */
   void setItem(const String &key, const Item &item);
 
   /*!
    * Returns true if the tag does not contain any data.
    */
-      bool isEmpty() const;
+  bool isEmpty() const override;
 
  protected:
-
   /*!
    * Reads from the file specified in the constructor.
    */
@@ -202,7 +209,8 @@ namespace TagLib {
   class TagPrivate;
   TagPrivate *d;
 };
-  }
-}
+}  // namespace APE
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/asf/asfattribute.cpp

@@ -23,25 +23,22 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <taglib.h>
-#include <tdebug.h>
-#include <trefcounter.h>
+#include <memory>
+
+#include "taglib.h"
+#include "tdebug.h"
 
 #include "asfattribute.h"
 #include "asffile.h"
 #include "asfutils.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
-class ASF::Attribute::AttributePrivate : public RefCounter
-{
-public:
-  AttributePrivate() :
-    pictureValue(ASF::Picture::fromInvalid()),
-    numericValue(0),
-    stream(0),
-    language(0) {}
-  AttributeTypes type;
+namespace {
+struct AttributeData {
+  explicit AttributeData() : numericValue(0), stream(0), language(0) {}
+
+  ASF::Attribute::AttributeTypes type;
   String stringValue;
   ByteVector byteVectorValue;
   ASF::Picture pictureValue;
@@ -49,143 +46,122 @@ public:
   int stream;
   int language;
 };
+}  // namespace
+
+class ASF::Attribute::AttributePrivate {
+ public:
+  AttributePrivate() : data(new AttributeData()) {
+    data->pictureValue = ASF::Picture::fromInvalid();
+  }
+
+  std::shared_ptr<AttributeData> data;
+};
 
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-ASF::Attribute::Attribute() :
-  d(new AttributePrivate())
-{
-  d->type = UnicodeType;
+ASF::Attribute::Attribute() : d(new AttributePrivate()) {
+  d->data->type = UnicodeType;
 }
 
-ASF::Attribute::Attribute(const ASF::Attribute &other) :
-  d(other.d)
-{
-  d->ref();
+ASF::Attribute::Attribute(const ASF::Attribute &other) : d(new AttributePrivate(*other.d)) {}
+
+ASF::Attribute::Attribute(const String &value) : d(new AttributePrivate()) {
+  d->data->type = UnicodeType;
+  d->data->stringValue = value;
 }
 
-ASF::Attribute::Attribute(const String &value) :
-  d(new AttributePrivate())
-{
-  d->type = UnicodeType;
-  d->stringValue = value;
+ASF::Attribute::Attribute(const ByteVector &value) : d(new AttributePrivate()) {
+  d->data->type = BytesType;
+  d->data->byteVectorValue = value;
 }
 
-ASF::Attribute::Attribute(const ByteVector &value) :
-  d(new AttributePrivate())
-{
-  d->type = BytesType;
-  d->byteVectorValue = value;
+ASF::Attribute::Attribute(const ASF::Picture &value) : d(new AttributePrivate()) {
+  d->data->type = BytesType;
+  d->data->pictureValue = value;
 }
 
-ASF::Attribute::Attribute(const ASF::Picture &value) :
-  d(new AttributePrivate())
-{
-  d->type = BytesType;
-  d->pictureValue = value;
+ASF::Attribute::Attribute(unsigned int value) : d(new AttributePrivate()) {
+  d->data->type = DWordType;
+  d->data->numericValue = value;
 }
 
-ASF::Attribute::Attribute(unsigned int value) :
-  d(new AttributePrivate())
-{
-  d->type = DWordType;
-  d->numericValue = value;
+ASF::Attribute::Attribute(unsigned long long value) : d(new AttributePrivate()) {
+  d->data->type = QWordType;
+  d->data->numericValue = value;
 }
 
-ASF::Attribute::Attribute(unsigned long long value) :
-  d(new AttributePrivate())
-{
-  d->type = QWordType;
-  d->numericValue = value;
+ASF::Attribute::Attribute(unsigned short value) : d(new AttributePrivate()) {
+  d->data->type = WordType;
+  d->data->numericValue = value;
 }
 
-ASF::Attribute::Attribute(unsigned short value) :
-  d(new AttributePrivate())
-{
-  d->type = WordType;
-  d->numericValue = value;
+ASF::Attribute::Attribute(bool value) : d(new AttributePrivate()) {
+  d->data->type = BoolType;
+  d->data->numericValue = value;
 }
 
-ASF::Attribute::Attribute(bool value) :
-  d(new AttributePrivate())
-{
-  d->type = BoolType;
-  d->numericValue = value;
-}
-
-ASF::Attribute &ASF::Attribute::operator=(const ASF::Attribute &other)
-{
+ASF::Attribute &ASF::Attribute::operator=(const ASF::Attribute &other) {
   Attribute(other).swap(*this);
   return *this;
 }
 
-void ASF::Attribute::swap(Attribute &other)
-{
+void ASF::Attribute::swap(Attribute &other) {
   using std::swap;
 
   swap(d, other.d);
 }
 
-ASF::Attribute::~Attribute()
-{
-  if(d->deref())
+ASF::Attribute::~Attribute() {
   delete d;
 }
 
-ASF::Attribute::AttributeTypes ASF::Attribute::type() const
-{
-  return d->type;
+ASF::Attribute::AttributeTypes ASF::Attribute::type() const {
+  return d->data->type;
 }
 
-String ASF::Attribute::toString() const
-{
-  return d->stringValue;
+String ASF::Attribute::toString() const {
+  return d->data->stringValue;
 }
 
-ByteVector ASF::Attribute::toByteVector() const
-{
-  if(d->pictureValue.isValid())
-    return d->pictureValue.render();
-  return d->byteVectorValue;
+ByteVector ASF::Attribute::toByteVector() const {
+  if (d->data->pictureValue.isValid())
+    return d->data->pictureValue.render();
+
+  return d->data->byteVectorValue;
 }
 
-unsigned short ASF::Attribute::toBool() const
-{
-  return d->numericValue ? 1 : 0;
+unsigned short ASF::Attribute::toBool() const {
+  return d->data->numericValue ? 1 : 0;
 }
 
-unsigned short ASF::Attribute::toUShort() const
-{
-  return static_cast<unsigned short>(d->numericValue);
+unsigned short ASF::Attribute::toUShort() const {
+  return static_cast<unsigned short>(d->data->numericValue);
 }
 
-unsigned int ASF::Attribute::toUInt() const
-{
-  return static_cast<unsigned int>(d->numericValue);
+unsigned int ASF::Attribute::toUInt() const {
+  return static_cast<unsigned int>(d->data->numericValue);
 }
 
-unsigned long long ASF::Attribute::toULongLong() const
-{
-  return static_cast<unsigned long long>(d->numericValue);
+unsigned long long ASF::Attribute::toULongLong() const {
+  return static_cast<unsigned long long>(d->data->numericValue);
 }
 
-ASF::Picture ASF::Attribute::toPicture() const
-{
-  return d->pictureValue;
+ASF::Picture ASF::Attribute::toPicture() const {
+  return d->data->pictureValue;
 }
 
-String ASF::Attribute::parse(ASF::File &f, int kind)
-{
+String ASF::Attribute::parse(ASF::File &f, int kind) {
+
   unsigned int size, nameLength;
   String name;
-  d->pictureValue = Picture::fromInvalid();
+  d->data->pictureValue = Picture::fromInvalid();
   // extended content descriptor
   if (kind == 0) {
     nameLength = readWORD(&f);
     name = readString(&f, nameLength);
-    d->type = ASF::Attribute::AttributeTypes(readWORD(&f));
+    d->data->type = ASF::Attribute::AttributeTypes(readWORD(&f));
     size = readWORD(&f);
   }
   // metadata & metadata library
@@ -193,11 +169,11 @@ String ASF::Attribute::parse(ASF::File &f, int kind)
     int temp = readWORD(&f);
     // metadata library
     if (kind == 2) {
-      d->language = temp;
+      d->data->language = temp;
     }
-    d->stream = readWORD(&f);
+    d->data->stream = readWORD(&f);
     nameLength = readWORD(&f);
-    d->type = ASF::Attribute::AttributeTypes(readWORD(&f));
+    d->data->type = ASF::Attribute::AttributeTypes(readWORD(&f));
     size = readDWORD(&f);
     name = readString(&f, nameLength);
   }
@@ -206,51 +182,52 @@ String ASF::Attribute::parse(ASF::File &f, int kind)
     debug("ASF::Attribute::parse() -- Value larger than 64kB");
   }
 
-  switch(d->type) {
+  switch (d->data->type) {
     case WordType:
-    d->numericValue = readWORD(&f);
+      d->data->numericValue = readWORD(&f);
       break;
 
     case BoolType:
       if (kind == 0) {
-      d->numericValue = (readDWORD(&f) != 0);
+        d->data->numericValue = (readDWORD(&f) != 0);
       }
       else {
-      d->numericValue = (readWORD(&f) != 0);
+        d->data->numericValue = (readWORD(&f) != 0);
       }
       break;
 
     case DWordType:
-    d->numericValue = readDWORD(&f);
+      d->data->numericValue = readDWORD(&f);
       break;
 
     case QWordType:
-    d->numericValue = readQWORD(&f);
+      d->data->numericValue = readQWORD(&f);
       break;
 
     case UnicodeType:
-    d->stringValue = readString(&f, size);
+      d->data->stringValue = readString(&f, size);
       break;
 
     case BytesType:
     case GuidType:
-    d->byteVectorValue = f.readBlock(size);
+      d->data->byteVectorValue = f.readBlock(size);
       break;
   }
 
-  if(d->type == BytesType && name == "WM/Picture") {
-    d->pictureValue.parse(d->byteVectorValue);
-    if(d->pictureValue.isValid()) {
-      d->byteVectorValue.clear();
+  if (d->data->type == BytesType && name == "WM/Picture") {
+    d->data->pictureValue.parse(d->data->byteVectorValue);
+    if (d->data->pictureValue.isValid()) {
+      d->data->byteVectorValue.clear();
     }
   }
 
   return name;
+
 }
 
-int ASF::Attribute::dataSize() const
-{
-  switch (d->type) {
+int ASF::Attribute::dataSize() const {
+
+  switch (d->data->type) {
     case WordType:
       return 2;
     case BoolType:
@@ -260,92 +237,92 @@ int ASF::Attribute::dataSize() const
     case QWordType:
       return 5;
     case UnicodeType:
-    return d->stringValue.size() * 2 + 2;
+      return static_cast<int>(d->data->stringValue.size() * 2 + 2);
     case BytesType:
-    if(d->pictureValue.isValid())
-      return d->pictureValue.dataSize();
+      if (d->data->pictureValue.isValid())
+        return d->data->pictureValue.dataSize();
+      break;
     case GuidType:
-    return d->byteVectorValue.size();
+      return static_cast<int>(d->data->byteVectorValue.size());
   }
   return 0;
+
 }
 
-ByteVector ASF::Attribute::render(const String &name, int kind) const
-{
+ByteVector ASF::Attribute::render(const String &name, int kind) const {
+
   ByteVector data;
 
-  switch (d->type) {
+  switch (d->data->type) {
     case WordType:
-    data.append(ByteVector::fromShort(toUShort(), false));
+      data.append(ByteVector::fromUInt16LE(toUShort()));
       break;
 
     case BoolType:
       if (kind == 0) {
-      data.append(ByteVector::fromUInt(toBool(), false));
+        data.append(ByteVector::fromUInt32LE(toBool()));
       }
       else {
-      data.append(ByteVector::fromShort(toBool(), false));
+        data.append(ByteVector::fromUInt16LE(toBool()));
       }
       break;
 
     case DWordType:
-    data.append(ByteVector::fromUInt(toUInt(), false));
+      data.append(ByteVector::fromUInt32LE(toUInt()));
       break;
 
     case QWordType:
-    data.append(ByteVector::fromLongLong(toULongLong(), false));
+      data.append(ByteVector::fromUInt64LE(toULongLong()));
       break;
 
     case UnicodeType:
-    data.append(renderString(d->stringValue));
+      data.append(renderString(d->data->stringValue));
       break;
 
     case BytesType:
-    if(d->pictureValue.isValid()) {
-      data.append(d->pictureValue.render());
+      if (d->data->pictureValue.isValid()) {
+        data.append(d->data->pictureValue.render());
         break;
       }
+      break;
     case GuidType:
-    data.append(d->byteVectorValue);
+      data.append(d->data->byteVectorValue);
       break;
   }
 
   if (kind == 0) {
     data = renderString(name, true) +
-           ByteVector::fromShort((int)d->type, false) +
-           ByteVector::fromShort(data.size(), false) +
+      ByteVector::fromUInt16LE((int)d->data->type) +
+      ByteVector::fromUInt16LE(data.size()) +
       data;
   }
   else {
     ByteVector nameData = renderString(name);
-    data = ByteVector::fromShort(kind == 2 ? d->language : 0, false) +
-           ByteVector::fromShort(d->stream, false) +
-           ByteVector::fromShort(nameData.size(), false) +
-           ByteVector::fromShort((int)d->type, false) +
-           ByteVector::fromUInt(data.size(), false) +
+    data = ByteVector::fromUInt16LE(kind == 2 ? d->data->language : 0) +
+      ByteVector::fromUInt16LE(d->data->stream) +
+      ByteVector::fromUInt16LE(nameData.size()) +
+      ByteVector::fromUInt16LE(static_cast<int>(d->data->type)) +
+      ByteVector::fromUInt32LE(data.size()) +
       nameData +
       data;
   }
 
   return data;
+
 }
 
-int ASF::Attribute::language() const
-{
-  return d->language;
+int ASF::Attribute::language() const {
+  return d->data->language;
 }
 
-void ASF::Attribute::setLanguage(int value)
-{
-  d->language = value;
+void ASF::Attribute::setLanguage(int value) {
+  d->data->language = value;
 }
 
-int ASF::Attribute::stream() const
-{
-  return d->stream;
+int ASF::Attribute::stream() const {
+  return d->data->stream;
 }
 
-void ASF::Attribute::setStream(int value)
-{
-  d->stream = value;
+void ASF::Attribute::setStream(int value) {
+  d->data->stream = value;
 }

3rdparty/taglib/asf/asfattribute.h

@@ -31,19 +31,15 @@
 #include "taglib_export.h"
 #include "asfpicture.h"
 
-namespace TagLib
-{
-
-  namespace ASF
-  {
+namespace Strawberry_TagLib {
+namespace TagLib {
+namespace ASF {
 
 class File;
 class Picture;
 
-    class TAGLIB_EXPORT Attribute
-    {
+class TAGLIB_EXPORT Attribute {
  public:
-
   /*!
    * Enum of types an Attribute can have.
    */
@@ -108,7 +104,7 @@ namespace TagLib
   /*!
    * Construct an attribute as a copy of \a other.
    */
-      Attribute(const Attribute &item);
+  Attribute(const Attribute &other);
 
   /*!
    * Copies the contents of \a other into this item.
@@ -185,24 +181,20 @@ namespace TagLib
    */
   void setStream(int value);
 
-#ifndef DO_NOT_DOCUMENT
-      /* THIS IS PRIVATE, DON'T TOUCH IT! */
-      String parse(ASF::File &file, int kind = 0);
-#endif
-
   //! Returns the size of the stored data
   int dataSize() const;
 
  private:
   friend class File;
 
+  String parse(ASF::File &file, int kind = 0);
   ByteVector render(const String &name, int kind = 0) const;
 
   class AttributePrivate;
   AttributePrivate *d;
 };
-  }
-
-}
+}  // namespace ASF
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/asf/asffile.cpp

@@ -23,21 +23,22 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tbytevectorlist.h>
-#include <tpropertymap.h>
-#include <tstring.h>
-#include <tagutils.h>
+#include <memory>
+
+#include "tdebug.h"
+#include "tbytevectorlist.h"
+#include "tpropertymap.h"
+#include "tstring.h"
+#include "tagutils.h"
 
 #include "asffile.h"
 #include "asftag.h"
 #include "asfproperties.h"
 #include "asfutils.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
-class ASF::File::FilePrivate
-{
+class ASF::File::FilePrivate {
  public:
   class BaseObject;
   class UnknownObject;
@@ -50,41 +51,26 @@ public:
   class MetadataObject;
   class MetadataLibraryObject;
 
-  FilePrivate():
-    headerSize(0),
-    tag(0),
-    properties(0),
-    contentDescriptionObject(0),
-    extendedContentDescriptionObject(0),
-    headerExtensionObject(0),
-    metadataObject(0),
-    metadataLibraryObject(0)
-  {
-    objects.setAutoDelete(true);
-  }
+  typedef List<std::shared_ptr<BaseObject>> ObjectList;
+  typedef ObjectList::ConstIterator ObjectConstIterator;
 
-  ~FilePrivate()
-  {
-    delete tag;
-    delete properties;
-  }
+  FilePrivate() : headerSize(0) {}
 
   unsigned long long headerSize;
 
-  ASF::Tag *tag;
-  ASF::Properties *properties;
+  std::unique_ptr<ASF::Tag> tag;
+  std::unique_ptr<ASF::AudioProperties> properties;
 
-  List<BaseObject *> objects;
+  ObjectList objects;
 
-  ContentDescriptionObject         *contentDescriptionObject;
-  ExtendedContentDescriptionObject *extendedContentDescriptionObject;
-  HeaderExtensionObject            *headerExtensionObject;
-  MetadataObject                   *metadataObject;
-  MetadataLibraryObject            *metadataLibraryObject;
+  std::shared_ptr<ContentDescriptionObject> contentDescriptionObject;
+  std::shared_ptr<ExtendedContentDescriptionObject> extendedContentDescriptionObject;
+  std::shared_ptr<HeaderExtensionObject> headerExtensionObject;
+  std::shared_ptr<MetadataObject> metadataObject;
+  std::shared_ptr<MetadataLibraryObject> metadataLibraryObject;
 };
 
-namespace
-{
+namespace {
 const ByteVector headerGuid("\x30\x26\xB2\x75\x8E\x66\xCF\x11\xA6\xD9\x00\xAA\x00\x62\xCE\x6C", 16);
 const ByteVector filePropertiesGuid("\xA1\xDC\xAB\x8C\x47\xA9\xCF\x11\x8E\xE4\x00\xC0\x0C\x20\x53\x65", 16);
 const ByteVector streamPropertiesGuid("\x91\x07\xDC\xB7\xB7\xA9\xCF\x11\x8E\xE6\x00\xC0\x0C\x20\x53\x65", 16);
@@ -97,10 +83,9 @@ namespace
 const ByteVector contentEncryptionGuid("\xFB\xB3\x11\x22\x23\xBD\xD2\x11\xB4\xB7\x00\xA0\xC9\x55\xFC\x6E", 16);
 const ByteVector extendedContentEncryptionGuid("\x14\xE6\x8A\x29\x22\x26 \x17\x4C\xB9\x35\xDA\xE0\x7E\xE9\x28\x9C", 16);
 const ByteVector advancedContentEncryptionGuid("\xB6\x9B\x07\x7A\xA4\xDA\x12\x4E\xA5\xCA\x91\xD3\x8D\xC1\x1A\x8D", 16);
-}
+}  // namespace
 
-class ASF::File::FilePrivate::BaseObject
-{
+class ASF::File::FilePrivate::BaseObject {
  public:
   ByteVector data;
   virtual ~BaseObject() {}
@@ -109,156 +94,143 @@ public:
   virtual ByteVector render(ASF::File *file);
 };
 
-class ASF::File::FilePrivate::UnknownObject : public ASF::File::FilePrivate::BaseObject
-{
+class ASF::File::FilePrivate::UnknownObject : public ASF::File::FilePrivate::BaseObject {
   ByteVector myGuid;
+
  public:
-  UnknownObject(const ByteVector &guid);
-  ByteVector guid() const;
+  explicit UnknownObject(const ByteVector &guid);
+  ByteVector guid() const override;
 };
 
-class ASF::File::FilePrivate::FilePropertiesObject : public ASF::File::FilePrivate::BaseObject
-{
+class ASF::File::FilePrivate::FilePropertiesObject : public ASF::File::FilePrivate::BaseObject {
  public:
-  ByteVector guid() const;
-  void parse(ASF::File *file, unsigned int size);
+  ByteVector guid() const override;
+  void parse(ASF::File *file, unsigned int size) override;
 };
 
-class ASF::File::FilePrivate::StreamPropertiesObject : public ASF::File::FilePrivate::BaseObject
-{
+class ASF::File::FilePrivate::StreamPropertiesObject : public ASF::File::FilePrivate::BaseObject {
  public:
-  ByteVector guid() const;
-  void parse(ASF::File *file, unsigned int size);
+  ByteVector guid() const override;
+  void parse(ASF::File *file, unsigned int size) override;
 };
 
-class ASF::File::FilePrivate::ContentDescriptionObject : public ASF::File::FilePrivate::BaseObject
-{
+class ASF::File::FilePrivate::ContentDescriptionObject : public ASF::File::FilePrivate::BaseObject {
  public:
-  ByteVector guid() const;
-  void parse(ASF::File *file, unsigned int size);
-  ByteVector render(ASF::File *file);
+  ByteVector guid() const override;
+  void parse(ASF::File *file, unsigned int size) override;
+  ByteVector render(ASF::File *file) override;
 };
 
-class ASF::File::FilePrivate::ExtendedContentDescriptionObject : public ASF::File::FilePrivate::BaseObject
-{
+class ASF::File::FilePrivate::ExtendedContentDescriptionObject : public ASF::File::FilePrivate::BaseObject {
  public:
   ByteVectorList attributeData;
-  ByteVector guid() const;
-  void parse(ASF::File *file, unsigned int size);
-  ByteVector render(ASF::File *file);
+  ByteVector guid() const override;
+  void parse(ASF::File *file, unsigned int size) override;
+  ByteVector render(ASF::File *file) override;
 };
 
-class ASF::File::FilePrivate::MetadataObject : public ASF::File::FilePrivate::BaseObject
-{
+class ASF::File::FilePrivate::MetadataObject : public ASF::File::FilePrivate::BaseObject {
  public:
   ByteVectorList attributeData;
-  ByteVector guid() const;
-  void parse(ASF::File *file, unsigned int size);
-  ByteVector render(ASF::File *file);
+  ByteVector guid() const override;
+  void parse(ASF::File *file, unsigned int size) override;
+  ByteVector render(ASF::File *file) override;
 };
 
-class ASF::File::FilePrivate::MetadataLibraryObject : public ASF::File::FilePrivate::BaseObject
-{
+class ASF::File::FilePrivate::MetadataLibraryObject : public ASF::File::FilePrivate::BaseObject {
  public:
   ByteVectorList attributeData;
-  ByteVector guid() const;
-  void parse(ASF::File *file, unsigned int size);
-  ByteVector render(ASF::File *file);
+  ByteVector guid() const override;
+  void parse(ASF::File *file, unsigned int size) override;
+  ByteVector render(ASF::File *file) override;
 };
 
-class ASF::File::FilePrivate::HeaderExtensionObject : public ASF::File::FilePrivate::BaseObject
-{
+class ASF::File::FilePrivate::HeaderExtensionObject : public ASF::File::FilePrivate::BaseObject {
  public:
-  List<ASF::File::FilePrivate::BaseObject *> objects;
+  ObjectList objects;
   HeaderExtensionObject();
-  ByteVector guid() const;
-  void parse(ASF::File *file, unsigned int size);
-  ByteVector render(ASF::File *file);
+  ByteVector guid() const override;
+  void parse(ASF::File *file, unsigned int size) override;
+  ByteVector render(ASF::File *file) override;
 };
 
-class ASF::File::FilePrivate::CodecListObject : public ASF::File::FilePrivate::BaseObject
-{
+class ASF::File::FilePrivate::CodecListObject : public ASF::File::FilePrivate::BaseObject {
  public:
-  ByteVector guid() const;
-  void parse(ASF::File *file, unsigned int size);
+  ByteVector guid() const override;
+  void parse(ASF::File *file, unsigned int size) override;
 
  private:
-  enum CodecType
-  {
+  enum CodecType {
     Video = 0x0001,
     Audio = 0x0002,
     Unknown = 0xFFFF
   };
 };
 
-void ASF::File::FilePrivate::BaseObject::parse(ASF::File *file, unsigned int size)
-{
+void ASF::File::FilePrivate::BaseObject::parse(ASF::File *file, unsigned int size) {
+
   data.clear();
-  if(size > 24 && size <= (unsigned int)(file->length()))
+  if (size > 24 && static_cast<long long>(size) <= file->length())
     data = file->readBlock(size - 24);
   else
     data = ByteVector();
+
 }
 
-ByteVector ASF::File::FilePrivate::BaseObject::render(ASF::File * /*file*/)
-{
-  return guid() + ByteVector::fromLongLong(data.size() + 24, false) + data;
+ByteVector ASF::File::FilePrivate::BaseObject::render(ASF::File * /*file*/) {
+  return guid() + ByteVector::fromUInt64LE(data.size() + 24) + data;
 }
 
-ASF::File::FilePrivate::UnknownObject::UnknownObject(const ByteVector &guid) : myGuid(guid)
-{
-}
+ASF::File::FilePrivate::UnknownObject::UnknownObject(const ByteVector &guid) : myGuid(guid) {}
 
-ByteVector ASF::File::FilePrivate::UnknownObject::guid() const
-{
+ByteVector ASF::File::FilePrivate::UnknownObject::guid() const {
   return myGuid;
 }
 
-ByteVector ASF::File::FilePrivate::FilePropertiesObject::guid() const
-{
+ByteVector ASF::File::FilePrivate::FilePropertiesObject::guid() const {
   return filePropertiesGuid;
 }
 
-void ASF::File::FilePrivate::FilePropertiesObject::parse(ASF::File *file, unsigned int size)
-{
+void ASF::File::FilePrivate::FilePropertiesObject::parse(ASF::File *file, unsigned int size) {
+
   BaseObject::parse(file, size);
   if (data.size() < 64) {
     debug("ASF::File::FilePrivate::FilePropertiesObject::parse() -- data is too short.");
     return;
   }
 
-  const long long duration = data.toLongLong(40, false);
-  const long long preroll  = data.toLongLong(56, false);
+  const long long duration = data.toInt64LE(40);
+  const long long preroll = data.toInt64LE(56);
   file->d->properties->setLengthInMilliseconds(static_cast<int>(duration / 10000.0 - preroll + 0.5));
+
 }
 
-ByteVector ASF::File::FilePrivate::StreamPropertiesObject::guid() const
-{
+ByteVector ASF::File::FilePrivate::StreamPropertiesObject::guid() const {
   return streamPropertiesGuid;
 }
 
-void ASF::File::FilePrivate::StreamPropertiesObject::parse(ASF::File *file, unsigned int size)
-{
+void ASF::File::FilePrivate::StreamPropertiesObject::parse(ASF::File *file, unsigned int size) {
+
   BaseObject::parse(file, size);
   if (data.size() < 70) {
     debug("ASF::File::FilePrivate::StreamPropertiesObject::parse() -- data is too short.");
     return;
   }
 
-  file->d->properties->setCodec(data.toUShort(54, false));
-  file->d->properties->setChannels(data.toUShort(56, false));
-  file->d->properties->setSampleRate(data.toUInt(58, false));
-  file->d->properties->setBitrate(static_cast<int>(data.toUInt(62, false) * 8.0 / 1000.0 + 0.5));
-  file->d->properties->setBitsPerSample(data.toUShort(68, false));
+  file->d->properties->setCodec(data.toUInt16LE(54));
+  file->d->properties->setChannels(data.toUInt16LE(56));
+  file->d->properties->setSampleRate(data.toUInt32LE(58));
+  file->d->properties->setBitrate(static_cast<int>(data.toUInt32LE(62) * 8.0 / 1000.0 + 0.5));
+  file->d->properties->setBitsPerSample(data.toUInt16LE(68));
+
 }
 
-ByteVector ASF::File::FilePrivate::ContentDescriptionObject::guid() const
-{
+ByteVector ASF::File::FilePrivate::ContentDescriptionObject::guid() const {
   return contentDescriptionGuid;
 }
 
-void ASF::File::FilePrivate::ContentDescriptionObject::parse(ASF::File *file, unsigned int /*size*/)
-{
+void ASF::File::FilePrivate::ContentDescriptionObject::parse(ASF::File *file, unsigned int /*size*/) {
+
   const int titleLength = readWORD(file);
   const int artistLength = readWORD(file);
   const int copyrightLength = readWORD(file);
@@ -269,110 +241,113 @@ void ASF::File::FilePrivate::ContentDescriptionObject::parse(ASF::File *file, un
   file->d->tag->setCopyright(readString(file, copyrightLength));
   file->d->tag->setComment(readString(file, commentLength));
   file->d->tag->setRating(readString(file, ratingLength));
+
 }
 
-ByteVector ASF::File::FilePrivate::ContentDescriptionObject::render(ASF::File *file)
-{
+ByteVector ASF::File::FilePrivate::ContentDescriptionObject::render(ASF::File *file) {
+
   const ByteVector v1 = renderString(file->d->tag->title());
   const ByteVector v2 = renderString(file->d->tag->artist());
   const ByteVector v3 = renderString(file->d->tag->copyright());
   const ByteVector v4 = renderString(file->d->tag->comment());
   const ByteVector v5 = renderString(file->d->tag->rating());
   data.clear();
-  data.append(ByteVector::fromShort(v1.size(), false));
-  data.append(ByteVector::fromShort(v2.size(), false));
-  data.append(ByteVector::fromShort(v3.size(), false));
-  data.append(ByteVector::fromShort(v4.size(), false));
-  data.append(ByteVector::fromShort(v5.size(), false));
+  data.append(ByteVector::fromUInt16LE(v1.size()));
+  data.append(ByteVector::fromUInt16LE(v2.size()));
+  data.append(ByteVector::fromUInt16LE(v3.size()));
+  data.append(ByteVector::fromUInt16LE(v4.size()));
+  data.append(ByteVector::fromUInt16LE(v5.size()));
   data.append(v1);
   data.append(v2);
   data.append(v3);
   data.append(v4);
   data.append(v5);
   return BaseObject::render(file);
+
 }
 
-ByteVector ASF::File::FilePrivate::ExtendedContentDescriptionObject::guid() const
-{
+ByteVector ASF::File::FilePrivate::ExtendedContentDescriptionObject::guid() const {
   return extendedContentDescriptionGuid;
 }
 
-void ASF::File::FilePrivate::ExtendedContentDescriptionObject::parse(ASF::File *file, unsigned int /*size*/)
-{
+void ASF::File::FilePrivate::ExtendedContentDescriptionObject::parse(ASF::File *file, unsigned int /*size*/) {
+
   int count = readWORD(file);
   while (count--) {
     ASF::Attribute attribute;
     String name = attribute.parse(*file);
     file->d->tag->addAttribute(name, attribute);
   }
+
 }
 
-ByteVector ASF::File::FilePrivate::ExtendedContentDescriptionObject::render(ASF::File *file)
-{
+ByteVector ASF::File::FilePrivate::ExtendedContentDescriptionObject::render(ASF::File *file) {
+
   data.clear();
-  data.append(ByteVector::fromShort(attributeData.size(), false));
+  data.append(ByteVector::fromUInt16LE(attributeData.size()));
   data.append(attributeData.toByteVector(""));
   return BaseObject::render(file);
+
 }
 
-ByteVector ASF::File::FilePrivate::MetadataObject::guid() const
-{
+ByteVector ASF::File::FilePrivate::MetadataObject::guid() const {
   return metadataGuid;
 }
 
-void ASF::File::FilePrivate::MetadataObject::parse(ASF::File *file, unsigned int /*size*/)
-{
+void ASF::File::FilePrivate::MetadataObject::parse(ASF::File *file, unsigned int /*size*/) {
+
   int count = readWORD(file);
   while (count--) {
     ASF::Attribute attribute;
     String name = attribute.parse(*file, 1);
     file->d->tag->addAttribute(name, attribute);
   }
+
 }
 
-ByteVector ASF::File::FilePrivate::MetadataObject::render(ASF::File *file)
-{
+ByteVector ASF::File::FilePrivate::MetadataObject::render(ASF::File *file) {
+
   data.clear();
-  data.append(ByteVector::fromShort(attributeData.size(), false));
+  data.append(ByteVector::fromUInt16LE(attributeData.size()));
   data.append(attributeData.toByteVector(""));
   return BaseObject::render(file);
+
 }
 
-ByteVector ASF::File::FilePrivate::MetadataLibraryObject::guid() const
-{
+ByteVector ASF::File::FilePrivate::MetadataLibraryObject::guid() const {
   return metadataLibraryGuid;
 }
 
-void ASF::File::FilePrivate::MetadataLibraryObject::parse(ASF::File *file, unsigned int /*size*/)
-{
+void ASF::File::FilePrivate::MetadataLibraryObject::parse(ASF::File *file, unsigned int /*size*/) {
+
   int count = readWORD(file);
   while (count--) {
     ASF::Attribute attribute;
     String name = attribute.parse(*file, 2);
     file->d->tag->addAttribute(name, attribute);
   }
+
 }
 
-ByteVector ASF::File::FilePrivate::MetadataLibraryObject::render(ASF::File *file)
-{
+ByteVector ASF::File::FilePrivate::MetadataLibraryObject::render(ASF::File *file) {
+
   data.clear();
-  data.append(ByteVector::fromShort(attributeData.size(), false));
+  data.append(ByteVector::fromUInt16LE(attributeData.size()));
   data.append(attributeData.toByteVector(""));
   return BaseObject::render(file);
+
 }
 
-ASF::File::FilePrivate::HeaderExtensionObject::HeaderExtensionObject()
-{
+ASF::File::FilePrivate::HeaderExtensionObject::HeaderExtensionObject() {
   objects.setAutoDelete(true);
 }
 
-ByteVector ASF::File::FilePrivate::HeaderExtensionObject::guid() const
-{
+ByteVector ASF::File::FilePrivate::HeaderExtensionObject::guid() const {
   return headerExtensionGuid;
 }
 
-void ASF::File::FilePrivate::HeaderExtensionObject::parse(ASF::File *file, unsigned int /*size*/)
-{
+void ASF::File::FilePrivate::HeaderExtensionObject::parse(ASF::File *file, unsigned int /*size*/) {
+
   file->seek(18, File::Current);
   long long dataSize = readDWORD(file);
   long long dataPos = 0;
@@ -388,41 +363,42 @@ void ASF::File::FilePrivate::HeaderExtensionObject::parse(ASF::File *file, unsig
       file->setValid(false);
       break;
     }
-    BaseObject *obj;
+    std::shared_ptr<BaseObject> obj;
     if (guid == metadataGuid) {
-      file->d->metadataObject = new MetadataObject();
+      file->d->metadataObject.reset(new MetadataObject());
       obj = file->d->metadataObject;
     }
     else if (guid == metadataLibraryGuid) {
-      file->d->metadataLibraryObject = new MetadataLibraryObject();
+      file->d->metadataLibraryObject.reset(new MetadataLibraryObject());
       obj = file->d->metadataLibraryObject;
     }
     else {
-      obj = new UnknownObject(guid);
+      obj.reset(new UnknownObject(guid));
     }
-    obj->parse(file, (unsigned int)size);
+    obj->parse(file, static_cast<unsigned int>(size));
     objects.append(obj);
     dataPos += size;
   }
+
 }
 
-ByteVector ASF::File::FilePrivate::HeaderExtensionObject::render(ASF::File *file)
-{
+ByteVector ASF::File::FilePrivate::HeaderExtensionObject::render(ASF::File *file) {
+
   data.clear();
-  for(List<BaseObject *>::ConstIterator it = objects.begin(); it != objects.end(); ++it) {
+  for (ObjectConstIterator it = objects.begin(); it != objects.end(); ++it) {
     data.append((*it)->render(file));
   }
-  data = ByteVector("\x11\xD2\xD3\xAB\xBA\xA9\xcf\x11\x8E\xE6\x00\xC0\x0C\x20\x53\x65\x06\x00", 18) + ByteVector::fromUInt(data.size(), false) + data;
+  data = ByteVector("\x11\xD2\xD3\xAB\xBA\xA9\xcf\x11\x8E\xE6\x00\xC0\x0C\x20\x53\x65\x06\x00", 18) + ByteVector::fromUInt32LE(data.size()) + data;
   return BaseObject::render(file);
+
 }
 
-ByteVector ASF::File::FilePrivate::CodecListObject::guid() const
-{
+ByteVector ASF::File::FilePrivate::CodecListObject::guid() const {
   return codecListGuid;
 }
 
-void ASF::File::FilePrivate::CodecListObject::parse(ASF::File *file, unsigned int size)
-{
+void ASF::File::FilePrivate::CodecListObject::parse(ASF::File *file, unsigned int size) {
+
   BaseObject::parse(file, size);
   if (data.size() <= 20) {
     debug("ASF::File::FilePrivate::CodecListObject::parse() -- data is too short.");
@@ -431,7 +407,7 @@ void ASF::File::FilePrivate::CodecListObject::parse(ASF::File *file, unsigned in
 
   unsigned int pos = 16;
 
-  const int count = data.toUInt(pos, false);
+  const int count = data.toUInt32LE(pos);
   pos += 4;
 
   for (int i = 0; i < count; ++i) {
@@ -439,22 +415,22 @@ void ASF::File::FilePrivate::CodecListObject::parse(ASF::File *file, unsigned in
     if (pos >= data.size())
       break;
 
-    const CodecType type = static_cast<CodecType>(data.toUShort(pos, false));
+    const CodecType type = static_cast<CodecType>(data.toUInt16LE(pos));
     pos += 2;
 
-    int nameLength = data.toUShort(pos, false);
+    int nameLength = data.toUInt16LE(pos);
     pos += 2;
 
     const unsigned int namePos = pos;
     pos += nameLength * 2;
 
-    const int descLength = data.toUShort(pos, false);
+    const int descLength = data.toUInt16LE(pos);
     pos += 2;
 
     const unsigned int descPos = pos;
     pos += descLength * 2;
 
-    const int infoLength = data.toUShort(pos, false);
+    const int infoLength = data.toUInt16LE(pos);
     pos += 2 + infoLength * 2;
 
     if (type == CodecListObject::Audio) {
@@ -469,72 +445,50 @@ void ASF::File::FilePrivate::CodecListObject::parse(ASF::File *file, unsigned in
       break;
     }
   }
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // static members
 ////////////////////////////////////////////////////////////////////////////////
 
-bool ASF::File::isSupported(IOStream *stream)
-{
+bool ASF::File::isSupported(IOStream *stream) {
+
   // An ASF file has to start with the designated GUID.
 
   const ByteVector id = Utils::readHeader(stream, 16, false);
   return (id == headerGuid);
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-ASF::File::File(FileName file, bool, Properties::ReadStyle) :
-  TagLib::File(file),
-  d(new FilePrivate())
-{
+ASF::File::File(FileName file, bool, AudioProperties::ReadStyle) : Strawberry_TagLib::TagLib::File(file), d(new FilePrivate()) {
   if (isOpen())
     read();
 }
 
-ASF::File::File(IOStream *stream, bool, Properties::ReadStyle) :
-  TagLib::File(stream),
-  d(new FilePrivate())
-{
+ASF::File::File(IOStream *stream, bool, AudioProperties::ReadStyle) : Strawberry_TagLib::TagLib::File(stream), d(new FilePrivate()) {
   if (isOpen())
     read();
 }
 
-ASF::File::~File()
-{
+ASF::File::~File() {
   delete d;
 }
 
-ASF::Tag *ASF::File::tag() const
-{
-  return d->tag;
+ASF::Tag *ASF::File::tag() const {
+  return d->tag.get();
 }
 
-PropertyMap ASF::File::properties() const
-{
-  return d->tag->properties();
+ASF::AudioProperties *ASF::File::audioProperties() const {
+  return d->properties.get();
 }
 
-void ASF::File::removeUnsupportedProperties(const StringList &properties)
-{
-  d->tag->removeUnsupportedProperties(properties);
-}
+bool ASF::File::save() {
 
-PropertyMap ASF::File::setProperties(const PropertyMap &properties)
-{
-  return d->tag->setProperties(properties);
-}
-
-ASF::Properties *ASF::File::audioProperties() const
-{
-  return d->properties;
-}
-
-bool ASF::File::save()
-{
   if (readOnly()) {
     debug("ASF::File::save() -- File is read only.");
     return false;
@@ -546,23 +500,23 @@ bool ASF::File::save()
   }
 
   if (!d->contentDescriptionObject) {
-    d->contentDescriptionObject = new FilePrivate::ContentDescriptionObject();
+    d->contentDescriptionObject.reset(new FilePrivate::ContentDescriptionObject());
     d->objects.append(d->contentDescriptionObject);
   }
   if (!d->extendedContentDescriptionObject) {
-    d->extendedContentDescriptionObject = new FilePrivate::ExtendedContentDescriptionObject();
+    d->extendedContentDescriptionObject.reset(new FilePrivate::ExtendedContentDescriptionObject());
     d->objects.append(d->extendedContentDescriptionObject);
   }
   if (!d->headerExtensionObject) {
-    d->headerExtensionObject = new FilePrivate::HeaderExtensionObject();
+    d->headerExtensionObject.reset(new FilePrivate::HeaderExtensionObject());
     d->objects.append(d->headerExtensionObject);
   }
   if (!d->metadataObject) {
-    d->metadataObject = new FilePrivate::MetadataObject();
+    d->metadataObject.reset(new FilePrivate::MetadataObject());
     d->headerExtensionObject->objects.append(d->metadataObject);
   }
   if (!d->metadataLibraryObject) {
-    d->metadataLibraryObject = new FilePrivate::MetadataLibraryObject();
+    d->metadataLibraryObject.reset(new FilePrivate::MetadataLibraryObject());
     d->headerExtensionObject->objects.append(d->metadataLibraryObject);
   }
 
@@ -601,28 +555,29 @@ bool ASF::File::save()
   }
 
   ByteVector data;
-  for(List<FilePrivate::BaseObject *>::ConstIterator it = d->objects.begin(); it != d->objects.end(); ++it) {
+  for (FilePrivate::ObjectConstIterator it = d->objects.begin(); it != d->objects.end(); ++it) {
     data.append((*it)->render(this));
   }
 
   seek(16);
-  writeBlock(ByteVector::fromLongLong(data.size() + 30, false));
-  writeBlock(ByteVector::fromUInt(d->objects.size(), false));
+  writeBlock(ByteVector::fromUInt64LE(data.size() + 30));
+  writeBlock(ByteVector::fromUInt32LE(d->objects.size()));
   writeBlock(ByteVector("\x01\x02", 2));
 
-  insert(data, 30, static_cast<unsigned long>(d->headerSize - 30));
+  insert(data, 30, static_cast<size_t>(d->headerSize - 30));
 
   d->headerSize = data.size() + 30;
 
   return true;
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // private members
 ////////////////////////////////////////////////////////////////////////////////
 
-void ASF::File::read()
-{
+void ASF::File::read() {
+
   if (!isValid())
     return;
 
@@ -632,8 +587,8 @@ void ASF::File::read()
     return;
   }
 
-  d->tag = new ASF::Tag();
-  d->properties = new ASF::Properties();
+  d->tag.reset(new ASF::Tag());
+  d->properties.reset(new ASF::AudioProperties());
 
   bool ok;
   d->headerSize = readQWORD(this, &ok);
@@ -648,42 +603,42 @@ void ASF::File::read()
   }
   seek(2, Current);
 
-  FilePrivate::FilePropertiesObject   *filePropertiesObject   = 0;
-  FilePrivate::StreamPropertiesObject *streamPropertiesObject = 0;
+  std::shared_ptr<FilePrivate::FilePropertiesObject> filePropertiesObject;
+  std::shared_ptr<FilePrivate::StreamPropertiesObject> streamPropertiesObject;
   for (int i = 0; i < numObjects; i++) {
     const ByteVector guid = readBlock(16);
     if (guid.size() != 16) {
       setValid(false);
       break;
     }
-    long size = (long)readQWORD(this, &ok);
+    long size = static_cast<long>(readQWORD(this, &ok));
     if (!ok) {
       setValid(false);
       break;
     }
-    FilePrivate::BaseObject *obj;
+    std::shared_ptr<FilePrivate::BaseObject> obj;
     if (guid == filePropertiesGuid) {
-      filePropertiesObject = new FilePrivate::FilePropertiesObject();
+      filePropertiesObject.reset(new FilePrivate::FilePropertiesObject());
       obj = filePropertiesObject;
     }
     else if (guid == streamPropertiesGuid) {
-      streamPropertiesObject = new FilePrivate::StreamPropertiesObject();
+      streamPropertiesObject.reset(new FilePrivate::StreamPropertiesObject());
       obj = streamPropertiesObject;
     }
     else if (guid == contentDescriptionGuid) {
-      d->contentDescriptionObject = new FilePrivate::ContentDescriptionObject();
+      d->contentDescriptionObject.reset(new FilePrivate::ContentDescriptionObject());
       obj = d->contentDescriptionObject;
     }
     else if (guid == extendedContentDescriptionGuid) {
-      d->extendedContentDescriptionObject = new FilePrivate::ExtendedContentDescriptionObject();
+      d->extendedContentDescriptionObject.reset(new FilePrivate::ExtendedContentDescriptionObject());
       obj = d->extendedContentDescriptionObject;
     }
     else if (guid == headerExtensionGuid) {
-      d->headerExtensionObject = new FilePrivate::HeaderExtensionObject();
+      d->headerExtensionObject.reset(new FilePrivate::HeaderExtensionObject());
       obj = d->headerExtensionObject;
     }
     else if (guid == codecListGuid) {
-      obj = new FilePrivate::CodecListObject();
+      obj.reset(new FilePrivate::CodecListObject());
     }
     else {
       if (guid == contentEncryptionGuid ||
@@ -691,7 +646,7 @@ void ASF::File::read()
         guid == advancedContentEncryptionGuid) {
         d->properties->setEncrypted(true);
       }
-      obj = new FilePrivate::UnknownObject(guid);
+      obj.reset(new FilePrivate::UnknownObject(guid));
     }
     obj->parse(this, size);
     d->objects.append(obj);
@@ -702,4 +657,5 @@ void ASF::File::read()
     setValid(false);
     return;
   }
+
 }

3rdparty/taglib/asf/asffile.h

@@ -32,6 +32,7 @@
 #include "asfproperties.h"
 #include "asftag.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
 //! An implementation of ASF (WMA) metadata
@@ -43,10 +44,8 @@ namespace TagLib {
  * the abstract TagLib::File API as well as providing some additional
  * information specific to ASF files.
  */
-    class TAGLIB_EXPORT File : public TagLib::File
-    {
+class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File {
  public:
-
   /*!
    * Constructs an ASF file from \a file.
    *
@@ -54,8 +53,7 @@ namespace TagLib {
    * \a propertiesStyle are ignored.  The audio properties are always
    * read.
    */
-      File(FileName file, bool readProperties = true,
-           Properties::ReadStyle propertiesStyle = Properties::Average);
+  explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
 
   /*!
    * Constructs an ASF file from \a stream.
@@ -67,13 +65,12 @@ namespace TagLib {
    * \note TagLib will *not* take ownership of the stream, the caller is
    * responsible for deleting it after the File object.
    */
-      File(IOStream *stream, bool readProperties = true,
-           Properties::ReadStyle propertiesStyle = Properties::Average);
+  explicit File(IOStream *stream, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
 
   /*!
    * Destroys this instance of the File.
    */
-      virtual ~File();
+  ~File() override;
 
   /*!
    * Returns a pointer to the ASF tag of the file.
@@ -85,42 +82,24 @@ namespace TagLib {
    * deleted by the user.  It will be deleted when the file (object) is
    * destroyed.
    */
-      virtual Tag *tag() const;
-
-      /*!
-       * Implements the unified property interface -- export function.
-       */
-      PropertyMap properties() const;
-
-      /*!
-       * Removes unsupported properties. Forwards to the actual Tag's
-       * removeUnsupportedProperties() function.
-       */
-      void removeUnsupportedProperties(const StringList &properties);
-
-      /*!
-       * Implements the unified property interface -- import function.
-       */
-      PropertyMap setProperties(const PropertyMap &);
+  Tag *tag() const override;
 
   /*!
    * Returns the ASF audio properties for this file.
    */
-      virtual Properties *audioProperties() const;
+  AudioProperties *audioProperties() const override;
 
   /*!
    * Save the file.
    *
    * This returns true if the save was successful.
    */
-      virtual bool save();
+  bool save() override;
 
   /*!
-       * Returns whether or not the given \a stream can be opened as an ASF
-       * file.
+   * Returns whether or not the given \a stream can be opened as an ASF file.
    *
-       * \note This method is designed to do a quick check.  The result may
-       * not necessarily be correct.
+   * \note This method is designed to do a quick check.  The result may not necessarily be correct.
    */
   static bool isSupported(IOStream *stream);
 
@@ -131,8 +110,9 @@ namespace TagLib {
   FilePrivate *d;
 };
 
-  }
+}  // namespace ASF
 
-}
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/asf/asfpicture.cpp

@@ -23,161 +23,146 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <taglib.h>
-#include <tdebug.h>
-#include <trefcounter.h>
+#include <memory>
+
+#include "taglib.h"
+#include "tdebug.h"
 
 #include "asfattribute.h"
 #include "asffile.h"
 #include "asfpicture.h"
 #include "asfutils.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
-class ASF::Picture::PicturePrivate : public RefCounter
-{
-public:
+namespace {
+struct PictureData {
   bool valid;
-  Type type;
+  ASF::Picture::Type type;
   String mimeType;
   String description;
   ByteVector picture;
 };
+}  // namespace
+
+class ASF::Picture::PicturePrivate {
+ public:
+  explicit PicturePrivate() : data(new PictureData()) {}
+
+  std::shared_ptr<PictureData> data;
+};
 
 ////////////////////////////////////////////////////////////////////////////////
 // Picture class members
 ////////////////////////////////////////////////////////////////////////////////
 
-ASF::Picture::Picture() :
-  d(new PicturePrivate())
-{
-  d->valid = true;
+ASF::Picture::Picture() : d(new PicturePrivate()) {
+  d->data->valid = true;
 }
 
-ASF::Picture::Picture(const Picture& other) :
-  d(other.d)
-{
-  d->ref();
-}
+ASF::Picture::Picture(const Picture& other) : d(new PicturePrivate(*other.d)) {}
 
-ASF::Picture::~Picture()
-{
-  if(d->deref())
+ASF::Picture::~Picture() {
   delete d;
 }
 
-bool ASF::Picture::isValid() const
-{
-  return d->valid;
+bool ASF::Picture::isValid() const {
+  return d->data->valid;
 }
 
-String ASF::Picture::mimeType() const
-{
-  return d->mimeType;
+String ASF::Picture::mimeType() const {
+  return d->data->mimeType;
 }
 
-void ASF::Picture::setMimeType(const String &value)
-{
-  d->mimeType = value;
+void ASF::Picture::setMimeType(const String& value) {
+  d->data->mimeType = value;
 }
 
-ASF::Picture::Type ASF::Picture::type() const
-{
-  return d->type;
+ASF::Picture::Type ASF::Picture::type() const {
+  return d->data->type;
 }
 
-void ASF::Picture::setType(const ASF::Picture::Type& t)
-{
-  d->type = t;
+void ASF::Picture::setType(const ASF::Picture::Type &t) {
+  d->data->type = t;
 }
 
-String ASF::Picture::description() const
-{
-  return d->description;
+String ASF::Picture::description() const {
+  return d->data->description;
 }
 
-void ASF::Picture::setDescription(const String &desc)
-{
-  d->description = desc;
+void ASF::Picture::setDescription(const String& desc) {
+  d->data->description = desc;
 }
 
-ByteVector ASF::Picture::picture() const
-{
-  return d->picture;
+ByteVector ASF::Picture::picture() const {
+  return d->data->picture;
 }
 
-void ASF::Picture::setPicture(const ByteVector &p)
-{
-  d->picture = p;
+void ASF::Picture::setPicture(const ByteVector &p) {
+  d->data->picture = p;
 }
 
-int ASF::Picture::dataSize() const
-{
-  return
-    9 + (d->mimeType.length() + d->description.length()) * 2 +
-    d->picture.size();
+int ASF::Picture::dataSize() const {
+  return 9 + (d->data->mimeType.length() + d->data->description.length()) * 2 + d->data->picture.size();
 }
 
-ASF::Picture& ASF::Picture::operator=(const ASF::Picture& other)
-{
+ASF::Picture& ASF::Picture::operator=(const ASF::Picture& other) {
   Picture(other).swap(*this);
   return *this;
 }
 
-void ASF::Picture::swap(Picture &other)
-{
+void ASF::Picture::swap(Picture& other) {
   using std::swap;
 
   swap(d, other.d);
 }
 
-ByteVector ASF::Picture::render() const
-{
+ByteVector ASF::Picture::render() const {
+
   if (!isValid())
     return ByteVector();
 
-  return
-    ByteVector((char)d->type) +
-    ByteVector::fromUInt(d->picture.size(), false) +
-    renderString(d->mimeType) +
-    renderString(d->description) +
-    d->picture;
+  return ByteVector(static_cast<char>(d->data->type)) + ByteVector::fromUInt32LE(d->data->picture.size()) + renderString(d->data->mimeType) + renderString(d->data->description) + d->data->picture;
+
 }
 
-void ASF::Picture::parse(const ByteVector& bytes)
-{
-  d->valid = false;
+void ASF::Picture::parse(const ByteVector &bytes) {
+
+  d->data->valid = false;
   if (bytes.size() < 9)
     return;
-  int pos = 0;
-  d->type = (Type)bytes[0]; ++pos;
-  const unsigned int dataLen = bytes.toUInt(pos, false); pos+=4;
+  size_t pos = 0;
+  d->data->type = static_cast<Type>(bytes[0]);
+  ++pos;
+  const unsigned int dataLen = bytes.toUInt32LE(pos);
+  pos += 4;
 
   const ByteVector nullStringTerminator(2, 0);
 
-  int endPos = bytes.find(nullStringTerminator, pos, 2);
-  if(endPos < 0)
+  size_t endPos = bytes.find(nullStringTerminator, pos, 2);
+  if (endPos == ByteVector::npos())
     return;
-  d->mimeType = String(bytes.mid(pos, endPos - pos), String::UTF16LE);
+  d->data->mimeType = String(bytes.mid(pos, endPos - pos), String::UTF16LE);
   pos = endPos + 2;
 
   endPos = bytes.find(nullStringTerminator, pos, 2);
-  if(endPos < 0)
+  if (endPos == ByteVector::npos())
     return;
-  d->description = String(bytes.mid(pos, endPos - pos), String::UTF16LE);
+  d->data->description = String(bytes.mid(pos, endPos - pos), String::UTF16LE);
   pos = endPos + 2;
 
   if (dataLen + pos != bytes.size())
     return;
 
-  d->picture = bytes.mid(pos, dataLen);
-  d->valid = true;
-  return;
+  d->data->picture = bytes.mid(pos, dataLen);
+  d->data->valid = true;
+
 }
 
-ASF::Picture ASF::Picture::fromInvalid()
-{
+ASF::Picture ASF::Picture::fromInvalid() {
+
   Picture ret;
-  ret.d->valid = false;
+  ret.d->data->valid = false;
   return ret;
+
 }

3rdparty/taglib/asf/asfpicture.h

@@ -31,24 +31,22 @@
 #include "taglib_export.h"
 #include "attachedpictureframe.h"
 
-namespace TagLib
-{
-  namespace ASF
-  {
+namespace Strawberry_TagLib {
+namespace TagLib {
+namespace ASF {
+class Attribute;
 
 //! An ASF attached picture interface implementation
 
 /*!
-     * This is an implementation of ASF attached pictures interface.  Pictures may be
-     * included in attributes, one per WM/Picture attribute (but there may be multiple WM/Picture
-     * attribute in a single tag).  These pictures are usually in either JPEG or
-     * PNG format.
+ * This is an implementation of ASF attached pictures interface.
+ * Pictures may be included in attributes, one per WM/Picture attribute (but there may be multiple WM/Picture attribute in a single tag).
+ * These pictures are usually in either JPEG or PNG format.
  * \see Attribute::toPicture()
  * \see Attribute::Attribute(const Picture& picture)
  */
 class TAGLIB_EXPORT Picture {
  public:
-
   /*!
    * This describes the function or content of the picture.
    */
@@ -100,7 +98,7 @@ namespace TagLib
   /*!
    * Constructs an empty picture.
    */
-      Picture();
+  explicit Picture();
 
   /*!
    * Construct an picture as a copy of \a other.
@@ -128,8 +126,7 @@ namespace TagLib
   bool isValid() const;
 
   /*!
-       * Returns the mime type of the image. This should in most cases be
-       * "image/png" or "image/jpeg".
+   * Returns the mime type of the image. This should in most cases be "image/png" or "image/jpeg".
    * \see setMimeType(const String &)
    * \see picture()
    * \see setPicture(const ByteArray&)
@@ -137,8 +134,7 @@ namespace TagLib
   String mimeType() const;
 
   /*!
-       * Sets the mime type of the image.  This should in most cases be
-       * "image/png" or "image/jpeg".
+   * Sets the mime type of the image.  This should in most cases be "image/png" or "image/jpeg".
    * \see setMimeType(const String &)
    * \see picture()
    * \see setPicture(const ByteArray&)
@@ -178,8 +174,7 @@ namespace TagLib
   /*!
    * Returns the image data as a ByteVector.
    *
-       * \note ByteVector has a data() method that returns a const char * which
-       * should make it easy to export this data to external programs.
+   * \note ByteVector has a data() method that returns a const char * which should make it easy to export this data to external programs.
    *
    * \see setPicture()
    * \see mimeType()
@@ -187,8 +182,8 @@ namespace TagLib
   ByteVector picture() const;
 
   /*!
-       * Sets the image data to \a p.  \a p should be of the type specified in
-       * this frame's mime-type specification.
+   * Sets the image data to \a p.
+   * \a p should be of the type specified in this frame's mime-type specification.
    *
    * \see picture()
    * \see mimeType()
@@ -206,17 +201,18 @@ namespace TagLib
    */
   int dataSize() const;
 
-#ifndef DO_NOT_DOCUMENT
-      /* THIS IS PRIVATE, DON'T TOUCH IT! */
+ private:
+  friend class Attribute;
+
   void parse(const ByteVector&);
   static Picture fromInvalid();
-#endif
 
  private:
   class PicturePrivate;
   PicturePrivate* d;
 };
-  }
-}
+}  // namespace ASF
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif  // ASFPICTURE_H

3rdparty/taglib/asf/asfproperties.cpp

@@ -23,22 +23,20 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tstring.h>
+#include "tdebug.h"
+#include "tstring.h"
 #include "asfproperties.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
-class ASF::Properties::PropertiesPrivate
-{
+class ASF::AudioProperties::AudioPropertiesPrivate {
  public:
-  PropertiesPrivate() :
-    length(0),
+  explicit AudioPropertiesPrivate() : length(0),
                                        bitrate(0),
                                        sampleRate(0),
                                        channels(0),
                                        bitsPerSample(0),
-    codec(ASF::Properties::Unknown),
+                                       codec(ASF::AudioProperties::Unknown),
                                        encrypted(false) {}
 
   int length;
@@ -46,7 +44,7 @@ public:
   int sampleRate;
   int channels;
   int bitsPerSample;
-  ASF::Properties::Codec codec;
+  ASF::AudioProperties::Codec codec;
   String codecName;
   String codecDescription;
   bool encrypted;
@@ -56,69 +54,50 @@ public:
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-ASF::Properties::Properties() :
-  AudioProperties(AudioProperties::Average),
-  d(new PropertiesPrivate())
-{
+ASF::AudioProperties::AudioProperties() : Strawberry_TagLib::TagLib::AudioProperties(), d(new AudioPropertiesPrivate()) {
 }
 
-ASF::Properties::~Properties()
-{
+ASF::AudioProperties::~AudioProperties() {
   delete d;
 }
 
-int ASF::Properties::length() const
-{
-  return lengthInSeconds();
-}
-
-int ASF::Properties::lengthInSeconds() const
-{
+int ASF::AudioProperties::lengthInSeconds() const {
   return d->length / 1000;
 }
 
-int ASF::Properties::lengthInMilliseconds() const
-{
+int ASF::AudioProperties::lengthInMilliseconds() const {
   return d->length;
 }
 
-int ASF::Properties::bitrate() const
-{
+int ASF::AudioProperties::bitrate() const {
   return d->bitrate;
 }
 
-int ASF::Properties::sampleRate() const
-{
+int ASF::AudioProperties::sampleRate() const {
   return d->sampleRate;
 }
 
-int ASF::Properties::channels() const
-{
+int ASF::AudioProperties::channels() const {
   return d->channels;
 }
 
-int ASF::Properties::bitsPerSample() const
-{
+int ASF::AudioProperties::bitsPerSample() const {
   return d->bitsPerSample;
 }
 
-ASF::Properties::Codec ASF::Properties::codec() const
-{
+ASF::AudioProperties::Codec ASF::AudioProperties::codec() const {
   return d->codec;
 }
 
-String ASF::Properties::codecName() const
-{
+String ASF::AudioProperties::codecName() const {
   return d->codecName;
 }
 
-String ASF::Properties::codecDescription() const
-{
+String ASF::AudioProperties::codecDescription() const {
   return d->codecDescription;
 }
 
-bool ASF::Properties::isEncrypted() const
-{
+bool ASF::AudioProperties::isEncrypted() const {
   return d->encrypted;
 }
 
@@ -126,40 +105,29 @@ bool ASF::Properties::isEncrypted() const
 // private members
 ////////////////////////////////////////////////////////////////////////////////
 
-void ASF::Properties::setLength(int /*length*/)
-{
-  debug("ASF::Properties::setLength() -- This method is deprecated. Do not use.");
-}
-
-void ASF::Properties::setLengthInMilliseconds(int value)
-{
+void ASF::AudioProperties::setLengthInMilliseconds(int value) {
   d->length = value;
 }
 
-void ASF::Properties::setBitrate(int value)
-{
+void ASF::AudioProperties::setBitrate(int value) {
   d->bitrate = value;
 }
 
-void ASF::Properties::setSampleRate(int value)
-{
+void ASF::AudioProperties::setSampleRate(int value) {
   d->sampleRate = value;
 }
 
-void ASF::Properties::setChannels(int value)
-{
+void ASF::AudioProperties::setChannels(int value) {
   d->channels = value;
 }
 
-void ASF::Properties::setBitsPerSample(int value)
-{
+void ASF::AudioProperties::setBitsPerSample(int value) {
   d->bitsPerSample = value;
 }
 
-void ASF::Properties::setCodec(int value)
-{
-  switch(value)
-  {
+void ASF::AudioProperties::setCodec(int value) {
+
+  switch (value) {
     case 0x0160:
       d->codec = WMA1;
       break;
@@ -176,19 +144,17 @@ void ASF::Properties::setCodec(int value)
       d->codec = Unknown;
       break;
   }
+
 }
 
-void ASF::Properties::setCodecName(const String &value)
-{
+void ASF::AudioProperties::setCodecName(const String &value) {
   d->codecName = value;
 }
 
-void ASF::Properties::setCodecDescription(const String &value)
-{
+void ASF::AudioProperties::setCodecDescription(const String &value) {
   d->codecDescription = value;
 }
 
-void ASF::Properties::setEncrypted(bool value)
-{
+void ASF::AudioProperties::setEncrypted(bool value) {
   d->encrypted = value;
 }

3rdparty/taglib/asf/asfproperties.h

@@ -30,20 +30,19 @@
 #include "tstring.h"
 #include "taglib_export.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
-
 namespace ASF {
 
 //! An implementation of ASF audio properties
-    class TAGLIB_EXPORT Properties : public AudioProperties
-    {
-    public:
+class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
+  friend class File;
 
+ public:
   /*!
    * Audio codec types can be used in ASF file.
    */
-      enum Codec
-      {
+  enum Codec {
     /*!
      * Couldn't detect the codec.
      */
@@ -73,22 +72,12 @@ namespace TagLib {
   /*!
    * Creates an instance of ASF::Properties.
    */
-      Properties();
+  explicit AudioProperties();
 
   /*!
-       * Destroys this ASF::Properties instance.
+   * Destroys this ASF::AudioProperties instance.
    */
-      virtual ~Properties();
-
-      /*!
-       * Returns the length of the file in seconds.  The length is rounded down to
-       * the nearest whole second.
-       *
-       * \note This method is just an alias of lengthInSeconds().
-       *
-       * \deprecated
-       */
-      virtual int length() const;
+  ~AudioProperties() override;
 
   /*!
    * Returns the length of the file in seconds.  The length is rounded down to
@@ -96,31 +85,29 @@ namespace TagLib {
    *
    * \see lengthInMilliseconds()
    */
-      // BIC: make virtual
-      int lengthInSeconds() const;
+  int lengthInSeconds() const override;
 
   /*!
    * Returns the length of the file in milliseconds.
    *
    * \see lengthInSeconds()
    */
-      // BIC: make virtual
-      int lengthInMilliseconds() const;
+  int lengthInMilliseconds() const override;
 
   /*!
    * Returns the average bit rate of the file in kb/s.
    */
-      virtual int bitrate() const;
+  int bitrate() const override;
 
   /*!
    * Returns the sample rate in Hz.
    */
-      virtual int sampleRate() const;
+  int sampleRate() const override;
 
   /*!
    * Returns the number of audio channels.
    */
-      virtual int channels() const;
+  int channels() const override;
 
   /*!
    * Returns the number of bits per audio sample.
@@ -136,8 +123,7 @@ namespace TagLib {
   Codec codec() const;
 
   /*!
-       * Returns the concrete codec name, for example "Windows Media Audio 9.1"
-       * used in the file if available, otherwise an empty string.
+   * Returns the concrete codec name, for example "Windows Media Audio 9.1" used in the file if available, otherwise an empty string.
    *
    * \see codec()
    * \see codecDescription()
@@ -146,8 +132,7 @@ namespace TagLib {
 
   /*!
    * Returns the codec description, typically contains the encoder settings,
-       * for example "VBR Quality 50, 44kHz, stereo 1-pass VBR" if available,
-       * otherwise an empty string.
+   * for example "VBR Quality 50, 44kHz, stereo 1-pass VBR" if available, otherwise an empty string.
    *
    * \see codec()
    * \see codecName()
@@ -159,10 +144,7 @@ namespace TagLib {
    */
   bool isEncrypted() const;
 
-#ifndef DO_NOT_DOCUMENT
-      // deprecated
-      void setLength(int value);
-
+ private:
   void setLengthInMilliseconds(int value);
   void setBitrate(int value);
   void setSampleRate(int value);
@@ -172,15 +154,15 @@ namespace TagLib {
   void setCodecName(const String &value);
   void setCodecDescription(const String &value);
   void setEncrypted(bool value);
-#endif
 
  private:
-      class PropertiesPrivate;
-      PropertiesPrivate *d;
+  class AudioPropertiesPrivate;
+  AudioPropertiesPrivate *d;
 };
 
-  }
+}  // namespace ASF
 
-}
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/asf/asftag.cpp

@@ -23,13 +23,13 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tpropertymap.h>
+#include "tpicturemap.h"
+#include "tpropertymap.h"
 #include "asftag.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
-class ASF::Tag::TagPrivate
-{
+class ASF::Tag::TagPrivate {
  public:
   String title;
   String artist;
@@ -39,58 +39,50 @@ public:
   AttributeListMap attributeListMap;
 };
 
-ASF::Tag::Tag() :
-  TagLib::Tag(),
-  d(new TagPrivate())
-{
-}
+ASF::Tag::Tag() : d(new TagPrivate()) {}
 
-ASF::Tag::~Tag()
-{
+ASF::Tag::~Tag() {
   delete d;
 }
 
-String ASF::Tag::title() const
-{
+String ASF::Tag::title() const {
   return d->title;
 }
 
-String ASF::Tag::artist() const
-{
+String ASF::Tag::artist() const {
   return d->artist;
 }
 
-String ASF::Tag::album() const
-{
+String ASF::Tag::album() const {
+
   if (d->attributeListMap.contains("WM/AlbumTitle"))
     return d->attributeListMap["WM/AlbumTitle"][0].toString();
   return String();
+
 }
 
-String ASF::Tag::copyright() const
-{
+String ASF::Tag::copyright() const {
   return d->copyright;
 }
 
-String ASF::Tag::comment() const
-{
+String ASF::Tag::comment() const {
   return d->comment;
 }
 
-String ASF::Tag::rating() const
-{
+String ASF::Tag::rating() const {
   return d->rating;
 }
 
-unsigned int ASF::Tag::year() const
-{
+unsigned int ASF::Tag::year() const {
+
   if (d->attributeListMap.contains("WM/Year"))
     return d->attributeListMap["WM/Year"][0].toString().toInt();
   return 0;
+
 }
 
-unsigned int ASF::Tag::track() const
-{
+unsigned int ASF::Tag::track() const {
+
   if (d->attributeListMap.contains("WM/TrackNumber")) {
     const ASF::Attribute attr = d->attributeListMap["WM/TrackNumber"][0];
     if (attr.type() == ASF::Attribute::DWordType)
@@ -101,117 +93,265 @@ unsigned int ASF::Tag::track() const
   if (d->attributeListMap.contains("WM/Track"))
     return d->attributeListMap["WM/Track"][0].toUInt();
   return 0;
+
 }
 
-String ASF::Tag::genre() const
-{
+String ASF::Tag::genre() const {
+
   if (d->attributeListMap.contains("WM/Genre"))
     return d->attributeListMap["WM/Genre"][0].toString();
   return String();
+
 }
 
-void ASF::Tag::setTitle(const String &value)
-{
+PictureMap ASF::Tag::pictures() const {
+
+  PictureMap map;
+  if (d->attributeListMap.contains("WM/Picture")) {
+    AttributeList list = d->attributeListMap["WM/Picture"];
+    for (AttributeList::ConstIterator it = list.begin(); it != list.end(); ++it) {
+      ASF::Picture asfPicture = (*it).toPicture();
+      TagLib::Picture::Type type;
+      switch (asfPicture.type()) {
+        case ASF::Picture::FileIcon:
+          type = TagLib::Picture::FileIcon;
+          break;
+        case ASF::Picture::OtherFileIcon:
+          type = TagLib::Picture::OtherFileIcon;
+          break;
+        case ASF::Picture::FrontCover:
+          type = TagLib::Picture::FrontCover;
+          break;
+        case ASF::Picture::BackCover:
+          type = TagLib::Picture::BackCover;
+          break;
+        case ASF::Picture::LeafletPage:
+          type = TagLib::Picture::LeafletPage;
+          break;
+        case ASF::Picture::Media:
+          type = TagLib::Picture::Media;
+          break;
+        case ASF::Picture::LeadArtist:
+          type = TagLib::Picture::LeadArtist;
+          break;
+        case ASF::Picture::Artist:
+          type = TagLib::Picture::Artist;
+          break;
+        case ASF::Picture::Conductor:
+          type = TagLib::Picture::Conductor;
+          break;
+        case ASF::Picture::Band:
+          type = TagLib::Picture::Band;
+          break;
+        case ASF::Picture::Composer:
+          type = TagLib::Picture::Composer;
+          break;
+        case ASF::Picture::Lyricist:
+          type = TagLib::Picture::Lyricist;
+          break;
+        case ASF::Picture::RecordingLocation:
+          type = TagLib::Picture::RecordingLocation;
+          break;
+        case ASF::Picture::DuringRecording:
+          type = TagLib::Picture::DuringRecording;
+          break;
+        case ASF::Picture::DuringPerformance:
+          type = TagLib::Picture::DuringPerformance;
+          break;
+        case ASF::Picture::MovieScreenCapture:
+          type = TagLib::Picture::MovieScreenCapture;
+          break;
+        case ASF::Picture::ColouredFish:
+          type = TagLib::Picture::ColouredFish;
+          break;
+        case ASF::Picture::Illustration:
+          type = TagLib::Picture::Illustration;
+          break;
+        case ASF::Picture::BandLogo:
+          type = TagLib::Picture::BandLogo;
+          break;
+        case ASF::Picture::PublisherLogo:
+          type = TagLib::Picture::PublisherLogo;
+          break;
+        default:
+          type = TagLib::Picture::Other;
+          break;
+      }
+      TagLib::Picture picture(asfPicture.picture(), type, asfPicture.mimeType(), asfPicture.description());
+      map.insert(picture);
+    }
+  }
+  return PictureMap(map);
+
+}
+
+void ASF::Tag::setTitle(const String &value) {
   d->title = value;
 }
 
-void ASF::Tag::setArtist(const String &value)
-{
+void ASF::Tag::setArtist(const String &value) {
   d->artist = value;
 }
 
-void ASF::Tag::setCopyright(const String &value)
-{
+void ASF::Tag::setCopyright(const String &value) {
   d->copyright = value;
 }
 
-void ASF::Tag::setComment(const String &value)
-{
+void ASF::Tag::setComment(const String &value) {
   d->comment = value;
 }
 
-void ASF::Tag::setRating(const String &value)
-{
+void ASF::Tag::setRating(const String &value) {
   d->rating = value;
 }
 
-void ASF::Tag::setAlbum(const String &value)
-{
+void ASF::Tag::setAlbum(const String &value) {
   setAttribute("WM/AlbumTitle", value);
 }
 
-void ASF::Tag::setGenre(const String &value)
-{
+void ASF::Tag::setGenre(const String &value) {
   setAttribute("WM/Genre", value);
 }
 
-void ASF::Tag::setYear(unsigned int value)
-{
+void ASF::Tag::setYear(unsigned int value) {
   setAttribute("WM/Year", String::number(value));
 }
 
-void ASF::Tag::setTrack(unsigned int value)
-{
+void ASF::Tag::setTrack(unsigned int value) {
   setAttribute("WM/TrackNumber", String::number(value));
 }
 
-ASF::AttributeListMap& ASF::Tag::attributeListMap()
-{
+void ASF::Tag::setPictures(const PictureMap &l) {
+
+  removeItem("WM/Picture");
+  for (PictureMap::ConstIterator pictureMapIt = l.begin(); pictureMapIt != l.end(); ++pictureMapIt) {
+    PictureList list = pictureMapIt->second;
+    for (PictureList::ConstIterator pictureListIt = list.begin(); pictureListIt != list.end(); ++pictureListIt) {
+      const TagLib::Picture picture = (*pictureListIt);
+      ASF::Picture asfPicture;
+      asfPicture.setPicture(picture.data());
+      asfPicture.setMimeType(picture.mime());
+      asfPicture.setDescription(picture.description());
+      switch (picture.type()) {
+        case TagLib::Picture::Other:
+          asfPicture.setType(ASF::Picture::Other);
+          break;
+        case TagLib::Picture::FileIcon:
+          asfPicture.setType(ASF::Picture::FileIcon);
+          break;
+        case TagLib::Picture::OtherFileIcon:
+          asfPicture.setType(ASF::Picture::OtherFileIcon);
+          break;
+        case TagLib::Picture::FrontCover:
+          asfPicture.setType(ASF::Picture::FrontCover);
+          break;
+        case TagLib::Picture::BackCover:
+          asfPicture.setType(ASF::Picture::BackCover);
+          break;
+        case TagLib::Picture::LeafletPage:
+          asfPicture.setType(ASF::Picture::LeafletPage);
+          break;
+        case TagLib::Picture::Media:
+          asfPicture.setType(ASF::Picture::Media);
+          break;
+        case TagLib::Picture::LeadArtist:
+          asfPicture.setType(ASF::Picture::LeadArtist);
+          break;
+        case TagLib::Picture::Artist:
+          asfPicture.setType(ASF::Picture::Artist);
+          break;
+        case TagLib::Picture::Conductor:
+          asfPicture.setType(ASF::Picture::Conductor);
+          break;
+        case TagLib::Picture::Band:
+          asfPicture.setType(ASF::Picture::Band);
+          break;
+        case TagLib::Picture::Composer:
+          asfPicture.setType(ASF::Picture::Composer);
+          break;
+        case TagLib::Picture::Lyricist:
+          asfPicture.setType(ASF::Picture::Lyricist);
+          break;
+        case TagLib::Picture::RecordingLocation:
+          asfPicture.setType(ASF::Picture::RecordingLocation);
+          break;
+        case TagLib::Picture::DuringRecording:
+          asfPicture.setType(ASF::Picture::DuringRecording);
+          break;
+        case TagLib::Picture::DuringPerformance:
+          asfPicture.setType(ASF::Picture::DuringPerformance);
+          break;
+        case TagLib::Picture::MovieScreenCapture:
+          asfPicture.setType(ASF::Picture::MovieScreenCapture);
+          break;
+        case TagLib::Picture::ColouredFish:
+          asfPicture.setType(ASF::Picture::ColouredFish);
+          break;
+        case TagLib::Picture::Illustration:
+          asfPicture.setType(ASF::Picture::Illustration);
+          break;
+        case TagLib::Picture::BandLogo:
+          asfPicture.setType(ASF::Picture::BandLogo);
+          break;
+        case TagLib::Picture::PublisherLogo:
+          asfPicture.setType(ASF::Picture::PublisherLogo);
+          break;
+      }
+      addAttribute("WM/Picture", Attribute(asfPicture));
+    }
+  }
+
+}
+
+const ASF::AttributeListMap &ASF::Tag::attributeListMap() const {
   return d->attributeListMap;
 }
 
-const ASF::AttributeListMap &ASF::Tag::attributeListMap() const
-{
-  return d->attributeListMap;
-}
-
-bool ASF::Tag::contains(const String &key) const
-{
+bool ASF::Tag::contains(const String &key) const {
   return d->attributeListMap.contains(key);
 }
 
-void ASF::Tag::removeItem(const String &key)
-{
+void ASF::Tag::removeItem(const String &key) {
   d->attributeListMap.erase(key);
 }
 
-ASF::AttributeList ASF::Tag::attribute(const String &name) const
-{
+ASF::AttributeList ASF::Tag::attribute(const String &name) const {
   return d->attributeListMap[name];
 }
 
-void ASF::Tag::setAttribute(const String &name, const Attribute &attribute)
-{
+void ASF::Tag::setAttribute(const String &name, const Attribute &attribute) {
+
   AttributeList value;
   value.append(attribute);
   d->attributeListMap.insert(name, value);
+
 }
 
-void ASF::Tag::setAttribute(const String &name, const AttributeList &values)
-{
+void ASF::Tag::setAttribute(const String &name, const AttributeList &values) {
   d->attributeListMap.insert(name, values);
 }
 
-void ASF::Tag::addAttribute(const String &name, const Attribute &attribute)
-{
+void ASF::Tag::addAttribute(const String &name, const Attribute &attribute) {
+
   if (d->attributeListMap.contains(name)) {
     d->attributeListMap[name].append(attribute);
   }
   else {
     setAttribute(name, attribute);
   }
+
 }
 
-bool ASF::Tag::isEmpty() const
-{
-  return TagLib::Tag::isEmpty() &&
+bool ASF::Tag::isEmpty() const {
+
+  return Strawberry_TagLib::TagLib::Tag::isEmpty() &&
     copyright().isEmpty() &&
     rating().isEmpty() &&
     d->attributeListMap.isEmpty();
+
 }
 
-namespace
-{
+namespace {
 const char *keyTranslation[][2] = {
   { "WM/AlbumTitle", "ALBUM" },
   { "WM/AlbumArtist", "ALBUMARTIST" },
@@ -255,19 +395,20 @@ namespace
 };
 const size_t keyTranslationSize = sizeof(keyTranslation) / sizeof(keyTranslation[0]);
 
-  String translateKey(const String &key)
-  {
+String translateKey(const String &key) {
+
   for (size_t i = 0; i < keyTranslationSize; ++i) {
     if (key == keyTranslation[i][0])
       return keyTranslation[i][1];
   }
 
   return String();
-  }
-}
 
-PropertyMap ASF::Tag::properties() const
-{
+}
+}  // namespace
+
+PropertyMap ASF::Tag::properties() const {
+
   PropertyMap props;
 
   if (!d->title.isEmpty()) {
@@ -305,17 +446,19 @@ PropertyMap ASF::Tag::properties() const
     }
   }
   return props;
+
 }
 
-void ASF::Tag::removeUnsupportedProperties(const StringList &props)
-{
+void ASF::Tag::removeUnsupportedProperties(const StringList &props) {
+
   StringList::ConstIterator it = props.begin();
   for (; it != props.end(); ++it)
     d->attributeListMap.erase(*it);
+
 }
 
-PropertyMap ASF::Tag::setProperties(const PropertyMap &props)
-{
+PropertyMap ASF::Tag::setProperties(const PropertyMap &props) {
+
   static Map<String, String> reverseKeyMap;
   if (reverseKeyMap.isEmpty()) {
     int numKeys = sizeof(keyTranslation) / sizeof(keyTranslation[0]);
@@ -375,4 +518,5 @@ PropertyMap ASF::Tag::setProperties(const PropertyMap &props)
   }
 
   return ignoredProps;
+
 }

3rdparty/taglib/asf/asftag.h

@@ -32,6 +32,7 @@
 #include "taglib_export.h"
 #include "asfattribute.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
 namespace ASF {
@@ -39,42 +40,39 @@ namespace TagLib {
 typedef List<Attribute> AttributeList;
 typedef Map<String, AttributeList> AttributeListMap;
 
-    class TAGLIB_EXPORT Tag : public TagLib::Tag {
+class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag {
 
   friend class File;
 
  public:
+  explicit Tag();
 
-      Tag();
-
-      virtual ~Tag();
+  ~Tag() override;
 
   /*!
    * Returns the track name.
    */
-      virtual String title() const;
+  String title() const override;
 
   /*!
    * Returns the artist name.
    */
-      virtual String artist() const;
+  String artist() const override;
 
   /*!
-       * Returns the album name; if no album name is present in the tag
-       * String::null will be returned.
+   * Returns the album name; if no album name is present in the tag String::null will be returned.
    */
-      virtual String album() const;
+  String album() const override;
 
   /*!
    * Returns the track comment.
    */
-      virtual String comment() const;
+  String comment() const override;
 
   /*!
-       * Returns the genre name; if no genre is present in the tag String::null
-       * will be returned.
+   * Returns the genre name; if no genre is present in the tag String::null will be returned.
    */
-      virtual String genre() const;
+  String genre() const override;
 
   /*!
    * Returns the rating.
@@ -82,105 +80,97 @@ namespace TagLib {
   virtual String rating() const;
 
   /*!
-       * Returns the genre name; if no genre is present in the tag String::null
-       * will be returned.
+   * Returns the genre name; if no genre is present in the tag String::null will be returned.
    */
   virtual String copyright() const;
 
   /*!
    * Returns the year; if there is no year set, this will return 0.
    */
-      virtual unsigned int year() const;
+  unsigned int year() const override;
 
   /*!
-       * Returns the track number; if there is no track number set, this will
-       * return 0.
+   * Returns the track number; if there is no track number set, this will return 0.
    */
-      virtual unsigned int track() const;
+  unsigned int track() const override;
+
+  PictureMap pictures() const override;
 
   /*!
    * Sets the title to \a s.
    */
-      virtual void setTitle(const String &s);
+  void setTitle(const String &value) override;
 
   /*!
    * Sets the artist to \a s.
    */
-      virtual void setArtist(const String &s);
+  void setArtist(const String &value) override;
 
   /*!
-       * Sets the album to \a s.  If \a s is String::null then this value will be
-       * cleared.
+   * Sets the album to \a s.  If \a s is String::null then this value will be cleared.
    */
-      virtual void setAlbum(const String &s);
+  void setAlbum(const String &value) override;
 
   /*!
    * Sets the comment to \a s.
    */
-      virtual void setComment(const String &s);
+  void setComment(const String &value) override;
 
   /*!
    * Sets the rating to \a s.
    */
-      virtual void setRating(const String &s);
+  virtual void setRating(const String &value);
 
   /*!
    * Sets the copyright to \a s.
    */
-      virtual void setCopyright(const String &s);
+  virtual void setCopyright(const String &value);
 
   /*!
    * Sets the genre to \a s.
    */
-      virtual void setGenre(const String &s);
+  void setGenre(const String &value) override;
 
   /*!
    * Sets the year to \a i.  If \a s is 0 then this value will be cleared.
    */
-      virtual void setYear(unsigned int i);
+  void setYear(unsigned int value) override;
 
   /*!
    * Sets the track to \a i.  If \a s is 0 then this value will be cleared.
    */
-      virtual void setTrack(unsigned int i);
+  void setTrack(unsigned int value) override;
+
+  void setPictures(const PictureMap&) override;
 
   /*!
-       * Returns true if the tag does not contain any data.  This should be
-       * reimplemented in subclasses that provide more than the basic tagging
-       * abilities in this class.
+   * Returns true if the tag does not contain any data.
+   * This should be reimplemented in subclasses that provide more than the basic tagging abilities in this class.
    */
-      virtual bool isEmpty() const;
+  bool isEmpty() const override;
 
   /*!
-       * \deprecated
-       */
-      AttributeListMap &attributeListMap();
-
-      /*!
-       * Returns a reference to the item list map.  This is an AttributeListMap of
-       * all of the items in the tag.
+   * Returns a reference to the item list map.  This is an AttributeListMap of all of the items in the tag.
    */
   const AttributeListMap &attributeListMap() const;
 
   /*!
    * \return True if a value for \a attribute is currently set.
    */
-      bool contains(const String &name) const;
+  bool contains(const String &key) const;
 
   /*!
    * Removes the \a key attribute from the tag
    */
-      void removeItem(const String &name);
+  void removeItem(const String &key);
 
   /*!
-       * \return The list of values for the key \a name, or an empty list if no
-       * values have been set.
+   * \return The list of values for the key \a name, or an empty list if no values have been set.
    */
   AttributeList attribute(const String &name) const;
 
   /*!
-       * Sets the \a key attribute to the value of \a attribute. If an attribute
-       * with the \a key is already present, it will be replaced.
+   * Sets the \a key attribute to the value of \a attribute. If an attribute with the \a key is already present, it will be replaced.
    */
   void setAttribute(const String &name, const Attribute &attribute);
 
@@ -195,15 +185,17 @@ namespace TagLib {
    */
   void addAttribute(const String &name, const Attribute &attribute);
 
-      PropertyMap properties() const;
-      void removeUnsupportedProperties(const StringList& properties);
-      PropertyMap setProperties(const PropertyMap &properties);
+  PropertyMap properties() const override;
+  void removeUnsupportedProperties(const StringList &props) override;
+  PropertyMap setProperties(const PropertyMap &props) override;
 
  private:
-
   class TagPrivate;
   TagPrivate *d;
 };
-  }
-}
+
+}  // namespace ASF
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
+
 #endif

3rdparty/taglib/asf/asfutils.h

@@ -30,50 +30,45 @@
 
 #ifndef DO_NOT_DOCUMENT  // tell Doxygen not to document this header
 
-namespace TagLib
-{
-  namespace ASF
-  {
-    namespace
-    {
+namespace Strawberry_TagLib {
+namespace TagLib {
+namespace ASF {
+namespace {
 
-      inline unsigned short readWORD(File *file, bool *ok = 0)
-      {
+inline unsigned short readWORD(File *file, bool *ok = nullptr) {
   const ByteVector v = file->readBlock(2);
   if (v.size() != 2) {
     if (ok) *ok = false;
     return 0;
   }
   if (ok) *ok = true;
-        return v.toUShort(false);
+  return v.toUInt16LE(0);
 }
 
-      inline unsigned int readDWORD(File *file, bool *ok = 0)
-      {
+inline unsigned int readDWORD(File *file, bool *ok = nullptr) {
   const ByteVector v = file->readBlock(4);
   if (v.size() != 4) {
     if (ok) *ok = false;
     return 0;
   }
   if (ok) *ok = true;
-        return v.toUInt(false);
+  return v.toUInt32LE(0);
 }
 
-      inline long long readQWORD(File *file, bool *ok = 0)
-      {
+inline long long readQWORD(File *file, bool *ok = nullptr) {
   const ByteVector v = file->readBlock(8);
   if (v.size() != 8) {
     if (ok) *ok = false;
     return 0;
   }
   if (ok) *ok = true;
-        return v.toLongLong(false);
+  return v.toInt64LE(0);
 }
 
-      inline String readString(File *file, int length)
-      {
+inline String readString(File *file, int length) {
+
   ByteVector data = file->readBlock(length);
-        unsigned int size = data.size();
+  size_t size = data.size();
   while (size >= 2) {
     if (data[size - 1] != '\0' || data[size - 2] != '\0') {
       break;
@@ -84,20 +79,21 @@ namespace TagLib
     data.resize(size);
   }
   return String(data, String::UTF16LE);
+
 }
 
-      inline ByteVector renderString(const String &str, bool includeLength = false)
-      {
-        ByteVector data = str.data(String::UTF16LE) + ByteVector::fromShort(0, false);
+inline ByteVector renderString(const String &str, bool includeLength = false) {
+  ByteVector data = str.data(String::UTF16LE) + ByteVector::fromUInt16LE(0);
   if (includeLength) {
-          data = ByteVector::fromShort(data.size(), false) + data;
+    data = ByteVector::fromUInt16LE(data.size()) + data;
   }
   return data;
 }
 
-    }
-  }
-}
+}  // namespace
+}  // namespace ASF
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif
 

3rdparty/taglib/audioproperties.cpp

@@ -23,95 +23,31 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevector.h>
-
-#include "aiffproperties.h"
-#include "apeproperties.h"
-#include "asfproperties.h"
-#include "flacproperties.h"
-#include "mp4properties.h"
-#include "mpcproperties.h"
-#include "mpegproperties.h"
-#include "opusproperties.h"
-#include "speexproperties.h"
-#include "trueaudioproperties.h"
-#include "vorbisproperties.h"
-#include "wavproperties.h"
-#include "wavpackproperties.h"
-#include "dsfproperties.h"
-#include "dsdiffproperties.h"
+#include "tstringlist.h"
 
 #include "audioproperties.h"
 
-using namespace TagLib;
-
-// This macro is a workaround for the fact that we can't add virtual functions.
-// Should be true virtual functions in taglib2.
-
-#define VIRTUAL_FUNCTION_WORKAROUND(function_name, default_value)               \
-  if(dynamic_cast<const APE::Properties*>(this))                                \
-    return dynamic_cast<const APE::Properties*>(this)->function_name();         \
-  else if(dynamic_cast<const ASF::Properties*>(this))                           \
-    return dynamic_cast<const ASF::Properties*>(this)->function_name();         \
-  else if(dynamic_cast<const FLAC::Properties*>(this))                          \
-    return dynamic_cast<const FLAC::Properties*>(this)->function_name();        \
-  else if(dynamic_cast<const MP4::Properties*>(this))                           \
-    return dynamic_cast<const MP4::Properties*>(this)->function_name();         \
-  else if(dynamic_cast<const MPC::Properties*>(this))                           \
-    return dynamic_cast<const MPC::Properties*>(this)->function_name();         \
-  else if(dynamic_cast<const MPEG::Properties*>(this))                          \
-    return dynamic_cast<const MPEG::Properties*>(this)->function_name();        \
-  else if(dynamic_cast<const Ogg::Opus::Properties*>(this))                     \
-    return dynamic_cast<const Ogg::Opus::Properties*>(this)->function_name();   \
-  else if(dynamic_cast<const Ogg::Speex::Properties*>(this))                    \
-    return dynamic_cast<const Ogg::Speex::Properties*>(this)->function_name();  \
-  else if(dynamic_cast<const TrueAudio::Properties*>(this))                     \
-    return dynamic_cast<const TrueAudio::Properties*>(this)->function_name();   \
-  else if(dynamic_cast<const RIFF::AIFF::Properties*>(this))                    \
-    return dynamic_cast<const RIFF::AIFF::Properties*>(this)->function_name();  \
-  else if(dynamic_cast<const RIFF::WAV::Properties*>(this))                     \
-    return dynamic_cast<const RIFF::WAV::Properties*>(this)->function_name();   \
-  else if(dynamic_cast<const Vorbis::Properties*>(this))                        \
-    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);
-
-class AudioProperties::AudioPropertiesPrivate
-{
-
-};
+using namespace Strawberry_TagLib::TagLib;
 
 ////////////////////////////////////////////////////////////////////////////////
 // public methods
 ////////////////////////////////////////////////////////////////////////////////
 
-AudioProperties::~AudioProperties()
-{
+AudioProperties::~AudioProperties() {}
 
-}
 
-int AudioProperties::lengthInSeconds() const
-{
-  VIRTUAL_FUNCTION_WORKAROUND(lengthInSeconds, 0)
-}
+String AudioProperties::toString() const {
+
+  StringList desc;
+  desc.append("Audio");
+  desc.append(String::number(lengthInSeconds()) + " seconds");
+  desc.append(String::number(bitrate()) + " kbps");
+  return desc.toString(", ");
 
-int AudioProperties::lengthInMilliseconds() const
-{
-  VIRTUAL_FUNCTION_WORKAROUND(lengthInMilliseconds, 0)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // protected methods
 ////////////////////////////////////////////////////////////////////////////////
 
-AudioProperties::AudioProperties(ReadStyle) :
-  d(0)
-{
-
-}
+AudioProperties::AudioProperties() : d(nullptr) {}

3rdparty/taglib/audioproperties.h

@@ -27,28 +27,27 @@
 #define TAGLIB_AUDIOPROPERTIES_H
 
 #include "taglib_export.h"
+#include "tstring.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
 //! A simple, abstract interface to common audio properties
 
 /*!
-   * The values here are common to most audio formats.  For more specific, codec
-   * dependent values, please see see the subclasses APIs.  This is meant to
-   * compliment the TagLib::File and TagLib::Tag APIs in providing a simple
+   * The values here are common to most audio formats.
+   * For more specific, codec dependent values, please see see the subclasses APIs.
+   * This is meant to compliment the TagLib::File and TagLib::Tag APIs in providing a simple
    * interface that is sufficient for most applications.
    */
 
-  class TAGLIB_EXPORT AudioProperties
-  {
+class TAGLIB_EXPORT AudioProperties {
  public:
-
   /*!
    * Reading audio properties from a file can sometimes be very time consuming
-     * and for the most accurate results can often involve reading the entire
-     * file.  Because in many situations speed is critical or the accuracy of the
-     * values is not particularly important this allows the level of desired
-     * accuracy to be set.
+   * and for the most accurate results can often involve reading the entire file.
+   * Because in many situations speed is critical or the accuracy of the values
+   * is not particularly important this allows the level of desired accuracy to be set.
    */
   enum ReadStyle {
     //! Read as little of the file as possible
@@ -65,31 +64,22 @@ namespace TagLib {
   virtual ~AudioProperties();
 
   /*!
-     * Returns the length of the file in seconds.
-     */
-    virtual int length() const = 0;
-
-    /*!
-     * Returns the length of the file in seconds.  The length is rounded down to
-     * the nearest whole second.
+   * Returns the length of the file in seconds.  The length is rounded down to the nearest whole second.
    *
    * \see lengthInMilliseconds()
    */
-    // BIC: make virtual
-    int lengthInSeconds() const;
+  virtual int lengthInSeconds() const = 0;
 
   /*!
    * Returns the length of the file in milliseconds.
    *
    * \see lengthInSeconds()
    */
-    // BIC: make virtual
-    int lengthInMilliseconds() const;
+  virtual int lengthInMilliseconds() const = 0;
 
   /*!
-     * Returns the most appropriate bit rate for the file in kb/s.  For constant
-     * bitrate formats this is simply the bitrate of the file.  For variable
-     * bitrate formats this is either the average or nominal bitrate.
+   * Returns the most appropriate bit rate for the file in kb/s.  For constant bitrate formats this is simply the bitrate of the file.
+   * For variable bitrate formats this is either the average or nominal bitrate.
    */
   virtual int bitrate() const = 0;
 
@@ -103,16 +93,18 @@ namespace TagLib {
    */
   virtual int channels() const = 0;
 
-  protected:
-
   /*!
-     * Construct an audio properties instance.  This is protected as this class
-     * should not be instantiated directly, but should be instantiated via its
-     * subclasses and can be fetched from the FileRef or File APIs.
-     *
-     * \see ReadStyle
+   * Returns description of the audio file.
    */
-    AudioProperties(ReadStyle style);
+  virtual String toString() const;
+
+ protected:
+  /*!
+   * Construct an audio properties instance.
+   * This is protected as this class should not be instantiated directly,
+   * but should be instantiated via its subclasses and can be fetched from the FileRef or File APIs.
+   */
+  explicit AudioProperties();
 
  private:
   AudioProperties(const AudioProperties&);
@@ -122,6 +114,7 @@ namespace TagLib {
   AudioPropertiesPrivate *d;
 };
 
-}
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/dsdiff/dsdiffdiintag.cpp

@@ -26,112 +26,95 @@
 #include "dsdiffdiintag.h"
 #include "tstringlist.h"
 #include "tpropertymap.h"
+#include "tpicturemap.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace DSDIFF::DIIN;
 
-class DSDIFF::DIIN::Tag::TagPrivate
-{
+class DSDIFF::DIIN::Tag::TagPrivate {
  public:
-  TagPrivate()
-  {
+  TagPrivate() {
   }
 
   String title;
   String artist;
 };
 
-DSDIFF::DIIN::Tag::Tag() : TagLib::Tag()
-{
+DSDIFF::DIIN::Tag::Tag() {
   d = new TagPrivate;
 }
 
-DSDIFF::DIIN::Tag::~Tag()
-{
+DSDIFF::DIIN::Tag::~Tag() {
   delete d;
 }
 
-String DSDIFF::DIIN::Tag::title() const
-{
+String DSDIFF::DIIN::Tag::title() const {
   return d->title;
 }
 
-String DSDIFF::DIIN::Tag::artist() const
-{
+String DSDIFF::DIIN::Tag::artist() const {
   return d->artist;
 }
 
-String DSDIFF::DIIN::Tag::album() const
-{
+String DSDIFF::DIIN::Tag::album() const {
   return String();
 }
 
-String DSDIFF::DIIN::Tag::comment() const
-{
+String DSDIFF::DIIN::Tag::comment() const {
   return String();
 }
 
-String DSDIFF::DIIN::Tag::genre() const
-{
+String DSDIFF::DIIN::Tag::genre() const {
   return String();
 }
 
-unsigned int DSDIFF::DIIN::Tag::year() const
-{
+unsigned int DSDIFF::DIIN::Tag::year() const {
   return 0;
 }
 
-unsigned int DSDIFF::DIIN::Tag::track() const
-{
+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
+PictureMap DSDIFF::DIIN::Tag::pictures() const {
+  return PictureMap();
+}
+
+void DSDIFF::DIIN::Tag::setTitle(const String &title) {
+
   d->title = title;
+
 }
 
-void DSDIFF::DIIN::Tag::setArtist(const String &artist)
-{
-  if(artist.isNull() || artist.isEmpty())
-    d->artist = String();
-  else
+void DSDIFF::DIIN::Tag::setArtist(const String &artist) {
+
   d->artist = artist;
+
 }
 
-void DSDIFF::DIIN::Tag::setAlbum(const String &)
-{
-}
+void DSDIFF::DIIN::Tag::setAlbum(const String &) {}
 
-void DSDIFF::DIIN::Tag::setComment(const String &)
-{
-}
+void DSDIFF::DIIN::Tag::setComment(const String &) {}
 
-void DSDIFF::DIIN::Tag::setGenre(const String &)
-{
-}
+void DSDIFF::DIIN::Tag::setGenre(const String &) {}
 
-void DSDIFF::DIIN::Tag::setYear(unsigned int)
-{
-}
+void DSDIFF::DIIN::Tag::setYear(unsigned int) {}
 
-void DSDIFF::DIIN::Tag::setTrack(unsigned int)
-{
-}
+void DSDIFF::DIIN::Tag::setTrack(unsigned int) {}
+
+void DSDIFF::DIIN::Tag::setPictures(const PictureMap&) {}
+
+PropertyMap DSDIFF::DIIN::Tag::properties() const {
 
-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 DSDIFF::DIIN::Tag::setProperties(const PropertyMap &origProps) {
+
   PropertyMap properties(origProps);
   properties.removeEmpty();
   StringList oneValueSet;
@@ -139,13 +122,15 @@ PropertyMap DSDIFF::DIIN::Tag::setProperties(const PropertyMap &origProps)
   if (properties.contains("TITLE")) {
     d->title = properties["TITLE"].front();
     oneValueSet.append("TITLE");
-  } else
+  }
+  else
     d->title = String();
 
   if (properties.contains("ARTIST")) {
     d->artist = properties["ARTIST"].front();
     oneValueSet.append("ARTIST");
-  } else
+  }
+  else
     d->artist = String();
 
   // for each tag that has been set above, remove the first entry in the corresponding
@@ -158,5 +143,5 @@ PropertyMap DSDIFF::DIIN::Tag::setProperties(const PropertyMap &origProps)
   }
 
   return properties;
-}
 
+}

3rdparty/taglib/dsdiff/dsdiffdiintag.h

@@ -28,10 +28,9 @@
 
 #include "tag.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
-
 namespace DSDIFF {
-
 namespace DIIN {
 
 /*!
@@ -39,101 +38,106 @@ namespace TagLib {
  *
  * Only Title and Artist tags are supported
  */
-      class TAGLIB_EXPORT Tag : public TagLib::Tag
-      {
+
+class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag {
  public:
-        Tag();
-        virtual ~Tag();
+  explicit Tag();
+  ~Tag() override;
 
   /*!
-         * Returns the track name; if no track name is present in the tag
-         * String() will be returned.
+   * Returns the track name; if no track name is present in the tag String() will be returned.
    */
-        String title() const;
+  String title() const override;
 
   /*!
-         * Returns the artist name; if no artist name is present in the tag
-         * String() will be returned.
+   * Returns the artist name; if no artist name is present in the tag String() will be returned.
    */
-        String artist() const;
+  String artist() const override;
 
   /*!
    * Not supported.  Therefore always returns String().
    */
-        String album() const;
+  String album() const override;
 
   /*!
    * Not supported.  Therefore always returns String().
    */
-        String comment() const;
+  String comment() const override;
 
   /*!
    * Not supported.  Therefore always returns String().
    */
-        String genre() const;
+  String genre() const override;
 
   /*!
    * Not supported.  Therefore always returns 0.
    */
-        unsigned int year() const;
+  unsigned int year() const override;
 
   /*!
    * Not supported.  Therefore always returns 0.
    */
-        unsigned int track() const;
+  unsigned int track() const override;
 
   /*!
-         * Sets the title to \a title.  If \a title is String() then this
-         * value will be cleared.
+   * Not supported.  Therefore always returns an empty list.
    */
-        void setTitle(const String &title);
+  PictureMap pictures() const override;
 
   /*!
-         * Sets the artist to \a artist.  If \a artist is String() then this
-         * value will be cleared.
+   * Sets the title to \a title.  If \a title is String() then this value will be cleared.
    */
-        void setArtist(const String &artist);
+  void setTitle(const String &title) override;
+
+  /*!
+   * Sets the artist to \a artist.  If \a artist is String() then this value will be cleared.
+   */
+  void setArtist(const String &artist) override;
 
   /*!
    * Not supported and therefore ignored.
    */
-        void setAlbum(const String &album);
+  void setAlbum(const String &album) override;
 
   /*!
    * Not supported and therefore ignored.
    */
-        void setComment(const String &comment);
+  void setComment(const String &comment) override;
 
   /*!
    * Not supported and therefore ignored.
    */
-        void setGenre(const String &genre);
+  void setGenre(const String &genre) override;
 
   /*!
    * Not supported and therefore ignored.
    */
-        void setYear(unsigned int year);
+  void setYear(unsigned int year) override;
 
   /*!
    * Not supported and therefore ignored.
    */
-        void setTrack(unsigned int track);
+  void setTrack(unsigned int track) override;
+
+  /*!
+   * Not supported and therefore ignored.
+   */
+  void setPictures(const PictureMap&) override;
 
   /*!
    * Implements the unified property interface -- export function.
    * Since the DIIN tag is very limited, the exported map is as well.
    */
-        PropertyMap properties() const;
+  PropertyMap properties() const override;
 
   /*!
    * 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.
+   * 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 &);
+  PropertyMap setProperties(const PropertyMap &) override;
 
  private:
   Tag(const Tag &);
@@ -142,9 +146,9 @@ namespace TagLib {
   class TagPrivate;
   TagPrivate *d;
 };
-    }
-  }
-}
+}  // namespace DIIN
+}  // namespace DSDIFF
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif
-

3rdparty/taglib/dsdiff/dsdifffile.cpp

@@ -23,28 +23,57 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevector.h>
-#include <tdebug.h>
-#include <id3v2tag.h>
-#include <tstringlist.h>
-#include <tpropertymap.h>
-#include <tagutils.h>
+#include <memory>
+#include <array>
+
+#include "tstring.h"
+#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;
+using namespace Strawberry_TagLib::TagLib;
 
-struct Chunk64
-{
+namespace {
+struct Chunk64 {
   ByteVector name;
   unsigned long long offset;
   unsigned long long size;
   char padding;
 };
 
-namespace
-{
+typedef std::vector<Chunk64> ChunkList;
+
+int chunkIndex(const ChunkList &chunks, const ByteVector &id) {
+
+  for (unsigned long int i = 0; i < chunks.size(); i++) {
+    if (chunks[i].name == id)
+      return i;
+  }
+
+  return -1;
+
+}
+
+bool isValidChunkID(const ByteVector &name) {
+
+  if (name.size() != 4)
+    return false;
+
+  for (int i = 0; i < 4; i++) {
+    if (name[i] < 32)
+      return false;
+  }
+
+  return true;
+
+}
+
 enum {
   ID3v2Index = 0,
   DIINIndex = 1
@@ -53,44 +82,41 @@ namespace
   PROPChunk = 0,
   DIINChunk = 1
 };
-}
+}  // namespace
 
-class DSDIFF::File::FilePrivate
-{
+class DSDIFF::File::FilePrivate {
  public:
-  FilePrivate() :
-  endianness(BigEndian),
+  FilePrivate() : endianness(BigEndian),
                   size(0),
                   isID3InPropChunk(false),
                   duplicateID3V2chunkIndex(-1),
-  properties(0),
                   id3v2TagChunkID("ID3 "),
                   hasID3v2(false),
-  hasDiin(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.
+  ChunkList chunks;
+  std::array<ChunkList, 2> childChunks;
+  std::array<int, 2> childChunkIndex;
+  /*
+   * Two possibilities can be found: ID3V2 chunk inside PROP chunk or at root level
+   */
+  bool isID3InPropChunk;
+  /*
+   * 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.
+   */
+  int duplicateID3V2chunkIndex;
 
-  Properties *properties;
+  std::unique_ptr<AudioProperties> properties;
 
-  TagUnion tag;
+  DoubleTagUnion tag;
 
   ByteVector id3v2TagChunkID;
 
@@ -102,95 +128,94 @@ public:
 // static members
 ////////////////////////////////////////////////////////////////////////////////
 
-bool DSDIFF::File::isSupported(IOStream *stream)
-{
+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)
-{
+DSDIFF::File::File(FileName file, bool readProperties, AudioProperties::ReadStyle propertiesStyle) : Strawberry_TagLib::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)
-{
+DSDIFF::File::File(IOStream *stream, bool readProperties, AudioProperties::ReadStyle propertiesStyle) : Strawberry_TagLib::TagLib::File(stream) {
+
   d = new FilePrivate;
   d->endianness = BigEndian;
   if (isOpen())
     read(readProperties, propertiesStyle);
+
 }
 
-DSDIFF::File::~File()
-{
+DSDIFF::File::~File() {
   delete d;
 }
 
-TagLib::Tag *DSDIFF::File::tag() const
-{
+Strawberry_TagLib::TagLib::Tag *DSDIFF::File::tag() const {
   return &d->tag;
 }
 
-ID3v2::Tag *DSDIFF::File::ID3v2Tag() const
-{
-  return d->tag.access<ID3v2::Tag>(ID3v2Index, false);
+ID3v2::Tag *DSDIFF::File::ID3v2Tag(bool create) const {
+  return d->tag.access<ID3v2::Tag>(ID3v2Index, create);
 }
 
-bool DSDIFF::File::hasID3v2Tag() const
-{
+bool DSDIFF::File::hasID3v2Tag() const {
   return d->hasID3v2;
 }
 
-DSDIFF::DIIN::Tag *DSDIFF::File::DIINTag() const
-{
-  return d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, false);
+DSDIFF::DIIN::Tag *DSDIFF::File::DIINTag(bool create) const {
+  return d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, create);
 }
 
-bool DSDIFF::File::hasDIINTag() const
-{
+bool DSDIFF::File::hasDIINTag() const {
   return d->hasDiin;
 }
 
-PropertyMap DSDIFF::File::properties() const
-{
+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)
-{
+void DSDIFF::File::removeUnsupportedProperties(const StringList &properties) {
+
   if (d->hasID3v2)
-    d->tag.access<ID3v2::Tag>(ID3v2Index, false)->removeUnsupportedProperties(unsupported);
+    d->tag.access<ID3v2::Tag>(ID3v2Index, false)->removeUnsupportedProperties(properties);
 
   if (d->hasDiin)
-    d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, false)->removeUnsupportedProperties(unsupported);
+    d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, false)->removeUnsupportedProperties(properties);
+
 }
 
-PropertyMap DSDIFF::File::setProperties(const PropertyMap &properties)
-{
+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;
+DSDIFF::AudioProperties *DSDIFF::File::audioProperties() const {
+  return d->properties.get();
 }
 
-bool DSDIFF::File::save()
-{
+bool DSDIFF::File::save() {
+  return save(AllTags);
+}
+
+bool DSDIFF::File::save(TagTypes tags, StripTags, ID3v2::Version version) {
+
   if (readOnly()) {
     debug("DSDIFF::File::save() -- File is read only.");
     return false;
@@ -201,11 +226,17 @@ bool DSDIFF::File::save()
     return false;
   }
 
+  //if(strip == StripOthers || strip == StripAll)
+  //File::strip(static_cast<TagTypes>(AllTags & ~tags));
+
   // First: save ID3V2 chunk
+
   ID3v2::Tag *id3v2Tag = d->tag.access<ID3v2::Tag>(ID3v2Index, false);
+
+  if (tags & ID3v2 && id3v2Tag) {
     if (d->isID3InPropChunk) {
-    if(id3v2Tag != NULL && !id3v2Tag->isEmpty()) {
-      setChildChunkData(d->id3v2TagChunkID, id3v2Tag->render(), PROPChunk);
+      if (id3v2Tag && !id3v2Tag->isEmpty()) {
+        setChildChunkData(d->id3v2TagChunkID, id3v2Tag->render(version), PROPChunk);
         d->hasID3v2 = true;
       }
       else {
@@ -215,8 +246,8 @@ bool DSDIFF::File::save()
       }
     }
     else {
-    if(id3v2Tag != NULL && !id3v2Tag->isEmpty()) {
-      setRootChunkData(d->id3v2TagChunkID, id3v2Tag->render());
+      if (id3v2Tag && !id3v2Tag->isEmpty()) {
+        setRootChunkData(d->id3v2TagChunkID, id3v2Tag->render(version));
         d->hasID3v2 = true;
       }
       else {
@@ -225,23 +256,31 @@ bool DSDIFF::File::save()
         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()) {
+  if (tags & DIIN && diinTag) {
+    if (!diinTag->title().isEmpty()) {
       ByteVector diinTitle;
-      diinTitle.append(ByteVector::fromUInt(diinTag->title().size(), d->endianness == BigEndian));
+      if (d->endianness == BigEndian)
+        diinTitle.append(ByteVector::fromUInt32BE(diinTag->title().size()));
+      else
+        diinTitle.append(ByteVector::fromUInt32LE(diinTag->title().size()));
       diinTitle.append(ByteVector::fromCString(diinTag->title().toCString()));
       setChildChunkData("DITI", diinTitle, DIINChunk);
     }
     else
       setChildChunkData("DITI", ByteVector(), DIINChunk);
 
-    if(!diinTag->artist().isNull() && !diinTag->artist().isEmpty()) {
+    if (!diinTag->artist().isEmpty()) {
       ByteVector diinArtist;
-      diinArtist.append(ByteVector::fromUInt(diinTag->artist().size(), d->endianness == BigEndian));
+      if (d->endianness == BigEndian)
+        diinArtist.append(ByteVector::fromUInt32BE(diinTag->artist().size()));
+      else
+        diinArtist.append(ByteVector::fromUInt32LE(diinTag->artist().size()));
       diinArtist.append(ByteVector::fromCString(diinTag->artist().toCString()));
       setChildChunkData("DIAR", diinArtist, DIINChunk);
     }
@@ -256,71 +295,115 @@ bool DSDIFF::File::save()
   }
 
   return true;
+
+}
+
+void DSDIFF::File::strip(TagTypes tags) {
+
+  if (tags & ID3v2) {
+    removeRootChunk("ID3 ");
+    removeRootChunk("id3 ");
+    d->hasID3v2 = false;
+    d->tag.set(ID3v2Index, new ID3v2::Tag);
+
+    /// TODO: needs to also account for ID3v2 tags under the PROP chunk
+  }
+  if (tags & DIIN) {
+    removeRootChunk("DITI");
+    removeRootChunk("DIAR");
+    d->hasDiin = false;
+    d->tag.set(DIINIndex, new DIIN::Tag);
+  }
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // 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);
+void DSDIFF::File::removeRootChunk(unsigned int i) {
 
-    removeBlock(d->chunks[i].offset - 12, removedChunkTotalSize);
+  unsigned long long chunkSize = d->chunks[i].size + d->chunks[i].padding + 12;
+
+  d->size -= chunkSize;
+  if (d->endianness == BigEndian)
+    insert(ByteVector::fromUInt64BE(d->size), 4, 8);
+  else
+    insert(ByteVector::fromUInt64LE(d->size), 4, 8);
+
+  removeBlock(d->chunks[i].offset - 12, chunkSize);
 
   // 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[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 {
+
+void DSDIFF::File::removeRootChunk(const ByteVector &id) {
+
+  int i = chunkIndex(d->chunks, id);
+
+  if (i >= 0)
+    removeRootChunk(i);
+
+}
+
+void DSDIFF::File::setRootChunkData(unsigned int i, const ByteVector &data) {
+
+  if (data.isEmpty()) {
+    removeRootChunk(i);
+    return;
+  }
+
   // 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);
+  if (d->endianness == BigEndian)
+    insert(ByteVector::fromUInt64BE(d->size), 4, 8);
+  else
+    insert(ByteVector::fromUInt64LE(d->size), 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);
+
+  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)
-{
+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) {
+  int i = chunkIndex(d->chunks, name);
+
+  if (i >= 0) {
     setRootChunkData(i, data);
     return;
   }
-  }
 
   // Couldn't find an existing chunk, so let's create a new one.
-  unsigned int i = d->chunks.size() - 1;
+  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);
+  if (d->endianness == BigEndian)
+    insert(ByteVector::fromUInt64BE(d->size), 4, 8);
+  else
+    insert(ByteVector::fromUInt64LE(d->size), 4, 8);
 
   // Now add the chunk to the file
   writeChunk(name,
@@ -336,62 +419,83 @@ void DSDIFF::File::setRootChunkData(const ByteVector &name, const ByteVector &da
   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];
+void DSDIFF::File::removeChildChunk(unsigned int i, unsigned int childChunkNum) {
+
+  ChunkList &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);
+  if (d->endianness == BigEndian)
+    insert(ByteVector::fromUInt64BE(d->size), 4, 8);
+  else
+    insert(ByteVector::fromUInt64LE(d->size), 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);
+  if (d->endianness == BigEndian)
+    insert(ByteVector::fromUInt64BE(d->chunks[d->childChunkIndex[childChunkNum]].size), d->chunks[d->childChunkIndex[childChunkNum]].offset - 8, 8);
+  else
+    insert(ByteVector::fromUInt64LE(d->chunks[d->childChunkIndex[childChunkNum]].size), 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;
+      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;
+    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 {
+
+void DSDIFF::File::setChildChunkData(unsigned int i, const ByteVector &data, unsigned int childChunkNum) {
+
+  ChunkList &childChunks = d->childChunks[childChunkNum];
+
+  if (data.isEmpty()) {
+    removeChildChunk(i, childChunkNum);
+    return;
+  }
+
   // 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);
+
+  if (d->endianness == BigEndian)
+    insert(ByteVector::fromUInt64BE(d->size), 4, 8);
+  else
+    insert(ByteVector::fromUInt64LE(d->size), 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);
+
+  d->chunks[d->childChunkIndex[childChunkNum]].size += ((data.size() + 1) & ~1) - (childChunks[i].size + childChunks[i].padding);
+  
+  if (d->endianness == BigEndian)
+    insert(ByteVector::fromUInt64BE(d->chunks[d->childChunkIndex[childChunkNum]].size), d->chunks[d->childChunkIndex[childChunkNum]].offset - 8, 8);
+  else
+    insert(ByteVector::fromUInt64LE(d->chunks[d->childChunkIndex[childChunkNum]].size), 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);
+
+  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;
@@ -399,19 +503,16 @@ void DSDIFF::File::setChildChunkData(unsigned int i,
   // 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;
+    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];
+void DSDIFF::File::setChildChunkData(const ByteVector &name, const ByteVector &data, unsigned int childChunkNum) {
+
+  ChunkList &childChunks = d->childChunks[childChunkNum];
 
   if (childChunks.size() == 0) {
     debug("DSDIFF::File::setPropChunkData - No valid chunks found.");
@@ -426,24 +527,33 @@ void DSDIFF::File::setChildChunkData(const ByteVector &name,
   }
 
   // Do not attempt to remove a non existing chunk
-  if(data.isNull() || data.isEmpty())
+
+  if (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);
+  if (d->endianness == BigEndian)
+    insert(ByteVector::fromUInt64BE(d->size), 4, 8);
+  else
+    insert(ByteVector::fromUInt64LE(d->size), 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);
+
+  d->chunks[d->childChunkIndex[childChunkNum]].size += (offset & 1) + ((data.size() + 1) & ~1) + 12;
+  if (d->endianness == BigEndian)
+    insert(ByteVector::fromUInt64BE(d->chunks[d->childChunkIndex[childChunkNum]].size), d->chunks[d->childChunkIndex[childChunkNum]].offset - 8, 8);
+  else
+    insert(ByteVector::fromUInt64LE(d->chunks[d->childChunkIndex[childChunkNum]].size), 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;
@@ -453,6 +563,7 @@ void DSDIFF::File::setChildChunkData(const ByteVector &name,
     (offset & 1) ? 1 : 0);
 
   // For root chunks
+
   updateRootChunksStructure(d->childChunkIndex[childChunkNum] + 1);
 
   Chunk64 chunk;
@@ -462,60 +573,48 @@ void DSDIFF::File::setChildChunkData(const ByteVector &name,
   chunk.padding = (data.size() & 0x01) ? 1 : 0;
 
   childChunks.push_back(chunk);
+
 }
 
-static bool isValidChunkID(const ByteVector &name)
-{
-  if(name.size() != 4)
-    return false;
+void DSDIFF::File::updateRootChunksStructure(unsigned int startingChunk) {
 
-  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;
+    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];
+    ChunkList &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;
+        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];
+    ChunkList &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;
-    }
+        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)
-{
+}
+
+void DSDIFF::File::read(bool readProperties, AudioProperties::ReadStyle propertiesStyle) {
+
   bool bigEndian = (d->endianness == BigEndian);
 
   d->type = readBlock(4);
-  d->size = readBlock(8).toLongLong(bigEndian);
+  d->size = bigEndian ? readBlock(8).toInt64BE(0) : readBlock(8).toInt64LE(0);
   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);
+    unsigned long long chunkSize = bigEndian ? readBlock(8).toInt64BE(0) : readBlock(8).toInt64LE(0);
 
     if (!isValidChunkID(chunkName)) {
       debug("DSDIFF::File::read() -- Chunk '" + chunkName + "' has invalid ID");
@@ -523,9 +622,9 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
       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)");
+    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;
     }
@@ -538,6 +637,7 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
     seek(chunk.size, Current);
 
     // Check padding
+
     chunk.padding = 0;
     long uPosNotPadded = tell();
     if ((uPosNotPadded & 0x01) != 0) {
@@ -551,10 +651,14 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
     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 DSD uncompressed
+  unsigned long long lengthDSDSamplesTimeChannels = 0;
+  // For computing bitrate
+  unsigned long long audioDataSizeinBytes = 0;
+  // For DST compressed frames
+  unsigned long dstNumFrames = 0;
+  // For DST compressed frames
+  unsigned short dstFrameRate = 0;
 
   for (unsigned int i = 0; i < d->chunks.size(); i++) {
     if (d->chunks[i].name == "DSD ") {
@@ -570,7 +674,7 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
 
       while (tell() + 12 <= dstChunkEnd) {
         ByteVector dstChunkName = readBlock(4);
-        long long dstChunkSize = readBlock(8).toLongLong(bigEndian);
+        long long dstChunkSize = bigEndian ? readBlock(8).toInt64BE(0) : readBlock(8).toInt64LE(0);
 
         if (!isValidChunkID(dstChunkName)) {
           debug("DSDIFF::File::read() -- DST Chunk '" + dstChunkName + "' has invalid ID");
@@ -579,17 +683,17 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
         }
 
         if (static_cast<long long>(tell()) + dstChunkSize > dstChunkEnd) {
-          debug("DSDIFF::File::read() -- DST Chunk '" + dstChunkName
-                + "' has invalid size (larger than the DST chunk)");
+          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
+          dstNumFrames = bigEndian ? readBlock(4).toUInt32BE(0) : readBlock(4).toUInt32LE(0);
+          dstFrameRate = bigEndian ? readBlock(2).toUInt16BE(0) : readBlock(2).toUInt16LE(0);
+          // Found the wanted one, no need to look at the others
+          break;
         }
 
         seek(dstChunkSize, Current);
@@ -608,10 +712,11 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
       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
+      // +4 to remove the 'SND ' marker at beginning of 'PROP' chunk
+      seek(d->chunks[i].offset + 4);
       while (tell() + 12 <= propChunkEnd) {
         ByteVector propChunkName = readBlock(4);
-        long long propChunkSize = readBlock(8).toLongLong(bigEndian);
+        long long propChunkSize = bigEndian ? readBlock(8).toInt64BE(0) : readBlock(8).toInt64LE(0);
 
         if (!isValidChunkID(propChunkName)) {
           debug("DSDIFF::File::read() -- PROP Chunk '" + propChunkName + "' has invalid ID");
@@ -620,8 +725,7 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
         }
 
         if (static_cast<long long>(tell()) + propChunkSize > propChunkEnd) {
-          debug("DSDIFF::File::read() -- PROP Chunk '" + propChunkName
-                + "' has invalid size (larger than the PROP chunk)");
+          debug("DSDIFF::File::read() -- PROP Chunk '" + propChunkName + "' has invalid size (larger than the PROP chunk)");
           setValid(false);
           break;
         }
@@ -650,13 +754,15 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
     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);
+        long long diinChunkSize = bigEndian ? readBlock(8).toInt64BE(0) : readBlock(8).toInt64LE(0);
 
         if (!isValidChunkID(diinChunkName)) {
           debug("DSDIFF::File::read() -- DIIN Chunk '" + diinChunkName + "' has invalid ID");
@@ -665,8 +771,7 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
         }
 
         if (static_cast<long long>(tell()) + diinChunkSize > diinChunkEnd) {
-          debug("DSDIFF::File::read() -- DIIN Chunk '" + diinChunkName
-                + "' has invalid size (larger than the DIIN chunk)");
+          debug("DSDIFF::File::read() -- DIIN Chunk '" + diinChunkName + "' has invalid size (larger than the DIIN chunk)");
           setValid(false);
           break;
         }
@@ -679,8 +784,10 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
         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))
@@ -718,7 +825,8 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
     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
+        // ID3V2 tag has already been found at root level
+        continue;
       }
       d->id3v2TagChunkID = d->childChunks[PROPChunk][i].name;
       d->tag.set(ID3v2Index, new ID3v2::Tag(this, d->childChunks[PROPChunk][i].offset));
@@ -728,23 +836,24 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
     else if (d->childChunks[PROPChunk][i].name == "FS  ") {
       // Sample rate
       seek(d->childChunks[PROPChunk][i].offset);
-      sampleRate = readBlock(4).toUInt(0, 4, bigEndian);
+      sampleRate = bigEndian ? readBlock(4).toUInt32BE(0) : readBlock(4).toUInt32LE(0);
     }
     else if (d->childChunks[PROPChunk][i].name == "CHNL") {
       // Channels
       seek(d->childChunks[PROPChunk][i].offset);
-      channels = readBlock(2).toShort(0, bigEndian);
+      channels = bigEndian ? readBlock(2).toInt16BE(0) : readBlock(2).toInt16LE(0);
     }
   }
 
   // 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);
+        unsigned int titleStrLength = bigEndian ? readBlock(4).toUInt32BE(0) : readBlock(4).toUInt32LE(0);
         if (titleStrLength <= d->childChunks[DIINChunk][i].size) {
           ByteVector titleStr = readBlock(titleStrLength);
           d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, false)->setTitle(titleStr);
@@ -752,7 +861,7 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
       }
       else if (d->childChunks[DIINChunk][i].name == "DIAR") {
         seek(d->childChunks[DIINChunk][i].offset);
-        unsigned int artistStrLength = readBlock(4).toUInt(0, 4, bigEndian);
+        unsigned int artistStrLength = bigEndian ? readBlock(4).toUInt32BE(0) : readBlock(4).toUInt32LE(0);
         if (artistStrLength <= d->childChunks[DIINChunk][i].size) {
           ByteVector artistStr = readBlock(artistStrLength);
           d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, false)->setArtist(artistStr);
@@ -765,8 +874,7 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
     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;
+        lengthDSDSamplesTimeChannels = static_cast<unsigned long long>(dstNumFrames) * static_cast<unsigned long long>(sampleRate) / static_cast<unsigned long long>(dstFrameRate);
       else
         lengthDSDSamplesTimeChannels = 0;
     }
@@ -779,34 +887,33 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
     if (lengthDSDSamplesTimeChannels > 0)
       bitrate = (audioDataSizeinBytes * 8 * sampleRate) / lengthDSDSamplesTimeChannels / 1000;
 
-    d->properties = new Properties(sampleRate,
-                                   channels,
-                                   lengthDSDSamplesTimeChannels,
-                                   bitrate,
-                                   propertiesStyle);
+    d->properties.reset(new AudioProperties(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
+    // By default, ID3 chunk is at root level
+    d->isID3InPropChunk = false;
     d->hasID3v2 = false;
   }
+
 }
 
-void DSDIFF::File::writeChunk(const ByteVector &name, const ByteVector &data,
-                              unsigned long long offset, unsigned long replace,
-                              unsigned int leadingPadding)
-{
+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));
+  if (d->endianness == BigEndian)
+    combined.append(ByteVector::fromUInt64BE(data.size()));
+  else
+    combined.append(ByteVector::fromUInt64LE(data.size()));
   combined.append(data);
   if ((data.size() & 0x01) != 0)
     combined.append('\x00');
 
   insert(combined, offset, replace);
-}
 
+}

3rdparty/taglib/dsdiff/dsdifffile.h

@@ -31,6 +31,7 @@
 #include "dsdiffproperties.h"
 #include "dsdiffdiintag.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
 //! An implementation of DSDIFF metadata
@@ -40,10 +41,9 @@ namespace TagLib {
  *
  * 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
+ * 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 explicitly 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
  */
 
@@ -53,102 +53,106 @@ namespace TagLib {
 
 /*!
  * 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.
+ * 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
-    {
+class TAGLIB_EXPORT File : public Strawberry_TagLib::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.
+   * This set of flags is used for various operations and is suitable for
+   * being OR-ed together.
    */
-      File(FileName file, bool readProperties = true,
-           Properties::ReadStyle propertiesStyle = Properties::Average);
+  enum TagTypes {
+    //! Empty set.  Matches no tag types.
+    NoTags = 0x0000,
+    //! Matches DIIN tags.
+    DIIN = 0x0002,
+    //! Matches ID3v1 tags.
+    ID3v2 = 0x0002,
+    //! Matches all tag types.
+    AllTags = 0xffff
+  };
 
   /*!
-       * 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.
+   * 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(IOStream *stream, bool readProperties = true,
-           Properties::ReadStyle propertiesStyle = Properties::Average);
+  explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::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.
+   */
+  explicit File(IOStream *stream, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
 
   /*!
    * Destroys this instance of the File.
    */
-      virtual ~File();
+  ~File() override;
 
   /*!
-       * 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,
+   * 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.
+   * 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.
+   * 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;
+  Tag *tag() const override;
 
   /*!
    * 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.
+   * \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;
+  ID3v2::Tag *ID3v2Tag(bool create = false) const;
 
   /*!
    * Returns the DSDIFF DIIN Tag for this file
    *
    */
-      DSDIFF::DIIN::Tag *DIINTag() const;
+  DSDIFF::DIIN::Tag *DIINTag(bool create = false) const;
 
   /*!
    * Implements the unified property interface -- export function.
    * This method forwards to ID3v2::Tag::properties().
    */
-      PropertyMap properties() const;
+  PropertyMap properties() const override;
 
-      void removeUnsupportedProperties(const StringList &properties);
+  void removeUnsupportedProperties(const StringList &properties) override;
 
   /*!
    * Implements the unified property interface -- import function.
    * This method forwards to ID3v2::Tag::setProperties().
    */
-      PropertyMap setProperties(const PropertyMap &);
+  PropertyMap setProperties(const PropertyMap &properties) override;
 
   /*!
-       * Returns the AIFF::Properties for this file.  If no audio properties
-       * were read then this will return a null pointer.
+   * Returns the AIFF::AudioProperties for this file.
+   * If no audio properties were read then this will return a null pointer.
    */
-      virtual Properties *audioProperties() const;
+  AudioProperties *audioProperties() const override;
 
   /*!
-       * 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.
+   * 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.
+   * 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);
    *
@@ -157,18 +161,22 @@ namespace TagLib {
    *
    * \see save(int tags)
    */
-      virtual bool save();
+  bool save() override;
 
   /*!
-       * 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.
+   * Save the file.  If \a strip is specified,
+   * it is possible to choose if tags not specified in \a tags should be stripped from the file or retained.
+   * With \a version, it is possible to specify whether ID3v2.4 or ID3v2.3 should be used.
    */
-      bool save(int tags);
+  bool save(TagTypes tags, StripTags strip = StripOthers, ID3v2::Version version = ID3v2::v4);
+
+  /*!
+   * This will strip the tags that match the OR-ed together TagTypes from the file.
+   * By default it strips all tags.  It returns true if the tags are successfully stripped.
+   *
+   * \note This will update the file immediately.
+   */
+  void strip(TagTypes tags = AllTags);
 
   /*!
    * Returns whether or not the file on disk actually has an ID3v2 tag.
@@ -178,24 +186,24 @@ namespace TagLib {
   bool hasID3v2Tag() const;
 
   /*!
-       * Returns whether or not the file on disk actually has the DSDIFF 
-       * Title & Artist tag.
+   * Returns whether or not the file on disk actually has the DSDIFF title and artist tags.
    *
    * \see DIINTag()
    */
   bool hasDIINTag() const;
 
   /*!
-       * Returns whether or not the given \a stream can be opened as a DSDIFF
-       * file.
+   * 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.
+   * \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 };
+  enum Endianness {
+    BigEndian,
+    LittleEndian
+  };
 
   File(FileName file, Endianness endianness);
   File(IOStream *stream, Endianness endianness);
@@ -204,6 +212,10 @@ namespace TagLib {
   File(const File &);
   File &operator=(const File &);
 
+  void removeRootChunk(const ByteVector &id);
+  void removeRootChunk(unsigned int i);
+  void removeChildChunk(unsigned int i, unsigned int childChunkNum);
+
   /*!
    * Sets the data for the the specified chunk at root level to \a data.
    *
@@ -213,9 +225,7 @@ namespace TagLib {
 
   /*!
    * 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.
+   * 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.
    */
@@ -228,33 +238,28 @@ namespace TagLib {
    *
    * \warning This will update the file immediately.
    */
-      void setChildChunkData(unsigned int i, const ByteVector &data,
-                             unsigned int childChunkNum);
+  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.
+   * 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 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);
+  void read(bool readProperties, AudioProperties::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;
 };
-  }
-}
+}  // namespace DSDIFF
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif
-

3rdparty/taglib/dsdiff/dsdiffproperties.cpp

@@ -23,24 +23,21 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tstring.h>
-#include <tdebug.h>
+#include "tstring.h"
+#include "tdebug.h"
 
 #include "dsdiffproperties.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
-class DSDIFF::Properties::PropertiesPrivate
-{
+class DSDIFF::AudioProperties::AudioPropertiesPrivate {
  public:
-  PropertiesPrivate() :
-  length(0),
+  explicit AudioPropertiesPrivate() : length(0),
                                       bitrate(0),
                                       sampleRate(0),
                                       channels(0),
                                       sampleWidth(0),
-  sampleCount(0)
-  {
+                                      sampleCount(0) {
   }
 
   int length;
@@ -55,66 +52,45 @@ public:
 // 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;
+DSDIFF::AudioProperties::AudioProperties(const unsigned int sampleRate, const unsigned short channels, const unsigned long long samplesCount, const int bitrate, ReadStyle) : Strawberry_TagLib::TagLib::AudioProperties(), d(new AudioPropertiesPrivate) {
 
   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;
+  d->length = d->sampleRate > 0 ? static_cast<int>((d->sampleCount * 1000.0) / d->sampleRate + 0.5) : 0;
+
 }
 
-DSDIFF::Properties::~Properties()
-{
+DSDIFF::AudioProperties::~AudioProperties() {
   delete d;
 }
 
-int DSDIFF::Properties::length() const
-{
-  return lengthInSeconds();
-}
-
-int DSDIFF::Properties::lengthInSeconds() const
-{
+int DSDIFF::AudioProperties::lengthInSeconds() const {
   return d->length / 1000;
 }
 
-int DSDIFF::Properties::lengthInMilliseconds() const
-{
+int DSDIFF::AudioProperties::lengthInMilliseconds() const {
   return d->length;
 }
 
-int DSDIFF::Properties::bitrate() const
-{
+int DSDIFF::AudioProperties::bitrate() const {
   return d->bitrate;
 }
 
-int DSDIFF::Properties::sampleRate() const
-{
+int DSDIFF::AudioProperties::sampleRate() const {
   return d->sampleRate;
 }
 
-int DSDIFF::Properties::channels() const
-{
+int DSDIFF::AudioProperties::channels() const {
   return d->channels;
 }
 
-int DSDIFF::Properties::bitsPerSample() const
-{
+int DSDIFF::AudioProperties::bitsPerSample() const {
   return d->sampleWidth;
 }
 
-long long DSDIFF::Properties::sampleCount() const
-{
+long long DSDIFF::AudioProperties::sampleCount() const {
   return d->sampleCount;
 }
-

3rdparty/taglib/dsdiff/dsdiffproperties.h

@@ -28,8 +28,8 @@
 
 #include "audioproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
-
 namespace DSDIFF {
 
 class File;
@@ -37,47 +37,42 @@ namespace TagLib {
 //! An implementation of audio property reading for DSDIFF
 
 /*!
-     * This reads the data from an DSDIFF stream found in the AudioProperties
-     * API.
+ * This reads the data from an DSDIFF stream found in the AudioProperties API.
  */
 
-    class TAGLIB_EXPORT Properties : public AudioProperties
-    {
+class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
  public:
   /*!
-       * Create an instance of DSDIFF::Properties with the data read from the
-       * ByteVector \a data.
+   * Create an instance of DSDIFF::AudioProperties 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);
+  explicit AudioProperties(const unsigned int sampleRate, const unsigned short channels, const unsigned long long samplesCount, const int bitrate, ReadStyle);
 
   /*!
-       * Destroys this DSDIFF::Properties instance.
+   * Destroys this DSDIFF::AudioProperties instance.
    */
-      virtual ~Properties();
+  ~AudioProperties() override;
 
   // 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 lengthInSeconds() const override;
+  int lengthInMilliseconds() const override;
+  int bitrate() const override;
+  int sampleRate() const override;
+  int channels() const override;
 
   int bitsPerSample() const;
   long long sampleCount() const;
 
  private:
-      Properties(const Properties &);
-      Properties &operator=(const Properties &);
+  AudioProperties(const AudioProperties &);
+  AudioProperties &operator=(const AudioProperties &);
 
-      class PropertiesPrivate;
-      PropertiesPrivate *d;
+  class AudioPropertiesPrivate;
+  AudioPropertiesPrivate *d;
 };
-  }
-}
+
+}  // namespace DSDIFF
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif
-

3rdparty/taglib/dsf/dsffile.cpp

@@ -23,49 +23,43 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevector.h>
-#include <tdebug.h>
-#include <id3v2tag.h>
-#include <tstringlist.h>
-#include <tpropertymap.h>
-#include <tagutils.h>
+#include <memory>
+
+#include "tbytevector.h"
+#include "tdebug.h"
+#include "id3v2tag.h"
+#include "tstringlist.h"
+#include "tpropertymap.h"
+#include "tagutils.h"
 
 #include "dsffile.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 // The DSF specification is located at http://dsd-guide.com/sites/default/files/white-papers/DSFFileFormatSpec_E.pdf
 
-class DSF::File::FilePrivate
-{
+class DSF::File::FilePrivate {
  public:
-  FilePrivate() :
-  properties(0),
-  tag(0)
-  {
-  }
-
-  ~FilePrivate()
-  {
-    delete properties;
-    delete tag;
-  }
+  FilePrivate() : fileSize(0),
+                  metadataOffset(0) {}
 
   long long fileSize;
   long long metadataOffset;
-  Properties *properties;
-  ID3v2::Tag *tag;
+
+  std::unique_ptr<AudioProperties> properties;
+  std::unique_ptr<ID3v2::Tag> tag;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // static members
 ////////////////////////////////////////////////////////////////////////////////
 
-bool DSF::File::isSupported(IOStream *stream)
-{
+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 ");
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -73,50 +67,42 @@ bool DSF::File::isSupported(IOStream *stream)
 ////////////////////////////////////////////////////////////////////////////////
 
 DSF::File::File(FileName file, bool readProperties,
-                Properties::ReadStyle propertiesStyle) :
-  TagLib::File(file),
-  d(new FilePrivate())
-{
+  AudioProperties::ReadStyle propertiesStyle) : Strawberry_TagLib::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())
-{
+DSF::File::File(IOStream *stream, bool readProperties, AudioProperties::ReadStyle propertiesStyle) : Strawberry_TagLib::TagLib::File(stream), d(new FilePrivate()) {
+
   if (isOpen())
     read(readProperties, propertiesStyle);
+
 }
 
-DSF::File::~File()
-{
+DSF::File::~File() {
   delete d;
 }
 
-ID3v2::Tag *DSF::File::tag() const
-{
-  return d->tag;
+ID3v2::Tag *DSF::File::tag() const {
+  return d->tag.get();
 }
 
-PropertyMap DSF::File::properties() const
-{
+DSF::AudioProperties *DSF::File::audioProperties() const {
+  return d->properties.get();
+}
+
+PropertyMap DSF::File::properties() const {
   return d->tag->properties();
 }
 
-PropertyMap DSF::File::setProperties(const PropertyMap &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() {
 
-bool DSF::File::save()
-{
   if (readOnly()) {
     debug("DSF::File::save() -- File is read only.");
     return false;
@@ -134,13 +120,13 @@ bool DSF::File::save()
 
     // Update the file size
     if (d->fileSize != newFileSize) {
-      insert(ByteVector::fromLongLong(newFileSize, false), 12, 8);
+      insert(ByteVector::fromUInt64LE(newFileSize), 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);
+      insert(ByteVector::fromUInt64LE(0ULL), 20, 8);
       d->metadataOffset = 0;
     }
 
@@ -156,13 +142,13 @@ bool DSF::File::save()
 
     // Update the file size
     if (d->fileSize != newFileSize) {
-      insert(ByteVector::fromLongLong(newFileSize, false), 12, 8);
+      insert(ByteVector::fromUInt64LE(newFileSize), 12, 8);
       d->fileSize = newFileSize;
     }
 
     // Update the metadata offset
     if (d->metadataOffset != newMetadataOffset) {
-      insert(ByteVector::fromLongLong(newMetadataOffset, false), 20, 8);
+      insert(ByteVector::fromUInt64LE(newMetadataOffset), 20, 8);
       d->metadataOffset = newMetadataOffset;
     }
 
@@ -171,6 +157,7 @@ bool DSF::File::save()
   }
 
   return true;
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -178,8 +165,8 @@ bool DSF::File::save()
 ////////////////////////////////////////////////////////////////////////////////
 
 
-void DSF::File::read(bool readProperties, Properties::ReadStyle propertiesStyle)
-{
+void DSF::File::read(bool, AudioProperties::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
 
@@ -191,7 +178,7 @@ void DSF::File::read(bool readProperties, Properties::ReadStyle propertiesStyle)
     return;
   }
 
-  long long chunkSize = readBlock(8).toLongLong(false);
+  long long chunkSize = readBlock(8).toInt64LE(0);
 
   // Integrity check
   if (28 != chunkSize) {
@@ -200,7 +187,7 @@ void DSF::File::read(bool readProperties, Properties::ReadStyle propertiesStyle)
     return;
   }
 
-  d->fileSize = readBlock(8).toLongLong(false);
+  d->fileSize = readBlock(8).toInt64LE(0);
 
   // File is malformed or corrupted
   if (d->fileSize != length()) {
@@ -209,7 +196,7 @@ void DSF::File::read(bool readProperties, Properties::ReadStyle propertiesStyle)
     return;
   }
 
-  d->metadataOffset = readBlock(8).toLongLong(false);
+  d->metadataOffset = readBlock(8).toInt64LE(0);
 
   // File is malformed or corrupted
   if (d->metadataOffset > d->fileSize) {
@@ -226,16 +213,16 @@ void DSF::File::read(bool readProperties, Properties::ReadStyle propertiesStyle)
     return;
   }
 
-  chunkSize = readBlock(8).toLongLong(false);
+  chunkSize = readBlock(8).toInt64LE(0);
 
-  d->properties = new Properties(readBlock(chunkSize), propertiesStyle);
+  d->properties.reset(new AudioProperties(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();
+    d->tag.reset(new ID3v2::Tag());
   else
-    d->tag = new ID3v2::Tag(this, d->metadataOffset);
-}
+    d->tag.reset(new ID3v2::Tag(this, d->metadataOffset));
 
+}

3rdparty/taglib/dsf/dsffile.h

@@ -30,6 +30,7 @@
 #include "id3v2tag.h"
 #include "dsfproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
 //! An implementation of DSF metadata
@@ -42,73 +43,69 @@ namespace TagLib {
 
 namespace DSF {
 
-    //! An implementation of TagLib::File with DSF specific methods
+//! An implementation of Strawberry_TagLib::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.
+ * Strawberry_TagLib::TagLib::Tag and Strawberry_TagLib::TagLib::AudioProperties interfaces by way of implementing
+ * the abstract Strawberry_TagLib::TagLib::File API as well as providing some additional information specific to DSF files.
+ *
  */
 
-    class TAGLIB_EXPORT File : public TagLib::File
-    {
+class TAGLIB_EXPORT File : public Strawberry_TagLib::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.
+   * Constructs 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);
+  explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::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.
+   * Constructs 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);
+  explicit File(IOStream *stream, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
 
   /*!
    * Destroys this instance of the File.
    */
-      virtual ~File();
+  ~File() override;
 
   /*!
    * Returns the Tag for this file.
    */
-      ID3v2::Tag *tag() const;
+  ID3v2::Tag *tag() const override;
 
   /*!
    * Implements the unified property interface -- export function.
    * This method forwards to ID3v2::Tag::properties().
    */
-      PropertyMap properties() const;
+  PropertyMap properties() const override;
 
   /*!
    * Implements the unified property interface -- import function.
    * This method forwards to ID3v2::Tag::setProperties().
    */
-      PropertyMap setProperties(const PropertyMap &);
+  PropertyMap setProperties(const PropertyMap &) override;
 
   /*!
-       * Returns the DSF::AudioProperties for this file.  If no audio properties
-       * were read then this will return a null pointer.
+   * Returns the DSF::AudioProperties for this file.
+   * If no audio properties were read then this will return a null pointer.
    */
-      virtual Properties *audioProperties() const;
+  AudioProperties *audioProperties() const override;
 
   /*!
    * Saves the file.
    */
-      virtual bool save();
+  bool save() override;
 
   /*!
-       * Returns whether or not the given \a stream can be opened as a DSF
-       * file.
+   * 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.
+   * \note This method is designed to do a quick check.
+   * The result may not necessarily be correct.
    */
   static bool isSupported(IOStream *stream);
 
@@ -116,13 +113,13 @@ namespace TagLib {
   File(const File &);
   File &operator=(const File &);
 
-      void read(bool readProperties, Properties::ReadStyle propertiesStyle);
+  void read(bool readProperties, AudioProperties::ReadStyle propertiesStyle);
 
   class FilePrivate;
   FilePrivate *d;
 };
-  }
-}
+}  // namespace DSF
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif
-

3rdparty/taglib/dsf/dsfproperties.cpp

@@ -23,18 +23,16 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tstring.h>
-#include <tdebug.h>
+#include "tstring.h"
+#include "tdebug.h"
 
 #include "dsfproperties.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
-class DSF::Properties::PropertiesPrivate
-{
+class DSF::AudioProperties::AudioPropertiesPrivate {
  public:
-  PropertiesPrivate() :
-  formatVersion(0),
+  explicit AudioPropertiesPrivate() : formatVersion(0),
                                       formatID(0),
                                       channelType(0),
                                       channelNum(0),
@@ -43,8 +41,7 @@ public:
                                       sampleCount(0),
                                       blockSizePerChannel(0),
                                       bitrate(0),
-  length(0)
-  {
+                                      length(0) {
   }
 
   // Nomenclature is from DSF file format specification
@@ -58,83 +55,64 @@ public:
   unsigned int blockSizePerChannel;
 
   // Computed
-  unsigned int bitrate;
-  unsigned int length;
+  int bitrate;
+  int length;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-DSF::Properties::Properties(const ByteVector &data, ReadStyle style) : TagLib::AudioProperties(style)
-{
-  d = new PropertiesPrivate;
+DSF::AudioProperties::AudioProperties(const ByteVector &data, ReadStyle) : Strawberry_TagLib::TagLib::AudioProperties(), d(new AudioPropertiesPrivate()) {
   read(data);
 }
 
-DSF::Properties::~Properties()
-{
+DSF::AudioProperties::~AudioProperties() {
   delete d;
 }
 
-int DSF::Properties::length() const
-{
-  return lengthInSeconds();
-}
-
-int DSF::Properties::lengthInSeconds() const
-{
+int DSF::AudioProperties::lengthInSeconds() const {
   return d->length / 1000;
 }
 
-int DSF::Properties::lengthInMilliseconds() const
-{
+int DSF::AudioProperties::lengthInMilliseconds() const {
   return d->length;
 }
 
-int DSF::Properties::bitrate() const
-{
+int DSF::AudioProperties::bitrate() const {
   return d->bitrate;
 }
 
-int DSF::Properties::sampleRate() const
-{
+int DSF::AudioProperties::sampleRate() const {
   return d->samplingFrequency;
 }
 
-int DSF::Properties::channels() const
-{
+int DSF::AudioProperties::channels() const {
   return d->channelNum;
 }
 
 // DSF specific
-int DSF::Properties::formatVersion() const
-{
+int DSF::AudioProperties::formatVersion() const {
   return d->formatVersion;
 }
 
-int DSF::Properties::formatID() const
-{
+int DSF::AudioProperties::formatID() const {
   return d->formatID;
 }
 
-int DSF::Properties::channelType() const
-{
+int DSF::AudioProperties::channelType() const {
   return d->channelType;
 }
 
-int DSF::Properties::bitsPerSample() const
-{
+int DSF::AudioProperties::bitsPerSample() const {
   return d->bitsPerSample;
 }
 
-long long DSF::Properties::sampleCount() const
-{
+long long DSF::AudioProperties::sampleCount() const {
   return d->sampleCount;
 }
 
-int DSF::Properties::blockSizePerChannel() const
-{
+int DSF::AudioProperties::blockSizePerChannel() const {
   return d->blockSizePerChannel;
 }
 
@@ -142,20 +120,16 @@ int DSF::Properties::blockSizePerChannel() const
 // 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);
+void DSF::AudioProperties::read(const ByteVector &data) {
+  d->formatVersion = data.toUInt32LE(0);
+  d->formatID = data.toUInt32LE(4);
+  d->channelType = data.toUInt32LE(8);
+  d->channelNum = data.toUInt32LE(12);
+  d->samplingFrequency = data.toUInt32LE(16);
+  d->bitsPerSample = data.toUInt32LE(20);
+  d->sampleCount = data.toInt64LE(24);
+  d->blockSizePerChannel = data.toUInt32LE(32);
 
-  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;
+  d->bitrate = static_cast<int>((d->samplingFrequency * d->bitsPerSample * d->channelNum) / 1000.0 + 0.5);
+  d->length = d->samplingFrequency > 0 ? static_cast<int>(d->sampleCount * 1000.0 / d->samplingFrequency + 0.5) : 0;
 }
-

3rdparty/taglib/dsf/dsfproperties.h

@@ -28,8 +28,8 @@
 
 #include "audioproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
-
 namespace DSF {
 
 class File;
@@ -37,39 +37,41 @@ namespace TagLib {
 //! An implementation of audio property reading for DSF
 
 /*!
-     * This reads the data from a DSF stream found in the AudioProperties
-     * API.
+ * This reads the data from a DSF stream found in the AudioProperties API.
  */
 
-    class TAGLIB_EXPORT Properties : public TagLib::AudioProperties
-    {
+class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
  public:
   /*!
-       * Create an instance of DSF::AudioProperties with the data read from the
-       * ByteVector \a data.
+   * Create an instance of DSF::AudioProperties with the data read from the ByteVector \a data.
    */
-      Properties(const ByteVector &data, ReadStyle style);
+  explicit AudioProperties(const ByteVector &data, ReadStyle);
 
   /*!
    * Destroys this DSF::AudioProperties instance.
    */
-      virtual ~Properties();
+  ~AudioProperties() override;
 
   // 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 lengthInSeconds() const override;
+  int lengthInMilliseconds() const override;
+  int bitrate() const override;
+  int sampleRate() const override;
+  int channels() const override;
 
   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
+   * 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;
@@ -77,16 +79,16 @@ namespace TagLib {
   int blockSizePerChannel() const;
 
  private:
-      Properties(const Properties &);
-      Properties &operator=(const Properties &);
+  AudioProperties(const AudioProperties&);
+  AudioProperties &operator=(const AudioProperties&);
 
   void read(const ByteVector &data);
 
-      class PropertiesPrivate;
-      PropertiesPrivate *d;
+  class AudioPropertiesPrivate;
+  AudioPropertiesPrivate *d;
 };
-  }
-}
+}  // namespace DSF
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif
-

3rdparty/taglib/fileref.cpp

@@ -27,11 +27,12 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tfile.h>
-#include <tfilestream.h>
-#include <tstring.h>
-#include <tdebug.h>
-#include <trefcounter.h>
+#include <memory>
+
+#include "tfile.h"
+#include "tfilestream.h"
+#include "tstring.h"
+#include "tdebug.h"
 
 #include "fileref.h"
 #include "asffile.h"
@@ -55,18 +56,16 @@
 #include "dsffile.h"
 #include "dsdifffile.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
-namespace
-{
+namespace {
 typedef List<const FileRef::FileTypeResolver*> ResolverList;
 ResolverList fileTypeResolvers;
 
 // Detect the file type by user-defined resolvers.
 
-  File *detectByResolvers(FileName fileName, bool readAudioProperties,
-                          AudioProperties::ReadStyle audioPropertiesStyle)
-  {
+File *detectByResolvers(FileName fileName, bool readAudioProperties, AudioProperties::ReadStyle audioPropertiesStyle) {
+
   ResolverList::ConstIterator it = fileTypeResolvers.begin();
   for (; it != fileTypeResolvers.end(); ++it) {
     File *file = (*it)->createFile(fileName, readAudioProperties, audioPropertiesStyle);
@@ -74,23 +73,23 @@ namespace
       return file;
   }
 
-    return 0;
+  return nullptr;
+
 }
 
 // Detect the file type based on the file extension.
 
-  File* detectByExtension(IOStream *stream, bool readAudioProperties,
-                          AudioProperties::ReadStyle audioPropertiesStyle)
-  {
+File *detectByExtension(IOStream *stream, bool readAudioProperties, AudioProperties::ReadStyle audioPropertiesStyle) {
+
 #ifdef _WIN32
-    const String s = stream->name().toString();
+  const String s(stream->name().wstr());
 #else
   const String s(stream->name());
 #endif
 
   String ext;
-    const int pos = s.rfind(".");
-    if(pos != -1)
+  const size_t pos = s.rfind(".");
+  if (pos != String::npos())
     ext = s.substr(pos + 1).upper();
 
   // If this list is updated, the method defaultFileExtensions() should also be
@@ -98,7 +97,7 @@ namespace
   // that a default file type resolver is created.
 
   if (ext.isEmpty())
-      return 0;
+    return nullptr;
 
   // .oga can be any audio in the Ogg container. So leave it to content-based detection.
 
@@ -107,7 +106,7 @@ namespace
   if (ext == "OGG")
     return new Ogg::Vorbis::File(stream, readAudioProperties, audioPropertiesStyle);
   if (ext == "FLAC")
-      return new FLAC::File(stream, ID3v2::FrameFactory::instance(), readAudioProperties, audioPropertiesStyle);
+    return new FLAC::File(stream, readAudioProperties, audioPropertiesStyle);
   if (ext == "MPC")
     return new MPC::File(stream, readAudioProperties, audioPropertiesStyle);
   if (ext == "WV")
@@ -142,15 +141,15 @@ namespace
   if (ext == "DSF")
     return new DSF::File(stream, readAudioProperties, audioPropertiesStyle);
 
-    return 0;
+  return nullptr;
+
 }
 
 // Detect the file type based on the actual content of the stream.
 
-  File *detectByContent(IOStream *stream, bool readAudioProperties,
-                        AudioProperties::ReadStyle audioPropertiesStyle)
-  {
-    File *file = 0;
+File *detectByContent(IOStream *stream, bool readAudioProperties, AudioProperties::ReadStyle audioPropertiesStyle) {
+
+  File *file = nullptr;
 
   if (MPEG::File::isSupported(stream))
     file = new MPEG::File(stream, ID3v2::FrameFactory::instance(), readAudioProperties, audioPropertiesStyle);
@@ -159,7 +158,7 @@ namespace
   else if (Ogg::FLAC::File::isSupported(stream))
     file = new Ogg::FLAC::File(stream, readAudioProperties, audioPropertiesStyle);
   else if (FLAC::File::isSupported(stream))
-      file = new FLAC::File(stream, ID3v2::FrameFactory::instance(), readAudioProperties, audioPropertiesStyle);
+    file = new FLAC::File(stream, readAudioProperties, audioPropertiesStyle);
   else if (MPC::File::isSupported(stream))
     file = new MPC::File(stream, readAudioProperties, audioPropertiesStyle);
   else if (WavPack::File::isSupported(stream))
@@ -194,95 +193,14 @@ namespace
       delete file;
   }
 
-    return 0;
+  return nullptr;
+
 }
 
-  // Internal function that supports FileRef::create().
-  // This looks redundant, but necessary in order not to change the previous
-  // behavior of FileRef::create().
+struct FileRefData {
+  FileRefData() : file(nullptr), stream(nullptr) {}
 
-  File* createInternal(FileName fileName, bool readAudioProperties,
-                       AudioProperties::ReadStyle audioPropertiesStyle)
-  {
-    File *file = detectByResolvers(fileName, readAudioProperties, audioPropertiesStyle);
-    if(file)
-      return file;
-
-#ifdef _WIN32
-    const String s = fileName.toString();
-#else
-    const String s(fileName);
-#endif
-
-    String ext;
-    const int pos = s.rfind(".");
-    if(pos != -1)
-      ext = s.substr(pos + 1).upper();
-
-    if(ext.isEmpty())
-      return 0;
-
-    if(ext == "MP3")
-      return new MPEG::File(fileName, ID3v2::FrameFactory::instance(), readAudioProperties, audioPropertiesStyle);
-    if(ext == "OGG")
-      return new Ogg::Vorbis::File(fileName, readAudioProperties, audioPropertiesStyle);
-    if(ext == "OGA") {
-      /* .oga can be any audio in the Ogg container. First try FLAC, then Vorbis. */
-      File *file = new Ogg::FLAC::File(fileName, readAudioProperties, audioPropertiesStyle);
-      if(file->isValid())
-        return file;
-      delete file;
-      return new Ogg::Vorbis::File(fileName, readAudioProperties, audioPropertiesStyle);
-    }
-    if(ext == "FLAC")
-      return new FLAC::File(fileName, ID3v2::FrameFactory::instance(), readAudioProperties, audioPropertiesStyle);
-    if(ext == "MPC")
-      return new MPC::File(fileName, readAudioProperties, audioPropertiesStyle);
-    if(ext == "WV")
-      return new WavPack::File(fileName, readAudioProperties, audioPropertiesStyle);
-    if(ext == "SPX")
-      return new Ogg::Speex::File(fileName, readAudioProperties, audioPropertiesStyle);
-    if(ext == "OPUS")
-      return new Ogg::Opus::File(fileName, readAudioProperties, audioPropertiesStyle);
-    if(ext == "TTA")
-      return new TrueAudio::File(fileName, readAudioProperties, audioPropertiesStyle);
-    if(ext == "M4A" || ext == "M4R" || ext == "M4B" || ext == "M4P" || ext == "MP4" || ext == "3G2" || ext == "M4V")
-      return new MP4::File(fileName, readAudioProperties, audioPropertiesStyle);
-    if(ext == "WMA" || ext == "ASF")
-      return new ASF::File(fileName, readAudioProperties, audioPropertiesStyle);
-    if(ext == "AIF" || ext == "AIFF" || ext == "AFC" || ext == "AIFC")
-      return new RIFF::AIFF::File(fileName, readAudioProperties, audioPropertiesStyle);
-    if(ext == "WAV")
-      return new RIFF::WAV::File(fileName, readAudioProperties, audioPropertiesStyle);
-    if(ext == "APE")
-      return new APE::File(fileName, readAudioProperties, audioPropertiesStyle);
-    // module, nst and wow are possible but uncommon extensions
-    if(ext == "MOD" || ext == "MODULE" || ext == "NST" || ext == "WOW")
-      return new Mod::File(fileName, readAudioProperties, audioPropertiesStyle);
-    if(ext == "S3M")
-      return new S3M::File(fileName, readAudioProperties, audioPropertiesStyle);
-    if(ext == "IT")
-      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;
-  }
-}
-
-class FileRef::FileRefPrivate : public RefCounter
-{
-public:
-  FileRefPrivate() :
-    RefCounter(),
-    file(0),
-    stream(0) {}
-
-  ~FileRefPrivate() {
+  ~FileRefData() {
     delete file;
     delete stream;
   }
@@ -291,86 +209,108 @@ public:
   IOStream *stream;
 };
 
+}  // namespace
+
+class FileRef::FileRefPrivate {
+ public:
+  FileRefPrivate() : data(new FileRefData()) {}
+
+  std::shared_ptr<FileRefData> data;
+};
+
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-FileRef::FileRef() :
-  d(new FileRefPrivate())
-{
-}
+FileRef::FileRef() : d(new FileRefPrivate()) {}
 
-FileRef::FileRef(FileName fileName, bool readAudioProperties,
-                 AudioProperties::ReadStyle audioPropertiesStyle) :
-  d(new FileRefPrivate())
-{
+FileRef::FileRef(FileName fileName, bool readAudioProperties, AudioProperties::ReadStyle audioPropertiesStyle) : d(new FileRefPrivate()) {
   parse(fileName, readAudioProperties, audioPropertiesStyle);
 }
 
-FileRef::FileRef(IOStream* stream, bool readAudioProperties, AudioProperties::ReadStyle audioPropertiesStyle) :
-  d(new FileRefPrivate())
-{
+FileRef::FileRef(IOStream *stream, bool readAudioProperties, AudioProperties::ReadStyle audioPropertiesStyle) : d(new FileRefPrivate()) {
   parse(stream, readAudioProperties, audioPropertiesStyle);
 }
 
-FileRef::FileRef(File *file) :
-  d(new FileRefPrivate())
-{
-  d->file = file;
+FileRef::FileRef(File *file) : d(new FileRefPrivate()) {
+  d->data->file = file;
 }
 
-FileRef::FileRef(const FileRef &ref) :
-  d(ref.d)
-{
-  d->ref();
-}
+FileRef::FileRef(const FileRef &ref) : d(new FileRefPrivate(*ref.d)) {}
 
-FileRef::~FileRef()
-{
-  if(d->deref())
+FileRef::~FileRef() {
   delete d;
 }
 
-Tag *FileRef::tag() const
-{
+Tag *FileRef::tag() const {
+
   if (isNull()) {
     debug("FileRef::tag() - Called without a valid file.");
-    return 0;
+    return nullptr;
   }
-  return d->file->tag();
+  return d->data->file->tag();
+
 }
 
-AudioProperties *FileRef::audioProperties() const
-{
+PropertyMap FileRef::properties() const {
+  if (isNull()) {
+    debug("FileRef::properties() - Called without a valid file.");
+    return PropertyMap();
+  }
+
+  return d->data->file->properties();
+}
+
+void FileRef::removeUnsupportedProperties(const StringList &properties) {
+  if (isNull()) {
+    debug("FileRef::removeUnsupportedProperties() - Called without a valid file.");
+    return;
+  }
+
+  d->data->file->removeUnsupportedProperties(properties);
+}
+
+
+PropertyMap FileRef::setProperties(const PropertyMap &properties) {
+  if (isNull()) {
+    debug("FileRef::setProperties() - Called without a valid file.");
+    return PropertyMap();
+  }
+
+  return d->data->file->setProperties(properties);
+}
+
+AudioProperties *FileRef::audioProperties() const {
+
   if (isNull()) {
     debug("FileRef::audioProperties() - Called without a valid file.");
-    return 0;
+    return nullptr;
   }
-  return d->file->audioProperties();
+  return d->data->file->audioProperties();
+
 }
 
-File *FileRef::file() const
-{
-  return d->file;
+File *FileRef::file() const {
+  return d->data->file;
 }
 
-bool FileRef::save()
-{
+bool FileRef::save() {
+
   if (isNull()) {
     debug("FileRef::save() - Called without a valid file.");
     return false;
   }
-  return d->file->save();
+  return d->data->file->save();
+
 }
 
-const FileRef::FileTypeResolver *FileRef::addFileTypeResolver(const FileRef::FileTypeResolver *resolver) // static
-{
+const FileRef::FileTypeResolver *FileRef::addFileTypeResolver(const FileRef::FileTypeResolver *resolver) {  // static
   fileTypeResolvers.prepend(resolver);
   return resolver;
 }
 
-StringList FileRef::defaultFileExtensions()
-{
+StringList FileRef::defaultFileExtensions() {
+
   StringList l;
 
   l.append("ogg");
@@ -406,86 +346,79 @@ StringList FileRef::defaultFileExtensions()
   l.append("dsdiff");  // alias for "dff"
 
   return l;
+
 }
 
-bool FileRef::isNull() const
-{
-  return (!d->file || !d->file->isValid());
+bool FileRef::isValid() const {
+  return (d->data->file && d->data->file->isValid());
 }
 
-FileRef &FileRef::operator=(const FileRef &ref)
-{
+bool FileRef::isNull() const {
+  return (!d->data->file || !d->data->file->isValid());
+}
+
+FileRef &FileRef::operator=(const FileRef &ref) {
   FileRef(ref).swap(*this);
   return *this;
 }
 
-void FileRef::swap(FileRef &ref)
-{
+void FileRef::swap(FileRef &ref) {
   using std::swap;
 
   swap(d, ref.d);
 }
 
-bool FileRef::operator==(const FileRef &ref) const
-{
-  return (ref.d->file == d->file);
+bool FileRef::operator==(const FileRef &ref) const {
+  return (ref.d->data == d->data);
 }
 
-bool FileRef::operator!=(const FileRef &ref) const
-{
-  return (ref.d->file != d->file);
-}
-
-File *FileRef::create(FileName fileName, bool readAudioProperties,
-                      AudioProperties::ReadStyle audioPropertiesStyle) // static
-{
-  return createInternal(fileName, readAudioProperties, audioPropertiesStyle);
+bool FileRef::operator!=(const FileRef &ref) const {
+  return (ref.d->data != d->data);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // private members
 ////////////////////////////////////////////////////////////////////////////////
 
-void FileRef::parse(FileName fileName, bool readAudioProperties,
-                    AudioProperties::ReadStyle audioPropertiesStyle)
-{
+void FileRef::parse(FileName fileName, bool readAudioProperties, AudioProperties::ReadStyle audioPropertiesStyle) {
+
   // Try user-defined resolvers.
 
-  d->file = detectByResolvers(fileName, readAudioProperties, audioPropertiesStyle);
-  if(d->file)
+  d->data->file = detectByResolvers(fileName, readAudioProperties, audioPropertiesStyle);
+  if (d->data->file)
     return;
 
   // Try to resolve file types based on the file extension.
 
-  d->stream = new FileStream(fileName);
-  d->file = detectByExtension(d->stream, readAudioProperties, audioPropertiesStyle);
-  if(d->file)
+  d->data->stream = new FileStream(fileName);
+  d->data->file = detectByExtension(d->data->stream, readAudioProperties, audioPropertiesStyle);
+  if (d->data->file)
     return;
 
   // At last, try to resolve file types based on the actual content.
 
-  d->file = detectByContent(d->stream, readAudioProperties, audioPropertiesStyle);
-  if(d->file)
+  d->data->file = detectByContent(d->data->stream, readAudioProperties, audioPropertiesStyle);
+  if (d->data->file)
     return;
 
   // Stream have to be closed here if failed to resolve file types.
 
-  delete d->stream;
-  d->stream = 0;
+  delete d->data->stream;
+  d->data->stream = nullptr;
 }
 
-void FileRef::parse(IOStream *stream, bool readAudioProperties,
-                    AudioProperties::ReadStyle audioPropertiesStyle)
-{
+void FileRef::parse(IOStream *stream, bool readAudioProperties, AudioProperties::ReadStyle audioPropertiesStyle) {
+
   // User-defined resolvers won't work with a stream.
 
   // Try to resolve file types based on the file extension.
 
-  d->file = detectByExtension(stream, readAudioProperties, audioPropertiesStyle);
-  if(d->file)
+  d->data->file = detectByExtension(stream, readAudioProperties, audioPropertiesStyle);
+  if (d->data->file)
     return;
 
   // At last, try to resolve file types based on the actual content of the file.
 
-  d->file = detectByContent(stream, readAudioProperties, audioPropertiesStyle);
+  d->data->file = detectByContent(stream, readAudioProperties, audioPropertiesStyle);
+
 }

3rdparty/taglib/fileref.h

@@ -30,8 +30,10 @@
 #include "tstringlist.h"
 
 #include "taglib_export.h"
+#include "tpropertymap.h"
 #include "audioproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
 class Tag;
@@ -39,32 +41,26 @@ namespace TagLib {
 //! This class provides a simple abstraction for creating and handling files
 
 /*!
-   * FileRef exists to provide a minimal, generic and value-based wrapper around
-   * a File.  It is lightweight and implicitly shared, and as such suitable for
-   * pass-by-value use.  This hides some of the uglier details of TagLib::File
-   * and the non-generic portions of the concrete file implementations.
+   * FileRef exists to provide a minimal, generic and value-based wrapper around a File.
+   * It is lightweight and implicitly shared, and as such suitable for pass-by-value use.
+   * This hides some of the uglier details of TagLib::File and the non-generic portions of the concrete file implementations.
    *
    * This class is useful in a "simple usage" situation where it is desirable
-   * to be able to get and set some of the tag information that is similar
-   * across file types.
+   * to be able to get and set some of the tag information that is similar across file types.
    *
    * Also note that it is probably a good idea to plug this into your mime
-   * type system rather than using the constructor that accepts a file name using
-   * the FileTypeResolver.
+   * type system rather than using the constructor that accepts a file name using the FileTypeResolver.
    *
    * \see FileTypeResolver
    * \see addFileTypeResolver()
    */
 
-  class TAGLIB_EXPORT FileRef
-  {
+class TAGLIB_EXPORT FileRef {
  public:
-
   //! A class for pluggable file type resolution.
 
   /*!
-   * This class is used to add extend TagLib's very basic file name based file
-   * type resolution.
+   * This class is used to add extend TagLib's very basic file name based file type resolution.
    *
    * This can be accomplished with:
    *
@@ -72,10 +68,10 @@ namespace TagLib {
    *
    * class MyFileTypeResolver : FileTypeResolver
    * {
-   *   TagLib::File *createFile(TagLib::FileName *fileName, bool, AudioProperties::ReadStyle) const
+   *   Strawberry_TagLib::TagLib::File *createFile(Strawberry_TagLib::TagLib::FileName *fileName, bool, AudioProperties::ReadStyle) const
    *   {
    *     if(someCheckForAnMP3File(fileName))
-   *       return new TagLib::MPEG::File(fileName);
+   *       return new Strawberry_TagLib::TagLib::MPEG::File(fileName);
    *     return 0;
    *   }
    * }
@@ -84,69 +80,52 @@ namespace TagLib {
    *
    * \endcode
    *
-   * Naturally a less contrived example would be slightly more complex.  This
-   * can be used to plug in mime-type detection systems or to add new file types
-   * to TagLib.
+   * Naturally a less contrived example would be slightly more complex.
+   * This can be used to plug in mime-type detection systems or to add new file types to TagLib.
    */
 
-    class TAGLIB_EXPORT FileTypeResolver
-    {
-      TAGLIB_IGNORE_MISSING_DESTRUCTOR
+  class TAGLIB_EXPORT FileTypeResolver {
    public:
+    virtual ~FileTypeResolver() {}
     /*!
-       * This method must be overridden to provide an additional file type
-       * resolver.  If the resolver is able to determine the file type it should
-       * return a valid File object; if not it should return 0.
+     * This method must be overridden to provide an additional file type resolver.
+     * If the resolver is able to determine the file type it should return a valid File object; if not it should return 0.
      *
-       * \note The created file is then owned by the FileRef and should not be
-       * deleted.  Deletion will happen automatically when the FileRef passes
-       * out of scope.
+     * \note The created file is then owned by the FileRef and should not be deleted.
+     * Deletion will happen automatically when the FileRef passes out of scope.
      */
-      virtual File *createFile(FileName fileName,
-                               bool readAudioProperties = true,
-                               AudioProperties::ReadStyle
-                               audioPropertiesStyle = AudioProperties::Average) const = 0;
+    virtual File *createFile(FileName fileName, bool readAudioProperties = true, AudioProperties::ReadStyle audioPropertiesStyle = AudioProperties::Average) const = 0;
   };
 
   /*!
    * Creates a null FileRef.
    */
-    FileRef();
+  explicit FileRef();
 
   /*!
-     * Create a FileRef from \a fileName.  If \a readAudioProperties is true then
-     * the audio properties will be read using \a audioPropertiesStyle.  If
-     * \a readAudioProperties is false then \a audioPropertiesStyle will be
-     * ignored.
+   * Create a FileRef from \a fileName.
+   * If \a readAudioProperties is true then the audio properties will be read using \a audioPropertiesStyle.
+   * If \a readAudioProperties is false then \a audioPropertiesStyle will be ignored.
    *
    * Also see the note in the class documentation about why you may not want to
    * use this method in your application.
    */
-    explicit FileRef(FileName fileName,
-                     bool readAudioProperties = true,
-                     AudioProperties::ReadStyle
-                     audioPropertiesStyle = AudioProperties::Average);
+  explicit FileRef(FileName fileName, bool readAudioProperties = true, AudioProperties::ReadStyle audioPropertiesStyle = AudioProperties::Average);
 
   /*!
-     * Construct a FileRef from an opened \a IOStream.  If \a readAudioProperties
-     * is true then the audio properties will be read using \a audioPropertiesStyle.
-     * If \a readAudioProperties is false then \a audioPropertiesStyle will be
-     * ignored.
+   * Construct a FileRef from an opened \a IOStream.
+   * If \a readAudioProperties is true then the audio properties will be read using \a audioPropertiesStyle.
+   * If \a readAudioProperties is false then \a audioPropertiesStyle will be ignored.
    *
-     * Also see the note in the class documentation about why you may not want to
-     * use this method in your application.
+   * Also see the note in the class documentation about why you may not want to use this method in your application.
    *
-     * \note TagLib will *not* take ownership of the stream, the caller is
-     * responsible for deleting it after the File object.
+   * \note TagLib will *not* take ownership of the stream, the caller is responsible for deleting it after the File object.
    */
-    explicit FileRef(IOStream* stream,
-                     bool readAudioProperties = true,
-                     AudioProperties::ReadStyle
-                     audioPropertiesStyle = AudioProperties::Average);
+  explicit FileRef(IOStream *stream, bool readAudioProperties = true, AudioProperties::ReadStyle audioPropertiesStyle = AudioProperties::Average);
 
   /*!
-     * Construct a FileRef using \a file.  The FileRef now takes ownership of the
-     * pointer and will delete the File when it passes out of scope.
+   * Construct a FileRef using \a file.
+   * The FileRef now takes ownership of the pointer and will delete the File when it passes out of scope.
    */
   explicit FileRef(File *file);
 
@@ -174,8 +153,36 @@ namespace TagLib {
   Tag *tag() const;
 
   /*!
-     * Returns the audio properties for this FileRef.  If no audio properties
-     * were read then this will returns a null pointer.
+   * Exports the tags of the file as dictionary mapping (human readable) tag names (uppercase Strings) to StringLists of tag values.
+   * Calls the according specialization in the File subclasses.
+   * For each metadata object of the file that could not be parsed into the PropertyMap format,
+   * the returend map's unsupportedData() list will contain one entry identifying that object (e.g. the frame type for ID3v2 tags).
+   * Use removeUnsupportedProperties() to remove (a subset of) them.
+   * For files that contain more than one tag (e.g. an MP3 with both an ID3v1 and an ID3v2 tag) only the most "modern" one will be exported (ID3v2 in this case).
+   */
+  PropertyMap properties() const;
+
+  /*!
+   * Removes unsupported properties, or a subset of them, from the file's metadata.
+   * The parameter \a properties must contain only entries from properties().unsupportedData().
+   */
+  void removeUnsupportedProperties(const StringList &properties);
+
+  /*!
+   * Sets the tags of this File to those specified in \a properties.
+   * Calls the according specialization method in the subclasses of File to do the translation into the format-specific details.
+   * If some value(s) could not be written imported to the specific metadata format,
+   * the returned PropertyMap will contain those value(s). Otherwise it will be empty, indicating that no problems occured.
+   * With file types that support several tag formats (for instance, MP3 files can have ID3v1, ID3v2, and APEv2 tags),
+   * this function will create the most appropriate one (ID3v2 for MP3 files). Older formats will be updated as well,
+   * if they exist, but won't be taken into account for the return value of this function.
+   * See the documentation of the subclass implementations for detailed descriptions.
+   */
+  PropertyMap setProperties(const PropertyMap &properties);
+
+  /*!
+   * Returns the audio properties for this FileRef.
+   * If no audio properties were read then this will returns a null pointer.
    */
   AudioProperties *audioProperties() const;
 
@@ -202,14 +209,12 @@ namespace TagLib {
   bool save();
 
   /*!
-     * Adds a FileTypeResolver to the list of those used by TagLib.  Each
-     * additional FileTypeResolver is added to the front of a list of resolvers
-     * that are tried.  If the FileTypeResolver returns zero the next resolver
-     * is tried.
+   * Adds a FileTypeResolver to the list of those used by TagLib.
+   * Each additional FileTypeResolver is added to the front of a list of resolvers that are tried.
+   * If the FileTypeResolver returns zero the next resolver is tried.
    *
    * Returns a pointer to the added resolver (the same one that's passed in --
-     * this is mostly so that static initializers have something to use for
-     * assignment).
+   * this is mostly so that static initializers have something to use for assignment).
    *
    * \see FileTypeResolver
    */
@@ -217,8 +222,7 @@ namespace TagLib {
 
   /*!
    * As is mentioned elsewhere in this class's documentation, the default file
-     * type resolution code provided by TagLib only works by comparing file
-     * extensions.
+   * type resolution code provided by TagLib only works by comparing file extensions.
    *
    * This method returns the list of file extensions that are used by default.
    *
@@ -233,6 +237,13 @@ namespace TagLib {
    */
   static StringList defaultFileExtensions();
 
+  /*!
+   * Returns true if the file is open and readable.
+   *
+   * \note Just a negative of isNull().
+   */
+  bool isValid() const;
+
   /*!
    * Returns true if the file (and as such other pointers) are null.
    */
@@ -254,26 +265,10 @@ namespace TagLib {
   bool operator==(const FileRef &ref) const;
 
   /*!
-     * Returns true if this FileRef and \a ref do not point to the same File
-     * object.
+   * Returns true if this FileRef and \a ref do not point to the same File object.
    */
   bool operator!=(const FileRef &ref) const;
 
-    /*!
-     * A simple implementation of file type guessing.  If \a readAudioProperties
-     * is true then the audio properties will be read using
-     * \a audioPropertiesStyle.  If \a readAudioProperties is false then
-     * \a audioPropertiesStyle will be ignored.
-     *
-     * \note You generally shouldn't use this method, but instead the constructor
-     * directly.
-     *
-     * \deprecated
-     */
-    static File *create(FileName fileName,
-                        bool readAudioProperties = true,
-                        AudioProperties::ReadStyle audioPropertiesStyle = AudioProperties::Average);
-
  private:
   void parse(FileName fileName, bool readAudioProperties, AudioProperties::ReadStyle audioPropertiesStyle);
   void parse(IOStream *stream, bool readAudioProperties, AudioProperties::ReadStyle audioPropertiesStyle);
@@ -283,5 +278,6 @@ namespace TagLib {
 };
 
 }  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
-#endif
+#endif  // TAGLIB_FILEREF_H

3rdparty/taglib/flac/flacfile.cpp

@@ -23,75 +23,85 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevector.h>
-#include <tstring.h>
-#include <tlist.h>
-#include <tdebug.h>
-#include <tagunion.h>
-#include <tpropertymap.h>
-#include <tagutils.h>
+#include <memory>
 
-#include <id3v2header.h>
-#include <id3v2tag.h>
-#include <id3v1tag.h>
-#include <xiphcomment.h>
+#include "tbytevector.h"
+#include "tstring.h"
+#include "tlist.h"
+#include "tdebug.h"
+#include "tagunion.h"
+#include "tpropertymap.h"
+#include "tagutils.h"
+
+#include "id3v2header.h"
+#include "id3v2tag.h"
+#include "id3v1tag.h"
+#include "xiphcomment.h"
 
 #include "flacpicture.h"
 #include "flacfile.h"
 #include "flacmetadatablock.h"
 #include "flacunknownmetadatablock.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
-namespace
-{
-  typedef List<FLAC::MetadataBlock *> BlockList;
+namespace {
+typedef List<std::shared_ptr<FLAC::MetadataBlock>> BlockList;
 typedef BlockList::Iterator BlockIterator;
 typedef BlockList::Iterator BlockConstIterator;
 
-  enum { FlacXiphIndex = 0, FlacID3v2Index = 1, FlacID3v1Index = 2 };
+enum { FlacXiphIndex = 0,
+  FlacID3v2Index = 1,
+  FlacID3v1Index = 2 };
 
-  const long MinPaddingLength = 4096;
-  const long MaxPaddingLegnth = 1024 * 1024;
+const long long MinPaddingLength = 4096;
+const long long MaxPaddingLegnth = 1024 * 1024;
 
 const char LastBlockFlag = '\x80';
-}
+}  // namespace
 
-class FLAC::File::FilePrivate
-{
+namespace Strawberry_TagLib {
+namespace TagLib {
+namespace FLAC {
+// Enables BlockList::find() to take raw pointers.
+
+bool operator==(std::shared_ptr<MetadataBlock> lhs, MetadataBlock *rhs);
+bool operator==(std::shared_ptr<MetadataBlock> lhs, MetadataBlock *rhs) {
+  return lhs.get() == rhs;
+}
+}  // namespace FLAC
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
+
+class FLAC::File::FilePrivate {
  public:
-  FilePrivate(const ID3v2::FrameFactory *frameFactory = ID3v2::FrameFactory::instance()) :
-    ID3v2FrameFactory(frameFactory),
+  explicit FilePrivate(const ID3v2::FrameFactory *frameFactory) : ID3v2FrameFactory(ID3v2::FrameFactory::instance()),
                                                                   ID3v2Location(-1),
                                                                   ID3v2OriginalSize(0),
                                                                   ID3v1Location(-1),
-    properties(0),
                                                                   flacStart(0),
                                                                   streamStart(0),
-    scanned(false)
-  {
-    blocks.setAutoDelete(true);
-  }
+                                                                  scanned(false) {
+
+    if (frameFactory)
+      ID3v2FrameFactory = frameFactory;
 
-  ~FilePrivate()
-  {
-    delete properties;
   }
 
   const ID3v2::FrameFactory *ID3v2FrameFactory;
-  long ID3v2Location;
-  long ID3v2OriginalSize;
+  long long ID3v2Location;
+  long long ID3v2OriginalSize;
 
-  long ID3v1Location;
+  long long ID3v1Location;
 
-  TagUnion tag;
+  TripleTagUnion tag;
 
-  Properties *properties;
+  std::unique_ptr<AudioProperties> properties;
   ByteVector xiphCommentData;
   BlockList blocks;
 
-  long flacStart;
-  long streamStart;
+  long long flacStart;
+  long long streamStart;
   bool scanned;
 };
 
@@ -99,76 +109,51 @@ public:
 // static members
 ////////////////////////////////////////////////////////////////////////////////
 
-bool FLAC::File::isSupported(IOStream *stream)
-{
+bool FLAC::File::isSupported(IOStream *stream) {
+
   // A FLAC file has an ID "fLaC" somewhere. An ID3v2 tag may precede.
 
   const ByteVector buffer = Utils::readHeader(stream, bufferSize(), true);
-  return (buffer.find("fLaC") >= 0);
+  return (buffer.find("fLaC") != ByteVector::npos());
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-FLAC::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
-  TagLib::File(file),
-  d(new FilePrivate())
-{
+FLAC::File::File(FileName file, bool readProperties, AudioProperties::ReadStyle, ID3v2::FrameFactory *frameFactory) : Strawberry_TagLib::TagLib::File(file), d(new FilePrivate(frameFactory)) {
+
   if (isOpen())
     read(readProperties);
+
 }
 
-FLAC::File::File(FileName file, ID3v2::FrameFactory *frameFactory,
-                 bool readProperties, Properties::ReadStyle) :
-  TagLib::File(file),
-  d(new FilePrivate(frameFactory))
-{
+FLAC::File::File(IOStream *stream, bool readProperties, AudioProperties::ReadStyle, ID3v2::FrameFactory *frameFactory) : Strawberry_TagLib::TagLib::File(stream), d(new FilePrivate(frameFactory)) {
+
   if (isOpen())
     read(readProperties);
+
 }
 
-FLAC::File::File(IOStream *stream, ID3v2::FrameFactory *frameFactory,
-                 bool readProperties, Properties::ReadStyle) :
-  TagLib::File(stream),
-  d(new FilePrivate(frameFactory))
-{
-  if(isOpen())
-    read(readProperties);
-}
-
-FLAC::File::~File()
-{
+FLAC::File::~File() {
   delete d;
 }
 
-TagLib::Tag *FLAC::File::tag() const
-{
+Strawberry_TagLib::TagLib::Tag *FLAC::File::tag() const {
   return &d->tag;
 }
 
-PropertyMap FLAC::File::properties() const
-{
-  return d->tag.properties();
-}
-
-void FLAC::File::removeUnsupportedProperties(const StringList &unsupported)
-{
-  d->tag.removeUnsupportedProperties(unsupported);
-}
-
-PropertyMap FLAC::File::setProperties(const PropertyMap &properties)
-{
+PropertyMap FLAC::File::setProperties(const PropertyMap &properties) {
   return xiphComment(true)->setProperties(properties);
 }
 
-FLAC::Properties *FLAC::File::audioProperties() const
-{
-  return d->properties;
+FLAC::AudioProperties *FLAC::File::audioProperties() const {
+  return d->properties.get();
 }
 
-bool FLAC::File::save()
-{
+bool FLAC::File::save() {
+
   if (readOnly()) {
     debug("FLAC::File::save() - Cannot save to a read only file.");
     return false;
@@ -190,20 +175,19 @@ bool FLAC::File::save()
   for (BlockIterator it = d->blocks.begin(); it != d->blocks.end(); ++it) {
     if ((*it)->code() == MetadataBlock::VorbisComment) {
       // Set the new Vorbis Comment block
-      delete *it;
       d->blocks.erase(it);
       break;
     }
   }
 
-  d->blocks.append(new UnknownMetadataBlock(MetadataBlock::VorbisComment, d->xiphCommentData));
+  d->blocks.append(std::shared_ptr<MetadataBlock>(new UnknownMetadataBlock(MetadataBlock::VorbisComment, d->xiphCommentData)));
 
   // Render data for the metadata blocks
 
   ByteVector data;
   for (BlockConstIterator it = d->blocks.begin(); it != d->blocks.end(); ++it) {
     ByteVector blockData = (*it)->render();
-    ByteVector blockHeader = ByteVector::fromUInt(blockData.size());
+    ByteVector blockHeader = ByteVector::fromUInt32BE(blockData.size());
     blockHeader[0] = (*it)->code();
     data.append(blockHeader);
     data.append(blockData);
@@ -211,8 +195,8 @@ bool FLAC::File::save()
 
   // Compute the amount of padding, and append that to data.
 
-  long originalLength = d->streamStart - d->flacStart;
-  long paddingLength = originalLength - data.size() - 4;
+  long long originalLength = d->streamStart - d->flacStart;
+  long long paddingLength = originalLength - data.size() - 4;
 
   if (paddingLength <= 0) {
     paddingLength = MinPaddingLength;
@@ -220,7 +204,7 @@ bool FLAC::File::save()
   else {
     // Padding won't increase beyond 1% of the file size or 1MB.
 
-    long threshold = length() / 100;
+    long long threshold = length() / 100;
     threshold = std::max(threshold, MinPaddingLength);
     threshold = std::min(threshold, MaxPaddingLegnth);
 
@@ -228,10 +212,10 @@ bool FLAC::File::save()
       paddingLength = MinPaddingLength;
   }
 
-  ByteVector paddingHeader = ByteVector::fromUInt(paddingLength);
+  ByteVector paddingHeader = ByteVector::fromUInt32BE(paddingLength);
   paddingHeader[0] = static_cast<char>(MetadataBlock::Padding | LastBlockFlag);
   data.append(paddingHeader);
-  data.resize(static_cast<unsigned int>(data.size() + paddingLength));
+  data.resize(static_cast<size_t>(data.size() + paddingLength));
 
   // Write the data to the file
 
@@ -305,106 +289,83 @@ bool FLAC::File::save()
   }
 
   return true;
+
 }
 
-ID3v2::Tag *FLAC::File::ID3v2Tag(bool create)
-{
+ID3v2::Tag *FLAC::File::ID3v2Tag(bool create) {
   return d->tag.access<ID3v2::Tag>(FlacID3v2Index, create);
 }
 
-ID3v1::Tag *FLAC::File::ID3v1Tag(bool create)
-{
+ID3v1::Tag *FLAC::File::ID3v1Tag(bool create) {
   return d->tag.access<ID3v1::Tag>(FlacID3v1Index, create);
 }
 
-Ogg::XiphComment *FLAC::File::xiphComment(bool create)
-{
+Ogg::XiphComment *FLAC::File::xiphComment(bool create) {
   return d->tag.access<Ogg::XiphComment>(FlacXiphIndex, create);
 }
 
-void FLAC::File::setID3v2FrameFactory(const ID3v2::FrameFactory *factory)
-{
-  d->ID3v2FrameFactory = factory;
-}
+List<FLAC::Picture *> FLAC::File::pictureList() {
 
-ByteVector FLAC::File::streamInfoData()
-{
-  debug("FLAC::File::streamInfoData() -- This function is obsolete. Returning an empty ByteVector.");
-  return ByteVector();
-}
-
-long FLAC::File::streamLength()
-{
-  debug("FLAC::File::streamLength() -- This function is obsolete. Returning zero.");
-  return 0;
-}
-
-List<FLAC::Picture *> FLAC::File::pictureList()
-{
   List<Picture *> pictures;
   for (BlockConstIterator it = d->blocks.begin(); it != d->blocks.end(); ++it) {
-    Picture *picture = dynamic_cast<Picture *>(*it);
+    Picture *picture = dynamic_cast<Picture *>(it->get());
     if (picture) {
       pictures.append(picture);
     }
   }
   return pictures;
+
 }
 
-void FLAC::File::addPicture(Picture *picture)
-{
-  d->blocks.append(picture);
+void FLAC::File::addPicture(Picture *picture) {
+  d->blocks.append(std::shared_ptr<Picture>(picture));
 }
 
-void FLAC::File::removePicture(Picture *picture, bool del)
-{
+void FLAC::File::removePicture(Picture *picture) {
+
   BlockIterator it = d->blocks.find(picture);
   if (it != d->blocks.end())
     d->blocks.erase(it);
 
-  if(del)
-    delete picture;
 }
 
-void FLAC::File::removePictures()
-{
+void FLAC::File::removePictures() {
+
   for (BlockIterator it = d->blocks.begin(); it != d->blocks.end();) {
-    if(dynamic_cast<Picture *>(*it)) {
-      delete *it;
+    if (dynamic_cast<Picture *>(it->get())) {
       it = d->blocks.erase(it);
     }
     else {
       ++it;
     }
   }
+
 }
 
-void FLAC::File::strip(int tags)
-{
+void FLAC::File::strip(int tags) {
+
   if (tags & ID3v1)
-    d->tag.set(FlacID3v1Index, 0);
+    d->tag.set(FlacID3v1Index, nullptr);
 
   if (tags & ID3v2)
-    d->tag.set(FlacID3v2Index, 0);
+    d->tag.set(FlacID3v2Index, nullptr);
 
   if (tags & XiphComment) {
     xiphComment()->removeAllFields();
     xiphComment()->removeAllPictures();
   }
+
 }
 
-bool FLAC::File::hasXiphComment() const
-{
+bool FLAC::File::hasXiphComment() const {
   return !d->xiphCommentData.isEmpty();
 }
 
-bool FLAC::File::hasID3v1Tag() const
-{
+bool FLAC::File::hasID3v1Tag() const {
   return (d->ID3v1Location >= 0);
 }
 
-bool FLAC::File::hasID3v2Tag() const
-{
+bool FLAC::File::hasID3v2Tag() const {
   return (d->ID3v2Location >= 0);
 }
 
@@ -412,8 +373,8 @@ bool FLAC::File::hasID3v2Tag() const
 // private members
 ////////////////////////////////////////////////////////////////////////////////
 
-void FLAC::File::read(bool readProperties)
-{
+void FLAC::File::read(bool readProperties) {
+
   // Look for an ID3v2 tag
 
   d->ID3v2Location = Utils::findID3v2(this);
@@ -448,19 +409,20 @@ void FLAC::File::read(bool readProperties)
 
     const ByteVector infoData = d->blocks.front()->render();
 
-    long streamLength;
+    long long streamLength;
 
     if (d->ID3v1Location >= 0)
       streamLength = d->ID3v1Location - d->streamStart;
     else
       streamLength = length() - d->streamStart;
 
-    d->properties = new Properties(infoData, streamLength);
-  }
+    d->properties.reset(new AudioProperties(infoData, streamLength));
   }
 
-void FLAC::File::scan()
-{
+}
+
+void FLAC::File::scan() {
+
   // Scan the metadata pages
 
   if (d->scanned)
@@ -469,7 +431,7 @@ void FLAC::File::scan()
   if (!isValid())
     return;
 
-  long nextBlockOffset;
+  long long nextBlockOffset;
 
   if (d->ID3v2Location >= 0)
     nextBlockOffset = find("fLaC", d->ID3v2Location + d->ID3v2OriginalSize);
@@ -504,7 +466,7 @@ void FLAC::File::scan()
 
     const char blockType = header[0] & ~LastBlockFlag;
     const bool isLastBlock = (header[0] & LastBlockFlag) != 0;
-    const unsigned int blockLength = header.toUInt(1U, 3U);
+    const size_t blockLength = header.toUInt24BE(1);
 
     // First block should be the stream_info metadata
 
@@ -514,9 +476,7 @@ void FLAC::File::scan()
       return;
     }
 
-    if(blockLength == 0
-      && blockType != MetadataBlock::Padding && blockType != MetadataBlock::SeekTable)
-    {
+    if (blockLength == 0 && blockType != MetadataBlock::Padding && blockType != MetadataBlock::SeekTable) {
       debug("FLAC::File::scan() -- Zero-sized metadata block found");
       setValid(false);
       return;
@@ -529,33 +489,32 @@ void FLAC::File::scan()
       return;
     }
 
-    MetadataBlock *block = 0;
+    std::shared_ptr<MetadataBlock> block;
 
     // Found the vorbis-comment
     if (blockType == MetadataBlock::VorbisComment) {
       if (d->xiphCommentData.isEmpty()) {
         d->xiphCommentData = data;
-        block = new UnknownMetadataBlock(MetadataBlock::VorbisComment, data);
+        block.reset(new UnknownMetadataBlock(MetadataBlock::VorbisComment, data));
       }
       else {
         debug("FLAC::File::scan() -- multiple Vorbis Comment blocks found, discarding");
       }
     }
     else if (blockType == MetadataBlock::Picture) {
-      FLAC::Picture *picture = new FLAC::Picture();
+      std::shared_ptr<FLAC::Picture> picture(new FLAC::Picture());
       if (picture->parse(data)) {
         block = picture;
       }
       else {
         debug("FLAC::File::scan() -- invalid picture found, discarding");
-        delete picture;
       }
     }
     else if (blockType == MetadataBlock::Padding) {
       // Skip all padding blocks.
     }
     else {
-      block = new UnknownMetadataBlock(blockType, data);
+      block.reset(new UnknownMetadataBlock(blockType, data));
     }
 
     if (block)
@@ -572,4 +531,5 @@ void FLAC::File::scan()
   d->streamStart = nextBlockOffset;
 
   d->scanned = true;
+
 }

3rdparty/taglib/flac/flacfile.h

@@ -26,6 +26,8 @@
 #ifndef TAGLIB_FLACFILE_H
 #define TAGLIB_FLACFILE_H
 
+#include <memory>
+
 #include "taglib_export.h"
 #include "tfile.h"
 #include "tlist.h"
@@ -34,12 +36,20 @@
 #include "flacpicture.h"
 #include "flacproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
 class Tag;
-  namespace ID3v2 { class FrameFactory; class Tag; }
-  namespace ID3v1 { class Tag; }
-  namespace Ogg { class XiphComment; }
+namespace ID3v2 {
+class FrameFactory;
+class Tag;
+}  // namespace ID3v2
+namespace ID3v1 {
+class Tag;
+}
+namespace Ogg {
+class XiphComment;
+}
 
 //! An implementation of FLAC metadata
 
@@ -57,14 +67,12 @@ namespace TagLib {
 //! An implementation of TagLib::File with FLAC specific methods
 
 /*!
-     * This implements and provides an interface for FLAC 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 FLAC files.
+ * This implements and provides an interface for FLAC 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 FLAC files.
+ *
  */
 
-    class TAGLIB_EXPORT File : public TagLib::File
-    {
+class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File {
  public:
   /*!
    * This set of flags is used for various operations and is suitable for
@@ -84,111 +92,73 @@ namespace TagLib {
   };
 
   /*!
-       * Constructs a FLAC file from \a file.  If \a readProperties is true the
-       * file's audio properties will also be read.
+   * Constructs an FLAC file from \a file.
+   * If \a readProperties is true the file's audio properties will also be read.
+   *
+   * If this file contains and ID3v2 tag the frames will be created using \a frameFactory.
    *
    * \note In the current implementation, \a propertiesStyle is ignored.
-       *
-       * \deprecated This constructor will be dropped in favor of the one below
-       * in a future version.
    */
-      File(FileName file, bool readProperties = true,
-           Properties::ReadStyle propertiesStyle = Properties::Average);
+  explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average, ID3v2::FrameFactory *frameFactory = nullptr);
 
   /*!
-       * Constructs an FLAC file from \a file.  If \a readProperties is true the
-       * file's audio properties will also be read.
+   * Constructs a FLAC file from \a stream.  If \a readProperties is true the file's audio properties will also be read.
    *
-       * If this file contains and ID3v2 tag the frames will be created using
-       * \a frameFactory.
+   * \note TagLib will *not* take ownership of the stream, the caller is responsible for deleting it after the File object.
+   *
+   * If this file contains and ID3v2 tag the frames will be created using \a frameFactory.
    *
    * \note In the current implementation, \a propertiesStyle is ignored.
    */
   // BIC: merge with the above constructor
-      File(FileName file, ID3v2::FrameFactory *frameFactory,
-           bool readProperties = true,
-           Properties::ReadStyle propertiesStyle = Properties::Average);
-
-      /*!
-       * Constructs a FLAC 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.
-       *
-       * If this file contains and ID3v2 tag the frames will be created using
-       * \a frameFactory.
-       *
-       * \note In the current implementation, \a propertiesStyle is ignored.
-       */
-      // BIC: merge with the above constructor
-      File(IOStream *stream, ID3v2::FrameFactory *frameFactory,
-           bool readProperties = true,
-           Properties::ReadStyle propertiesStyle = Properties::Average);
+  explicit File(IOStream *stream, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average, ID3v2::FrameFactory *frameFactory = nullptr);
 
   /*!
    * Destroys this instance of the File.
    */
-      virtual ~File();
+  ~File() override;
 
   /*!
-       * Returns the Tag for this file.  This will be a union of XiphComment,
-       * ID3v1 and ID3v2 tags.
+   * Returns the Tag for this file.  This will be a union of XiphComment, ID3v1 and ID3v2 tags.
    *
    * \see ID3v2Tag()
    * \see ID3v1Tag()
    * \see XiphComment()
    */
-      virtual TagLib::Tag *tag() const;
-
-      /*!
-       * Implements the unified property interface -- export function.
-       * If the file contains more than one tag (e.g. XiphComment and ID3v1),
-       * only the first one (in the order XiphComment, ID3v2, ID3v1) will be
-       * converted to the PropertyMap.
-       */
-      PropertyMap properties() const;
-
-      void removeUnsupportedProperties(const StringList &);
+  Strawberry_TagLib::TagLib::Tag *tag() const override;
 
   /*!
    * Implements the unified property interface -- import function.
-       * This always creates a Xiph comment, if none exists. The return value
-       * relates to the Xiph comment only.
-       * Ignores any changes to ID3v1 or ID3v2 comments since they are not allowed
-       * in the FLAC specification.
+   * This always creates a Xiph comment, if none exists. The return value relates to the Xiph comment only.
+   * Ignores any changes to ID3v1 or ID3v2 comments since they are not allowed in the FLAC specification.
    */
-      PropertyMap setProperties(const PropertyMap &);
+  PropertyMap setProperties(const PropertyMap &) override;
 
   /*!
-       * Returns the FLAC::Properties for this file.  If no audio properties
-       * were read then this will return a null pointer.
+   * Returns the FLAC::AudioProperties for this file.  If no audio properties were read then this will return a null pointer.
    */
-      virtual Properties *audioProperties() const;
+  AudioProperties *audioProperties() const override;
 
   /*!
-       * Save the file.  This will primarily save the XiphComment, but
-       * will also keep any old ID3-tags up to date. If the file
-       * has no XiphComment, one will be constructed from the ID3-tags.
+   * Save the file.  This will primarily save the XiphComment, but will also keep any old ID3-tags up to date.
+   * If the file has no XiphComment, one will be constructed from the ID3-tags.
    *
    * This returns true if the save was successful.
    */
-      virtual bool save();
+  bool save() override;
 
   /*!
    * Returns a pointer to the ID3v2 tag of the file.
    *
    * If \a create is false (the default) this returns a null pointer
-       * if there is no valid ID3v2 tag.  If \a create is true it will create
-       * an ID3v2 tag if one does not exist and returns a valid pointer.
+   * if there is no valid ID3v2 tag.
+   * If \a create is true it will create an ID3v2 tag if one does not exist and returns a valid pointer.
    *
-       * \note This may return 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.
+   * \note This may return 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.
    *
    * \note The Tag <b>is still</b> owned by the MPEG::File and should not be
-       * deleted by the user.  It will be deleted when the file (object) is
-       * destroyed.
+   * deleted by the user.  It will be deleted when the file (object) is destroyed.
    *
    * \see hasID3v2Tag()
    */
@@ -197,17 +167,14 @@ namespace TagLib {
   /*!
    * Returns a pointer to the ID3v1 tag of the file.
    *
-       * If \a create is false (the default) this returns a null pointer
-       * if there is no valid APE tag.  If \a create is true it will create
-       * an APE tag if one does not exist and returns a valid pointer.
+   * If \a create is false (the default) this returns a null pointer if there is no valid APE tag.
+   * If \a create is true it will create an APE tag if one does not exist and returns a valid pointer.
    *
-       * \note This may return a valid pointer regardless of whether or not the
-       * file on disk has an ID3v1 tag.  Use hasID3v1Tag() to check if the file
-       * on disk actually has an ID3v1 tag.
+   * \note This may return a valid pointer regardless of whether or not the file on disk has an ID3v1 tag.
+   * Use hasID3v1Tag() to check if the file on disk actually has an ID3v1 tag.
    *
-       * \note The Tag <b>is still</b> owned by the MPEG::File and should not be
-       * deleted by the user.  It will be deleted when the file (object) is
-       * destroyed.
+   * \note The Tag <b>is still</b> owned by the MPEG::File and should not be deleted by the user.
+   * It will be deleted when the file (object) is destroyed.
    *
    * \see hasID3v1Tag()
    */
@@ -216,58 +183,28 @@ namespace TagLib {
   /*!
    * Returns a pointer to the XiphComment for the file.
    *
-       * If \a create is false (the default) this returns a null pointer
-       * if there is no valid XiphComment.  If \a create is true it will create
-       * a XiphComment if one does not exist and returns a valid pointer.
+   * If \a create is false (the default) this returns a null pointer if there is no valid XiphComment.
+   * If \a create is true it will create a XiphComment if one does not exist and returns a valid pointer.
    *
-       * \note This may return a valid pointer regardless of whether or not the
-       * file on disk has a XiphComment.  Use hasXiphComment() to check if the
-       * file on disk actually has a XiphComment.
+   * \note This may return a valid pointer regardless of whether or not the file on disk has a XiphComment.
+   * Use hasXiphComment() to check if the file on disk actually has a XiphComment.
    *
-       * \note The Tag <b>is still</b> owned by the FLAC::File and should not be
-       * deleted by the user.  It will be deleted when the file (object) is
-       * destroyed.
+   * \note The Tag <b>is still</b> owned by the FLAC::File and should not be deleted by the user.
+   * It will be deleted when the file (object) is destroyed.
    *
    * \see hasXiphComment()
    */
   Ogg::XiphComment *xiphComment(bool create = false);
 
-      /*!
-       * Set the ID3v2::FrameFactory to something other than the default.  This
-       * can be used to specify the way that ID3v2 frames will be interpreted
-       * when
-       *
-       * \see ID3v2FrameFactory
-       * \deprecated This value should be passed in via the constructor
-       */
-      void setID3v2FrameFactory(const ID3v2::FrameFactory *factory);
-
-      /*!
-       * Returns the block of data used by FLAC::Properties for parsing the
-       * stream properties.
-       *
-       * \deprecated Always returns an empty vector.
-       */
-      ByteVector streamInfoData(); // BIC: remove
-
-      /*!
-       * Returns the length of the audio-stream, used by FLAC::Properties for
-       * calculating the bitrate.
-       *
-       * \deprecated Always returns zero.
-       */
-      long streamLength();  // BIC: remove
-
   /*!
    * Returns a list of pictures attached to the FLAC file.
    */
   List<Picture *> pictureList();
 
   /*!
-       * Removes an attached picture. If \a del is true the picture's memory
-       * will be freed; if it is false, it must be deleted by the user.
+   * Removes an attached picture. The picture's memory will be freed.
    */
-      void removePicture(Picture *picture, bool del = true);
+  void removePicture(Picture *picture);
 
   /*!
    * Remove all attached images.
@@ -275,25 +212,23 @@ namespace TagLib {
   void removePictures();
 
   /*!
-       * Add a new picture to the file. The file takes ownership of the
-       * picture and will handle freeing its memory.
+   * Add a new picture to the file.
+   * The file takes ownership of the picture and will handle freeing its memory.
    *
    * \note The file will be saved only after calling save().
    */
   void addPicture(Picture *picture);
 
   /*!
-       * This will remove the tags that match the OR-ed together TagTypes from
-       * the file.  By default it removes all tags.
+   * This will remove the tags that match the OR-ed together TagTypes from the file.
+   * By default it removes all tags.
    *
-       * \warning This will also invalidate pointers to the tags as their memory
-       * will be freed.
+   * \warning This will also invalidate pointers to the tags as their memory will be freed.
    *
-       * \note In order to make the removal permanent save() still needs to be
-       * called.
+   * \note In order to make the removal permanent save() still needs to be called.
    *
-       * \note This won't remove the Vorbis comment block completely.  The
-       * vendor ID will be preserved.
+   * \note This won't remove the Vorbis comment block completely.
+   * The vendor ID will be preserved.
    */
   void strip(int tags = AllTags);
 
@@ -319,11 +254,10 @@ namespace TagLib {
   bool hasID3v2Tag() const;
 
   /*!
-       * Returns whether or not the given \a stream can be opened as a FLAC
-       * file.
+   * Returns whether or not the given \a stream can be opened as a FLAC file.
    *
-       * \note This method is designed to do a quick check.  The result may
-       * not necessarily be correct.
+   * \note This method is designed to do a quick check.
+   * The result may not necessarily be correct.
    */
   static bool isSupported(IOStream *stream);
 
@@ -337,7 +271,8 @@ namespace TagLib {
   class FilePrivate;
   FilePrivate *d;
 };
-  }
-}
+}  // namespace FLAC
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/flac/flacmetadatablock.cpp

@@ -23,25 +23,17 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <taglib.h>
-#include <tdebug.h>
+#include "taglib.h"
+#include "tdebug.h"
 #include "flacmetadatablock.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
-class FLAC::MetadataBlock::MetadataBlockPrivate
-{
+class FLAC::MetadataBlock::MetadataBlockPrivate {
  public:
   MetadataBlockPrivate() {}
-
 };
 
-FLAC::MetadataBlock::MetadataBlock()
-{
-  d = 0;
-}
-
-FLAC::MetadataBlock::~MetadataBlock()
-{
-}
+FLAC::MetadataBlock::MetadataBlock() : d(nullptr) {}
 
+FLAC::MetadataBlock::~MetadataBlock() {}

3rdparty/taglib/flac/flacmetadatablock.h

@@ -30,14 +30,13 @@
 #include "tbytevector.h"
 #include "taglib_export.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
-
 namespace FLAC {
 
-    class TAGLIB_EXPORT MetadataBlock
-    {
+class TAGLIB_EXPORT MetadataBlock {
  public:
-      MetadataBlock();
+  explicit MetadataBlock();
   virtual ~MetadataBlock();
 
   enum BlockType {
@@ -68,8 +67,8 @@ namespace TagLib {
   MetadataBlockPrivate *d;
 };
 
-  }
-
-}
+}  // namespace FLAC
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/flac/flacpicture.cpp

@@ -23,22 +23,20 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <taglib.h>
-#include <tdebug.h>
+#include "taglib.h"
+#include "tdebug.h"
 #include "flacpicture.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
-class FLAC::Picture::PicturePrivate
-{
+class FLAC::Picture::PicturePrivate {
  public:
-  PicturePrivate() :
-    type(FLAC::Picture::Other),
+  explicit PicturePrivate() : type(FLAC::Picture::Other),
                               width(0),
                               height(0),
                               colorDepth(0),
-    numColors(0)
-    {}
+                              numColors(0) {
+  }
 
   Type type;
   String mimeType;
@@ -50,38 +48,32 @@ public:
   ByteVector data;
 };
 
-FLAC::Picture::Picture() :
-  d(new PicturePrivate())
-{
+FLAC::Picture::Picture() : d(new PicturePrivate()) {
 }
 
-FLAC::Picture::Picture(const ByteVector &data) :
-  d(new PicturePrivate())
-{
+FLAC::Picture::Picture(const ByteVector &data) : d(new PicturePrivate()) {
   parse(data);
 }
 
-FLAC::Picture::~Picture()
-{
+FLAC::Picture::~Picture() {
   delete d;
 }
 
-int FLAC::Picture::code() const
-{
+int FLAC::Picture::code() const {
   return FLAC::MetadataBlock::Picture;
 }
 
-bool FLAC::Picture::parse(const ByteVector &data)
-{
+bool FLAC::Picture::parse(const ByteVector &data) {
+
   if (data.size() < 32) {
     debug("A picture block must contain at least 5 bytes.");
     return false;
   }
 
-  unsigned int pos = 0;
-  d->type = FLAC::Picture::Type(data.toUInt(pos));
+  size_t pos = 0;
+  d->type = FLAC::Picture::Type(data.toUInt32BE(pos));
   pos += 4;
-  unsigned int mimeTypeLength = data.toUInt(pos);
+  const unsigned int mimeTypeLength = data.toUInt32BE(pos);
   pos += 4;
   if (pos + mimeTypeLength + 24 > data.size()) {
     debug("Invalid picture block.");
@@ -89,7 +81,7 @@ bool FLAC::Picture::parse(const ByteVector &data)
   }
   d->mimeType = String(data.mid(pos, mimeTypeLength), String::UTF8);
   pos += mimeTypeLength;
-  unsigned int descriptionLength = data.toUInt(pos);
+  const unsigned int descriptionLength = data.toUInt32BE(pos);
   pos += 4;
   if (pos + descriptionLength + 20 > data.size()) {
     debug("Invalid picture block.");
@@ -97,15 +89,15 @@ bool FLAC::Picture::parse(const ByteVector &data)
   }
   d->description = String(data.mid(pos, descriptionLength), String::UTF8);
   pos += descriptionLength;
-  d->width = data.toUInt(pos);
+  d->width = data.toUInt32BE(pos);
   pos += 4;
-  d->height = data.toUInt(pos);
+  d->height = data.toUInt32BE(pos);
   pos += 4;
-  d->colorDepth = data.toUInt(pos);
+  d->colorDepth = data.toUInt32BE(pos);
   pos += 4;
-  d->numColors = data.toUInt(pos);
+  d->numColors = data.toUInt32BE(pos);
   pos += 4;
-  unsigned int dataLength = data.toUInt(pos);
+  const unsigned int dataLength = data.toUInt32BE(pos);
   pos += 4;
   if (pos + dataLength > data.size()) {
     debug("Invalid picture block.");
@@ -114,104 +106,89 @@ bool FLAC::Picture::parse(const ByteVector &data)
   d->data = data.mid(pos, dataLength);
 
   return true;
+
 }
 
-ByteVector FLAC::Picture::render() const
-{
+ByteVector FLAC::Picture::render() const {
+
   ByteVector result;
-  result.append(ByteVector::fromUInt(d->type));
+  result.append(ByteVector::fromUInt32BE(d->type));
   ByteVector mimeTypeData = d->mimeType.data(String::UTF8);
-  result.append(ByteVector::fromUInt(mimeTypeData.size()));
+  result.append(ByteVector::fromUInt32BE(mimeTypeData.size()));
   result.append(mimeTypeData);
   ByteVector descriptionData = d->description.data(String::UTF8);
-  result.append(ByteVector::fromUInt(descriptionData.size()));
+  result.append(ByteVector::fromUInt32BE(descriptionData.size()));
   result.append(descriptionData);
-  result.append(ByteVector::fromUInt(d->width));
-  result.append(ByteVector::fromUInt(d->height));
-  result.append(ByteVector::fromUInt(d->colorDepth));
-  result.append(ByteVector::fromUInt(d->numColors));
-  result.append(ByteVector::fromUInt(d->data.size()));
+  result.append(ByteVector::fromUInt32BE(d->width));
+  result.append(ByteVector::fromUInt32BE(d->height));
+  result.append(ByteVector::fromUInt32BE(d->colorDepth));
+  result.append(ByteVector::fromUInt32BE(d->numColors));
+  result.append(ByteVector::fromUInt32BE(d->data.size()));
   result.append(d->data);
   return result;
+
 }
 
-FLAC::Picture::Type FLAC::Picture::type() const
-{
+FLAC::Picture::Type FLAC::Picture::type() const {
   return d->type;
 }
 
-void FLAC::Picture::setType(FLAC::Picture::Type type)
-{
+void FLAC::Picture::setType(FLAC::Picture::Type type) {
   d->type = type;
 }
 
-String FLAC::Picture::mimeType() const
-{
+String FLAC::Picture::mimeType() const {
   return d->mimeType;
 }
 
-void FLAC::Picture::setMimeType(const String &mimeType)
-{
+void FLAC::Picture::setMimeType(const String &mimeType) {
   d->mimeType = mimeType;
 }
 
-String FLAC::Picture::description() const
-{
+String FLAC::Picture::description() const {
   return d->description;
 }
 
-void FLAC::Picture::setDescription(const String &description)
-{
+void FLAC::Picture::setDescription(const String &description) {
   d->description = description;
 }
 
-int FLAC::Picture::width() const
-{
+int FLAC::Picture::width() const {
   return d->width;
 }
 
-void FLAC::Picture::setWidth(int width)
-{
+void FLAC::Picture::setWidth(int width) {
   d->width = width;
 }
 
-int FLAC::Picture::height() const
-{
+int FLAC::Picture::height() const {
   return d->height;
 }
 
-void FLAC::Picture::setHeight(int height)
-{
+void FLAC::Picture::setHeight(int height) {
   d->height = height;
 }
 
-int FLAC::Picture::colorDepth() const
-{
+int FLAC::Picture::colorDepth() const {
   return d->colorDepth;
 }
 
-void FLAC::Picture::setColorDepth(int colorDepth)
-{
+void FLAC::Picture::setColorDepth(int colorDepth) {
   d->colorDepth = colorDepth;
 }
 
-int FLAC::Picture::numColors() const
-{
+int FLAC::Picture::numColors() const {
   return d->numColors;
 }
 
-void FLAC::Picture::setNumColors(int numColors)
-{
+void FLAC::Picture::setNumColors(int numColors) {
   d->numColors = numColors;
 }
 
-ByteVector FLAC::Picture::data() const
-{
+ByteVector FLAC::Picture::data() const {
   return d->data;
 }
 
-void FLAC::Picture::setData(const ByteVector &data)
-{
+void FLAC::Picture::setData(const ByteVector &data) {
   d->data = data;
 }
-

3rdparty/taglib/flac/flacpicture.h

@@ -32,14 +32,13 @@
 #include "taglib_export.h"
 #include "flacmetadatablock.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
 namespace FLAC {
 
-    class TAGLIB_EXPORT Picture : public MetadataBlock
-    {
+class TAGLIB_EXPORT Picture : public MetadataBlock {
  public:
-
   /*!
    * This describes the function or content of the picture.
    */
@@ -88,9 +87,9 @@ namespace TagLib {
     PublisherLogo = 0x14
   };
 
-      Picture();
-      Picture(const ByteVector &data);
-      ~Picture();
+  explicit Picture();
+  explicit Picture(const ByteVector &data);
+  ~Picture() override;
 
   /*!
    * Returns the type of the image.
@@ -103,14 +102,12 @@ namespace TagLib {
   void setType(Type type);
 
   /*!
-       * Returns the mime type of the image.  This should in most cases be
-       * "image/png" or "image/jpeg".
+   * Returns the mime type of the image.  This should in most cases be "image/png" or "image/jpeg".
    */
   String mimeType() const;
 
   /*!
-       * Sets the mime type of the image.  This should in most cases be
-       * "image/png" or "image/jpeg".
+   * Sets the mime type of the image.  This should in most cases be "image/png" or "image/jpeg".
    */
   void setMimeType(const String &m);
 
@@ -179,12 +176,12 @@ namespace TagLib {
   /*!
    * Returns the FLAC metadata block type.
    */
-      int code() const;
+  int code() const override;
 
   /*!
    * Render the content to the FLAC picture block format.
    */
-      ByteVector render() const;
+  ByteVector render() const override;
 
   /*!
    * Parse the picture data in the FLAC picture block format.
@@ -199,10 +196,8 @@ namespace TagLib {
   PicturePrivate *d;
 };
 
-    typedef List<Picture> PictureList;
-
-  }
-
-}
+}  // namespace FLAC
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/flac/flacproperties.cpp

@@ -23,19 +23,17 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tstring.h>
-#include <tdebug.h>
+#include "tstring.h"
+#include "tdebug.h"
 
 #include "flacproperties.h"
 #include "flacfile.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
-class FLAC::Properties::PropertiesPrivate
-{
+class FLAC::AudioProperties::AudioPropertiesPrivate {
  public:
-  PropertiesPrivate() :
-    length(0),
+  explicit AudioPropertiesPrivate() : length(0),
                                       bitrate(0),
                                       sampleRate(0),
                                       bitsPerSample(0),
@@ -55,72 +53,43 @@ public:
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-FLAC::Properties::Properties(ByteVector data, long streamLength, ReadStyle style) :
-  AudioProperties(style),
-  d(new PropertiesPrivate())
-{
+FLAC::AudioProperties::AudioProperties(const ByteVector &data, long long streamLength, ReadStyle) : Strawberry_TagLib::TagLib::AudioProperties(), d(new AudioPropertiesPrivate()) {
   read(data, streamLength);
 }
 
-FLAC::Properties::Properties(File *, ReadStyle style) :
-  AudioProperties(style),
-  d(new PropertiesPrivate())
-{
-  debug("FLAC::Properties::Properties() - This constructor is no longer used.");
-}
-
-FLAC::Properties::~Properties()
-{
+FLAC::AudioProperties::~AudioProperties() {
   delete d;
 }
 
-int FLAC::Properties::length() const
-{
-  return lengthInSeconds();
-}
-
-int FLAC::Properties::lengthInSeconds() const
-{
+int FLAC::AudioProperties::lengthInSeconds() const {
   return d->length / 1000;
 }
 
-int FLAC::Properties::lengthInMilliseconds() const
-{
+int FLAC::AudioProperties::lengthInMilliseconds() const {
   return d->length;
 }
 
-int FLAC::Properties::bitrate() const
-{
+int FLAC::AudioProperties::bitrate() const {
   return d->bitrate;
 }
 
-int FLAC::Properties::sampleRate() const
-{
+int FLAC::AudioProperties::sampleRate() const {
   return d->sampleRate;
 }
 
-int FLAC::Properties::bitsPerSample() const
-{
+int FLAC::AudioProperties::bitsPerSample() const {
   return d->bitsPerSample;
 }
 
-int FLAC::Properties::sampleWidth() const
-{
-  return bitsPerSample();
-}
-
-int FLAC::Properties::channels() const
-{
+int FLAC::AudioProperties::channels() const {
   return d->channels;
 }
 
-unsigned long long FLAC::Properties::sampleFrames() const
-{
+unsigned long long FLAC::AudioProperties::sampleFrames() const {
   return d->sampleFrames;
 }
 
-ByteVector FLAC::Properties::signature() const
-{
+ByteVector FLAC::AudioProperties::signature() const {
   return d->signature;
 }
 
@@ -128,14 +97,14 @@ ByteVector FLAC::Properties::signature() const
 // private members
 ////////////////////////////////////////////////////////////////////////////////
 
-void FLAC::Properties::read(const ByteVector &data, long streamLength)
-{
+void FLAC::AudioProperties::read(const ByteVector &data, long long streamLength) {
+
   if (data.size() < 18) {
-    debug("FLAC::Properties::read() - FLAC properties must contain at least 18 bytes.");
+    debug("FLAC::AudioProperties::read() - FLAC properties must contain at least 18 bytes.");
     return;
   }
 
-  unsigned int pos = 0;
+  size_t pos = 0;
 
   // Minimum block size (in samples)
   pos += 2;
@@ -149,7 +118,7 @@ void FLAC::Properties::read(const ByteVector &data, long streamLength)
   // Maximum frame size (in bytes)
   pos += 3;
 
-  const unsigned int flags = data.toUInt(pos, true);
+  const unsigned int flags = data.toUInt32BE(pos);
   pos += 4;
 
   d->sampleRate = flags >> 12;
@@ -160,7 +129,7 @@ void FLAC::Properties::read(const ByteVector &data, long streamLength)
   // stream length in samples. (Audio files measured in days)
 
   const unsigned long long hi = flags & 0xf;
-  const unsigned long long lo = data.toUInt(pos, true);
+  const unsigned long long lo = data.toUInt32BE(pos);
   pos += 4;
 
   d->sampleFrames = (hi << 32) | lo;
@@ -173,4 +142,5 @@ void FLAC::Properties::read(const ByteVector &data, long streamLength)
 
   if (data.size() >= pos + 16)
     d->signature = data.mid(pos, 16);
+
 }

3rdparty/taglib/flac/flacproperties.h

@@ -29,6 +29,7 @@
 #include "taglib_export.h"
 #include "audioproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
 namespace FLAC {
@@ -38,111 +39,73 @@ namespace TagLib {
 //! An implementation of audio property reading for FLAC
 
 /*!
-     * This reads the data from an FLAC stream found in the AudioProperties
-     * API.
+ * This reads the data from an FLAC stream found in the AudioProperties API.
  */
 
-    class TAGLIB_EXPORT Properties : public AudioProperties
-    {
+class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
  public:
   /*!
-       * Create an instance of FLAC::Properties with the data read from the
-       * ByteVector \a data.
+   * Create an instance of FLAC::AudioProperties with the data read from the ByteVector \a data.
    */
-       // BIC: switch to const reference
-      Properties(ByteVector data, long streamLength, ReadStyle style = Average);
+  explicit AudioProperties(const ByteVector &data, long long streamLength, ReadStyle style = Average);
 
   /*!
-       * Create an instance of FLAC::Properties with the data read from the
-       * FLAC::File \a file.
+   * Destroys this FLAC::AudioProperties instance.
    */
-       // BIC: remove
-      Properties(File *file, ReadStyle style = Average);
+  ~AudioProperties() override;
 
   /*!
-       * Destroys this FLAC::Properties instance.
-       */
-      virtual ~Properties();
-
-      /*!
-       * Returns the length of the file in seconds.  The length is rounded down to
-       * the nearest whole second.
-       *
-       * \note This method is just an alias of lengthInSeconds().
-       *
-       * \deprecated
-       */
-      virtual int length() const;
-
-      /*!
-       * Returns the length of the file in seconds.  The length is rounded down to
-       * the nearest whole second.
+   * Returns the length of the file in seconds.  The length is rounded down to the nearest whole second.
    *
    * \see lengthInMilliseconds()
    */
-      // BIC: make virtual
-      int lengthInSeconds() const;
+  int lengthInSeconds() const override;
 
   /*!
    * Returns the length of the file in milliseconds.
    *
    * \see lengthInSeconds()
    */
-      // BIC: make virtual
-      int lengthInMilliseconds() const;
+  int lengthInMilliseconds() const override;
 
   /*!
    * Returns the average bit rate of the file in kb/s.
    */
-      virtual int bitrate() const;
+  int bitrate() const override;
 
   /*!
    * Returns the sample rate in Hz.
    */
-      virtual int sampleRate() const;
+  int sampleRate() const override;
 
   /*!
    * Returns the number of audio channels.
    */
-      virtual int channels() const;
+  int channels() const override;
 
   /*!
-       * Returns the number of bits per audio sample as read from the FLAC
-       * identification header.
+   * Returns the number of bits per audio sample as read from the FLAC identification header.
    */
   int bitsPerSample() const;
 
-      /*!
-       * Returns the sample width as read from the FLAC identification
-       * header.
-       *
-       * \note This method is just an alias of bitsPerSample().
-       *
-       * \deprecated
-       */
-      int sampleWidth() const;
-
   /*!
    * Return the number of sample frames.
    */
   unsigned long long sampleFrames() const;
 
   /*!
-       * Returns the MD5 signature of the uncompressed audio stream as read
-       * from the stream info header.
+   * Returns the MD5 signature of the uncompressed audio stream as read from the stream info header.
    */
   ByteVector signature() const;
 
  private:
-      Properties(const Properties &);
-      Properties &operator=(const Properties &);
+  void read(const ByteVector &data, long long streamLength);
 
-      void read(const ByteVector &data, long streamLength);
-
-      class PropertiesPrivate;
-      PropertiesPrivate *d;
+  class AudioPropertiesPrivate;
+  AudioPropertiesPrivate *d;
 };
-  }
-}
+}  // namespace FLAC
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/flac/flacunknownmetadatablock.cpp

@@ -23,56 +23,46 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <taglib.h>
-#include <tdebug.h>
-#include <tstring.h>
+#include "taglib.h"
+#include "tdebug.h"
+#include "tstring.h"
 #include "flacunknownmetadatablock.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
-class FLAC::UnknownMetadataBlock::UnknownMetadataBlockPrivate
-{
+class FLAC::UnknownMetadataBlock::UnknownMetadataBlockPrivate {
  public:
-  UnknownMetadataBlockPrivate() : code(0) {}
+  explicit UnknownMetadataBlockPrivate() : code(0) {}
 
   int code;
   ByteVector data;
 };
 
-FLAC::UnknownMetadataBlock::UnknownMetadataBlock(int code, const ByteVector &data) :
-  d(new UnknownMetadataBlockPrivate())
-{
+FLAC::UnknownMetadataBlock::UnknownMetadataBlock(int code, const ByteVector &data) : d(new UnknownMetadataBlockPrivate()) {
   d->code = code;
   d->data = data;
 }
 
-FLAC::UnknownMetadataBlock::~UnknownMetadataBlock()
-{
+FLAC::UnknownMetadataBlock::~UnknownMetadataBlock() {
   delete d;
 }
 
-int FLAC::UnknownMetadataBlock::code() const
-{
+int FLAC::UnknownMetadataBlock::code() const {
   return d->code;
 }
 
-void FLAC::UnknownMetadataBlock::setCode(int code)
-{
+void FLAC::UnknownMetadataBlock::setCode(int code) {
   d->code = code;
 }
 
-ByteVector FLAC::UnknownMetadataBlock::data() const
-{
+ByteVector FLAC::UnknownMetadataBlock::data() const {
   return d->data;
 }
 
-void FLAC::UnknownMetadataBlock::setData(const ByteVector &data)
-{
+void FLAC::UnknownMetadataBlock::setData(const ByteVector &data) {
   d->data = data;
 }
 
-ByteVector FLAC::UnknownMetadataBlock::render() const
-{
+ByteVector FLAC::UnknownMetadataBlock::render() const {
   return d->data;
 }
-

3rdparty/taglib/flac/flacunknownmetadatablock.h

@@ -31,20 +31,19 @@
 #include "taglib_export.h"
 #include "flacmetadatablock.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
-
 namespace FLAC {
 
-    class TAGLIB_EXPORT UnknownMetadataBlock : public MetadataBlock
-    {
+class TAGLIB_EXPORT UnknownMetadataBlock : public MetadataBlock {
  public:
-      UnknownMetadataBlock(int blockType, const ByteVector &data);
-      ~UnknownMetadataBlock();
+  explicit UnknownMetadataBlock(int code, const ByteVector &data);
+  ~UnknownMetadataBlock() override;
 
   /*!
    * Returns the FLAC metadata block type.
    */
-      int code() const;
+  int code() const override;
 
   /*!
    * Sets the FLAC metadata block type.
@@ -64,18 +63,18 @@ namespace TagLib {
   /*!
    * Render the content of the block.
    */
-      ByteVector render() const;
+  ByteVector render() const override;
 
  private:
-      UnknownMetadataBlock(const MetadataBlock &item);
+  explicit UnknownMetadataBlock(const MetadataBlock &item);
   UnknownMetadataBlock &operator=(const MetadataBlock &item);
 
   class UnknownMetadataBlockPrivate;
   UnknownMetadataBlockPrivate *d;
 };
 
-  }
-
-}
+}  // namespace FLAC
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/it/itfile.cpp

@@ -30,68 +30,46 @@
 #include "modfileprivate.h"
 #include "tpropertymap.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace IT;
 
-class IT::File::FilePrivate
-{
+class IT::File::FilePrivate {
  public:
-  FilePrivate(AudioProperties::ReadStyle propertiesStyle)
-    : tag(), properties(propertiesStyle)
-  {
-  }
+  explicit FilePrivate(AudioProperties::ReadStyle propertiesStyle) : properties(propertiesStyle) {}
 
   Mod::Tag tag;
-  IT::Properties properties;
+  IT::AudioProperties properties;
 };
 
-IT::File::File(FileName file, bool readProperties,
-               AudioProperties::ReadStyle propertiesStyle) :
-  Mod::FileBase(file),
-  d(new FilePrivate(propertiesStyle))
-{
+IT::File::File(FileName file, bool readProperties, AudioProperties::ReadStyle propertiesStyle) : Mod::FileBase(file), d(new FilePrivate(propertiesStyle)) {
+
   if (isOpen())
     read(readProperties);
+
 }
 
-IT::File::File(IOStream *stream, bool readProperties,
-               AudioProperties::ReadStyle propertiesStyle) :
-  Mod::FileBase(stream),
-  d(new FilePrivate(propertiesStyle))
-{
+IT::File::File(IOStream *stream, bool readProperties, AudioProperties::ReadStyle propertiesStyle) : Mod::FileBase(stream), d(new FilePrivate(propertiesStyle)) {
+
   if (isOpen())
     read(readProperties);
+
 }
 
-IT::File::~File()
-{
+IT::File::~File() {
   delete d;
 }
 
-Mod::Tag *IT::File::tag() const
-{
+Mod::Tag *IT::File::tag() const {
   return &d->tag;
 }
 
-PropertyMap IT::File::properties() const
-{
-  return d->tag.properties();
-}
-
-PropertyMap IT::File::setProperties(const PropertyMap &properties)
-{
-  return d->tag.setProperties(properties);
-}
-
-IT::Properties *IT::File::audioProperties() const
-{
+IT::AudioProperties *IT::File::audioProperties() const {
   return &d->properties;
 }
 
-bool IT::File::save()
-{
-  if(readOnly())
-  {
+bool IT::File::save() {
+
+  if (readOnly()) {
     debug("IT::File::save() - Cannot save to a read only file.");
     return false;
   }
@@ -113,8 +91,8 @@ bool IT::File::save()
   // write comment as instrument and sample names:
   StringList lines = d->tag.comment().split("\n");
   for (unsigned short i = 0; i < instrumentCount; ++i) {
-    seek(192L + length + ((long)i << 2));
-    unsigned long instrumentOffset = 0;
+    seek(192L + length + (static_cast<long>(i) << 2));
+    unsigned int instrumentOffset = 0;
     if (!readU32L(instrumentOffset))
       return false;
 
@@ -128,14 +106,14 @@ bool IT::File::save()
   }
 
   for (unsigned short i = 0; i < sampleCount; ++i) {
-    seek(192L + length + ((long)instrumentCount << 2) + ((long)i << 2));
-    unsigned long sampleOffset = 0;
+    seek(192L + length + (static_cast<long>(instrumentCount) << 2) + (static_cast<long>(i) << 2));
+    unsigned int sampleOffset = 0;
     if (!readU32L(sampleOffset))
       return false;
 
     seek(sampleOffset + 20);
 
-    if((unsigned int)(i + instrumentCount) < lines.size())
+    if (static_cast<unsigned int>(i + instrumentCount) < lines.size())
       writeString(lines[i + instrumentCount], 25);
     else
       writeString(String(), 25);
@@ -152,18 +130,18 @@ bool IT::File::save()
   // terminating NUL but it does not hurt to add one:
   if (message.size() > 7999)
     message.resize(7999);
-  message.append((char)0);
+  message.append(static_cast<char>(0));
 
   unsigned short special = 0;
   unsigned short messageLength = 0;
-  unsigned long  messageOffset = 0;
+  unsigned int messageOffset = 0;
 
   seek(46);
   if (!readU16L(special))
     return false;
 
-  unsigned long fileSize = File::length();
-  if(special & Properties::MessageAttached) {
+  unsigned int fileSize = File::length();
+  if (special & AudioProperties::MessageAttached) {
     seek(54);
     if (!readU16L(messageLength) || !readU32L(messageOffset))
       return false;
@@ -171,8 +149,7 @@ bool IT::File::save()
     if (messageLength == 0)
       messageOffset = fileSize;
   }
-  else
-  {
+  else {
     messageOffset = fileSize;
     seek(46);
     writeU16L(special | 0x1);
@@ -199,8 +176,7 @@ bool IT::File::save()
   return true;
 }
 
-void IT::File::read(bool)
-{
+void IT::File::read(bool) {
   if (!isOpen())
     return;
 
@@ -233,14 +209,14 @@ void IT::File::read(bool)
   // sample/instrument names are abused as comments so
   // I just add all together.
   String message;
-  if(special & Properties::MessageAttached) {
+  if (special & AudioProperties::MessageAttached) {
     READ_U16L_AS(messageLength);
     READ_U32L_AS(messageOffset);
     seek(messageOffset);
     ByteVector messageBytes = readBlock(messageLength);
     READ_ASSERT(messageBytes.size() == messageLength);
-    int index = messageBytes.find((char) 0);
-    if(index > -1)
+    const size_t index = messageBytes.find(static_cast<char>(0));
+    if (index != ByteVector::npos())
       messageBytes.resize(index, 0);
     messageBytes.replace('\r', '\n');
     message = messageBytes;
@@ -258,7 +234,7 @@ void IT::File::read(bool)
     // But this always gives 64 channels for all my files anyway.
     // Strangely VLC does report other values. I wonder how VLC
     // gets it's values.
-    if((unsigned char) pannings[i] < 128 && volumes[i] > 0)
+    if (static_cast<unsigned char>(pannings[i]) < 128 && volumes[i] > 0)
       ++channels;
   }
   d->properties.setChannels(channels);
@@ -277,10 +253,10 @@ void IT::File::read(bool)
   //       in the instrument/sample names and more characters
   //       afterwards. The spec does not mention such a case.
   //       Currently I just discard anything after a nil, but
-  //       e.g. VLC seems to interprete a nil as a space. I
+  //       e.g. VLC seems to interpret a nil as a space. I
   //       don't know what is the proper behaviour.
   for (unsigned short i = 0; i < instrumentCount; ++i) {
-    seek(192L + length + ((long)i << 2));
+    seek(192L + length + (static_cast<long>(i) << 2));
     READ_U32L_AS(instrumentOffset);
     seek(instrumentOffset);
 
@@ -296,7 +272,7 @@ void IT::File::read(bool)
   }
 
   for (unsigned short i = 0; i < sampleCount; ++i) {
-    seek(192L + length + ((long)instrumentCount << 2) + ((long)i << 2));
+    seek(192L + length + (static_cast<long>(instrumentCount) << 2) + (static_cast<long>(i) << 2));
     READ_U32L_AS(sampleOffset);
 
     seek(sampleOffset);
@@ -332,4 +308,5 @@ void IT::File::read(bool)
     comment.append(message);
   d->tag.setComment(comment.toString("\n"));
   d->tag.setTrackerName("Impulse Tracker");
+
 }

3rdparty/taglib/it/itfile.h

@@ -29,8 +29,8 @@
 #include "modtag.h"
 #include "itproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
-
 namespace IT {
 
 class TAGLIB_EXPORT File : public Mod::FileBase {
@@ -38,52 +38,33 @@ namespace TagLib {
   /*!
    * Constructs a Impulse Tracker file from \a file.
    *
-         * \note In the current implementation, both \a readProperties and
-         * \a propertiesStyle are ignored.  The audio properties are always
-         * read.
+   * \note In the current implementation, both \a readProperties and \a propertiesStyle are ignored.
+   * The audio properties are always read.
    */
-        File(FileName file, bool readProperties = true,
-             AudioProperties::ReadStyle propertiesStyle =
-             AudioProperties::Average);
+  explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
 
   /*!
    * Constructs a Impulse Tracker file from \a stream.
    *
-         * \note In the current implementation, both \a readProperties and
-         * \a propertiesStyle are ignored.  The audio properties are always
-         * read.
+   * \note In the current implementation, both \a readProperties and \a propertiesStyle are ignored.
+   * The audio properties are always read.
    *
-         * \note TagLib will *not* take ownership of the stream, the caller is
-         * responsible for deleting it after the File object.
+   * \note TagLib will *not* take ownership of the stream, the caller is responsible for deleting it after the File object.
    */
-        File(IOStream *stream, bool readProperties = true,
-             AudioProperties::ReadStyle propertiesStyle =
-             AudioProperties::Average);
+  explicit File(IOStream *stream, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
 
   /*!
    * Destroys this instance of the File.
    */
-        virtual ~File();
+  ~File() override;
 
-        Mod::Tag *tag() const;
+  Mod::Tag *tag() const override;
 
   /*!
-         * Forwards to Mod::Tag::properties().
-         * BIC: will be removed once File::toDict() is made virtual
-         */
-        PropertyMap properties() const;
-
-        /*!
-         * Forwards to Mod::Tag::setProperties().
-         * BIC: will be removed once File::setProperties() is made virtual
-         */
-        PropertyMap setProperties(const PropertyMap &);
-
-        /*!
-         * Returns the IT::Properties for this file. If no audio properties
+   * Returns the IT::AudioProperties for this file. If no audio properties
    * were read then this will return a null pointer.
    */
-        IT::Properties *audioProperties() const;
+  IT::AudioProperties *audioProperties() const override;
 
   /*!
    * Save the file.
@@ -91,8 +72,7 @@ namespace TagLib {
    *
    * \note Saving Impulse Tracker tags is not supported.
    */
-        bool save();
-
+  bool save() override;
 
  private:
   File(const File&);
@@ -103,7 +83,9 @@ namespace TagLib {
   class FilePrivate;
   FilePrivate *d;
 };
-  }
-}
+
+}  // namespace IT
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/it/itproperties.cpp

@@ -26,14 +26,12 @@
 
 #include "itproperties.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace IT;
 
-class IT::Properties::PropertiesPrivate
-{
+class IT::AudioProperties::AudioPropertiesPrivate {
  public:
-  PropertiesPrivate() :
-    channels(0),
+  explicit AudioPropertiesPrivate() : channels(0),
                                       lengthInPatterns(0),
                                       instrumentCount(0),
                                       sampleCount(0),
@@ -47,8 +45,7 @@ public:
                                       tempo(0),
                                       bpmSpeed(0),
                                       panningSeparation(0),
-    pitchWheelDepth(0)
-  {
+                                      pitchWheelDepth(0) {
   }
 
   int channels;
@@ -68,193 +65,152 @@ public:
   unsigned char pitchWheelDepth;
 };
 
-IT::Properties::Properties(AudioProperties::ReadStyle propertiesStyle) :
-  AudioProperties(propertiesStyle),
-  d(new PropertiesPrivate())
-{
-}
+IT::AudioProperties::AudioProperties(AudioProperties::ReadStyle) : Strawberry_TagLib::TagLib::AudioProperties(), d(new AudioPropertiesPrivate()) {}
 
-IT::Properties::~Properties()
-{
+IT::AudioProperties::~AudioProperties() {
   delete d;
 }
 
-int IT::Properties::length() const
-{
+int IT::AudioProperties::lengthInSeconds() const {
   return 0;
 }
 
-int IT::Properties::lengthInSeconds() const
-{
+int IT::AudioProperties::lengthInMilliseconds() const {
   return 0;
 }
 
-int IT::Properties::lengthInMilliseconds() const
-{
+int IT::AudioProperties::bitrate() const {
   return 0;
 }
 
-int IT::Properties::bitrate() const
-{
+int IT::AudioProperties::sampleRate() const {
   return 0;
 }
 
-int IT::Properties::sampleRate() const
-{
-  return 0;
-}
-
-int IT::Properties::channels() const
-{
+int IT::AudioProperties::channels() const {
   return d->channels;
 }
 
-unsigned short IT::Properties::lengthInPatterns() const
-{
+unsigned short IT::AudioProperties::lengthInPatterns() const {
   return d->lengthInPatterns;
 }
 
-bool IT::Properties::stereo() const
-{
+bool IT::AudioProperties::stereo() const {
   return d->flags & Stereo;
 }
 
-unsigned short IT::Properties::instrumentCount() const
-{
+unsigned short IT::AudioProperties::instrumentCount() const {
   return d->instrumentCount;
 }
 
-unsigned short IT::Properties::sampleCount() const
-{
+unsigned short IT::AudioProperties::sampleCount() const {
   return d->sampleCount;
 }
 
-unsigned short IT::Properties::patternCount() const
-{
+unsigned short IT::AudioProperties::patternCount() const {
   return d->patternCount;
 }
 
-unsigned short IT::Properties::version() const
-{
+unsigned short IT::AudioProperties::version() const {
   return d->version;
 }
 
-unsigned short IT::Properties::compatibleVersion() const
-{
+unsigned short IT::AudioProperties::compatibleVersion() const {
   return d->compatibleVersion;
 }
 
-unsigned short IT::Properties::flags() const
-{
+unsigned short IT::AudioProperties::flags() const {
   return d->flags;
 }
 
-unsigned short IT::Properties::special() const
-{
+unsigned short IT::AudioProperties::special() const {
   return d->special;
 }
 
-unsigned char IT::Properties::globalVolume() const
-{
+unsigned char IT::AudioProperties::globalVolume() const {
   return d->globalVolume;
 }
 
-unsigned char IT::Properties::mixVolume() const
-{
+unsigned char IT::AudioProperties::mixVolume() const {
   return d->mixVolume;
 }
 
-unsigned char IT::Properties::tempo() const
-{
+unsigned char IT::AudioProperties::tempo() const {
   return d->tempo;
 }
 
-unsigned char IT::Properties::bpmSpeed() const
-{
+unsigned char IT::AudioProperties::bpmSpeed() const {
   return d->bpmSpeed;
 }
 
-unsigned char IT::Properties::panningSeparation() const
-{
+unsigned char IT::AudioProperties::panningSeparation() const {
   return d->panningSeparation;
 }
 
-unsigned char IT::Properties::pitchWheelDepth() const
-{
+unsigned char IT::AudioProperties::pitchWheelDepth() const {
   return d->pitchWheelDepth;
 }
 
-void IT::Properties::setChannels(int channels)
-{
+////////////////////////////////////////////////////////////////////////////////
+// private members
+////////////////////////////////////////////////////////////////////////////////
+
+void IT::AudioProperties::setChannels(int channels) {
   d->channels = channels;
 }
 
-void IT::Properties::setLengthInPatterns(unsigned short lengthInPatterns)
-{
+void IT::AudioProperties::setLengthInPatterns(unsigned short lengthInPatterns) {
   d->lengthInPatterns = lengthInPatterns;
 }
 
-void IT::Properties::setInstrumentCount(unsigned short instrumentCount)
-{
+void IT::AudioProperties::setInstrumentCount(unsigned short instrumentCount) {
   d->instrumentCount = instrumentCount;
 }
 
-void IT::Properties::setSampleCount(unsigned short sampleCount)
-{
+void IT::AudioProperties::setSampleCount(unsigned short sampleCount) {
   d->sampleCount = sampleCount;
 }
 
-void IT::Properties::setPatternCount(unsigned short patternCount)
-{
+void IT::AudioProperties::setPatternCount(unsigned short patternCount) {
   d->patternCount = patternCount;
 }
 
-void IT::Properties::setFlags(unsigned short flags)
-{
+void IT::AudioProperties::setFlags(unsigned short flags) {
   d->flags = flags;
 }
 
-void IT::Properties::setSpecial(unsigned short special)
-{
+void IT::AudioProperties::setSpecial(unsigned short special) {
   d->special = special;
 }
 
-void IT::Properties::setCompatibleVersion(unsigned short compatibleVersion)
-{
+void IT::AudioProperties::setCompatibleVersion(unsigned short compatibleVersion) {
   d->compatibleVersion = compatibleVersion;
 }
 
-void IT::Properties::setVersion(unsigned short version)
-{
+void IT::AudioProperties::setVersion(unsigned short version) {
   d->version = version;
 }
 
-void IT::Properties::setGlobalVolume(unsigned char globalVolume)
-{
+void IT::AudioProperties::setGlobalVolume(unsigned char globalVolume) {
   d->globalVolume = globalVolume;
 }
 
-void IT::Properties::setMixVolume(unsigned char mixVolume)
-{
+void IT::AudioProperties::setMixVolume(unsigned char mixVolume) {
   d->mixVolume = mixVolume;
 }
 
-void IT::Properties::setTempo(unsigned char tempo)
-{
+void IT::AudioProperties::setTempo(unsigned char tempo) {
   d->tempo = tempo;
 }
 
-void IT::Properties::setBpmSpeed(unsigned char bpmSpeed)
-{
+void IT::AudioProperties::setBpmSpeed(unsigned char bpmSpeed) {
   d->bpmSpeed = bpmSpeed;
 }
 
-void IT::Properties::setPanningSeparation(unsigned char panningSeparation)
-{
+void IT::AudioProperties::setPanningSeparation(unsigned char panningSeparation) {
   d->panningSeparation = panningSeparation;
 }
 
-void IT::Properties::setPitchWheelDepth(unsigned char pitchWheelDepth)
-{
+void IT::AudioProperties::setPitchWheelDepth(unsigned char pitchWheelDepth) {
   d->pitchWheelDepth = pitchWheelDepth;
 }

3rdparty/taglib/it/itproperties.h

@@ -29,10 +29,12 @@
 #include "taglib.h"
 #include "audioproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 namespace IT {
-    class TAGLIB_EXPORT Properties : public AudioProperties {
+class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
   friend class File;
+
  public:
   /*! Flag bits. */
   enum {
@@ -52,15 +54,14 @@ namespace TagLib {
     MidiConfEmbedded = 8
   };
 
-      Properties(AudioProperties::ReadStyle propertiesStyle);
-      virtual ~Properties();
+  explicit AudioProperties(AudioProperties::ReadStyle);
+  ~AudioProperties() override;
 
-      int length()               const;
-      int lengthInSeconds()      const;
-      int lengthInMilliseconds() const;
-      int bitrate()              const;
-      int sampleRate()           const;
-      int channels()             const;
+  int lengthInSeconds() const override;
+  int lengthInMilliseconds() const override;
+  int bitrate() const override;
+  int sampleRate() const override;
+  int channels() const override;
 
   unsigned short lengthInPatterns() const;
   bool stereo() const;
@@ -78,6 +79,7 @@ namespace TagLib {
   unsigned char panningSeparation() const;
   unsigned char pitchWheelDepth() const;
 
+ private:
   void setChannels(int channels);
   void setLengthInPatterns(unsigned short lengthInPatterns);
   void setInstrumentCount(unsigned short instrumentCount);
@@ -95,13 +97,11 @@ namespace TagLib {
   void setPitchWheelDepth(unsigned char pitchWheelDepth);
 
  private:
-      Properties(const Properties&);
-      Properties &operator=(const Properties&);
-
-      class PropertiesPrivate;
-      PropertiesPrivate *d;
+  class AudioPropertiesPrivate;
+  AudioPropertiesPrivate *d;
 };
-  }
-}
+}  // namespace IT
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/mod/modfile.cpp

@@ -30,66 +30,45 @@
 #include "modfileprivate.h"
 #include "tpropertymap.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace Mod;
 
-class Mod::File::FilePrivate
-{
+class Mod::File::FilePrivate {
  public:
-  FilePrivate(AudioProperties::ReadStyle propertiesStyle)
-    : properties(propertiesStyle)
-  {
-  }
+  explicit FilePrivate(AudioProperties::ReadStyle propertiesStyle) : properties(propertiesStyle) {}
 
   Mod::Tag tag;
-  Mod::Properties properties;
+  Mod::AudioProperties properties;
 };
 
-Mod::File::File(FileName file, bool readProperties,
-                AudioProperties::ReadStyle propertiesStyle) :
-  Mod::FileBase(file),
-  d(new FilePrivate(propertiesStyle))
-{
+Mod::File::File(FileName file, bool readProperties, AudioProperties::ReadStyle propertiesStyle) : Mod::FileBase(file), d(new FilePrivate(propertiesStyle)) {
+
   if (isOpen())
     read(readProperties);
+
 }
 
-Mod::File::File(IOStream *stream, bool readProperties,
-                AudioProperties::ReadStyle propertiesStyle) :
-  Mod::FileBase(stream),
-  d(new FilePrivate(propertiesStyle))
-{
+Mod::File::File(IOStream *stream, bool readProperties, AudioProperties::ReadStyle propertiesStyle) : Mod::FileBase(stream), d(new FilePrivate(propertiesStyle)) {
+
   if (isOpen())
     read(readProperties);
+
 }
 
-Mod::File::~File()
-{
+Mod::File::~File() {
   delete d;
 }
 
-Mod::Tag *Mod::File::tag() const
-{
+Mod::Tag *Mod::File::tag() const {
   return &d->tag;
 }
 
-Mod::Properties *Mod::File::audioProperties() const
-{
+Mod::AudioProperties *Mod::File::audioProperties() const {
   return &d->properties;
 }
 
-PropertyMap Mod::File::properties() const
-{
-  return d->tag.properties();
-}
+bool Mod::File::save() {
 
-PropertyMap Mod::File::setProperties(const PropertyMap &properties)
-{
-  return d->tag.setProperties(properties);
-}
-
-bool Mod::File::save()
-{
   if (readOnly()) {
     debug("Mod::File::save() - Cannot save to a read only file.");
     return false;
@@ -97,21 +76,22 @@ bool Mod::File::save()
   seek(0);
   writeString(d->tag.title(), 20);
   StringList lines = d->tag.comment().split("\n");
-  unsigned int n = std::min(lines.size(), d->properties.instrumentCount());
-  for(unsigned int i = 0; i < n; ++ i) {
+  size_t n = std::min<size_t>(lines.size(), d->properties.instrumentCount());
+  for (size_t i = 0; i < n; ++i) {
     writeString(lines[i], 22);
     seek(8, Current);
   }
 
-  for(unsigned int i = n; i < d->properties.instrumentCount(); ++ i) {
+  for (size_t i = n; i < d->properties.instrumentCount(); ++i) {
     writeString(String(), 22);
     seek(8, Current);
   }
   return true;
+
 }
 
-void Mod::File::read(bool)
-{
+void Mod::File::read(bool) {
+
   if (!isOpen())
     return;
 
@@ -189,4 +169,5 @@ void Mod::File::read(bool)
   READ_BYTE(d->properties.setLengthInPatterns);
 
   d->tag.setComment(comment.toString("\n"));
+
 }

3rdparty/taglib/mod/modfile.h

@@ -33,61 +33,42 @@
 #include "modtag.h"
 #include "modproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
-
 namespace Mod {
 
-    class TAGLIB_EXPORT File : public TagLib::Mod::FileBase
-    {
+class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::Mod::FileBase {
  public:
   /*!
    * Constructs a Protracker file from \a file.
    *
-       * \note In the current implementation, both \a readProperties and
-       * \a propertiesStyle are ignored.  The audio properties are always
-       * read.
+   * \note In the current implementation, both \a readProperties and \a propertiesStyle are ignored.
+   * The audio properties are always read.
    */
-      File(FileName file, bool readProperties = true,
-           AudioProperties::ReadStyle propertiesStyle =
-           AudioProperties::Average);
+  explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
 
   /*!
    * Constructs a Protracker file from \a stream.
    *
-       * \note In the current implementation, both \a readProperties and
-       * \a propertiesStyle are ignored.  The audio properties are always
-       * read.
+   * \note In the current implementation, both \a readProperties and \a propertiesStyle are ignored.
+   * The audio properties are always read.
    *
    * \note TagLib will *not* take ownership of the stream, the caller is
    * responsible for deleting it after the File object.
    */
-      File(IOStream *stream, bool readProperties = true,
-           AudioProperties::ReadStyle propertiesStyle =
-           AudioProperties::Average);
+  explicit File(IOStream *stream, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
 
   /*!
    * Destroys this instance of the File.
    */
-      virtual ~File();
+  ~File() override;
 
-      Mod::Tag *tag() const;
+  Mod::Tag *tag() const override;
 
   /*!
-       * Implements the unified property interface -- export function.
-       * Forwards to Mod::Tag::properties().
+   * Returns the Mod::AudioProperties for this file. If no audio properties were read then this will return a null pointer.
    */
-      PropertyMap properties() const;
-
-      /*!
-       * Implements the unified property interface -- import function.
-       * Forwards to Mod::Tag::setProperties().
-       */
-      PropertyMap setProperties(const PropertyMap &);
-      /*!
-       * Returns the Mod::Properties for this file. If no audio properties
-       * were read then this will return a null pointer.
-       */
-      Mod::Properties *audioProperties() const;
+  Mod::AudioProperties *audioProperties() const override;
 
   /*!
    * Save the file.
@@ -95,7 +76,7 @@ namespace TagLib {
    *
    * \note Saving Protracker tags is not supported.
    */
-      bool save();
+  bool save() override;
 
  private:
   File(const File &);
@@ -107,8 +88,8 @@ namespace TagLib {
   FilePrivate *d;
 };
 
-  }
-
-}
+}  // namespace Mod
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/mod/modfilebase.cpp

@@ -27,99 +27,96 @@
 #include "tdebug.h"
 #include "modfilebase.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace Mod;
 
-Mod::FileBase::FileBase(FileName file) : TagLib::File(file)
-{
-}
+Mod::FileBase::FileBase(FileName file) : Strawberry_TagLib::TagLib::File(file) {}
 
-Mod::FileBase::FileBase(IOStream *stream) : TagLib::File(stream)
-{
-}
+Mod::FileBase::FileBase(IOStream *stream) : Strawberry_TagLib::TagLib::File(stream) {}
 
-void Mod::FileBase::writeString(const String &s, unsigned long size, char padding)
-{
+void Mod::FileBase::writeString(const String &s, unsigned int size, char padding) {
   ByteVector data(s.data(String::Latin1));
   data.resize(size, padding);
   writeBlock(data);
 }
 
-bool Mod::FileBase::readString(String &s, unsigned long size)
-{
+bool Mod::FileBase::readString(String &s, unsigned int size) {
+
   ByteVector data(readBlock(size));
   if (data.size() < size) return false;
-  int index = data.find((char) 0);
-  if(index > -1)
-  {
+  const size_t index = data.find(static_cast<char>(0));
+  if (index != ByteVector::npos()) {
     data.resize(index);
   }
   data.replace('\xff', ' ');
 
   s = data;
   return true;
+
 }
 
-void Mod::FileBase::writeByte(unsigned char byte)
-{
-  ByteVector data(1, byte);
+void Mod::FileBase::writeByte(unsigned char _byte) {
+  ByteVector data(1, _byte);
   writeBlock(data);
 }
 
-void Mod::FileBase::writeU16L(unsigned short number)
-{
-  writeBlock(ByteVector::fromShort(number, false));
+void Mod::FileBase::writeU16L(unsigned short number) {
+  writeBlock(ByteVector::fromUInt16LE(number));
 }
 
-void Mod::FileBase::writeU32L(unsigned long number)
-{
-  writeBlock(ByteVector::fromUInt(number, false));
+void Mod::FileBase::writeU32L(unsigned int number) {
+  writeBlock(ByteVector::fromUInt32LE(number));
 }
 
-void Mod::FileBase::writeU16B(unsigned short number)
-{
-  writeBlock(ByteVector::fromShort(number, true));
+void Mod::FileBase::writeU16B(unsigned short number) {
+  writeBlock(ByteVector::fromUInt16BE(number));
 }
 
-void Mod::FileBase::writeU32B(unsigned long number)
-{
-  writeBlock(ByteVector::fromUInt(number, true));
+void Mod::FileBase::writeU32B(unsigned int number) {
+  writeBlock(ByteVector::fromUInt32BE(number));
 }
 
-bool Mod::FileBase::readByte(unsigned char &byte)
-{
+bool Mod::FileBase::readByte(unsigned char &_byte) {
+
   ByteVector data(readBlock(1));
   if (data.size() < 1) return false;
-  byte = data[0];
+  _byte = data[0];
   return true;
+
 }
 
-bool Mod::FileBase::readU16L(unsigned short &number)
-{
+bool Mod::FileBase::readU16L(unsigned short &number) {
+
   ByteVector data(readBlock(2));
   if (data.size() < 2) return false;
-  number = data.toUShort(false);
+  number = data.toUInt16LE(0);
   return true;
+
 }
 
-bool Mod::FileBase::readU32L(unsigned long &number) {
+bool Mod::FileBase::readU32L(unsigned int &number) {
+
   ByteVector data(readBlock(4));
   if (data.size() < 4) return false;
-  number = data.toUInt(false);
+  number = data.toUInt32LE(0);
   return true;
+
 }
 
-bool Mod::FileBase::readU16B(unsigned short &number)
-{
+bool Mod::FileBase::readU16B(unsigned short &number) {
+
   ByteVector data(readBlock(2));
   if (data.size() < 2) return false;
-  number = data.toUShort(true);
+  number = data.toUInt16BE(0);
   return true;
+
 }
 
-bool Mod::FileBase::readU32B(unsigned long &number) {
+bool Mod::FileBase::readU32B(unsigned int &number) {
+
   ByteVector data(readBlock(4));
   if (data.size() < 4) return false;
-  number = data.toUInt(true);
+  number = data.toUInt32BE(0);
   return true;
+
 }

3rdparty/taglib/mod/modfilebase.h

@@ -34,33 +34,32 @@
 
 #include <algorithm>
 
+namespace Strawberry_TagLib {
 namespace TagLib {
-
 namespace Mod {
 
-    class TAGLIB_EXPORT FileBase : public TagLib::File
-    {
+class TAGLIB_EXPORT FileBase : public Strawberry_TagLib::TagLib::File {
  protected:
-      FileBase(FileName file);
-      FileBase(IOStream *stream);
+  explicit FileBase(FileName file);
+  explicit FileBase(IOStream *stream);
 
-      void writeString(const String &s, unsigned long size, char padding = 0);
+  void writeString(const String &s, unsigned int size, char padding = 0);
   void writeByte(unsigned char byte);
   void writeU16L(unsigned short number);
-      void writeU32L(unsigned long number);
+  void writeU32L(unsigned int number);
   void writeU16B(unsigned short number);
-      void writeU32B(unsigned long number);
+  void writeU32B(unsigned int number);
 
-      bool readString(String &s, unsigned long size);
-      bool readByte(unsigned char &byte);
+  bool readString(String &s, unsigned int size);
+  bool readByte(unsigned char &_byte);
   bool readU16L(unsigned short &number);
-      bool readU32L(unsigned long &number);
+  bool readU32L(unsigned int &number);
   bool readU16B(unsigned short &number);
-      bool readU32B(unsigned long &number);
+  bool readU32B(unsigned int &number);
 };
 
-  }
-
-}
+}  // namespace Mod
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif