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

@@ -73,6 +73,11 @@ CMakeLists.txt.user*
 target_wrapper.*
 compile_commands.json
 
+*.kdev4
+*.vscode
+*.code-workspace
+*.sublime-workspace
+
 # Temporary files
 *~
 *.autosave
@@ -99,7 +104,6 @@ Thumbs.db
 
 # Stuff in dist
 maketarball.sh
-create-dmg.sh
 changelog
 PKGBUILD
 

.travis.yml

@@ -1,57 +1,45 @@
 sudo: required
 language: C++
 os:
-  - linux
   - osx
-services:
-  - docker
 compiler:
   - gcc
-  - clang
 
 before_install:
   - 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
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-      docker build -f Dockerfile -t strawberry-build . || travis_terminate 1;
-      docker run --name build -itd strawberry-build /bin/bash || travis_terminate 1;
-      docker exec build git clone https://github.com/jonaski/strawberry;
-    fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      git fetch --unshallow || travis_terminate 1;
-      git pull || travis_terminate 1;
-      brew update || travis_terminate 1;
-      brew unlink python || travis_terminate 1;
-      brew install glib pkgconfig libffi protobuf protobuf-c qt gettext gnutls fftw sqlite chromaprint;
-      brew install gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav;
-      brew install libcdio libmtp libimobiledevice libplist;
-      brew install create-dmg;
-      export Qt5_DIR=/usr/local/opt/qt5/lib/cmake;
-      export Qt5LinguistTools_DIR=/usr/local/opt/qt5/lib/cmake/Qt5LinguistTools;
-      export PATH="/usr/local/opt/gettext/bin:$PATH";
-      export PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig/:$PKG_CONFIG_PATH;
-      ls /usr/local/lib/gstreamer-1.0;
-      ls /usr/local/lib/gio/modules;
-    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 ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir build; cd build; cmake .. -DUSE_BUNDLE=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 || travis_terminate 1;
-      make install || travis_terminate 1;
-      sudo make dmg;
-  fi
+  - make -j8
+  - make install
+  - make dmg
 after_success:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ls -lh strawberry*.dmg; 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;
+        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-test;
+        rsync -e "ssh -o StrictHostKeyChecking=no" -va strawberry*.dmg travis@echoes.jkvinge.net:/home/travis/builds/macos/highsierra/;
       fi
     fi
 

3rdparty/README.md

@@ -19,7 +19,7 @@ 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.
 
 There is a bug in the latest version (1.11.1) corrupting Ogg files,
@@ -37,13 +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/
-
-
-SPMediaKeyTap
--------------
-
-This is used for macOS only to enable strawberry to grab global shortcuts and can safely be deleted on other
-platforms.

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/singleapplication/CMakeLists.txt

@@ -1,17 +1,55 @@
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required(VERSION 3.0)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -U__STRICT_ANSI__ -Wall -Woverloaded-virtual -Wno-sign-compare -fpermissive")
+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 ) )
-{
-    Q_D(SingleApplication);
+SingleApplication::SingleApplication(int &argc, char *argv[], bool allowSecondary, Options options, int timeout)
+    : app_t(argc, argv),
+      d_ptr(new SingleApplicationPrivate(this)) {
 
-    // Store the current mode of the program
-    d->options = options;
+  Q_D(SingleApplication);
 
-    // Generating an application ID used for identifying the shared memory
-    // block and QLocalServer
-    d->genBlockServerName();
+  // Store the current mode of the program
+  d->options_ = options;
+
+  // 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 );
 
-    // Create a shared memory block
-    if( d->memory->create( sizeof( InstancesInfo ) ) ) {
-        // Initialize the shared memory block
-        d->memory->lock();
-        d->initializeMemoryBlock();
-        d->memory->unlock();
-    } else {
-        // Attempt to attach to the memory segment
-        if( ! d->memory->attach() ) {
-            qCritical() << "SingleApplication: Unable to attach to shared memory block.";
-            qCritical() << d->memory->errorString();
-            delete d;
-            ::exit( EXIT_FAILURE );
-        }
+  // Guarantee thread safe behaviour with a shared memory block.
+  d->memory_ = new QSharedMemory(d->blockServerName_);
+
+  // Create a shared memory block
+  if (d->memory_->create(sizeof(InstancesInfo))) {
+    // Initialize the shared memory block
+    if (!d->memory_->lock()) {
+      qCritical() << "SingleApplication: Unable to lock memory block after create.";
+      abortSafely();
+    }
+    d->initializeMemoryBlock();
+  }
+  else {
+    if (d->memory_->error() == QSharedMemory::AlreadyExists) {
+      // Attempt to attach to the memory segment
+      if (!d->memory_->attach()) {
+        qCritical() << "SingleApplication: Unable to attach to shared memory block.";
+        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());
+  QElapsedTimer time;
+  time.start();
+
+  // Make sure the shared memory block is initialised and in consistent state
+  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();
     }
 
-    InstancesInfo* inst = static_cast<InstancesInfo*>( d->memory->data() );
-    QTime time;
-    time.start();
-
-    // Make sure the shared memory block is initialised and in consistent state
-    while( true ) {
-        d->memory->lock();
-
-        if( d->blockChecksum() == inst->checksum ) break;
-
-        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();
     }
-
-    if( inst->primary == false) {
-        d->startPrimary();
-        d->memory->unlock();
-        return;
+    d->randomSleep();
+    if (!d->memory_->lock()) {
+      qCritical() << "SingleApplication: Unable to lock memory after random wait.";
+      abortSafely();
     }
+  }
 
-    // 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 ) {
-            d->connectToPrimary( timeout, SingleApplicationPrivate::SecondaryInstance );
-        }
-        d->memory->unlock();
-        return;
+  if (inst->primary == false) {
+    d->startPrimary();
+    if (!d->memory_->unlock()) {
+      qDebug() << "SingleApplication: Unable to unlock memory after primary start.";
+      qDebug() << d->memory_->errorString();
     }
+    return;
+  }
 
-    d->memory->unlock();
+  // Check if another instance can be started
+  if (allowSecondary) {
+    d->startSecondary();
+    if (d->options_ & Mode::SecondaryNotification) {
+      d->connectToPrimary(timeout, SingleApplicationPrivate::SecondaryInstance);
+    }
+    if (!d->memory_->unlock()) {
+      qDebug() << "SingleApplication: Unable to unlock memory after secondary start.";
+      qDebug() << d->memory_->errorString();
+    }
+    return;
+  }
 
-    d->connectToPrimary( timeout, SingleApplicationPrivate::NewInstance );
+  if (!d->memory_->unlock()) {
+    qDebug() << "SingleApplication: Unable to unlock memory at end of execution.";
+    qDebug() << d->memory_->errorString();
+  }
 
-    delete d;
+  d->connectToPrimary(timeout, SingleApplicationPrivate::NewInstance);
 
-    ::exit( EXIT_SUCCESS );
+  delete d;
+
+  ::exit(EXIT_SUCCESS);
+
+}
+
+SingleApplication::~SingleApplication() {
+  Q_D(SingleApplication);
+  delete d;
 }
 
 /**
- * @brief Destructor
+ * Checks if the current application instance is primary.
+ * @return Returns true if the instance is primary, false otherwise.
  */
-SingleApplication::~SingleApplication()
-{
-    Q_D(SingleApplication);
-    delete d;
+bool SingleApplication::isPrimary() {
+  Q_D(SingleApplication);
+  return d->server_ != nullptr;
 }
 
-bool SingleApplication::isPrimary()
-{
-    Q_D(SingleApplication);
-    return d->server != nullptr;
+/**
+ * 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;
 }
 
-bool SingleApplication::isSecondary()
-{
-    Q_D(SingleApplication);
-    return d->server == nullptr;
+/**
+ * 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_;
 }
 
-quint32 SingleApplication::instanceId()
-{
-    Q_D(SingleApplication);
-    return d->instanceNumber;
+/**
+ * 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();
 }
 
-qint64 SingleApplication::primaryPid()
-{
-    Q_D(SingleApplication);
-    return d->primaryPid();
+/**
+ * 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();
 }
 
-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 );
-
-    d->socket->write( message );
-    bool dataWritten = d->socket->waitForBytesWritten( timeout );
-    d->socket->flush();
-    return dataWritten;
+/**
+ * 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
+  if (!d->connectToPrimary(timeout, SingleApplicationPrivate::Reconnect))
+    return false;
+
+  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,111 +20,134 @@
 // 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
-{
-    Q_OBJECT
+class SingleApplication : public QApplication {
+  Q_OBJECT
 
-    typedef QApplication app_t;
+  typedef QApplication app_t;
 
-public:
-    /**
-     * @brief Mode of operation of SingleApplication.
-     * Whether the block should be user-wide or system-wide and whether the
-     * primary instance should be notified when a secondary instance had been
-     * started.
-     * @note Operating system can restrict the shared memory blocks to the same
-     * user, in which case the User/System modes will have no effect and the
-     * block will be user wide.
-     * @enum
-     */
-    enum Mode {
-        User                    = 1 << 0,
-        System                  = 1 << 1,
-        SecondaryNotification   = 1 << 2,
-        ExcludeAppVersion       = 1 << 3,
-        ExcludeAppPath          = 1 << 4
-    };
-    Q_DECLARE_FLAGS(Options, Mode)
+ public:
+  /**
+   * @brief Mode of operation of SingleApplication.
+   * Whether the block should be user-wide or system-wide and whether the
+   * primary instance should be notified when a secondary instance had been
+   * started.
+   * @note Operating system can restrict the shared memory blocks to the same
+   * user, in which case the User/System modes will have no effect and the
+   * block will be user wide.
+   * @enum
+   */
+  enum Mode {
+    User = 1 << 0,
+    System = 1 << 1,
+    SecondaryNotification = 1 << 2,
+    ExcludeAppVersion = 1 << 3,
+    ExcludeAppPath = 1 << 4
+  };
+  Q_DECLARE_FLAGS(Options, Mode)
 
-    /**
-     * @brief Intitializes a SingleApplication instance with argc command line
-     * arguments in argv
-     * @arg {int &} argc - Number of arguments in argv
-     * @arg {const char *[]} argv - Supplied command line arguments
-     * @arg {bool} allowSecondary - Whether to start the instance as secondary
-     * 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.
-     * @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
-     * instance and the secondary instance.
-     * @note The timeout is just a hint for the maximum time of blocking
-     * operations. It does not guarantee that the SingleApplication
-     * 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 SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 1000 );
-    ~SingleApplication();
+  /**
+   * @brief Intitializes a SingleApplication instance with argc command line
+   * arguments in argv
+   * @arg {int &} argc - Number of arguments in argv
+   * @arg {const char *[]} argv - Supplied command line arguments
+   * @arg {bool} allowSecondary - Whether to start the instance as secondary
+   * 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 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
+   * instance and the secondary instance.
+   * @note The timeout is just a hint for the maximum time of blocking
+   * operations. It does not guarantee that the SingleApplication
+   * 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 SingleApplication(int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 1000);
+  ~SingleApplication() override;
 
-    /**
-     * @brief Returns if the instance is the primary instance
-     * @returns {bool}
-     */
-    bool isPrimary();
+  /**
+   * @brief Returns if the instance is the primary instance
+   * @returns {bool}
+   */
+  bool isPrimary();
 
-    /**
-     * @brief Returns if the instance is a secondary instance
-     * @returns {bool}
-     */
-    bool isSecondary();
+  /**
+   * @brief Returns if the instance is a secondary instance
+   * @returns {bool}
+   */
+  bool isSecondary();
 
-    /**
-     * @brief Returns a unique identifier for the current instance
-     * @returns {qint32}
-     */
-    quint32 instanceId();
+  /**
+   * @brief Returns a unique identifier for the current instance
+   * @returns {qint32}
+   */
+  quint32 instanceId();
 
-    /**
-     * @brief Returns the process ID (PID) of the primary instance
-     * @returns {qint64}
-     */
-    qint64 primaryPid();
+  /**
+   * @brief Returns the process ID (PID) of the primary instance
+   * @returns {qint64}
+   */
+  qint64 primaryPid();
 
-    /**
-     * @brief Sends a message to the primary instance. Returns true on success.
-     * @param {int} timeout - Timeout for connecting
-     * @returns {bool}
-     * @note sendMessage() will return false if invoked from the primary
-     * instance.
-     */
-    bool sendMessage( QByteArray message, int timeout = 1000 );
+  /**
+   * @brief Returns the username of the user running the primary instance
+   * @returns {QString}
+   */
+  QString primaryUser();
 
-Q_SIGNALS:
-    void instanceStarted();
-    void receivedMessage( quint32 instanceId, QByteArray message );
+  /**
+   * @brief Returns the username of the current user
+   * @returns {QString}
+   */
+  QString currentUser();
 
-private:
-    SingleApplicationPrivate *d_ptr;
-    Q_DECLARE_PRIVATE(SingleApplication)
+  /**
+   * @brief Sends a message to the primary instance. Returns true on success.
+   * @param {int} timeout - Timeout for connecting
+   * @returns {bool}
+   * @note sendMessage() will return false if invoked from the primary
+   * instance.
+   */
+  bool sendMessage(QByteArray message, int timeout = 1000);
+
+ 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)
 
-#endif // SINGLEAPPLICATION_H
+#endif  // SINGLEAPPLICATION_H

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,381 +24,447 @@
 //  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"
 
 #ifdef Q_OS_WIN
-    #include <windows.h>
-    #include <lmcons.h>
+#  include <windows.h>
+#  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;
+  }
+
+  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();
+
+    delete memory_;
+    memory_ = nullptr;
+  }
+
 }
 
-SingleApplicationPrivate::~SingleApplicationPrivate()
-{
-    if( socket != nullptr ) {
-        socket->close();
-        delete socket;
-    }
+QString SingleApplicationPrivate::getUsername() {
 
-    memory->lock();
-    InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
-    if( server != nullptr ) {
-        server->close();
-        delete server;
-        inst->primary = false;
-        inst->primaryPid = -1;
-        inst->checksum = blockChecksum();
-    }
-    memory->unlock();
-
-    delete memory;
-}
-
-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) ) {
-        appData.addData( SingleApplication::app_t::applicationVersion().toUtf8() );
-    }
-
-    if( ! (options & SingleApplication::Mode::ExcludeAppPath) ) {
-#ifdef Q_OS_WIN
-        appData.addData( SingleApplication::app_t::applicationFilePath().toLower().toUtf8() );
-#else
-        appData.addData( SingleApplication::app_t::applicationFilePath().toUtf8() );
-#endif
-    }
-
-    // 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()
-            );
-        }
+  QString username;
+#if defined(HAVE_GETEUID) && defined(HAVE_GETPWUID)
+  struct passwd *pw = getpwuid(geteuid());
+  if (pw) {
+    username = QString::fromLocal8Bit(pw->pw_name);
+  }
 #endif
-    }
-
-    // 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() );
-    inst->primary = false;
-    inst->secondary = 0;
-    inst->primaryPid = -1;
-    inst->checksum = blockChecksum();
-}
-
-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() );
-
-    inst->primary = true;
-    inst->primaryPid = q->applicationPid();
-    inst->checksum = blockChecksum();
-
-    instanceNumber = 0;
-}
-
-void SingleApplicationPrivate::startSecondary()
-{
-}
-
-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();
-    }
-
-    // If already connected - we are done;
-    if( socket->state() == QLocalSocket::ConnectedState )
-        return;
-
-    // If not connect
-    if( socket->state() == QLocalSocket::UnconnectedState ||
-        socket->state() == QLocalSocket::ClosingState ) {
-        socket->connectToServer( blockServerName );
-    }
-
-    // Wait for being connected
-    if( socket->state() == QLocalSocket::ConnectingState ) {
-        socket->waitForConnected( msecs );
-    }
-
-    // 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);
-
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-        writeStream.setVersion(QDataStream::Qt_5_6);
+  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
 
-        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);
+#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
-        headerStream << static_cast <quint64>( initMsg.length() );
 
-        socket->write( header );
-        socket->write( initMsg );
-        socket->flush();
-        socket->waitForBytesWritten( msecs );
+}
+
+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)) {
+    appData.addData(SingleApplication::app_t::applicationVersion().toUtf8());
+  }
+
+  if (!(options_ & SingleApplication::Mode::ExcludeAppPath)) {
+#ifdef Q_OS_WIN
+    appData.addData(SingleApplication::app_t::applicationFilePath().toLower().toUtf8());
+#else
+    appData.addData(SingleApplication::app_t::applicationFilePath().toUtf8());
+#endif
+  }
+
+  // User level block requires a user specific data in the hash
+  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("/", "_");
+
+}
+
+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() {
+
+  Q_Q(SingleApplication);
+
+  // Reset the number of connections
+  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();
+
+  // 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);
+
+}
+
+void SingleApplicationPrivate::startSecondary() {
+
+  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+
+  inst->secondary += 1;
+  inst->checksum = blockChecksum();
+  instanceNumber_ = inst->secondary;
+
+}
+
+bool SingleApplicationPrivate::connectToPrimary(int timeout, ConnectionType connectionType) {
+
+  QElapsedTimer time;
+  time.start();
+
+  // Connect to the Local Server of the Primary Instance if not already connected.
+  if (socket_ == nullptr) {
+    socket_ = new QLocalSocket();
+  }
+
+  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
+  QByteArray initMsg;
+  QDataStream writeStream(&initMsg, QIODevice::WriteOnly);
+  writeStream.setVersion(QDataStream::Qt_5_8);
+
+  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 << checksum;
+
+  // The header indicates the message length that follows
+  QByteArray header;
+  QDataStream headerStream(&header, QIODevice::WriteOnly);
+  headerStream.setVersion(QDataStream::Qt_5_8);
+  headerStream << static_cast<quint64>(initMsg.length());
+
+  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);
 
-    return pid;
 }
 
 /**
  * @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];
-            Q_EMIT this->slotClientConnectionClosed( nextConnSocket, info.instanceId );
-        }
-    );
+  QLocalSocket *nextConnSocket = server_->nextPendingConnection();
+  connectionMap_.insert(nextConnSocket, ConnectionInfo());
 
-    QObject::connect(nextConnSocket, &QLocalSocket::disconnected,
-        [nextConnSocket, this](){
-            connectionMap.remove(nextConnSocket);
-            nextConnSocket->deleteLater();
-        }
-    );
+  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);
+    nextConnSocket->deleteLater();
+  });
+
+  QObject::connect(nextConnSocket, &QLocalSocket::readyRead, [nextConnSocket, this]() {
+    auto &info = connectionMap_[nextConnSocket];
+    switch (info.stage) {
+      case StageHeader:
+        readInitMessageHeader(nextConnSocket);
+        break;
+      case StageBody:
+        readInitMessageBody(nextConnSocket);
+        break;
+      case StageConnected:
+        Q_EMIT this->slotDataAvailable(nextConnSocket, info.instanceId);
+        break;
+      default:
+        break;
+    };
+  });
 
-    QObject::connect(nextConnSocket, &QLocalSocket::readyRead,
-        [nextConnSocket, this]() {
-            auto &info = connectionMap[nextConnSocket];
-            switch(info.stage) {
-            case StageHeader:
-                readInitMessageHeader(nextConnSocket);
-                break;
-            case StageBody:
-                readInitMessageBody(nextConnSocket);
-                break;
-            case StageConnected:
-                Q_EMIT this->slotDataAvailable( nextConnSocket, info.instanceId );
-                break;
-            default:
-                break;
-            };
-        }
-    );
 }
 
-void SingleApplicationPrivate::readInitMessageHeader( QLocalSocket *sock )
-{
-    if (!connectionMap.contains( sock )) {
-        return;
-    }
+void SingleApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
 
-    if( sock->bytesAvailable() < ( qint64 )sizeof( quint64 ) ) {
-        return;
-    }
+  if (!connectionMap_.contains(sock)) {
+    return;
+  }
 
-    QDataStream headerStream( sock );
+  if (sock->bytesAvailable() < static_cast<qint64>(sizeof(quint64))) {
+    return;
+  }
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-    headerStream.setVersion( QDataStream::Qt_5_6 );
+  QDataStream headerStream(sock);
+  headerStream.setVersion(QDataStream::Qt_5_8);
+
+  // Read the header to know the message length
+  quint64 msgLen = 0;
+  headerStream >> msgLen;
+  ConnectionInfo &info = connectionMap_[sock];
+  info.stage = StageBody;
+  info.msgLen = msgLen;
+
+  if (sock->bytesAvailable() >= static_cast<qint64>(msgLen)) {
+    readInitMessageBody(sock);
+  }
+
+}
+
+void SingleApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
+
+  Q_Q(SingleApplication);
+
+  if (!connectionMap_.contains(sock)) {
+    return;
+  }
+
+  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);
+  readStream.setVersion(QDataStream::Qt_5_8);
+
+  // server name
+  QByteArray latin1Name;
+  readStream >> latin1Name;
+
+  // connection type
+  ConnectionType connectionType = InvalidConnection;
+  quint8 connTypeVal = InvalidConnection;
+  readStream >> connTypeVal;
+  connectionType = static_cast<ConnectionType>(connTypeVal);
+
+  // instance id
+  quint32 instanceId = 0;
+  readStream >> instanceId;
+
+  // checksum
+  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
 
-    // Read the header to know the message length
-    quint64 msgLen = 0;
-    headerStream >> msgLen;
-    ConnectionInfo &info = connectionMap[sock];
-    info.stage = StageBody;
-    info.msgLen = msgLen;
+  bool isValid = readStream.status() == QDataStream::Ok && QLatin1String(latin1Name) == blockServerName_ && msgChecksum == actualChecksum;
+
+  if (!isValid) {
+    sock->close();
+    return;
+  }
+
+  info.instanceId = instanceId;
+  info.stage = StageConnected;
+
+  if (connectionType == NewInstance || (connectionType == SecondaryInstance && options_ & SingleApplication::Mode::SecondaryNotification)) {
+    Q_EMIT q->instanceStarted();
+  }
+
+  if (sock->bytesAvailable() > 0) {
+    Q_EMIT this->slotDataAvailable(sock, instanceId);
+  }
 
-    if ( sock->bytesAvailable() >= (qint64) msgLen ) {
-        readInitMessageBody( sock );
-    }
 }
 
-void SingleApplicationPrivate::readInitMessageBody( QLocalSocket *sock )
-{
-    Q_Q(SingleApplication);
+void SingleApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, const quint32 instanceId) {
 
-    if (!connectionMap.contains( sock )) {
-        return;
-    }
+  Q_Q(SingleApplication);
+  Q_EMIT q->receivedMessage(instanceId, dataSocket->readAll());
 
-    ConnectionInfo &info = connectionMap[sock];
-    if( sock->bytesAvailable() < ( qint64 )info.msgLen ) {
-        return;
-    }
+}
 
-    // Read the message body
-    QByteArray msgBytes = sock->read(info.msgLen);
-    QDataStream readStream(msgBytes);
+void SingleApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSocket, const quint32 instanceId) {
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-    readStream.setVersion( QDataStream::Qt_5_6 );
+  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
 
-    // server name
-    QByteArray latin1Name;
-    readStream >> latin1Name;
-
-    // connection type
-    ConnectionType connectionType = InvalidConnection;
-    quint8 connTypeVal = InvalidConnection;
-    readStream >> connTypeVal;
-    connectionType = static_cast <ConnectionType>( connTypeVal );
-
-    // instance id
-    quint32 instanceId = 0;
-    readStream >> instanceId;
-
-    // checksum
-    quint16 msgChecksum = 0;
-    readStream >> msgChecksum;
-
-    const quint16 actualChecksum = qChecksum( msgBytes.constData(), static_cast<quint32>( msgBytes.length() - sizeof( quint16 ) ) );
-
-    bool isValid = readStream.status() == QDataStream::Ok &&
-                   QLatin1String(latin1Name) == blockServerName &&
-                   msgChecksum == actualChecksum;
-
-    if( !isValid ) {
-        sock->close();
-        return;
-    }
-
-    info.instanceId = instanceId;
-    info.stage = StageConnected;
-
-    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 )
-{
-    Q_Q(SingleApplication);
-    Q_EMIT q->receivedMessage( instanceId, dataSocket->readAll() );
-}
-
-void SingleApplicationPrivate::slotClientConnectionClosed( QLocalSocket *closedSocket, quint32 instanceId )
-{
-    if( closedSocket->bytesAvailable() > 0 )
-        Q_EMIT slotDataAvailable( closedSocket, instanceId  );
 }

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,76 +24,88 @@
 //  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;
-    quint16 checksum;
+  bool primary;
+  quint32 secondary;
+  qint64 primaryPid;
+  char primaryUser[128];
+  quint16 checksum;
 };
 
 struct ConnectionInfo {
-    explicit ConnectionInfo() :
-        msgLen(0), instanceId(0), stage(0) {}
-    qint64 msgLen;
-    quint32 instanceId;
-    quint8 stage;
+  explicit ConnectionInfo() : msgLen(0), instanceId(0), stage(0) {}
+  qint64 msgLen;
+  quint32 instanceId;
+  quint8 stage;
 };
 
 class SingleApplicationPrivate : public QObject {
-Q_OBJECT
-public:
-    enum ConnectionType : quint8 {
-        InvalidConnection = 0,
-        NewInstance = 1,
-        SecondaryInstance = 2,
-        Reconnect = 3
-    };
-    enum ConnectionStage : quint8 {
-        StageHeader = 0,
-        StageBody = 1,
-        StageConnected = 2,
-    };
-    Q_DECLARE_PUBLIC(SingleApplication)
+  Q_OBJECT
 
-    SingleApplicationPrivate( SingleApplication *q_ptr );
-     ~SingleApplicationPrivate();
+ public:
+  enum ConnectionType : quint8 {
+    InvalidConnection = 0,
+    NewInstance = 1,
+    SecondaryInstance = 2,
+    Reconnect = 3
+  };
+  enum ConnectionStage : quint8 {
+    StageHeader = 0,
+    StageBody = 1,
+    StageConnected = 2,
+  };
+  Q_DECLARE_PUBLIC(SingleApplication)
 
-    void genBlockServerName();
-    void initializeMemoryBlock();
-    void startPrimary();
-    void startSecondary();
-    void connectToPrimary(int msecs, ConnectionType connectionType );
-    quint16 blockChecksum();
-    qint64 primaryPid();
-    void readInitMessageHeader(QLocalSocket *socket);
-    void readInitMessageBody(QLocalSocket *socket);
+  explicit SingleApplicationPrivate(SingleApplication *ptr);
+  ~SingleApplicationPrivate() override;
 
-    SingleApplication *q_ptr;
-    QSharedMemory *memory;
-    QLocalSocket *socket;
-    QLocalServer *server;
-    quint32 instanceNumber;
-    QString blockServerName;
-    SingleApplication::Options options;
-    QMap<QLocalSocket*, ConnectionInfo> connectionMap;
+  QString getUsername();
+  void genBlockServerName();
+  void initializeMemoryBlock();
+  void startPrimary();
+  void startSecondary();
+  bool connectToPrimary(const int msecs, const ConnectionType connectionType);
+  quint16 blockChecksum();
+  qint64 primaryPid();
+  QString primaryUser();
+  void readInitMessageHeader(QLocalSocket *socket);
+  void readInitMessageBody(QLocalSocket *socket);
+  void randomSleep();
 
-public Q_SLOTS:
-    void slotConnectionEstablished();
-    void slotDataAvailable( QLocalSocket*, quint32 );
-    void slotClientConnectionClosed( QLocalSocket*, quint32 );
+  SingleApplication *q_ptr;
+  QSharedMemory *memory_;
+  QLocalSocket *socket_;
+  QLocalServer *server_;
+  quint32 instanceNumber_;
+  QString blockServerName_;
+  SingleApplication::Options options_;
+  QMap<QLocalSocket*, ConnectionInfo> connectionMap_;
+
+ public slots:
+  void slotConnectionEstablished();
+  void slotDataAvailable(QLocalSocket*, const quint32);
+  void slotClientConnectionClosed(QLocalSocket*, const quint32);
 };
 
-#endif // SINGLEAPPLICATION_P_H
+#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 ) )
-{
-    Q_D(SingleCoreApplication);
+SingleCoreApplication::SingleCoreApplication(int &argc, char *argv[], bool allowSecondary, Options options, int timeout)
+    : app_t(argc, argv),
+      d_ptr(new SingleCoreApplicationPrivate(this)) {
 
-    // Store the current mode of the program
-    d->options = options;
+  Q_D(SingleCoreApplication);
 
-    // Generating an application ID used for identifying the shared memory
-    // block and QLocalServer
-    d->genBlockServerName();
+  // Store the current mode of the program
+  d->options_ = options;
+
+  // 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 );
 
-    // Create a shared memory block
-    if( d->memory->create( sizeof( InstancesInfo ) ) ) {
-        // Initialize the shared memory block
-        d->memory->lock();
-        d->initializeMemoryBlock();
-        d->memory->unlock();
-    } else {
-        // Attempt to attach to the memory segment
-        if( ! d->memory->attach() ) {
-            qCritical() << "SingleCoreApplication: Unable to attach to shared memory block.";
-            qCritical() << d->memory->errorString();
-            delete d;
-            ::exit( EXIT_FAILURE );
-        }
+  // Guarantee thread safe behaviour with a shared memory block.
+  d->memory_ = new QSharedMemory(d->blockServerName_);
+
+  // Create a shared memory block
+  if (d->memory_->create(sizeof(InstancesInfo))) {
+    // Initialize the shared memory block
+    if (!d->memory_->lock()) {
+      qCritical() << "SingleCoreApplication: Unable to lock memory block after create.";
+      abortSafely();
+    }
+    d->initializeMemoryBlock();
+  }
+  else {
+    if (d->memory_->error() == QSharedMemory::AlreadyExists) {
+      // Attempt to attach to the memory segment
+      if (!d->memory_->attach()) {
+        qCritical() << "SingleCoreApplication: Unable to attach to shared memory block.";
+        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());
+  QElapsedTimer time;
+  time.start();
+
+  // Make sure the shared memory block is initialised and in consistent state
+  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();
     }
 
-    InstancesInfo* inst = static_cast<InstancesInfo*>( d->memory->data() );
-    QTime time;
-    time.start();
-
-    // Make sure the shared memory block is initialised and in consistent state
-    while( true ) {
-        d->memory->lock();
-
-        if( d->blockChecksum() == inst->checksum ) break;
-
-        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();
     }
-
-    if( inst->primary == false) {
-        d->startPrimary();
-        d->memory->unlock();
-        return;
+    d->randomSleep();
+    if (!d->memory_->lock()) {
+      qCritical() << "SingleCoreApplication: Unable to lock memory after random wait.";
+      abortSafely();
     }
+  }
 
-    // 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 ) {
-            d->connectToPrimary( timeout, SingleCoreApplicationPrivate::SecondaryInstance );
-        }
-        d->memory->unlock();
-        return;
+  if (inst->primary == false) {
+    d->startPrimary();
+    if (!d->memory_->unlock()) {
+      qDebug() << "SingleCoreApplication: Unable to unlock memory after primary start.";
+      qDebug() << d->memory_->errorString();
     }
+    return;
+  }
 
-    d->memory->unlock();
+  // Check if another instance can be started
+  if (allowSecondary) {
+    d->startSecondary();
+    if (d->options_ & Mode::SecondaryNotification) {
+      d->connectToPrimary(timeout, SingleCoreApplicationPrivate::SecondaryInstance);
+    }
+    if (!d->memory_->unlock()) {
+      qDebug() << "SingleCoreApplication: Unable to unlock memory after secondary start.";
+      qDebug() << d->memory_->errorString();
+    }
+    return;
+  }
 
-    d->connectToPrimary( timeout, SingleCoreApplicationPrivate::NewInstance );
+  if (!d->memory_->unlock()) {
+    qDebug() << "SingleCoreApplication: Unable to unlock memory at end of execution.";
+    qDebug() << d->memory_->errorString();
+  }
 
-    delete d;
+  d->connectToPrimary(timeout, SingleCoreApplicationPrivate::NewInstance);
 
-    ::exit( EXIT_SUCCESS );
+  delete d;
+
+  ::exit(EXIT_SUCCESS);
+
+}
+
+SingleCoreApplication::~SingleCoreApplication() {
+  Q_D(SingleCoreApplication);
+  delete d;
 }
 
 /**
- * @brief Destructor
+ * Checks if the current application instance is primary.
+ * @return Returns true if the instance is primary, false otherwise.
  */
-SingleCoreApplication::~SingleCoreApplication()
-{
-    Q_D(SingleCoreApplication);
-    delete d;
+bool SingleCoreApplication::isPrimary() {
+  Q_D(SingleCoreApplication);
+  return d->server_ != nullptr;
 }
 
-bool SingleCoreApplication::isPrimary()
-{
-    Q_D(SingleCoreApplication);
-    return d->server != nullptr;
+/**
+ * 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;
 }
 
-bool SingleCoreApplication::isSecondary()
-{
-    Q_D(SingleCoreApplication);
-    return d->server == nullptr;
+/**
+ * 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_;
 }
 
-quint32 SingleCoreApplication::instanceId()
-{
-    Q_D(SingleCoreApplication);
-    return d->instanceNumber;
+/**
+ * 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();
 }
 
-qint64 SingleCoreApplication::primaryPid()
-{
-    Q_D(SingleCoreApplication);
-    return d->primaryPid();
+/**
+ * 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();
 }
 
-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 );
-
-    d->socket->write( message );
-    bool dataWritten = d->socket->waitForBytesWritten( timeout );
-    d->socket->flush();
-    return dataWritten;
+/**
+ * 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
+  if (!d->connectToPrimary(timeout, SingleCoreApplicationPrivate::Reconnect))
+    return false;
+
+  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,111 +20,133 @@
 // 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
-{
-    Q_OBJECT
+class SingleCoreApplication : public QCoreApplication {
+  Q_OBJECT
 
-    typedef QCoreApplication app_t;
+  typedef QCoreApplication app_t;
 
-public:
-    /**
-     * @brief Mode of operation of SingleCoreApplication.
-     * Whether the block should be user-wide or system-wide and whether the
-     * primary instance should be notified when a secondary instance had been
-     * started.
-     * @note Operating system can restrict the shared memory blocks to the same
-     * user, in which case the User/System modes will have no effect and the
-     * block will be user wide.
-     * @enum
-     */
-    enum Mode {
-        User                    = 1 << 0,
-        System                  = 1 << 1,
-        SecondaryNotification   = 1 << 2,
-        ExcludeAppVersion       = 1 << 3,
-        ExcludeAppPath          = 1 << 4
-    };
-    Q_DECLARE_FLAGS(Options, Mode)
+ public:
+  /**
+   * @brief Mode of operation of SingleCoreApplication.
+   * Whether the block should be user-wide or system-wide and whether the
+   * primary instance should be notified when a secondary instance had been
+   * started.
+   * @note Operating system can restrict the shared memory blocks to the same
+   * user, in which case the User/System modes will have no effect and the
+   * block will be user wide.
+   * @enum
+   */
+  enum Mode {
+    User = 1 << 0,
+    System = 1 << 1,
+    SecondaryNotification = 1 << 2,
+    ExcludeAppVersion = 1 << 3,
+    ExcludeAppPath = 1 << 4
+  };
+  Q_DECLARE_FLAGS(Options, Mode)
 
-    /**
-     * @brief Intitializes a SingleCoreApplication instance with argc command line
-     * arguments in argv
-     * @arg {int &} argc - Number of arguments in argv
-     * @arg {const char *[]} argv - Supplied command line arguments
-     * @arg {bool} allowSecondary - Whether to start the instance as secondary
-     * 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.
-     * @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
-     * instance and the secondary instance.
-     * @note The timeout is just a hint for the maximum time of blocking
-     * 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();
+  /**
+   * @brief Intitializes a SingleCoreApplication instance with argc command line
+   * arguments in argv
+   * @arg {int &} argc - Number of arguments in argv
+   * @arg {const char *[]} argv - Supplied command line arguments
+   * @arg {bool} allowSecondary - Whether to start the instance as secondary
+   * 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 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
+   * instance and the secondary instance.
+   * @note The timeout is just a hint for the maximum time of blocking
+   * 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.
+   */
+  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
-     * @returns {bool}
-     */
-    bool isPrimary();
+  /**
+   * @brief Returns if the instance is the primary instance
+   * @returns {bool}
+   */
+  bool isPrimary();
 
-    /**
-     * @brief Returns if the instance is a secondary instance
-     * @returns {bool}
-     */
-    bool isSecondary();
+  /**
+   * @brief Returns if the instance is a secondary instance
+   * @returns {bool}
+   */
+  bool isSecondary();
 
-    /**
-     * @brief Returns a unique identifier for the current instance
-     * @returns {qint32}
-     */
-    quint32 instanceId();
+  /**
+   * @brief Returns a unique identifier for the current instance
+   * @returns {qint32}
+   */
+  quint32 instanceId();
 
-    /**
-     * @brief Returns the process ID (PID) of the primary instance
-     * @returns {qint64}
-     */
-    qint64 primaryPid();
+  /**
+   * @brief Returns the process ID (PID) of the primary instance
+   * @returns {qint64}
+   */
+  qint64 primaryPid();
 
-    /**
-     * @brief Sends a message to the primary instance. Returns true on success.
-     * @param {int} timeout - Timeout for connecting
-     * @returns {bool}
-     * @note sendMessage() will return false if invoked from the primary
-     * instance.
-     */
-    bool sendMessage( QByteArray message, int timeout = 1000 );
+  /**
+   * @brief Returns the username of the user running the primary instance
+   * @returns {QString}
+   */
+  QString primaryUser();
 
-Q_SIGNALS:
-    void instanceStarted();
-    void receivedMessage( quint32 instanceId, QByteArray message );
+  /**
+   * @brief Returns the username of the current user
+   * @returns {QString}
+   */
+  QString currentUser();
 
-private:
-    SingleCoreApplicationPrivate *d_ptr;
-    Q_DECLARE_PRIVATE(SingleCoreApplication)
+  /**
+   * @brief Sends a message to the primary instance. Returns true on success.
+   * @param {int} timeout - Timeout for connecting
+   * @returns {bool}
+   * @note sendMessage() will return false if invoked from the primary
+   * instance.
+   */
+  bool sendMessage(QByteArray message, int timeout = 1000);
+
+ 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)
 
-#endif // SINGLECOREAPPLICATION_H
+#endif  // SINGLECOREAPPLICATION_H

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,381 +24,447 @@
 //  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"
 
 #ifdef Q_OS_WIN
-    #include <windows.h>
-    #include <lmcons.h>
+#  include <windows.h>
+#  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;
+  }
+
+  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();
+
+    delete memory_;
+    memory_ = nullptr;
+  }
+
 }
 
-SingleCoreApplicationPrivate::~SingleCoreApplicationPrivate()
-{
-    if( socket != nullptr ) {
-        socket->close();
-        delete socket;
-    }
+QString SingleCoreApplicationPrivate::getUsername() {
 
-    memory->lock();
-    InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
-    if( server != nullptr ) {
-        server->close();
-        delete server;
-        inst->primary = false;
-        inst->primaryPid = -1;
-        inst->checksum = blockChecksum();
-    }
-    memory->unlock();
-
-    delete memory;
-}
-
-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) ) {
-        appData.addData( SingleCoreApplication::app_t::applicationVersion().toUtf8() );
-    }
-
-    if( ! (options & SingleCoreApplication::Mode::ExcludeAppPath) ) {
-#ifdef Q_OS_WIN
-        appData.addData( SingleCoreApplication::app_t::applicationFilePath().toLower().toUtf8() );
-#else
-        appData.addData( SingleCoreApplication::app_t::applicationFilePath().toUtf8() );
-#endif
-    }
-
-    // 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()
-            );
-        }
+  QString username;
+#if defined(HAVE_GETEUID) && defined(HAVE_GETPWUID)
+  struct passwd *pw = getpwuid(geteuid());
+  if (pw) {
+    username = QString::fromLocal8Bit(pw->pw_name);
+  }
 #endif
-    }
-
-    // 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() );
-    inst->primary = false;
-    inst->secondary = 0;
-    inst->primaryPid = -1;
-    inst->checksum = blockChecksum();
-}
-
-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() );
-
-    inst->primary = true;
-    inst->primaryPid = q->applicationPid();
-    inst->checksum = blockChecksum();
-
-    instanceNumber = 0;
-}
-
-void SingleCoreApplicationPrivate::startSecondary()
-{
-}
-
-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();
-    }
-
-    // If already connected - we are done;
-    if( socket->state() == QLocalSocket::ConnectedState )
-        return;
-
-    // If not connect
-    if( socket->state() == QLocalSocket::UnconnectedState ||
-        socket->state() == QLocalSocket::ClosingState ) {
-        socket->connectToServer( blockServerName );
-    }
-
-    // Wait for being connected
-    if( socket->state() == QLocalSocket::ConnectingState ) {
-        socket->waitForConnected( msecs );
-    }
-
-    // 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);
-
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-        writeStream.setVersion(QDataStream::Qt_5_6);
+  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
 
-        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);
+#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
-        headerStream << static_cast <quint64>( initMsg.length() );
 
-        socket->write( header );
-        socket->write( initMsg );
-        socket->flush();
-        socket->waitForBytesWritten( msecs );
+}
+
+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)) {
+    appData.addData(SingleCoreApplication::app_t::applicationVersion().toUtf8());
+  }
+
+  if (!(options_ & SingleCoreApplication::Mode::ExcludeAppPath)) {
+#ifdef Q_OS_WIN
+    appData.addData(SingleCoreApplication::app_t::applicationFilePath().toLower().toUtf8());
+#else
+    appData.addData(SingleCoreApplication::app_t::applicationFilePath().toUtf8());
+#endif
+  }
+
+  // User level block requires a user specific data in the hash
+  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("/", "_");
+
+}
+
+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() {
+
+  Q_Q(SingleCoreApplication);
+
+  // Reset the number of connections
+  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();
+
+  // 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);
+
+}
+
+void SingleCoreApplicationPrivate::startSecondary() {
+
+  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+
+  inst->secondary += 1;
+  inst->checksum = blockChecksum();
+  instanceNumber_ = inst->secondary;
+
+}
+
+bool SingleCoreApplicationPrivate::connectToPrimary(int timeout, ConnectionType connectionType) {
+
+  QElapsedTimer time;
+  time.start();
+
+  // Connect to the Local Server of the Primary Instance if not already connected.
+  if (socket_ == nullptr) {
+    socket_ = new QLocalSocket();
+  }
+
+  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
+  QByteArray initMsg;
+  QDataStream writeStream(&initMsg, QIODevice::WriteOnly);
+  writeStream.setVersion(QDataStream::Qt_5_8);
+
+  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 << checksum;
+
+  // The header indicates the message length that follows
+  QByteArray header;
+  QDataStream headerStream(&header, QIODevice::WriteOnly);
+  headerStream.setVersion(QDataStream::Qt_5_8);
+  headerStream << static_cast<quint64>(initMsg.length());
+
+  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);
 
-    return pid;
 }
 
 /**
  * @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];
-            Q_EMIT this->slotClientConnectionClosed( nextConnSocket, info.instanceId );
-        }
-    );
+  QLocalSocket *nextConnSocket = server_->nextPendingConnection();
+  connectionMap_.insert(nextConnSocket, ConnectionInfo());
 
-    QObject::connect(nextConnSocket, &QLocalSocket::disconnected,
-        [nextConnSocket, this](){
-            connectionMap.remove(nextConnSocket);
-            nextConnSocket->deleteLater();
-        }
-    );
+  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);
+    nextConnSocket->deleteLater();
+  });
+
+  QObject::connect(nextConnSocket, &QLocalSocket::readyRead, [nextConnSocket, this]() {
+    auto &info = connectionMap_[nextConnSocket];
+    switch (info.stage) {
+      case StageHeader:
+        readInitMessageHeader(nextConnSocket);
+        break;
+      case StageBody:
+        readInitMessageBody(nextConnSocket);
+        break;
+      case StageConnected:
+        Q_EMIT this->slotDataAvailable(nextConnSocket, info.instanceId);
+        break;
+      default:
+        break;
+    };
+  });
 
-    QObject::connect(nextConnSocket, &QLocalSocket::readyRead,
-        [nextConnSocket, this]() {
-            auto &info = connectionMap[nextConnSocket];
-            switch(info.stage) {
-            case StageHeader:
-                readInitMessageHeader(nextConnSocket);
-                break;
-            case StageBody:
-                readInitMessageBody(nextConnSocket);
-                break;
-            case StageConnected:
-                Q_EMIT this->slotDataAvailable( nextConnSocket, info.instanceId );
-                break;
-            default:
-                break;
-            };
-        }
-    );
 }
 
-void SingleCoreApplicationPrivate::readInitMessageHeader( QLocalSocket *sock )
-{
-    if (!connectionMap.contains( sock )) {
-        return;
-    }
+void SingleCoreApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
 
-    if( sock->bytesAvailable() < ( qint64 )sizeof( quint64 ) ) {
-        return;
-    }
+  if (!connectionMap_.contains(sock)) {
+    return;
+  }
 
-    QDataStream headerStream( sock );
+  if (sock->bytesAvailable() < static_cast<qint64>(sizeof(quint64))) {
+    return;
+  }
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-    headerStream.setVersion( QDataStream::Qt_5_6 );
+  QDataStream headerStream(sock);
+  headerStream.setVersion(QDataStream::Qt_5_8);
+
+  // Read the header to know the message length
+  quint64 msgLen = 0;
+  headerStream >> msgLen;
+  ConnectionInfo &info = connectionMap_[sock];
+  info.stage = StageBody;
+  info.msgLen = msgLen;
+
+  if (sock->bytesAvailable() >= static_cast<qint64>(msgLen)) {
+    readInitMessageBody(sock);
+  }
+
+}
+
+void SingleCoreApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
+
+  Q_Q(SingleCoreApplication);
+
+  if (!connectionMap_.contains(sock)) {
+    return;
+  }
+
+  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);
+  readStream.setVersion(QDataStream::Qt_5_8);
+
+  // server name
+  QByteArray latin1Name;
+  readStream >> latin1Name;
+
+  // connection type
+  ConnectionType connectionType = InvalidConnection;
+  quint8 connTypeVal = InvalidConnection;
+  readStream >> connTypeVal;
+  connectionType = static_cast<ConnectionType>(connTypeVal);
+
+  // instance id
+  quint32 instanceId = 0;
+  readStream >> instanceId;
+
+  // checksum
+  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
 
-    // Read the header to know the message length
-    quint64 msgLen = 0;
-    headerStream >> msgLen;
-    ConnectionInfo &info = connectionMap[sock];
-    info.stage = StageBody;
-    info.msgLen = msgLen;
+  bool isValid = readStream.status() == QDataStream::Ok && QLatin1String(latin1Name) == blockServerName_ && msgChecksum == actualChecksum;
+
+  if (!isValid) {
+    sock->close();
+    return;
+  }
+
+  info.instanceId = instanceId;
+  info.stage = StageConnected;
+
+  if (connectionType == NewInstance || (connectionType == SecondaryInstance && options_ & SingleCoreApplication::Mode::SecondaryNotification)) {
+    Q_EMIT q->instanceStarted();
+  }
+
+  if (sock->bytesAvailable() > 0) {
+    Q_EMIT this->slotDataAvailable(sock, instanceId);
+  }
 
-    if ( sock->bytesAvailable() >= (qint64) msgLen ) {
-        readInitMessageBody( sock );
-    }
 }
 
-void SingleCoreApplicationPrivate::readInitMessageBody( QLocalSocket *sock )
-{
-    Q_Q(SingleCoreApplication);
+void SingleCoreApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, const quint32 instanceId) {
 
-    if (!connectionMap.contains( sock )) {
-        return;
-    }
+  Q_Q(SingleCoreApplication);
+  Q_EMIT q->receivedMessage(instanceId, dataSocket->readAll());
 
-    ConnectionInfo &info = connectionMap[sock];
-    if( sock->bytesAvailable() < ( qint64 )info.msgLen ) {
-        return;
-    }
+}
 
-    // Read the message body
-    QByteArray msgBytes = sock->read(info.msgLen);
-    QDataStream readStream(msgBytes);
+void SingleCoreApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSocket, const quint32 instanceId) {
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-    readStream.setVersion( QDataStream::Qt_5_6 );
+  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
 
-    // server name
-    QByteArray latin1Name;
-    readStream >> latin1Name;
-
-    // connection type
-    ConnectionType connectionType = InvalidConnection;
-    quint8 connTypeVal = InvalidConnection;
-    readStream >> connTypeVal;
-    connectionType = static_cast <ConnectionType>( connTypeVal );
-
-    // instance id
-    quint32 instanceId = 0;
-    readStream >> instanceId;
-
-    // checksum
-    quint16 msgChecksum = 0;
-    readStream >> msgChecksum;
-
-    const quint16 actualChecksum = qChecksum( msgBytes.constData(), static_cast<quint32>( msgBytes.length() - sizeof( quint16 ) ) );
-
-    bool isValid = readStream.status() == QDataStream::Ok &&
-                   QLatin1String(latin1Name) == blockServerName &&
-                   msgChecksum == actualChecksum;
-
-    if( !isValid ) {
-        sock->close();
-        return;
-    }
-
-    info.instanceId = instanceId;
-    info.stage = StageConnected;
-
-    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 )
-{
-    Q_Q(SingleCoreApplication);
-    Q_EMIT q->receivedMessage( instanceId, dataSocket->readAll() );
-}
-
-void SingleCoreApplicationPrivate::slotClientConnectionClosed( QLocalSocket *closedSocket, quint32 instanceId )
-{
-    if( closedSocket->bytesAvailable() > 0 )
-        Q_EMIT slotDataAvailable( closedSocket, instanceId  );
 }

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,76 +24,88 @@
 //  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;
-    quint16 checksum;
+  bool primary;
+  quint32 secondary;
+  qint64 primaryPid;
+  char primaryUser[128];
+  quint16 checksum;
 };
 
 struct ConnectionInfo {
-    explicit ConnectionInfo() :
-        msgLen(0), instanceId(0), stage(0) {}
-    qint64 msgLen;
-    quint32 instanceId;
-    quint8 stage;
+  explicit ConnectionInfo() : msgLen(0), instanceId(0), stage(0) {}
+  qint64 msgLen;
+  quint32 instanceId;
+  quint8 stage;
 };
 
 class SingleCoreApplicationPrivate : public QObject {
-Q_OBJECT
-public:
-    enum ConnectionType : quint8 {
-        InvalidConnection = 0,
-        NewInstance = 1,
-        SecondaryInstance = 2,
-        Reconnect = 3
-    };
-    enum ConnectionStage : quint8 {
-        StageHeader = 0,
-        StageBody = 1,
-        StageConnected = 2,
-    };
-    Q_DECLARE_PUBLIC(SingleCoreApplication)
+  Q_OBJECT
 
-    SingleCoreApplicationPrivate( SingleCoreApplication *q_ptr );
-     ~SingleCoreApplicationPrivate();
+ public:
+  enum ConnectionType : quint8 {
+    InvalidConnection = 0,
+    NewInstance = 1,
+    SecondaryInstance = 2,
+    Reconnect = 3
+  };
+  enum ConnectionStage : quint8 {
+    StageHeader = 0,
+    StageBody = 1,
+    StageConnected = 2,
+  };
+  Q_DECLARE_PUBLIC(SingleCoreApplication)
 
-    void genBlockServerName();
-    void initializeMemoryBlock();
-    void startPrimary();
-    void startSecondary();
-    void connectToPrimary(int msecs, ConnectionType connectionType );
-    quint16 blockChecksum();
-    qint64 primaryPid();
-    void readInitMessageHeader(QLocalSocket *socket);
-    void readInitMessageBody(QLocalSocket *socket);
+  explicit SingleCoreApplicationPrivate(SingleCoreApplication *ptr);
+  ~SingleCoreApplicationPrivate() override;
 
-    SingleCoreApplication *q_ptr;
-    QSharedMemory *memory;
-    QLocalSocket *socket;
-    QLocalServer *server;
-    quint32 instanceNumber;
-    QString blockServerName;
-    SingleCoreApplication::Options options;
-    QMap<QLocalSocket*, ConnectionInfo> connectionMap;
+  QString getUsername();
+  void genBlockServerName();
+  void initializeMemoryBlock();
+  void startPrimary();
+  void startSecondary();
+  bool connectToPrimary(const int msecs, const ConnectionType connectionType);
+  quint16 blockChecksum();
+  qint64 primaryPid();
+  QString primaryUser();
+  void readInitMessageHeader(QLocalSocket *socket);
+  void readInitMessageBody(QLocalSocket *socket);
+  void randomSleep();
 
-public Q_SLOTS:
-    void slotConnectionEstablished();
-    void slotDataAvailable( QLocalSocket*, quint32 );
-    void slotClientConnectionClosed( QLocalSocket*, quint32 );
+  SingleCoreApplication *q_ptr;
+  QSharedMemory *memory_;
+  QLocalSocket *socket_;
+  QLocalServer *server_;
+  quint32 instanceNumber_;
+  QString blockServerName_;
+  SingleCoreApplication::Options options_;
+  QMap<QLocalSocket*, ConnectionInfo> connectionMap_;
+
+ public slots:
+  void slotConnectionEstablished();
+  void slotDataAvailable(QLocalSocket*, const quint32);
+  void slotClientConnectionClosed(QLocalSocket*, const quint32);
 };
 
-#endif // SINGLECOREAPPLICATION_P_H
+#endif  // SINGLECOREAPPLICATION_P_H

3rdparty/taglib/CMakeLists.txt

@@ -1,8 +1,4 @@
-cmake_minimum_required(VERSION 2.8.11)
-
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -U__STRICT_ANSI__ -fpermissive -Wall -Woverloaded-virtual -Wno-sign-compare -Wno-delete-non-virtual-dtor")
+cmake_minimum_required(VERSION 3.0)
 
 set(TAGLIB_SOVERSION_CURRENT  17)
 set(TAGLIB_SOVERSION_REVISION 0)
@@ -12,70 +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)
-
-if(NOT IS_BIG_ENDIAN)
-  add_definitions(-DSYSTEM_BYTEORDER=1)
-else()
-  add_definitions(-DSYSTEM_BYTEORDER=2)
-endif()
-
 include(ConfigureChecks.cmake)
-configure_file(config.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/config.h")
-configure_file(taglib_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_config.h)
+set(TESTS_DIR "${CMAKE_SOURCE_DIR}/tests/taglib/")
+configure_file(taglib-config.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/taglib-config.h")
 
 add_definitions(-DHAVE_CONFIG_H)
 add_definitions(-DTAGLIB_STATIC)
 
-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()
-
 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
@@ -84,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
@@ -93,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
@@ -342,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
@@ -351,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
@@ -383,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}
@@ -402,4 +400,3 @@ foreach(header ${tag_HDRS})
     COPYONLY
   )
 endforeach()
-

3rdparty/taglib/ConfigureChecks.cmake

@@ -1,36 +1,37 @@
 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)
+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)
+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)
+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)
+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)
+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)
+if(NOT SIZEOF_DOUBLE EQUAL 8)
   message(FATAL_ERROR "TagLib requires that double is 64-bit wide.")
 endif()
 
@@ -211,5 +212,5 @@ endif()
 
 # Detect WinRT mode
 if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-	set(PLATFORM WINRT 1)
+  set(PLATFORM WINRT 1)
 endif()

3rdparty/taglib/ape/apefile.cpp

@@ -31,14 +31,16 @@
  *   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"
@@ -46,122 +48,98 @@
 
 using namespace Strawberry_TagLib::TagLib;
 
-namespace
-{
-  enum { ApeAPEIndex = 0, ApeID3v1Index = 1 };
+namespace {
+enum { ApeAPEIndex = 0,
+  ApeID3v1Index = 1 };
 }
 
-class APE::File::FilePrivate
-{
-public:
-  FilePrivate() :
-    APELocation(-1),
-    APESize(0),
-    ID3v1Location(-1),
-    ID3v2Header(0),
-    ID3v2Location(-1),
-    ID3v2Size(0),
-    properties(0) {}
+class APE::File::FilePrivate {
+ public:
+  FilePrivate() : APELocation(-1),
+                  APESize(0),
+                  ID3v1Location(-1),
+                  ID3v2Location(-1),
+                  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) :
-  Strawberry_TagLib::TagLib::File(file),
-  d(new FilePrivate())
-{
-  if(isOpen())
+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) :
-  Strawberry_TagLib::TagLib::File(stream),
-  d(new FilePrivate())
-{
-  if(isOpen())
+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;
 }
 
-Strawberry_TagLib::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())
+  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()
-{
-  if(readOnly()) {
+bool APE::File::save() {
+
+  if (readOnly()) {
     debug("APE::File::save() -- File is read only.");
     return false;
   }
 
   // Update ID3v1 tag
 
-  if(ID3v1Tag() && !ID3v1Tag()->isEmpty()) {
+  if (ID3v1Tag() && !ID3v1Tag()->isEmpty()) {
 
     // ID3v1 tag is not empty. Update the old one or create a new one.
 
-    if(d->ID3v1Location >= 0) {
+    if (d->ID3v1Location >= 0) {
       seek(d->ID3v1Location);
     }
     else {
@@ -175,7 +153,7 @@ bool APE::File::save()
 
     // ID3v1 tag is empty. Remove the old one.
 
-    if(d->ID3v1Location >= 0) {
+    if (d->ID3v1Location >= 0) {
       truncate(d->ID3v1Location);
       d->ID3v1Location = -1;
     }
@@ -183,12 +161,12 @@ bool APE::File::save()
 
   // Update APE tag
 
-  if(APETag() && !APETag()->isEmpty()) {
+  if (APETag() && !APETag()->isEmpty()) {
 
     // APE tag is not empty. Update the old one or create a new one.
 
-    if(d->APELocation < 0) {
-      if(d->ID3v1Location >= 0)
+    if (d->APELocation < 0) {
+      if (d->ID3v1Location >= 0)
         d->APELocation = d->ID3v1Location;
       else
         d->APELocation = length();
@@ -197,7 +175,7 @@ bool APE::File::save()
     const ByteVector data = APETag()->render();
     insert(data, d->APELocation, d->APESize);
 
-    if(d->ID3v1Location >= 0)
+    if (d->ID3v1Location >= 0)
       d->ID3v1Location += (static_cast<long>(data.size()) - d->APESize);
 
     d->APESize = data.size();
@@ -206,10 +184,10 @@ bool APE::File::save()
 
     // APE tag is empty. Remove the old one.
 
-    if(d->APELocation >= 0) {
+    if (d->APELocation >= 0) {
       removeBlock(d->APELocation, d->APESize);
 
-      if(d->ID3v1Location >= 0)
+      if (d->ID3v1Location >= 0)
         d->ID3v1Location -= d->APESize;
 
       d->APELocation = -1;
@@ -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)
-{
-  if(tags & ID3v1)
-    d->tag.set(ApeID3v1Index, 0);
+void APE::File::strip(int tags) {
 
-  if(tags & APE)
-    d->tag.set(ApeAPEIndex, 0);
+  if (tags & ID3v1)
+    d->tag.set(ApeID3v1Index, nullptr);
 
-  if(!ID3v1Tag())
+  if (tags & APE)
+    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) {
+  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();
   }
 
@@ -272,36 +248,36 @@ void APE::File::read(bool readProperties)
 
   d->ID3v1Location = Utils::findID3v1(this);
 
-  if(d->ID3v1Location >= 0)
+  if (d->ID3v1Location >= 0)
     d->tag.set(ApeID3v1Index, new ID3v1::Tag(this, d->ID3v1Location));
 
   // Look for an APE tag
 
   d->APELocation = Utils::findAPE(this, d->ID3v1Location);
 
-  if(d->APELocation >= 0) {
+  if (d->APELocation >= 0) {
     d->tag.set(ApeAPEIndex, new APE::Tag(this, d->APELocation));
     d->APESize = APETag()->footer()->completeTagSize();
     d->APELocation = d->APELocation + APE::Footer::size() - d->APESize;
   }
 
-  if(d->ID3v1Location < 0)
+  if (d->ID3v1Location < 0)
     APETag(true);
 
   // Look for APE audio properties
 
-  if(readProperties) {
+  if (readProperties) {
 
-    long streamLength;
+    long long streamLength;
 
-    if(d->APELocation >= 0)
+    if (d->APELocation >= 0)
       streamLength = d->APELocation;
-    else if(d->ID3v1Location >= 0)
+    else if (d->ID3v1Location >= 0)
       streamLength = d->ID3v1Location;
     else
       streamLength = length();
 
-    if(d->ID3v2Location >= 0) {
+    if (d->ID3v2Location >= 0) {
       seek(d->ID3v2Location + d->ID3v2Size);
       streamLength -= (d->ID3v2Location + d->ID3v2Size);
     }
@@ -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

@@ -41,197 +41,174 @@
 namespace Strawberry_TagLib {
 namespace TagLib {
 
-  class Tag;
+class Tag;
 
-  namespace ID3v1 { class Tag; }
-  namespace APE { class Tag; }
+namespace ID3v1 {
+class Tag;
+}
+namespace APE {
+class Tag;
+}
 
-  //! An implementation of APE metadata
+//! 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.
+ *
+ */
+
+namespace APE {
+
+//! An implementation of TagLib::File with APE specific methods
+
+/*!
+ * 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.
+ *
+ */
+
+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.
+   */
+  enum TagTypes {
+    //! Empty set.  Matches no tag types.
+    NoTags = 0x0000,
+    //! Matches ID3v1 tags.
+    ID3v1 = 0x0001,
+    //! Matches APE tags.
+    APE = 0x0002,
+    //! Matches all tag types.
+    AllTags = 0xffff
+  };
 
   /*!
-   * This is implementation of APE metadata.
+   * Constructs an APE file from \a file.
+   * If \a readProperties is true the file's audio properties will also be read.
    *
-   * This supports ID3v1 and APE (v1 and v2) style comments as well as reading stream
-   * properties from the file.
+   * \note In the current implementation, \a propertiesStyle is ignored.
    */
+  explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
 
-  namespace APE {
+  /*!
+   * 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 In the current implementation, \a propertiesStyle is ignored.
+   */
+  explicit File(IOStream *stream, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
 
-    //! An implementation of Strawberry_TagLib::TagLib::File with APE specific methods
+  /*!
+   * Destroys this instance of the File.
+   */
+  ~File() override;
 
-    /*!
-     * This implements and provides an interface for APE files to the
-     * 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 APE files.
-     */
+  /*!
+   * Returns the Tag for this file.  This will be an APE tag, an ID3v1 tag or a combination of the two.
+   */
+  Strawberry_TagLib::TagLib::Tag *tag() const override;
 
-    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.
-       */
-      enum TagTypes {
-        //! Empty set.  Matches no tag types.
-        NoTags  = 0x0000,
-        //! Matches ID3v1 tags.
-        ID3v1   = 0x0001,
-        //! Matches APE tags.
-        APE     = 0x0002,
-        //! Matches all tag types.
-        AllTags = 0xffff
-      };
+  /*!
+   * Implements the unified property interface -- import function.
+   * Creates an APEv2 tag if necessary.
+   * A potentially existing ID3v1 tag will be updated as well.
+   */
+  PropertyMap setProperties(const PropertyMap&) override;
 
-      /*!
-       * 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);
+  /*!
+   * Returns the APE::AudioProperties for this file.
+   * If no audio properties were read then this will return a null pointer.
+   */
+  AudioProperties *audioProperties() const override;
 
-      /*!
-       * 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 In the current implementation, \a propertiesStyle is ignored.
-       */
-      File(IOStream *stream, bool readProperties = true,
-           Properties::ReadStyle propertiesStyle = Properties::Average);
+  /*!
+   * Saves the file.
+   *
+   * \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.
+   */
+  bool save() override;
 
-      /*!
-       * Destroys this instance of the File.
-       */
-      virtual ~File();
+  /*!
+   * 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.
+   *
+   * \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.
+   *
+   * \see hasID3v1Tag()
+   */
+  ID3v1::Tag *ID3v1Tag(bool create = false);
 
-      /*!
-       * Returns the Tag for this file.  This will be an APE tag, an ID3v1 tag
-       * or a combination of the two.
-       */
-      virtual Strawberry_TagLib::TagLib::Tag *tag() const;
+  /*!
+   * 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.
+   *
+   * \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.
+   *
+   * \see hasAPETag()
+   */
+  APE::Tag *APETag(bool create = false);
 
-      /*!
-       * 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;
+  /*!
+   * 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 In order to make the removal permanent save() still needs to be called
+   */
+  void strip(int tags = AllTags);
 
-      /*!
-       * Removes unsupported properties. Forwards to the actual Tag's
-       * removeUnsupportedProperties() function.
-       */
-      void removeUnsupportedProperties(const StringList &properties);
+  /*!
+   * Returns whether or not the file on disk actually has an APE tag.
+   *
+   * \see APETag()
+   */
+  bool hasAPETag() const;
 
-      /*!
-       * Implements the unified property interface -- import function.
-       * Creates an APEv2 tag if necessary. A potentially existing ID3v1
-       * tag will be updated as well.
-       */
-      PropertyMap setProperties(const PropertyMap &);
+  /*!
+   * Returns whether or not the file on disk actually has an ID3v1 tag.
+   *
+   * \see ID3v1Tag()
+   */
+  bool hasID3v1Tag() const;
 
-      /*!
-       * Returns the APE::Properties for this file.  If no audio properties
-       * were read then this will return a null pointer.
-       */
-      virtual Properties *audioProperties() const;
+  /*!
+   * 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.
+   */
+  static bool isSupported(IOStream *stream);
 
-      /*!
-       * Saves the file.
-       *
-       * \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();
+ private:
+  File(const File &);
+  File &operator=(const File &);
 
-      /*!
-       * 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.
-       *
-       * \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.
-       *
-       * \see hasID3v1Tag()
-       */
-      ID3v1::Tag *ID3v1Tag(bool create = false);
+  void read(bool readProperties);
 
-      /*!
-       * 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.
-       *
-       * \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.
-       *
-       * \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.
-       *
-       * \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);
-
-      /*!
-       * Returns whether or not the file on disk actually has an APE tag.
-       *
-       * \see APETag()
-       */
-      bool hasAPETag() const;
-
-      /*!
-       * Returns whether or not the file on disk actually has an ID3v1 tag.
-       *
-       * \see ID3v1Tag()
-       */
-      bool hasID3v1Tag() const;
-
-      /*!
-       * 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.
-       */
-      static bool isSupported(IOStream *stream);
-
-    private:
-      File(const File &);
-      File &operator=(const File &);
-
-      void read(bool readProperties);
-
-      class FilePrivate;
-      FilePrivate *d;
-    };
-  }
-}
-}
+  class FilePrivate;
+  FilePrivate *d;
+};
+}  // namespace APE
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/ape/apefooter.cpp

@@ -27,24 +27,22 @@
 #include <iostream>
 #include <bitset>
 
-#include <tstring.h>
-#include <tdebug.h>
+#include "tstring.h"
+#include "tdebug.h"
 
 #include "apefooter.h"
 
 using namespace Strawberry_TagLib::TagLib;
 using namespace APE;
 
-class APE::Footer::FooterPrivate
-{
-public:
-  FooterPrivate() :
-    version(0),
-    footerPresent(true),
-    headerPresent(false),
-    isHeader(false),
-    itemCount(0),
-    tagSize(0) {}
+class APE::Footer::FooterPrivate {
+ public:
+  FooterPrivate() : version(0),
+                    footerPresent(true),
+                    headerPresent(false),
+                    isHeader(false),
+                    itemCount(0),
+                    tagSize(0) {}
 
   unsigned int version;
 
@@ -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,119 +71,103 @@ 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
-{
-  if(d->headerPresent)
+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
-{
-  if(!d->headerPresent)
+ByteVector APE::Footer::renderHeader() const {
+
+  if (!d->headerPresent)
     return ByteVector();
   else
     return render(true);
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // protected members
 ////////////////////////////////////////////////////////////////////////////////
 
-void APE::Footer::parse(const ByteVector &data)
-{
-  if(data.size() < size())
+void APE::Footer::parse(const ByteVector &data) {
+
+  if (data.size() < size())
     return;
 
   // The first eight bytes, data[0..7], are the File Identifier, "APETAGEX".
 
   // 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,29 +186,30 @@ 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
 
   std::bitset<32> flags;
 
   flags[31] = d->headerPresent;
-  flags[30] = false; // footer is always present
+  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

@@ -32,144 +32,144 @@
 namespace Strawberry_TagLib {
 namespace TagLib {
 
-  namespace APE {
+namespace APE {
 
-    //! An implementation of APE footers
+//! 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
-    {
-    public:
-      /*!
-       * Constructs an empty APE footer.
-       */
-      Footer();
+class TAGLIB_EXPORT Footer {
+ public:
+  /*!
+   * Constructs an empty APE footer.
+   */
+  explicit Footer();
 
-      /*!
-       * Constructs an APE footer based on \a data.  parse() is called
-       * immediately.
-       */
-      Footer(const ByteVector &data);
+  /*!
+   * Constructs an APE footer based on \a data.  parse() is called immediately.
+   */
+  explicit Footer(const ByteVector &data);
 
-      /*!
-       * Destroys the footer.
-       */
-      virtual ~Footer();
+  /*!
+   * Destroys the footer.
+   */
+  virtual ~Footer();
 
-      /*!
-       * Returns the version number.  (Note: This is the 1000 or 2000.)
-       */
-      unsigned int version() const;
+  /*!
+   * Returns the version number.  (Note: This is the 1000 or 2000.)
+   */
+  unsigned int version() const;
 
-      /*!
-       * Returns true if a header is present in the tag.
-       */
-      bool headerPresent() const;
+  /*!
+   * Returns true if a header is present in the tag.
+   */
+  bool headerPresent() const;
 
-      /*!
-       * Returns true if a footer is present in the tag.
-       */
-      bool footerPresent() const;
+  /*!
+   * Returns true if a footer is present in the tag.
+   */
+  bool footerPresent() const;
 
-      /*!
-       * Returns true this is actually the header.
-       */
-      bool isHeader() const;
+  /*!
+   * Returns true this is actually the header.
+   */
+  bool isHeader() const;
 
-      /*!
-       * Sets whether the header should be rendered or not
-       */
-      void setHeaderPresent(bool b) const;
+  /*!
+   * Sets whether the header should be rendered or not
+   */
+  void setHeaderPresent(bool b) const;
 
-      /*!
-       * Returns the number of items in the tag.
-       */
-      unsigned int itemCount() const;
+  /*!
+   * Returns the number of items in the tag.
+   */
+  unsigned int itemCount() const;
 
-      /*!
-       * Set the item count to \a s.
-       * \see itemCount()
-       */
-      void setItemCount(unsigned int s);
+  /*!
+   * Set the item count to \a s.
+   * \see itemCount()
+   */
+  void setItemCount(unsigned int s);
 
-      /*!
-       * 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()
-       */
-      unsigned int tagSize() const;
+  /*!
+   * 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()
+   */
+  unsigned int tagSize() const;
 
-      /*!
-       * Returns the tag size, including if present, the header
-       * size.
-       *
-       * \see tagSize()
-       */
-      unsigned int completeTagSize() const;
+  /*!
+   * Returns the tag size, including if present, the header
+   * size.
+   *
+   * \see tagSize()
+   */
+  unsigned int completeTagSize() const;
 
-      /*!
-       * Set the tag size to \a s.
-       * \see tagSize()
-       */
-      void setTagSize(unsigned int s);
+  /*!
+   * Set the tag size to \a s.
+   * \see tagSize()
+   */
+  void setTagSize(unsigned int s);
 
-      /*!
-       * Returns the size of the footer.  Presently this is always 32 bytes.
-       */
-      static unsigned int size();
+  /*!
+   * Returns the size of the footer.  Presently this is always 32 bytes.
+   */
+  static unsigned int size();
 
-      /*!
-       * Returns the string used to identify an APE tag inside of a file.
-       * Presently this is always "APETAGEX".
-       */
-      static ByteVector fileIdentifier();
+  /*!
+   * Returns the string used to identify an APE tag inside of a file.
+   * Presently this is always "APETAGEX".
+   */
+  static ByteVector fileIdentifier();
 
-      /*!
-       * Sets the data that will be used as the footer.  32 bytes,
-       * starting from \a data will be used.
-       */
-      void setData(const ByteVector &data);
+  /*!
+   * Sets the data that will be used as the footer.  32 bytes,
+   * starting from \a data will be used.
+   */
+  void setData(const ByteVector &data);
 
-      /*!
-       * Renders the footer back to binary format.
-       */
-      ByteVector renderFooter() const;
+  /*!
+   * Renders the footer back to binary format.
+   */
+  ByteVector renderFooter() const;
 
-      /*!
-       * Renders the header corresponding to the footer. If headerPresent is
-       * set to false, it returns an empty ByteVector.
-       */
-      ByteVector renderHeader() const;
+  /*!
+   * 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.
-       */
-      void parse(const ByteVector &data);
+ protected:
+  /*!
+   * Called by setData() to parse the footer data.
+   * It makes this information available through the public API.
+   */
+  void parse(const ByteVector &data);
 
-      /*!
-       * Called by renderFooter and renderHeader
-       */
-      ByteVector render(bool isHeader) const;
+  /*!
+   * Called by renderFooter and renderHeader
+   */
+  ByteVector render(bool isHeader) const;
 
-    private:
-      Footer(const Footer &);
-      Footer &operator=(const Footer &);
+ private:
+  Footer(const Footer &);
+  Footer &operator=(const Footer &);
 
-      class FooterPrivate;
-      FooterPrivate *d;
-    };
+  class FooterPrivate;
+  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 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,257 +43,229 @@ 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;
-  if(binary) {
-    d->type = Binary;
-    d->value = value;
+APE::Item::Item(const String &key, const ByteVector &value, bool binary) : d(new ItemPrivate()) {
+  d->data->key = key;
+  if (binary) {
+    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(const Item &item) : d(new ItemPrivate(*item.d)) {}
 
-APE::Item::~Item()
-{
+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) {
+  if (data.size() < 11) {
     debug("APE::Item::parse() -- no data in item");
     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())
+  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

@@ -32,195 +32,176 @@
 
 namespace Strawberry_TagLib {
 namespace TagLib {
+namespace APE {
 
-  namespace APE {
+//! An implementation of APE-items
 
-    //! An implementation of APE-items
+/*!
+ * This class provides the features of items in the APEv2 standard.
+ */
+class TAGLIB_EXPORT Item {
+ public:
+  /*!
+   * Enum of types an Item can have. The value of 3 is reserved.
+   */
+  enum ItemTypes {
+    //! Item contains text information coded in UTF-8
+    Text = 0,
+    //! Item contains binary information
+    Binary = 1,
+    //! Item is a locator of external stored information
+    Locator = 2
+  };
+  /*!
+   * Constructs an empty item.
+   */
+  explicit Item();
 
-    /*!
-     * This class provides the features of items in the APEv2 standard.
-     */
-    class TAGLIB_EXPORT Item
-    {
-    public:
-      /*!
-       * Enum of types an Item can have. The value of 3 is reserved.
-       */
-      enum ItemTypes {
-        //! Item contains text information coded in UTF-8
-        Text = 0,
-        //! Item contains binary information
-        Binary = 1,
-        //! Item is a locator of external stored information
-        Locator = 2
-      };
-      /*!
-       * Constructs an empty item.
-       */
-      Item();
+  /*!
+   * Constructs a text item with \a key and \a values.
+   */
+  explicit Item(const String &key, const String &values);
 
-      /*!
-       * 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);
+  /*!
+   * Constructs a text item with \a key and \a values.
+   */
+  explicit Item(const String &key, const StringList &values);
 
-      /*!
-       * Constructs a text item with \a key and \a values.
-       */
-      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
+   */
+  explicit Item(const String &key, const ByteVector &value, bool binary);
 
-      /*!
-       * 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);
+  /*!
+   * Construct an item as a copy of \a item.
+   */
+  Item(const Item &item);
 
-      /*!
-       * Construct an item as a copy of \a item.
-       */
-      Item(const Item &item);
+  /*!
+   * Destroys the item.
+   */
+  virtual ~Item();
 
-      /*!
-       * Destroys the item.
-       */
-      virtual ~Item();
+  /*!
+   * Copies the contents of \a item into this item.
+   */
+  Item &operator=(const Item &item);
 
-      /*!
-       * Copies the contents of \a item into this item.
-       */
-      Item &operator=(const Item &item);
+  /*!
+   * Exchanges the content of this item by the content of \a item.
+   */
+  void swap(Item &item);
 
-      /*!
-       * Exchanges the content of this item by the content of \a item.
-       */
-      void swap(Item &item);
+  /*!
+   * Returns the key.
+   */
+  String key() const;
 
-      /*!
-       * Returns the key.
-       */
-      String key() const;
+  /*!
+   * Returns the binary value.
+   * If the item type is not \a Binary, always returns an empty ByteVector.
+   */
+  ByteVector binaryData() const;
 
-      /*!
-       * Returns the binary value.
-       * If the item type is not \a Binary, always returns an empty ByteVector.
-       */
-      ByteVector binaryData() const;
+  /*!
+   * Set the binary value to \a value
+   * The item's type will also be set to \a Binary
+   */
+  void setBinaryData(const ByteVector &value);
 
-     /*!
-      * Set the binary value to \a value
-      * The item's type will also be set to \a Binary
-      */
-      void setBinaryData(const ByteVector &value);
+  /*!
+   * Sets the key for the item to \a key.
+   */
+  void setKey(const String &key);
 
-#ifndef DO_NOT_DOCUMENT
-      /* Remove in next binary incompatible release */
-      ByteVector value() const;
-#endif
+  /*!
+   * Sets the text value of the item to \a value and clears any previous contents.
+   *
+   * \see toString()
+   */
+  void setValue(const String &value);
 
-      /*!
-       * Sets the key for the item to \a key.
-       */
-      void setKey(const String &key);
+  /*!
+   * Sets the text value of the item to the list of values in \a value and clears any previous contents.
+   *
+   * \see toStringList()
+   */
+  void setValues(const StringList &values);
 
-      /*!
-       * Sets the text value of the item to \a value and clears any previous contents.
-       *
-       * \see toString()
-       */
-      void setValue(const String &value);
+  /*!
+   * Appends \a value to create (or extend) the current list of text values.
+   *
+   * \see toString()
+   */
+  void appendValue(const String &value);
 
-      /*!
-       * Sets the text value of the item to the list of values in \a value and clears
-       * any previous contents.
-       *
-       * \see toStringList()
-       */
-      void setValues(const StringList &values);
+  /*!
+   * Appends \a values to extend the current list of text values.
+   *
+   * \see toStringList()
+   */
+  void appendValues(const StringList &values);
 
-      /*!
-       * Appends \a value to create (or extend) the current list of text values.
-       *
-       * \see toString()
-       */
-      void appendValue(const String &value);
+  /*!
+   * Returns the size of the full item.
+   */
+  int size() const;
 
-      /*!
-       * Appends \a values to extend the current list of text values.
-       *
-       * \see toStringList()
-       */
-      void appendValues(const StringList &values);
+  /*!
+   * 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;
 
-      /*!
-       * Returns the size of the full item.
-       */
-      int size() const;
+  /*!
+   * Returns the list of text values.  If the data type is not \a Text, always returns an empty StringList.
+   */
+  StringList values() 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.
-       */
-      String toString() const;
+  /*!
+   * Render the item to a ByteVector.
+   */
+  ByteVector render() const;
 
-#ifndef DO_NOT_DOCUMENT
-      /* Remove in next binary incompatible release */
-      StringList toStringList() const;
-#endif
+  /*!
+   * Parse the item from the ByteVector \a data.
+   */
+  void parse(const ByteVector &data);
 
-      /*!
-       * Returns the list of text values.  If the data type is not \a Text, always
-       * returns an empty StringList.
-       */
-      StringList values() const;
+  /*!
+   * Set the item to read-only.
+   */
+  void setReadOnly(bool readOnly);
 
-      /*!
-       * Render the item to a ByteVector.
-       */
-      ByteVector render() const;
+  /*!
+   * Return true if the item is read-only.
+   */
+  bool isReadOnly() const;
 
-      /*!
-       * Parse the item from the ByteVector \a data.
-       */
-      void parse(const ByteVector& data);
+  /*!
+   * Sets the type of the item to \a type.
+   *
+   * \see ItemTypes
+   */
+  void setType(ItemTypes type);
 
-      /*!
-       * Set the item to read-only.
-       */
-      void setReadOnly(bool readOnly);
+  /*!
+   * Returns the type of the item.
+   */
+  ItemTypes type() const;
 
-      /*!
-       * Return true if the item is read-only.
-       */
-      bool isReadOnly() const;
+  /*!
+   * Returns if the item has any real content.
+   */
+  bool isEmpty() const;
 
-      /*!
-       * Sets the type of the item to \a type.
-       *
-       * \see ItemTypes
-       */
-      void setType(ItemTypes type);
-
-      /*!
-       * Returns the type of the item.
-       */
-      ItemTypes type() const;
-
-      /*!
-       * Returns if the item has any real content.
-       */
-      bool isEmpty() const;
-
-    private:
-      class ItemPrivate;
-      ItemPrivate *d;
-    };
-  }
-
-}
-}
+ private:
+  class ItemPrivate;
+  ItemPrivate *d;
+};
+}  // namespace APE
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif
-
-

3rdparty/taglib/ape/apeproperties.cpp

@@ -27,9 +27,9 @@
  *   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"
@@ -38,17 +38,15 @@
 
 using namespace Strawberry_TagLib::TagLib;
 
-class APE::Properties::PropertiesPrivate
-{
-public:
-  PropertiesPrivate() :
-    length(0),
-    bitrate(0),
-    sampleRate(0),
-    channels(0),
-    version(0),
-    bitsPerSample(0),
-    sampleFrames(0) {}
+class APE::AudioProperties::AudioPropertiesPrivate {
+ public:
+  explicit AudioPropertiesPrivate() : length(0),
+                                      bitrate(0),
+                                      sampleRate(0),
+                                      channels(0),
+                                      version(0),
+                                      bitsPerSample(0),
+                                      sampleFrames(0) {}
 
   int length;
   int bitrate;
@@ -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,122 +105,123 @@ unsigned int APE::Properties::sampleFrames() const
 // private members
 ////////////////////////////////////////////////////////////////////////////////
 
-namespace
-{
-  int headerVersion(const ByteVector &header)
-  {
-    if(header.size() < 6 || !header.startsWith("MAC "))
-      return -1;
+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.
-  if(version < 0) {
+  if (version < 0) {
     offset = file->find("MAC ", offset);
     file->seek(offset);
     version = headerVersion(file->readBlock(6));
   }
 
-  if(version < 0) {
-    debug("APE::Properties::read() -- APE descriptor not found");
+  if (version < 0) {
+    debug("APE::AudioProperties::read() -- APE descriptor not found");
     return;
   }
 
   d->version = version;
 
-  if(d->version >= 3980)
+  if (d->version >= 3980)
     analyzeCurrent(file);
   else
     analyzeOld(file);
 
-  if(d->sampleFrames > 0 && d->sampleRate > 0) {
+  if (d->sampleFrames > 0 && d->sampleRate > 0) {
     const double length = d->sampleFrames * 1000.0 / d->sampleRate;
-    d->length  = static_cast<int>(length + 0.5);
+    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.");
+  if (descriptor.size() < 44) {
+    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)
+  if ((descriptorBytes - 52) > 0)
     file->seek(descriptorBytes - 52, File::Current);
 
   // Read the header
   const ByteVector header = file->readBlock(24);
-  if(header.size() < 24) {
-    debug("APE::Properties::analyzeCurrent() -- MAC header is too short.");
+  if (header.size() < 24) {
+    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);
-  if(totalFrames == 0)
+  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.");
+  if (header.size() < 26) {
+    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)
+  if (totalFrames == 0)
     return;
 
-  const short compressionLevel = header.toShort(0, false);
+  const short compressionLevel = header.toUInt32LE(0);
   unsigned int blocksPerFrame;
-  if(d->version >= 3950)
+  if (d->version >= 3950)
     blocksPerFrame = 73728 * 4;
-  else if(d->version >= 3900 || (d->version >= 3800 && compressionLevel == 4000))
+  else if (d->version >= 3900 || (d->version >= 3800 && compressionLevel == 4000))
     blocksPerFrame = 73728;
   else
     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.");
+  if (fmt.size() < 28 || !fmt.startsWith("WAVEfmt ")) {
+    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

@@ -35,111 +35,84 @@
 
 namespace Strawberry_TagLib {
 namespace TagLib {
+namespace APE {
 
-  namespace APE {
+class File;
 
-    class File;
+//! An implementation of audio property reading for APE
 
-    //! 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 AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
+ public:
 
-    class TAGLIB_EXPORT Properties : public 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::AudioProperties with the data read from the APE::File \a file.
+   */
+  explicit AudioProperties(File *file, long long streamLength, ReadStyle style = Average);
 
-      /*!
-       * Create an instance of APE::Properties with the data read from the
-       * APE::File \a file.
-       */
-      Properties(File *file, long streamLength, ReadStyle style = Average);
+  /*!
+   * Destroys this APE::AudioProperties instance.
+   */
+  ~AudioProperties() override;
 
-      /*!
-       * Destroys this APE::Properties instance.
-       */
-      virtual ~Properties();
+  /*!
+   * Returns the length of the file in seconds.  The length is rounded down to the nearest whole second.
+   *
+   * \see lengthInMilliseconds()
+   */
+  int lengthInSeconds() const 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 milliseconds.
+   *
+   * \see lengthInSeconds()
+   */
+  int lengthInMilliseconds() const override;
 
-      /*!
-       * 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;
+  /*!
+   * Returns the average bit rate of the file in kb/s.
+   */
+  int bitrate() const override;
 
-      /*!
-       * Returns the length of the file in milliseconds.
-       *
-       * \see lengthInSeconds()
-       */
-      // BIC: make virtual
-      int lengthInMilliseconds() const;
+  /*!
+   * Returns the sample rate in Hz.
+   */
+  int sampleRate() const override;
 
-      /*!
-       * Returns the average bit rate of the file in kb/s.
-       */
-      virtual int bitrate() const;
+  /*!
+   * Returns the number of audio channels.
+   */
+  int channels() const override;
 
-      /*!
-       * Returns the sample rate in Hz.
-       */
-      virtual int sampleRate() const;
+  /*!
+   * Returns the number of bits per audio sample.
+   */
+  int bitsPerSample() const;
 
-      /*!
-       * Returns the number of audio channels.
-       */
-      virtual int channels() const;
+  /*!
+   * Returns the total number of audio samples in file.
+   */
+  unsigned int sampleFrames() const;
 
-      /*!
-       * Returns the number of bits per audio sample.
-       */
-      int bitsPerSample() const;
+  /*!
+   * Returns APE version.
+   */
+  int version() const;
 
-      /*!
-       * Returns the total number of audio samples in file.
-       */
-      unsigned int sampleFrames() const;
+ private:
+  void read(File *file, long long streamLength);
 
-      /*!
-       * Returns APE version.
-       */
-      int version() const;
+  void analyzeCurrent(File *file);
+  void analyzeOld(File *file);
 
-    private:
-      Properties(const Properties &);
-      Properties &operator=(const Properties &);
-
-      void read(File *file, 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

@@ -28,15 +28,16 @@
 // it considers specializations with and without class types
 // to be different; this define forces Map to use only the
 // specialization with the class keyword.
-#define WANT_CLASS_INSTANTIATION_OF_MAP (1)
+#  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"
@@ -45,42 +46,38 @@
 using namespace Strawberry_TagLib::TagLib;
 using namespace APE;
 
-namespace
-{
-  const unsigned int MinKeyLength = 2;
-  const unsigned int MaxKeyLength = 255;
+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) {
 
-    // only allow printable ASCII including space (32..126)
+  const char *invalidKeys[] = { "ID3", "TAG", "OGGS", "MP+", nullptr };
 
-    for(ByteVector::ConstIterator it = key.begin(); it != key.end(); ++it) {
-      const int c = static_cast<unsigned char>(*it);
-      if(c < 32 || c > 126)
-        return false;
-    }
+  // only allow printable ASCII including space (32..126)
 
-    const String upperKey = String(key).upper();
-    for(size_t i = 0; invalidKeys[i] != 0; ++i) {
-      if(upperKey == invalidKeys[i])
-        return false;
-    }
-
-    return true;
+  for (ByteVector::ConstIterator it = key.begin(); it != key.end(); ++it) {
+    const int c = static_cast<unsigned char>(*it);
+    if (c < 32 || c > 126)
+      return false;
   }
-}
 
-class APE::Tag::TagPrivate
-{
-public:
-  TagPrivate() :
-    file(0),
-    footerLocation(0) {}
+  const String upperKey = String(key).upper();
+  for (size_t i = 0; invalidKeys[i] != nullptr; ++i) {
+    if (upperKey == invalidKeys[i])
+      return false;
+  }
+
+  return true;
+}
+}  // namespace
+
+class APE::Tag::TagPrivate {
+ public:
+  TagPrivate() : file(nullptr), footerLocation(0) {}
 
   File *file;
-  long footerLocation;
+  long long footerLocation;
 
   Footer footer;
   ItemListMap itemListMap;
@@ -90,172 +87,257 @@ public:
 // public methods
 ////////////////////////////////////////////////////////////////////////////////
 
-APE::Tag::Tag() :
-  Strawberry_TagLib::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(Strawberry_TagLib::TagLib::File *file, long footerLocation) :
-  Strawberry_TagLib::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
-{
-  if(d->itemListMap["TITLE"].isEmpty())
+String APE::Tag::title() const {
+
+  if (d->itemListMap["TITLE"].isEmpty())
     return String();
   return d->itemListMap["TITLE"].values().toString();
+
 }
 
-String APE::Tag::artist() const
-{
-  if(d->itemListMap["ARTIST"].isEmpty())
+String APE::Tag::artist() const {
+
+  if (d->itemListMap["ARTIST"].isEmpty())
     return String();
   return d->itemListMap["ARTIST"].values().toString();
+
 }
 
-String APE::Tag::album() const
-{
-  if(d->itemListMap["ALBUM"].isEmpty())
+String APE::Tag::album() const {
+
+  if (d->itemListMap["ALBUM"].isEmpty())
     return String();
   return d->itemListMap["ALBUM"].values().toString();
+
 }
 
-String APE::Tag::comment() const
-{
-  if(d->itemListMap["COMMENT"].isEmpty())
+String APE::Tag::comment() const {
+
+  if (d->itemListMap["COMMENT"].isEmpty())
     return String();
   return d->itemListMap["COMMENT"].values().toString();
+
 }
 
-String APE::Tag::genre() const
-{
-  if(d->itemListMap["GENRE"].isEmpty())
+String APE::Tag::genre() const {
+
+  if (d->itemListMap["GENRE"].isEmpty())
     return String();
   return d->itemListMap["GENRE"].values().toString();
+
 }
 
-unsigned int APE::Tag::year() const
-{
-  if(d->itemListMap["YEAR"].isEmpty())
+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
-{
-  if(d->itemListMap["TRACK"].isEmpty())
+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)
-{
-  if(i == 0)
+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)
-{
-  if(i == 0)
+void APE::Tag::setTrack(unsigned int i) {
+
+  if (i == 0)
     removeItem("TRACK");
   else
     addValue("TRACK", String::number(i), true);
+
 }
 
-namespace
-{
-  // conversions of tag keys between what we use in PropertyMap and what's usual
-  // for APE tags
-  //                                    usual,         APE
-  const char *keyConversions[][2] =  {{"TRACKNUMBER", "TRACK"       },
-                                      {"DATE",        "YEAR"        },
-                                      {"ALBUMARTIST", "ALBUM ARTIST"},
-                                      {"DISCNUMBER",  "DISC"        },
-                                      {"REMIXER",     "MIXARTIST"   }};
-  const size_t keyConversionsSize = sizeof(keyConversions) / sizeof(keyConversions[0]);
+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);
+    }
+  }
+
 }
 
-PropertyMap APE::Tag::properties() const
-{
+namespace {
+// conversions of tag keys between what we use in PropertyMap and what's usual
+// for APE tags
+//                                    usual,         APE
+const char *keyConversions[][2] = { { "TRACKNUMBER", "TRACK" },
+  { "DATE", "YEAR" },
+  { "ALBUMARTIST", "ALBUM ARTIST" },
+  { "DISCNUMBER", "DISC" },
+  { "REMIXER", "MIXARTIST" } };
+const size_t keyConversionsSize = sizeof(keyConversions) / sizeof(keyConversions[0]);
+}  // namespace
+
+PropertyMap APE::Tag::properties() const {
+
   PropertyMap properties;
   ItemListMap::ConstIterator it = itemListMap().begin();
-  for(; it != itemListMap().end(); ++it) {
+  for (; it != itemListMap().end(); ++it) {
     String tagName = it->first.upper();
     // if the item is Binary or Locator, or if the key is an invalid string,
     // add to unsupportedData
-    if(it->second.type() != Item::Text || tagName.isEmpty()) {
+    if (it->second.type() != Item::Text || tagName.isEmpty()) {
       properties.unsupportedData().append(it->first);
     }
     else {
       // Some tags need to be handled specially
-      for(size_t i = 0; i < keyConversionsSize; ++i) {
-        if(tagName == keyConversions[i][1])
+      for (size_t i = 0; i < keyConversionsSize; ++i) {
+        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)
+  for (; it != properties.end(); ++it)
     removeItem(*it);
+
 }
 
-PropertyMap APE::Tag::setProperties(const PropertyMap &origProps)
-{
-  PropertyMap properties(origProps); // make a local copy that can be modified
+PropertyMap APE::Tag::setProperties(const PropertyMap &origProps) {
+
+  PropertyMap properties(origProps);  // make a local copy that can be modified
 
   // see comment in properties()
-  for(size_t i = 0; i < keyConversionsSize; ++i)
-    if(properties.contains(keyConversions[i][0])) {
+  for (size_t i = 0; i < keyConversionsSize; ++i)
+    if (properties.contains(keyConversions[i][0])) {
       properties.insert(keyConversions[i][1], properties[keyConversions[i][0]]);
       properties.erase(keyConversions[i][0]);
     }
@@ -263,31 +345,31 @@ PropertyMap APE::Tag::setProperties(const PropertyMap &origProps)
   // first check if tags need to be removed completely
   StringList toRemove;
   ItemListMap::ConstIterator remIt = itemListMap().begin();
-  for(; remIt != itemListMap().end(); ++remIt) {
+  for (; remIt != itemListMap().end(); ++remIt) {
     String key = remIt->first.upper();
     // only remove if a) key is valid, b) type is text, c) key not contained in new properties
-    if(!key.isEmpty() && remIt->second.type() == APE::Item::Text && !properties.contains(key))
+    if (!key.isEmpty() && remIt->second.type() == APE::Item::Text && !properties.contains(key))
       toRemove.append(remIt->first);
   }
 
-  for(StringList::ConstIterator removeIt = toRemove.begin(); removeIt != toRemove.end(); removeIt++)
+  for (StringList::ConstIterator removeIt = toRemove.begin(); removeIt != toRemove.end(); removeIt++)
     removeItem(*removeIt);
 
   // now sync in the "forward direction"
   PropertyMap::ConstIterator it = properties.begin();
   PropertyMap invalid;
-  for(; it != properties.end(); ++it) {
+  for (; it != properties.end(); ++it) {
     const String &tagName = it->first;
-    if(!checkKey(tagName))
+    if (!checkKey(tagName))
       invalid.insert(it->first, it->second);
-    else if(!(itemListMap().contains(tagName)) || !(itemListMap()[tagName].values() == it->second)) {
-      if(it->second.isEmpty())
+    else if (!(itemListMap().contains(tagName)) || !(itemListMap()[tagName].values() == it->second)) {
+      if (it->second.isEmpty())
         removeItem(tagName);
       else {
         StringList::ConstIterator valueIt = it->second.begin();
         addValue(tagName, *valueIt, true);
         ++valueIt;
-        for(; valueIt != it->second.end(); ++valueIt)
+        for (; valueIt != it->second.end(); ++valueIt)
           addValue(tagName, *valueIt, false);
       }
     }
@@ -295,35 +377,33 @@ PropertyMap APE::Tag::setProperties(const PropertyMap &origProps)
   return invalid;
 }
 
-bool APE::Tag::checkKey(const String &key)
-{
-  if(key.size() < MinKeyLength || key.size() > MaxKeyLength)
+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)
-{
-  if(replace)
+void APE::Tag::addValue(const String &key, const String &value, bool replace) {
+
+  if (replace)
     removeItem(key);
 
-  if(value.isEmpty())
+  if (value.isEmpty())
     return;
 
   // Text items may contain more than one value.
@@ -331,34 +411,36 @@ void APE::Tag::addValue(const String &key, const String &value, bool replace)
 
   ItemListMap::Iterator it = d->itemListMap.find(key.upper());
 
-  if(it != d->itemListMap.end() && it->second.type() == Item::Text)
+  if (it != d->itemListMap.end() && it->second.type() == Item::Text)
     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())
+  if (value.isEmpty())
     return;
 
   setItem(key, Item(key, value, true));
+
 }
 
-void APE::Tag::setItem(const String &key, const Item &item)
-{
-  if(!checkKey(key)) {
+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,28 +448,29 @@ bool APE::Tag::isEmpty() const
 // protected methods
 ////////////////////////////////////////////////////////////////////////////////
 
-void APE::Tag::read()
-{
-  if(d->file && d->file->isValid()) {
+void APE::Tag::read() {
+
+  if (d->file && d->file->isValid()) {
 
     d->file->seek(d->footerLocation);
     d->footer.setData(d->file->readBlock(Footer::size()));
 
-    if(d->footer.tagSize() <= Footer::size() ||
-       d->footer.tagSize() > static_cast<unsigned long>(d->file->length()))
+    if (d->footer.tagSize() <= Footer::size() ||
+      d->footer.tagSize() > static_cast<unsigned long>(d->file->length()))
       return;
 
     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;
 
-  for(ItemListMap::ConstIterator it = d->itemListMap.begin(); it != d->itemListMap.end(); ++it) {
+  for (ItemListMap::ConstIterator it = d->itemListMap.begin(); it != d->itemListMap.end(); ++it) {
     data.append(it->second.render());
     itemCount++;
   }
@@ -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)
+  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++) {
+  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,177 +34,183 @@
 
 #include "apeitem.h"
 
+#define FRONT_COVER "COVER ART (FRONT)"
+#define BACK_COVER  "COVER ART (BACK)"
+
 namespace Strawberry_TagLib {
 namespace TagLib {
 
-  class File;
+class File;
 
-  //! An implementation of the APE tagging format
+//! An implementation of the APE tagging format
 
-  namespace APE {
+namespace APE {
 
-    class Footer;
+class Footer;
 
-    /*!
-     * A mapping between a list of item names, or keys, and the associated item.
-     *
-     * \see APE::Tag::itemListMap()
-     */
-    typedef Map<const String, Item> ItemListMap;
+/*!
+ * A mapping between a list of item names, or keys, and the associated item.
+ *
+ * \see APE::Tag::itemListMap()
+ */
+typedef Map<String, Item> ItemListMap;
 
 
-    //! An APE tag implementation
+//! An APE tag implementation
 
-    class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag
-    {
-    public:
-      /*!
-       * Create an APE tag with default values.
-       */
-      Tag();
+class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag {
+ public:
+  /*!
+   * Create an APE tag with default values.
+   */
+  explicit Tag();
 
-      /*!
-       * Create an APE tag and parse the data in \a file with APE footer at
-       * \a tagOffset.
-       */
-      Tag(Strawberry_TagLib::TagLib::File *file, long footerLocation);
+  /*!
+   * Create an APE tag and parse the data in \a file with APE footer at
+   * \a tagOffset.
+   */
+  explicit Tag(Strawberry_TagLib::TagLib::File *file, long long footerLocation);
 
-      /*!
-       * Destroys this Tag instance.
-       */
-      virtual ~Tag();
+  /*!
+   * Destroys this Tag instance.
+   */
+  ~Tag() override;
 
-      /*!
-       * Renders the in memory values to a ByteVector suitable for writing to
-       * the file.
-       */
-      ByteVector render() const;
+  /*!
+   * 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.
-       */
-      static ByteVector fileIdentifier();
+  /*!
+   * Returns the string "APETAGEX" suitable for usage in locating the tag in a file.
+   */
+  static ByteVector fileIdentifier();
 
-      // Reimplementations.
+  // 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;
 
-      /*!
-       * 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*
-       * 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).
-       *
-       * 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.
-       */
-      PropertyMap properties() const;
+  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;
 
-      void removeUnsupportedProperties(const StringList &properties);
+  /*!
+   * 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*
+   * 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).
+   *
+   * 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.
+   */
+  PropertyMap properties() const override;
 
-      /*!
-       * 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 &);
+  void removeUnsupportedProperties(const StringList &properties) override;
 
-      /*!
-       * Check if the given String is a valid APE tag key.
-       */
-      static bool checkKey(const String&);
+  /*!
+   * 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 &) override;
 
-      /*!
-       * Returns a pointer to the tag's footer.
-       */
-      Footer *footer() const;
+  /*!
+   * Check if the given String is a valid APE tag key.
+   */
+  static bool checkKey(const String &);
 
-      /*!
-       * 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.
-       *
-       * APE tags are case-insensitive, all keys in this map have been converted
-       * to upper case.
-       *
-       * \warning You should not modify this data structure directly, instead
-       * use setItem() and removeItem().
-       */
-      const ItemListMap &itemListMap() const;
+  /*!
+   * Returns a pointer to the tag's footer.
+   */
+  Footer *footer() const;
 
-      /*!
-       * Removes the \a key item from the tag
-       */
-      void removeItem(const String &key);
+  /*!
+   * 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.
+   *
+   * APE tags are case-insensitive, all keys in this map have been converted
+   * to upper case.
+   *
+   * \warning You should not modify this data structure directly, instead
+   * use setItem() and removeItem().
+   */
+  const ItemListMap &itemListMap() const;
 
-      /*!
-       * 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);
+  /*!
+   * Removes the \a key item from the tag
+   */
+  void removeItem(const String &key);
 
-     /*!
-      * 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.
-      */
-      void setData(const String &key, const ByteVector &value);
+  /*!
+   * 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);
 
-      /*!
-       * 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);
+  /*!
+  * 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.
+  */
+  void setData(const String &key, const ByteVector &value);
 
-      /*!
-       * Returns true if the tag does not contain any data.
-       */
-      bool isEmpty() const;
+  /*!
+   * 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);
 
-    protected:
+  /*!
+   * Returns true if the tag does not contain any data.
+   */
+  bool isEmpty() const override;
 
-      /*!
-       * Reads from the file specified in the constructor.
-       */
-      void read();
+ protected:
+  /*!
+   * Reads from the file specified in the constructor.
+   */
+  void read();
 
-      /*!
-       * Parses the body of the tag in \a data.
-       */
-      void parse(const ByteVector &data);
+  /*!
+   * Parses the body of the tag in \a data.
+   */
+  void parse(const ByteVector &data);
 
-    private:
-      Tag(const Tag &);
-      Tag &operator=(const Tag &);
+ private:
+  Tag(const Tag &);
+  Tag &operator=(const Tag &);
 
-      class TagPrivate;
-      TagPrivate *d;
-    };
-  }
-}
-}
+  class TagPrivate;
+  TagPrivate *d;
+};
+}  // namespace APE
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/asf/asfattribute.cpp

@@ -23,9 +23,10 @@
  *   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"
@@ -33,15 +34,11 @@
 
 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,303 +46,283 @@ 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())
-    delete d;
+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) {
+  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
   else {
     int temp = readWORD(&f);
     // metadata library
-    if(kind == 2) {
-      d->language = temp;
+    if (kind == 2) {
+      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);
   }
 
-  if(kind != 2 && size > 65535) {
+  if (kind != 2 && size > 65535) {
     debug("ASF::Attribute::parse() -- Value larger than 64kB");
   }
 
-  switch(d->type) {
-  case WordType:
-    d->numericValue = readWORD(&f);
-    break;
+  switch (d->data->type) {
+    case WordType:
+      d->data->numericValue = readWORD(&f);
+      break;
 
-  case BoolType:
-    if(kind == 0) {
-      d->numericValue = (readDWORD(&f) != 0);
-    }
-    else {
-      d->numericValue = (readWORD(&f) != 0);
-    }
-    break;
+    case BoolType:
+      if (kind == 0) {
+        d->data->numericValue = (readDWORD(&f) != 0);
+      }
+      else {
+        d->data->numericValue = (readWORD(&f) != 0);
+      }
+      break;
 
-  case DWordType:
-    d->numericValue = readDWORD(&f);
-    break;
+    case DWordType:
+      d->data->numericValue = readDWORD(&f);
+      break;
 
-  case QWordType:
-    d->numericValue = readQWORD(&f);
-    break;
+    case QWordType:
+      d->data->numericValue = readQWORD(&f);
+      break;
 
-  case UnicodeType:
-    d->stringValue = readString(&f, size);
-    break;
+    case UnicodeType:
+      d->data->stringValue = readString(&f, size);
+      break;
 
-  case BytesType:
-  case GuidType:
-    d->byteVectorValue = f.readBlock(size);
-    break;
+    case BytesType:
+    case GuidType:
+      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) {
-  case WordType:
-    return 2;
-  case BoolType:
-    return 4;
-  case DWordType:
-    return 4;
-  case QWordType:
-    return 5;
-  case UnicodeType:
-    return d->stringValue.size() * 2 + 2;
-  case BytesType:
-    if(d->pictureValue.isValid())
-      return d->pictureValue.dataSize();
-  case GuidType:
-    return d->byteVectorValue.size();
+int ASF::Attribute::dataSize() const {
+
+  switch (d->data->type) {
+    case WordType:
+      return 2;
+    case BoolType:
+      return 4;
+    case DWordType:
+      return 4;
+    case QWordType:
+      return 5;
+    case UnicodeType:
+      return static_cast<int>(d->data->stringValue.size() * 2 + 2);
+    case BytesType:
+      if (d->data->pictureValue.isValid())
+        return d->data->pictureValue.dataSize();
+      break;
+    case GuidType:
+      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) {
-  case WordType:
-    data.append(ByteVector::fromShort(toUShort(), false));
-    break;
-
-  case BoolType:
-    if(kind == 0) {
-      data.append(ByteVector::fromUInt(toBool(), false));
-    }
-    else {
-      data.append(ByteVector::fromShort(toBool(), false));
-    }
-    break;
-
-  case DWordType:
-    data.append(ByteVector::fromUInt(toUInt(), false));
-    break;
-
-  case QWordType:
-    data.append(ByteVector::fromLongLong(toULongLong(), false));
-    break;
-
-  case UnicodeType:
-    data.append(renderString(d->stringValue));
-    break;
-
-  case BytesType:
-    if(d->pictureValue.isValid()) {
-      data.append(d->pictureValue.render());
+  switch (d->data->type) {
+    case WordType:
+      data.append(ByteVector::fromUInt16LE(toUShort()));
+      break;
+
+    case BoolType:
+      if (kind == 0) {
+        data.append(ByteVector::fromUInt32LE(toBool()));
+      }
+      else {
+        data.append(ByteVector::fromUInt16LE(toBool()));
+      }
+      break;
+
+    case DWordType:
+      data.append(ByteVector::fromUInt32LE(toUInt()));
+      break;
+
+    case QWordType:
+      data.append(ByteVector::fromUInt64LE(toULongLong()));
+      break;
+
+    case UnicodeType:
+      data.append(renderString(d->data->stringValue));
+      break;
+
+    case BytesType:
+      if (d->data->pictureValue.isValid()) {
+        data.append(d->data->pictureValue.render());
+        break;
+      }
+      break;
+    case GuidType:
+      data.append(d->data->byteVectorValue);
       break;
-    }
-  case GuidType:
-    data.append(d->byteVectorValue);
-    break;
   }
 
-  if(kind == 0) {
+  if (kind == 0) {
     data = renderString(name, true) +
-           ByteVector::fromShort((int)d->type, false) +
-           ByteVector::fromShort(data.size(), false) +
-           data;
+      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) +
-           nameData +
-           data;
+    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

@@ -32,179 +32,169 @@
 #include "asfpicture.h"
 
 namespace Strawberry_TagLib {
-namespace TagLib
-{
+namespace TagLib {
+namespace ASF {
 
-  namespace ASF
-  {
+class File;
+class Picture;
 
-    class File;
-    class Picture;
+class TAGLIB_EXPORT Attribute {
+ public:
+  /*!
+   * Enum of types an Attribute can have.
+   */
+  enum AttributeTypes {
+    UnicodeType = 0,
+    BytesType = 1,
+    BoolType = 2,
+    DWordType = 3,
+    QWordType = 4,
+    WordType = 5,
+    GuidType = 6
+  };
 
-    class TAGLIB_EXPORT Attribute
-    {
-    public:
+  /*!
+   * Constructs an empty attribute.
+   */
+  Attribute();
 
-      /*!
-       * Enum of types an Attribute can have.
-       */
-      enum AttributeTypes {
-        UnicodeType = 0,
-        BytesType   = 1,
-        BoolType    = 2,
-        DWordType   = 3,
-        QWordType   = 4,
-        WordType    = 5,
-        GuidType    = 6
-      };
+  /*!
+   * Constructs an attribute with \a key and a UnicodeType \a value.
+   */
+  Attribute(const String &value);
 
-      /*!
-       * Constructs an empty attribute.
-       */
-      Attribute();
+  /*!
+   * Constructs an attribute with \a key and a BytesType \a value.
+   */
+  Attribute(const ByteVector &value);
 
-      /*!
-       * Constructs an attribute with \a key and a UnicodeType \a value.
-       */
-      Attribute(const String &value);
+  /*!
+   * Constructs an attribute with \a key and a Picture \a value.
+   *
+   * This attribute is compatible with the ID3 frame, APIC. The ID3 specification for the APIC frame stipulates that,
+   * while there may be any number of APIC frames associated with a file,
+   * only one may be of type 1 and only one may be of type 2.
+   *
+   * The specification also states that the description of the picture can be no longer than 64 characters, but can be empty.
+   * WM/Picture attributes added with TagLib::ASF are not automatically validated to conform to ID3 specifications.
+   * You must add code in your application to perform validations if you want to maintain complete compatibility with ID3.
+   */
+  Attribute(const Picture &value);
 
-      /*!
-       * Constructs an attribute with \a key and a BytesType \a value.
-       */
-      Attribute(const ByteVector &value);
+  /*!
+   * Constructs an attribute with \a key and a DWordType \a value.
+   */
+  Attribute(unsigned int value);
 
-      /*!
-       * Constructs an attribute with \a key and a Picture \a value.
-       *
-       * This attribute is compatible with the ID3 frame, APIC. The ID3 specification for the APIC frame stipulates that,
-       * while there may be any number of APIC frames associated with a file,
-       * only one may be of type 1 and only one may be of type 2.
-       *
-       * The specification also states that the description of the picture can be no longer than 64 characters, but can be empty.
-       * WM/Picture attributes added with Strawberry_TagLib::TagLib::ASF are not automatically validated to conform to ID3 specifications.
-       * You must add code in your application to perform validations if you want to maintain complete compatibility with ID3.
-       */
-      Attribute(const Picture &value);
+  /*!
+   * Constructs an attribute with \a key and a QWordType \a value.
+   */
+  Attribute(unsigned long long value);
 
-      /*!
-       * Constructs an attribute with \a key and a DWordType \a value.
-       */
-      Attribute(unsigned int value);
+  /*!
+   * Constructs an attribute with \a key and a WordType \a value.
+   */
+  Attribute(unsigned short value);
 
-      /*!
-       * Constructs an attribute with \a key and a QWordType \a value.
-       */
-      Attribute(unsigned long long value);
+  /*!
+   * Constructs an attribute with \a key and a BoolType \a value.
+   */
+  Attribute(bool value);
 
-      /*!
-       * Constructs an attribute with \a key and a WordType \a value.
-       */
-      Attribute(unsigned short value);
+  /*!
+   * Construct an attribute as a copy of \a other.
+   */
+  Attribute(const Attribute &other);
 
-      /*!
-       * Constructs an attribute with \a key and a BoolType \a value.
-       */
-      Attribute(bool value);
+  /*!
+   * Copies the contents of \a other into this item.
+   */
+  Attribute &operator=(const Attribute &other);
 
-      /*!
-       * Construct an attribute as a copy of \a other.
-       */
-      Attribute(const Attribute &item);
+  /*!
+   * Exchanges the content of the Attribute by the content of \a other.
+   */
+  void swap(Attribute &other);
 
-      /*!
-       * Copies the contents of \a other into this item.
-       */
-      Attribute &operator=(const Attribute &other);
+  /*!
+   * Destroys the attribute.
+   */
+  virtual ~Attribute();
 
-      /*!
-       * Exchanges the content of the Attribute by the content of \a other.
-       */
-      void swap(Attribute &other);
+  /*!
+   * Returns type of the value.
+   */
+  AttributeTypes type() const;
 
-      /*!
-       * Destroys the attribute.
-       */
-      virtual ~Attribute();
+  /*!
+   * Returns the BoolType \a value.
+   */
+  unsigned short toBool() const;
 
-      /*!
-       * Returns type of the value.
-       */
-      AttributeTypes type() const;
+  /*!
+   * Returns the WordType \a value.
+   */
+  unsigned short toUShort() const;
 
-      /*!
-       * Returns the BoolType \a value.
-       */
-      unsigned short toBool() const;
+  /*!
+   * Returns the DWordType \a value.
+   */
+  unsigned int toUInt() const;
 
-      /*!
-       * Returns the WordType \a value.
-       */
-      unsigned short toUShort() const;
+  /*!
+   * Returns the QWordType \a value.
+   */
+  unsigned long long toULongLong() const;
 
-      /*!
-       * Returns the DWordType \a value.
-       */
-      unsigned int toUInt() const;
+  /*!
+   * Returns the UnicodeType \a value.
+   */
+  String toString() const;
 
-      /*!
-       * Returns the QWordType \a value.
-       */
-      unsigned long long toULongLong() const;
+  /*!
+   * Returns the BytesType \a value.
+   */
+  ByteVector toByteVector() const;
 
-      /*!
-       * Returns the UnicodeType \a value.
-       */
-      String toString() const;
+  /*!
+   * Returns the Picture \a value.
+   */
+  Picture toPicture() const;
 
-      /*!
-       * Returns the BytesType \a value.
-       */
-      ByteVector toByteVector() const;
+  /*!
+   * Returns the language number, or 0 is no stream number was set.
+   */
+  int language() const;
 
-      /*!
-       * Returns the Picture \a value.
-       */
-      Picture toPicture() const;
+  /*!
+   * Sets the language number.
+   */
+  void setLanguage(int value);
 
-      /*!
-       * Returns the language number, or 0 is no stream number was set.
-       */
-      int language() const;
+  /*!
+   * Returns the stream number, or 0 is no stream number was set.
+   */
+  int stream() const;
 
-      /*!
-       * Sets the language number.
-       */
-      void setLanguage(int value);
+  /*!
+   * Sets the stream number.
+   */
+  void setStream(int value);
 
-      /*!
-       * Returns the stream number, or 0 is no stream number was set.
-       */
-      int stream() const;
+  //! Returns the size of the stored data
+  int dataSize() const;
 
-      /*!
-       * Sets the stream number.
-       */
-      void setStream(int value);
+ private:
+  friend class File;
 
-#ifndef DO_NOT_DOCUMENT
-      /* THIS IS PRIVATE, DON'T TOUCH IT! */
-      String parse(ASF::File &file, int kind = 0);
-#endif
+  String parse(ASF::File &file, int kind = 0);
+  ByteVector render(const String &name, int kind = 0) const;
 
-      //! Returns the size of the stored data
-      int dataSize() const;
-
-    private:
-      friend class File;
-
-      ByteVector render(const String &name, int kind = 0) const;
-
-      class AttributePrivate;
-      AttributePrivate *d;
-    };
-  }
-
-}
-}
+  class AttributePrivate;
+  AttributePrivate *d;
+};
+}  // namespace ASF
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/asf/asffile.cpp

@@ -23,11 +23,13 @@
  *   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"
@@ -36,9 +38,8 @@
 
 using namespace Strawberry_TagLib::TagLib;
 
-class ASF::File::FilePrivate
-{
-public:
+class ASF::File::FilePrivate {
+ public:
   class BaseObject;
   class UnknownObject;
   class FilePropertiesObject;
@@ -50,58 +51,42 @@ 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
-{
-  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);
-  const ByteVector contentDescriptionGuid("\x33\x26\xB2\x75\x8E\x66\xCF\x11\xA6\xD9\x00\xAA\x00\x62\xCE\x6C", 16);
-  const ByteVector extendedContentDescriptionGuid("\x40\xA4\xD0\xD2\x07\xE3\xD2\x11\x97\xF0\x00\xA0\xC9\x5E\xA8\x50", 16);
-  const ByteVector headerExtensionGuid("\xb5\x03\xbf_.\xa9\xcf\x11\x8e\xe3\x00\xc0\x0c Se", 16);
-  const ByteVector metadataGuid("\xEA\xCB\xF8\xC5\xAF[wH\204g\xAA\214D\xFAL\xCA", 16);
-  const ByteVector metadataLibraryGuid("\224\034#D\230\224\321I\241A\x1d\x13NEpT", 16);
-  const ByteVector codecListGuid("\x40\x52\xd1\x86\x1d\x31\xd0\x11\xa3\xa4\x00\xa0\xc9\x03\x48\xf6", 16);
-  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 {
+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);
+const ByteVector contentDescriptionGuid("\x33\x26\xB2\x75\x8E\x66\xCF\x11\xA6\xD9\x00\xAA\x00\x62\xCE\x6C", 16);
+const ByteVector extendedContentDescriptionGuid("\x40\xA4\xD0\xD2\x07\xE3\xD2\x11\x97\xF0\x00\xA0\xC9\x5E\xA8\x50", 16);
+const ByteVector headerExtensionGuid("\xb5\x03\xbf_.\xa9\xcf\x11\x8e\xe3\x00\xc0\x0c Se", 16);
+const ByteVector metadataGuid("\xEA\xCB\xF8\xC5\xAF[wH\204g\xAA\214D\xFAL\xCA", 16);
+const ByteVector metadataLibraryGuid("\224\034#D\230\224\321I\241A\x1d\x13NEpT", 16);
+const ByteVector codecListGuid("\x40\x52\xd1\x86\x1d\x31\xd0\x11\xa3\xa4\x00\xa0\xc9\x03\x48\xf6", 16);
+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
-{
-public:
+class ASF::File::FilePrivate::BaseObject {
+ public:
   ByteVector data;
   virtual ~BaseObject() {}
   virtual ByteVector guid() const = 0;
@@ -109,355 +94,346 @@ 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:
+
+ public:
   explicit UnknownObject(const ByteVector &guid);
-  ByteVector guid() const;
+  ByteVector guid() const override;
 };
 
-class ASF::File::FilePrivate::FilePropertiesObject : public ASF::File::FilePrivate::BaseObject
-{
-public:
-  ByteVector guid() const;
-  void parse(ASF::File *file, unsigned int size);
+class ASF::File::FilePrivate::FilePropertiesObject : public ASF::File::FilePrivate::BaseObject {
+ public:
+  ByteVector guid() const override;
+  void parse(ASF::File *file, unsigned int size) override;
 };
 
-class ASF::File::FilePrivate::StreamPropertiesObject : public ASF::File::FilePrivate::BaseObject
-{
-public:
-  ByteVector guid() const;
-  void parse(ASF::File *file, unsigned int size);
+class ASF::File::FilePrivate::StreamPropertiesObject : public ASF::File::FilePrivate::BaseObject {
+ public:
+  ByteVector guid() const override;
+  void parse(ASF::File *file, unsigned int size) override;
 };
 
-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);
+class ASF::File::FilePrivate::ContentDescriptionObject : public ASF::File::FilePrivate::BaseObject {
+ public:
+  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
-{
-public:
+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
-{
-public:
+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
-{
-public:
+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
-{
-public:
-  List<ASF::File::FilePrivate::BaseObject *> objects;
+class ASF::File::FilePrivate::HeaderExtensionObject : public ASF::File::FilePrivate::BaseObject {
+ public:
+  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
-{
-public:
-  ByteVector guid() const;
-  void parse(ASF::File *file, unsigned int size);
+class ASF::File::FilePrivate::CodecListObject : public ASF::File::FilePrivate::BaseObject {
+ public:
+  ByteVector guid() const override;
+  void parse(ASF::File *file, unsigned int size) override;
 
-private:
-  enum CodecType
-  {
-    Video   = 0x0001,
-    Audio   = 0x0002,
+ private:
+  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) {
+  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) {
+  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*/)
-{
-  const int titleLength     = readWORD(file);
-  const int artistLength    = readWORD(file);
+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);
-  const int commentLength   = readWORD(file);
-  const int ratingLength    = readWORD(file);
-  file->d->tag->setTitle(readString(file,titleLength));
-  file->d->tag->setArtist(readString(file,artistLength));
-  file->d->tag->setCopyright(readString(file,copyrightLength));
-  file->d->tag->setComment(readString(file,commentLength));
-  file->d->tag->setRating(readString(file,ratingLength));
+  const int commentLength = readWORD(file);
+  const int ratingLength = readWORD(file);
+  file->d->tag->setTitle(readString(file, titleLength));
+  file->d->tag->setArtist(readString(file, artistLength));
+  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--) {
+  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--) {
+  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--) {
+  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;
-  while(dataPos < dataSize) {
+  while (dataPos < dataSize) {
     ByteVector guid = file->readBlock(16);
-    if(guid.size() != 16) {
+    if (guid.size() != 16) {
       file->setValid(false);
       break;
     }
     bool ok;
     long long size = readQWORD(file, &ok);
-    if(!ok) {
+    if (!ok) {
       file->setValid(false);
       break;
     }
-    BaseObject *obj;
-    if(guid == metadataGuid) {
-      file->d->metadataObject = new MetadataObject();
+    std::shared_ptr<BaseObject> obj;
+    if (guid == metadataGuid) {
+      file->d->metadataObject.reset(new MetadataObject());
       obj = file->d->metadataObject;
     }
-    else if(guid == metadataLibraryGuid) {
-      file->d->metadataLibraryObject = new MetadataLibraryObject();
+    else if (guid == metadataLibraryGuid) {
+      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) {
+  if (data.size() <= 20) {
     debug("ASF::File::FilePrivate::CodecListObject::parse() -- data is too short.");
     return;
   }
 
   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) {
+  for (int i = 0; i < count; ++i) {
 
-    if(pos >= data.size())
+    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) {
+    if (type == CodecListObject::Audio) {
       // First audio codec found.
 
       const String name(data.mid(namePos, nameLength * 2), String::UTF16LE);
@@ -469,100 +445,78 @@ 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) :
-  Strawberry_TagLib::TagLib::File(file),
-  d(new FilePrivate())
-{
-  if(isOpen())
+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) :
-  Strawberry_TagLib::TagLib::File(stream),
-  d(new FilePrivate())
-{
-  if(isOpen())
+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()) {
+  if (readOnly()) {
     debug("ASF::File::save() -- File is read only.");
     return false;
   }
 
-  if(!isValid()) {
+  if (!isValid()) {
     debug("ASF::File::save() -- Trying to save invalid file.");
     return false;
   }
 
-  if(!d->contentDescriptionObject) {
-    d->contentDescriptionObject = new FilePrivate::ContentDescriptionObject();
+  if (!d->contentDescriptionObject) {
+    d->contentDescriptionObject.reset(new FilePrivate::ContentDescriptionObject());
     d->objects.append(d->contentDescriptionObject);
   }
-  if(!d->extendedContentDescriptionObject) {
-    d->extendedContentDescriptionObject = new FilePrivate::ExtendedContentDescriptionObject();
+  if (!d->extendedContentDescriptionObject) {
+    d->extendedContentDescriptionObject.reset(new FilePrivate::ExtendedContentDescriptionObject());
     d->objects.append(d->extendedContentDescriptionObject);
   }
-  if(!d->headerExtensionObject) {
-    d->headerExtensionObject = new FilePrivate::HeaderExtensionObject();
+  if (!d->headerExtensionObject) {
+    d->headerExtensionObject.reset(new FilePrivate::HeaderExtensionObject());
     d->objects.append(d->headerExtensionObject);
   }
-  if(!d->metadataObject) {
-    d->metadataObject = new FilePrivate::MetadataObject();
+  if (!d->metadataObject) {
+    d->metadataObject.reset(new FilePrivate::MetadataObject());
     d->headerExtensionObject->objects.append(d->metadataObject);
   }
-  if(!d->metadataLibraryObject) {
-    d->metadataLibraryObject = new FilePrivate::MetadataLibraryObject();
+  if (!d->metadataLibraryObject) {
+    d->metadataLibraryObject.reset(new FilePrivate::MetadataLibraryObject());
     d->headerExtensionObject->objects.append(d->metadataLibraryObject);
   }
 
@@ -572,7 +526,7 @@ bool ASF::File::save()
 
   const AttributeListMap allAttributes = d->tag->attributeListMap();
 
-  for(AttributeListMap::ConstIterator it = allAttributes.begin(); it != allAttributes.end(); ++it) {
+  for (AttributeListMap::ConstIterator it = allAttributes.begin(); it != allAttributes.end(); ++it) {
 
     const String &name = it->first;
     const AttributeList &attributes = it->second;
@@ -580,17 +534,17 @@ bool ASF::File::save()
     bool inExtendedContentDescriptionObject = false;
     bool inMetadataObject = false;
 
-    for(AttributeList::ConstIterator jt = attributes.begin(); jt != attributes.end(); ++jt) {
+    for (AttributeList::ConstIterator jt = attributes.begin(); jt != attributes.end(); ++jt) {
 
       const Attribute &attribute = *jt;
       const bool largeValue = (attribute.dataSize() > 65535);
-      const bool guid       = (attribute.type() == Attribute::GuidType);
+      const bool guid = (attribute.type() == Attribute::GuidType);
 
-      if(!inExtendedContentDescriptionObject && !guid && !largeValue && attribute.language() == 0 && attribute.stream() == 0) {
+      if (!inExtendedContentDescriptionObject && !guid && !largeValue && attribute.language() == 0 && attribute.stream() == 0) {
         d->extendedContentDescriptionObject->attributeData.append(attribute.render(name));
         inExtendedContentDescriptionObject = true;
       }
-      else if(!inMetadataObject && !guid && !largeValue && attribute.language() == 0 && attribute.stream() != 0) {
+      else if (!inMetadataObject && !guid && !largeValue && attribute.language() == 0 && attribute.stream() != 0) {
         d->metadataObject->attributeData.append(attribute.render(name, 1));
         inMetadataObject = true;
       }
@@ -601,105 +555,107 @@ 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()
-{
-  if(!isValid())
+void ASF::File::read() {
+
+  if (!isValid())
     return;
 
-  if(readBlock(16) != headerGuid) {
+  if (readBlock(16) != headerGuid) {
     debug("ASF::File::read(): Not an ASF file.");
     setValid(false);
     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);
-  if(!ok) {
+  if (!ok) {
     setValid(false);
     return;
   }
   int numObjects = readDWORD(this, &ok);
-  if(!ok) {
+  if (!ok) {
     setValid(false);
     return;
   }
   seek(2, Current);
 
-  FilePrivate::FilePropertiesObject   *filePropertiesObject   = 0;
-  FilePrivate::StreamPropertiesObject *streamPropertiesObject = 0;
-  for(int i = 0; i < numObjects; i++) {
+  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) {
+    if (guid.size() != 16) {
       setValid(false);
       break;
     }
-    long size = (long)readQWORD(this, &ok);
-    if(!ok) {
+    long size = static_cast<long>(readQWORD(this, &ok));
+    if (!ok) {
       setValid(false);
       break;
     }
-    FilePrivate::BaseObject *obj;
-    if(guid == filePropertiesGuid) {
-      filePropertiesObject = new FilePrivate::FilePropertiesObject();
+    std::shared_ptr<FilePrivate::BaseObject> obj;
+    if (guid == filePropertiesGuid) {
+      filePropertiesObject.reset(new FilePrivate::FilePropertiesObject());
       obj = filePropertiesObject;
     }
-    else if(guid == streamPropertiesGuid) {
-      streamPropertiesObject = new FilePrivate::StreamPropertiesObject();
+    else if (guid == streamPropertiesGuid) {
+      streamPropertiesObject.reset(new FilePrivate::StreamPropertiesObject());
       obj = streamPropertiesObject;
     }
-    else if(guid == contentDescriptionGuid) {
-      d->contentDescriptionObject = new FilePrivate::ContentDescriptionObject();
+    else if (guid == contentDescriptionGuid) {
+      d->contentDescriptionObject.reset(new FilePrivate::ContentDescriptionObject());
       obj = d->contentDescriptionObject;
     }
-    else if(guid == extendedContentDescriptionGuid) {
-      d->extendedContentDescriptionObject = new FilePrivate::ExtendedContentDescriptionObject();
+    else if (guid == extendedContentDescriptionGuid) {
+      d->extendedContentDescriptionObject.reset(new FilePrivate::ExtendedContentDescriptionObject());
       obj = d->extendedContentDescriptionObject;
     }
-    else if(guid == headerExtensionGuid) {
-      d->headerExtensionObject = new FilePrivate::HeaderExtensionObject();
+    else if (guid == headerExtensionGuid) {
+      d->headerExtensionObject.reset(new FilePrivate::HeaderExtensionObject());
       obj = d->headerExtensionObject;
     }
-    else if(guid == codecListGuid) {
-      obj = new FilePrivate::CodecListObject();
+    else if (guid == codecListGuid) {
+      obj.reset(new FilePrivate::CodecListObject());
     }
     else {
-      if(guid == contentEncryptionGuid ||
-         guid == extendedContentEncryptionGuid ||
-         guid == advancedContentEncryptionGuid) {
+      if (guid == contentEncryptionGuid ||
+        guid == extendedContentEncryptionGuid ||
+        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);
   }
 
-  if(!filePropertiesObject || !streamPropertiesObject) {
+  if (!filePropertiesObject || !streamPropertiesObject) {
     debug("ASF::File::read(): Missing mandatory header objects.");
     setValid(false);
     return;
   }
+
 }

3rdparty/taglib/asf/asffile.h

@@ -35,106 +35,84 @@
 namespace Strawberry_TagLib {
 namespace TagLib {
 
-  //! An implementation of ASF (WMA) metadata
-  namespace ASF {
+//! An implementation of ASF (WMA) metadata
+namespace ASF {
 
-    /*!
-     * This implements and provides an interface for ASF files to the
-     * 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 ASF files.
-     */
-    class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File
-    {
-    public:
+/*!
+ * This implements and provides an interface for ASF 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 ASF files.
+ */
+class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File {
+ public:
+  /*!
+   * Constructs an ASF file from \a file.
+   *
+   * \note In the current implementation, both \a readProperties and
+   * \a propertiesStyle are ignored.  The audio properties are always
+   * read.
+   */
+  explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
 
-      /*!
-       * Constructs an ASF file from \a file.
-       *
-       * \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,
-           Properties::ReadStyle propertiesStyle = Properties::Average);
+  /*!
+   * Constructs an ASF file from \a stream.
+   *
+   * \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.
+   */
+  explicit File(IOStream *stream, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
 
-      /*!
-       * Constructs an ASF file from \a stream.
-       *
-       * \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,
-           Properties::ReadStyle propertiesStyle = Properties::Average);
+  /*!
+   * Destroys this instance of the File.
+   */
+  ~File() override;
 
-      /*!
-       * Destroys this instance of the File.
-       */
-      virtual ~File();
+  /*!
+   * Returns a pointer to the ASF tag of the file.
+   *
+   * ASF::Tag implements the tag interface, so this serves as the
+   * reimplementation of TagLib::File::tag().
+   *
+   * \note The Tag <b>is still</b> owned by the ASF::File and should not be
+   * deleted by the user.  It will be deleted when the file (object) is
+   * destroyed.
+   */
+  Tag *tag() const override;
 
-      /*!
-       * Returns a pointer to the ASF tag of the file.
-       *
-       * ASF::Tag implements the tag interface, so this serves as the
-       * reimplementation of Strawberry_TagLib::TagLib::File::tag().
-       *
-       * \note The Tag <b>is still</b> owned by the ASF::File and should not be
-       * deleted by the user.  It will be deleted when the file (object) is
-       * destroyed.
-       */
-      virtual Tag *tag() const;
+  /*!
+   * Returns the ASF audio properties for this file.
+   */
+  AudioProperties *audioProperties() const override;
 
-      /*!
-       * Implements the unified property interface -- export function.
-       */
-      PropertyMap properties() const;
+  /*!
+   * Save the file.
+   *
+   * This returns true if the save was successful.
+   */
+  bool save() override;
 
-      /*!
-       * Removes unsupported properties. Forwards to the actual Tag's
-       * removeUnsupportedProperties() function.
-       */
-      void removeUnsupportedProperties(const StringList &properties);
+  /*!
+   * 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.
+   */
+  static bool isSupported(IOStream *stream);
 
-      /*!
-       * Implements the unified property interface -- import function.
-       */
-      PropertyMap setProperties(const PropertyMap &);
+ private:
+  void read();
 
-      /*!
-       * Returns the ASF audio properties for this file.
-       */
-      virtual Properties *audioProperties() const;
+  class FilePrivate;
+  FilePrivate *d;
+};
 
-      /*!
-       * Save the file.
-       *
-       * This returns true if the save was successful.
-       */
-      virtual bool save();
+}  // namespace ASF
 
-      /*!
-       * 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.
-       */
-      static bool isSupported(IOStream *stream);
-
-    private:
-      void read();
-
-      class FilePrivate;
-      FilePrivate *d;
-    };
-
-  }
-
-}
-}
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/asf/asfpicture.cpp

@@ -23,9 +23,10 @@
  *   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"
@@ -34,150 +35,134 @@
 
 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() {
+  delete d;
 }
 
-ASF::Picture::~Picture()
-{
-  if(d->deref())
-    delete d;
+bool ASF::Picture::isValid() const {
+  return d->data->valid;
 }
 
-bool ASF::Picture::isValid() const
-{
-  return d->valid;
+String ASF::Picture::mimeType() const {
+  return d->data->mimeType;
 }
 
-String ASF::Picture::mimeType() const
-{
-  return d->mimeType;
+void ASF::Picture::setMimeType(const String& value) {
+  d->data->mimeType = value;
 }
 
-void ASF::Picture::setMimeType(const String &value)
-{
-  d->mimeType = value;
+ASF::Picture::Type ASF::Picture::type() const {
+  return d->data->type;
 }
 
-ASF::Picture::Type ASF::Picture::type() const
-{
-  return d->type;
+void ASF::Picture::setType(const ASF::Picture::Type &t) {
+  d->data->type = t;
 }
 
-void ASF::Picture::setType(const ASF::Picture::Type& t)
-{
-  d->type = t;
+String ASF::Picture::description() const {
+  return d->data->description;
 }
 
-String ASF::Picture::description() const
-{
-  return d->description;
+void ASF::Picture::setDescription(const String& desc) {
+  d->data->description = desc;
 }
 
-void ASF::Picture::setDescription(const String &desc)
-{
-  d->description = desc;
+ByteVector ASF::Picture::picture() const {
+  return d->data->picture;
 }
 
-ByteVector ASF::Picture::picture() const
-{
-  return d->picture;
+void ASF::Picture::setPicture(const ByteVector &p) {
+  d->data->picture = p;
 }
 
-void ASF::Picture::setPicture(const ByteVector &p)
-{
-  d->picture = p;
+int ASF::Picture::dataSize() const {
+  return 9 + (d->data->mimeType.length() + d->data->description.length()) * 2 + d->data->picture.size();
 }
 
-int ASF::Picture::dataSize() const
-{
-  return
-    9 + (d->mimeType.length() + d->description.length()) * 2 +
-    d->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
-{
-  if(!isValid())
+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;
-  if(bytes.size() < 9)
+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);
-  pos = endPos+2;
+  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);
-  pos = endPos+2;
+  d->data->description = String(bytes.mid(pos, endPos - pos), String::UTF16LE);
+  pos = endPos + 2;
 
-  if(dataLen + pos != bytes.size())
+  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

@@ -32,193 +32,187 @@
 #include "attachedpictureframe.h"
 
 namespace Strawberry_TagLib {
-namespace TagLib
-{
-  namespace ASF
-  {
+namespace TagLib {
+namespace ASF {
+class Attribute;
 
-    //! An ASF attached picture interface implementation
+//! 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.
-     * \see Attribute::toPicture()
-     * \see Attribute::Attribute(const Picture& picture)
-     */
-    class TAGLIB_EXPORT Picture {
-    public:
+/*!
+ * 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.
+   */
+  enum Type {
+    //! A type not enumerated below
+    Other = 0x00,
+    //! 32x32 PNG image that should be used as the file icon
+    FileIcon = 0x01,
+    //! File icon of a different size or format
+    OtherFileIcon = 0x02,
+    //! Front cover image of the album
+    FrontCover = 0x03,
+    //! Back cover image of the album
+    BackCover = 0x04,
+    //! Inside leaflet page of the album
+    LeafletPage = 0x05,
+    //! Image from the album itself
+    Media = 0x06,
+    //! Picture of the lead artist or soloist
+    LeadArtist = 0x07,
+    //! Picture of the artist or performer
+    Artist = 0x08,
+    //! Picture of the conductor
+    Conductor = 0x09,
+    //! Picture of the band or orchestra
+    Band = 0x0A,
+    //! Picture of the composer
+    Composer = 0x0B,
+    //! Picture of the lyricist or text writer
+    Lyricist = 0x0C,
+    //! Picture of the recording location or studio
+    RecordingLocation = 0x0D,
+    //! Picture of the artists during recording
+    DuringRecording = 0x0E,
+    //! Picture of the artists during performance
+    DuringPerformance = 0x0F,
+    //! Picture from a movie or video related to the track
+    MovieScreenCapture = 0x10,
+    //! Picture of a large, coloured fish
+    ColouredFish = 0x11,
+    //! Illustration related to the track
+    Illustration = 0x12,
+    //! Logo of the band or performer
+    BandLogo = 0x13,
+    //! Logo of the publisher (record company)
+    PublisherLogo = 0x14
+  };
 
-      /*!
-       * This describes the function or content of the picture.
-       */
-      enum Type {
-        //! A type not enumerated below
-        Other              = 0x00,
-        //! 32x32 PNG image that should be used as the file icon
-        FileIcon           = 0x01,
-        //! File icon of a different size or format
-        OtherFileIcon      = 0x02,
-        //! Front cover image of the album
-        FrontCover         = 0x03,
-        //! Back cover image of the album
-        BackCover          = 0x04,
-        //! Inside leaflet page of the album
-        LeafletPage        = 0x05,
-        //! Image from the album itself
-        Media              = 0x06,
-        //! Picture of the lead artist or soloist
-        LeadArtist         = 0x07,
-        //! Picture of the artist or performer
-        Artist             = 0x08,
-        //! Picture of the conductor
-        Conductor          = 0x09,
-        //! Picture of the band or orchestra
-        Band               = 0x0A,
-        //! Picture of the composer
-        Composer           = 0x0B,
-        //! Picture of the lyricist or text writer
-        Lyricist           = 0x0C,
-        //! Picture of the recording location or studio
-        RecordingLocation  = 0x0D,
-        //! Picture of the artists during recording
-        DuringRecording    = 0x0E,
-        //! Picture of the artists during performance
-        DuringPerformance  = 0x0F,
-        //! Picture from a movie or video related to the track
-        MovieScreenCapture = 0x10,
-        //! Picture of a large, coloured fish
-        ColouredFish       = 0x11,
-        //! Illustration related to the track
-        Illustration       = 0x12,
-        //! Logo of the band or performer
-        BandLogo           = 0x13,
-        //! Logo of the publisher (record company)
-        PublisherLogo      = 0x14
-      };
+  /*!
+   * Constructs an empty picture.
+   */
+  explicit Picture();
 
-      /*!
-       * Constructs an empty picture.
-       */
-      Picture();
+  /*!
+   * Construct an picture as a copy of \a other.
+   */
+  Picture(const Picture& other);
 
-      /*!
-       * Construct an picture as a copy of \a other.
-       */
-      Picture(const Picture& other);
+  /*!
+   * Destroys the picture.
+   */
+  virtual ~Picture();
 
-      /*!
-       * Destroys the picture.
-       */
-      virtual ~Picture();
+  /*!
+   * Copies the contents of \a other into this picture.
+   */
+  Picture& operator=(const Picture& other);
 
-      /*!
-       * Copies the contents of \a other into this picture.
-       */
-      Picture& operator=(const Picture& other);
+  /*!
+   * Exchanges the content of the Picture by the content of \a other.
+   */
+  void swap(Picture& other);
 
-      /*!
-       * Exchanges the content of the Picture by the content of \a other.
-       */
-      void swap(Picture &other);
+  /*!
+   * Returns true if Picture stores valid picture
+   */
+  bool isValid() const;
 
-      /*!
-       * Returns true if Picture stores valid picture
-       */
-      bool isValid() const;
+  /*!
+   * 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&)
+   */
+  String mimeType() const;
 
-      /*!
-       * 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&)
-       */
-      String mimeType() const;
+  /*!
+   * 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&)
+   */
+  void setMimeType(const String& value);
 
-      /*!
-       * 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&)
-       */
-      void setMimeType(const String &value);
+  /*!
+   * Returns the type of the image.
+   *
+   * \see Type
+   * \see setType()
+   */
+  Type type() const;
 
-      /*!
-       * Returns the type of the image.
-       *
-       * \see Type
-       * \see setType()
-       */
-      Type type() const;
+  /*!
+   * Sets the type for the image.
+   *
+   * \see Type
+   * \see type()
+   */
+  void setType(const ASF::Picture::Type& t);
 
-      /*!
-       * Sets the type for the image.
-       *
-       * \see Type
-       * \see type()
-       */
-      void setType(const ASF::Picture::Type& t);
+  /*!
+   * Returns a text description of the image.
+   *
+   * \see setDescription()
+   */
+  String description() const;
 
-      /*!
-       * Returns a text description of the image.
-       *
-       * \see setDescription()
-       */
-      String description() const;
+  /*!
+   * Sets a textual description of the image to \a desc.
+   *
+   * \see description()
+   */
+  void setDescription(const String& desc);
 
-      /*!
-       * Sets a textual description of the image to \a desc.
-       *
-       * \see description()
-       */
-      void setDescription(const String &desc);
+  /*!
+   * 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.
+   *
+   * \see setPicture()
+   * \see mimeType()
+   */
+  ByteVector picture() const;
 
-      /*!
-       * 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.
-       *
-       * \see setPicture()
-       * \see mimeType()
-       */
-      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.
+   *
+   * \see picture()
+   * \see mimeType()
+   * \see setMimeType()
+   */
+  void setPicture(const ByteVector& p);
 
-      /*!
-       * 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()
-       * \see setMimeType()
-       */
-      void setPicture(const ByteVector &p);
+  /*!
+   * Returns picture as binary raw data \a value
+   */
+  ByteVector render() const;
 
-      /*!
-       * Returns picture as binary raw data \a value
-       */
-      ByteVector render() const;
+  /*!
+   * Returns picture as binary raw data \a value
+   */
+  int dataSize() const;
 
-      /*!
-       * Returns picture as binary raw data \a value
-       */
-      int dataSize() const;
+ private:
+  friend class Attribute;
 
-#ifndef DO_NOT_DOCUMENT
-      /* THIS IS PRIVATE, DON'T TOUCH IT! */
-      void parse(const ByteVector& );
-      static Picture fromInvalid();
-#endif
+  void parse(const ByteVector&);
+  static Picture fromInvalid();
 
-      private:
-        class PicturePrivate;
-        PicturePrivate *d;
-      };
-  }
-}
-}
+ private:
+  class PicturePrivate;
+  PicturePrivate* d;
+};
+}  // namespace ASF
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
-#endif // ASFPICTURE_H
+#endif  // ASFPICTURE_H

3rdparty/taglib/asf/asfproperties.cpp

@@ -23,30 +23,28 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tstring.h>
+#include "tdebug.h"
+#include "tstring.h"
 #include "asfproperties.h"
 
 using namespace Strawberry_TagLib::TagLib;
 
-class ASF::Properties::PropertiesPrivate
-{
-public:
-  PropertiesPrivate() :
-    length(0),
-    bitrate(0),
-    sampleRate(0),
-    channels(0),
-    bitsPerSample(0),
-    codec(ASF::Properties::Unknown),
-    encrypted(false) {}
+class ASF::AudioProperties::AudioPropertiesPrivate {
+ public:
+  explicit AudioPropertiesPrivate() : length(0),
+                                       bitrate(0),
+                                       sampleRate(0),
+                                       channels(0),
+                                       bitsPerSample(0),
+                                       codec(ASF::AudioProperties::Unknown),
+                                       encrypted(false) {}
 
   int length;
   int bitrate;
   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,69 +105,56 @@ 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)
-  {
-  case 0x0160:
-    d->codec = WMA1;
-    break;
-  case 0x0161:
-    d->codec = WMA2;
-    break;
-  case 0x0162:
-    d->codec = WMA9Pro;
-    break;
-  case 0x0163:
-    d->codec = WMA9Lossless;
-    break;
-  default:
-    d->codec = Unknown;
-    break;
+void ASF::AudioProperties::setCodec(int value) {
+
+  switch (value) {
+    case 0x0160:
+      d->codec = WMA1;
+      break;
+    case 0x0161:
+      d->codec = WMA2;
+      break;
+    case 0x0162:
+      d->codec = WMA9Pro;
+      break;
+    case 0x0163:
+      d->codec = WMA9Lossless;
+      break;
+    default:
+      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

@@ -32,157 +32,137 @@
 
 namespace Strawberry_TagLib {
 namespace TagLib {
+namespace ASF {
 
-  namespace ASF {
+//! An implementation of ASF audio properties
+class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
+  friend class File;
 
-    //! An implementation of ASF audio properties
-    class TAGLIB_EXPORT Properties : public AudioProperties
-    {
-    public:
+ public:
+  /*!
+   * Audio codec types can be used in ASF file.
+   */
+  enum Codec {
+    /*!
+     * Couldn't detect the codec.
+     */
+    Unknown = 0,
 
-      /*!
-       * Audio codec types can be used in ASF file.
-       */
-      enum Codec
-      {
-        /*!
-         * Couldn't detect the codec.
-         */
-        Unknown = 0,
+    /*!
+     * Windows Media Audio 1
+     */
+    WMA1,
 
-        /*!
-         * Windows Media Audio 1
-         */
-        WMA1,
+    /*!
+     * Windows Media Audio 2 or above
+     */
+    WMA2,
 
-        /*!
-         * Windows Media Audio 2 or above
-         */
-        WMA2,
+    /*!
+     * Windows Media Audio 9 Professional
+     */
+    WMA9Pro,
 
-        /*!
-         * Windows Media Audio 9 Professional
-         */
-        WMA9Pro,
+    /*!
+     * Windows Media Audio 9 Lossless
+     */
+    WMA9Lossless,
+  };
 
-        /*!
-         * Windows Media Audio 9 Lossless
-         */
-        WMA9Lossless,
-      };
+  /*!
+   * Creates an instance of ASF::Properties.
+   */
+  explicit AudioProperties();
 
-      /*!
-       * Creates an instance of ASF::Properties.
-       */
-      Properties();
+  /*!
+   * Destroys this ASF::AudioProperties instance.
+   */
+  ~AudioProperties() override;
 
-      /*!
-       * Destroys this ASF::Properties instance.
-       */
-      virtual ~Properties();
+  /*!
+   * Returns the length of the file in seconds.  The length is rounded down to
+   * the nearest whole second.
+   *
+   * \see lengthInMilliseconds()
+   */
+  int lengthInSeconds() const 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 milliseconds.
+   *
+   * \see lengthInSeconds()
+   */
+  int lengthInMilliseconds() const override;
 
-      /*!
-       * 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;
+  /*!
+   * Returns the average bit rate of the file in kb/s.
+   */
+  int bitrate() const override;
 
-      /*!
-       * Returns the length of the file in milliseconds.
-       *
-       * \see lengthInSeconds()
-       */
-      // BIC: make virtual
-      int lengthInMilliseconds() const;
+  /*!
+   * Returns the sample rate in Hz.
+   */
+  int sampleRate() const override;
 
-      /*!
-       * Returns the average bit rate of the file in kb/s.
-       */
-      virtual int bitrate() const;
+  /*!
+   * Returns the number of audio channels.
+   */
+  int channels() const override;
 
-      /*!
-       * Returns the sample rate in Hz.
-       */
-      virtual int sampleRate() const;
+  /*!
+   * Returns the number of bits per audio sample.
+   */
+  int bitsPerSample() const;
 
-      /*!
-       * Returns the number of audio channels.
-       */
-      virtual int channels() const;
+  /*!
+   * Returns the codec used in the file.
+   *
+   * \see codecName()
+   * \see codecDescription()
+   */
+  Codec codec() const;
 
-      /*!
-       * Returns the number of bits per audio sample.
-       */
-      int bitsPerSample() const;
+  /*!
+   * 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()
+   */
+  String codecName() const;
 
-      /*!
-       * Returns the codec used in the file.
-       *
-       * \see codecName()
-       * \see codecDescription()
-       */
-      Codec codec() const;
+  /*!
+   * 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.
+   *
+   * \see codec()
+   * \see codecName()
+   */
+  String codecDescription() const;
 
-      /*!
-       * 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()
-       */
-      String codecName() const;
+  /*!
+   * Returns whether or not the file is encrypted.
+   */
+  bool isEncrypted() const;
 
-      /*!
-       * 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.
-       *
-       * \see codec()
-       * \see codecName()
-       */
-      String codecDescription() const;
+ private:
+  void setLengthInMilliseconds(int value);
+  void setBitrate(int value);
+  void setSampleRate(int value);
+  void setChannels(int value);
+  void setBitsPerSample(int value);
+  void setCodec(int value);
+  void setCodecName(const String &value);
+  void setCodecDescription(const String &value);
+  void setEncrypted(bool value);
 
-      /*!
-       * Returns whether or not the file is encrypted.
-       */
-      bool isEncrypted() const;
+ private:
+  class AudioPropertiesPrivate;
+  AudioPropertiesPrivate *d;
+};
 
-#ifndef DO_NOT_DOCUMENT
-      // deprecated
-      void setLength(int value);
+}  // namespace ASF
 
-      void setLengthInMilliseconds(int value);
-      void setBitrate(int value);
-      void setSampleRate(int value);
-      void setChannels(int value);
-      void setBitsPerSample(int value);
-      void setCodec(int value);
-      void setCodecName(const String &value);
-      void setCodecDescription(const String &value);
-      void setEncrypted(bool value);
-#endif
-
-    private:
-      class PropertiesPrivate;
-      PropertiesPrivate *d;
-    };
-
-  }
-
-}
-}
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/asf/asftag.cpp

@@ -23,14 +23,14 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tpropertymap.h>
+#include "tpicturemap.h"
+#include "tpropertymap.h"
 #include "asftag.h"
 
 using namespace Strawberry_TagLib::TagLib;
 
-class ASF::Tag::TagPrivate
-{
-public:
+class ASF::Tag::TagPrivate {
+ public:
   String title;
   String artist;
   String copyright;
@@ -39,258 +39,399 @@ public:
   AttributeListMap attributeListMap;
 };
 
-ASF::Tag::Tag() :
-  Strawberry_TagLib::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
-{
-  if(d->attributeListMap.contains("WM/AlbumTitle"))
+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
-{
-  if(d->attributeListMap.contains("WM/Year"))
+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
-{
-  if(d->attributeListMap.contains("WM/TrackNumber")) {
+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)
+    if (attr.type() == ASF::Attribute::DWordType)
       return attr.toUInt();
     else
       return attr.toString().toInt();
   }
-  if(d->attributeListMap.contains("WM/Track"))
+  if (d->attributeListMap.contains("WM/Track"))
     return d->attributeListMap["WM/Track"][0].toUInt();
   return 0;
+
 }
 
-String ASF::Tag::genre() const
-{
-  if(d->attributeListMap.contains("WM/Genre"))
+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)
-{
-  if(d->attributeListMap.contains(name)) {
+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
-{
+bool ASF::Tag::isEmpty() const {
+
   return Strawberry_TagLib::TagLib::Tag::isEmpty() &&
-         copyright().isEmpty() &&
-         rating().isEmpty() &&
-         d->attributeListMap.isEmpty();
+    copyright().isEmpty() &&
+    rating().isEmpty() &&
+    d->attributeListMap.isEmpty();
+
 }
 
-namespace
-{
-  const char *keyTranslation[][2] = {
-    { "WM/AlbumTitle", "ALBUM" },
-    { "WM/AlbumArtist", "ALBUMARTIST" },
-    { "WM/Composer", "COMPOSER" },
-    { "WM/Writer", "WRITER" },
-    { "WM/Conductor", "CONDUCTOR" },
-    { "WM/ModifiedBy", "REMIXER" },
-    { "WM/Year", "DATE" },
-    { "WM/OriginalReleaseYear", "ORIGINALDATE" },
-    { "WM/Producer", "PRODUCER" },
-    { "WM/ContentGroupDescription", "GROUPING" },
-    { "WM/SubTitle", "SUBTITLE" },
-    { "WM/SetSubTitle", "DISCSUBTITLE" },
-    { "WM/TrackNumber", "TRACKNUMBER" },
-    { "WM/PartOfSet", "DISCNUMBER" },
-    { "WM/Genre", "GENRE" },
-    { "WM/BeatsPerMinute", "BPM" },
-    { "WM/Mood", "MOOD" },
-    { "WM/ISRC", "ISRC" },
-    { "WM/Lyrics", "LYRICS" },
-    { "WM/Media", "MEDIA" },
-    { "WM/Publisher", "LABEL" },
-    { "WM/CatalogNo", "CATALOGNUMBER" },
-    { "WM/Barcode", "BARCODE" },
-    { "WM/EncodedBy", "ENCODEDBY" },
-    { "WM/AlbumSortOrder", "ALBUMSORT" },
-    { "WM/AlbumArtistSortOrder", "ALBUMARTISTSORT" },
-    { "WM/ArtistSortOrder", "ARTISTSORT" },
-    { "WM/TitleSortOrder", "TITLESORT" },
-    { "WM/Script", "SCRIPT" },
-    { "WM/Language", "LANGUAGE" },
-    { "MusicBrainz/Track Id", "MUSICBRAINZ_TRACKID" },
-    { "MusicBrainz/Artist Id", "MUSICBRAINZ_ARTISTID" },
-    { "MusicBrainz/Album Id", "MUSICBRAINZ_ALBUMID" },
-    { "MusicBrainz/Album Artist Id", "MUSICBRAINZ_ALBUMARTISTID" },
-    { "MusicBrainz/Release Group Id", "MUSICBRAINZ_RELEASEGROUPID" },
-    { "MusicBrainz/Work Id", "MUSICBRAINZ_WORKID" },
-    { "MusicIP/PUID", "MUSICIP_PUID" },
-    { "Acoustid/Id", "ACOUSTID_ID" },
-    { "Acoustid/Fingerprint", "ACOUSTID_FINGERPRINT" },
-  };
-  const size_t keyTranslationSize = sizeof(keyTranslation) / sizeof(keyTranslation[0]);
+namespace {
+const char *keyTranslation[][2] = {
+  { "WM/AlbumTitle", "ALBUM" },
+  { "WM/AlbumArtist", "ALBUMARTIST" },
+  { "WM/Composer", "COMPOSER" },
+  { "WM/Writer", "WRITER" },
+  { "WM/Conductor", "CONDUCTOR" },
+  { "WM/ModifiedBy", "REMIXER" },
+  { "WM/Year", "DATE" },
+  { "WM/OriginalReleaseYear", "ORIGINALDATE" },
+  { "WM/Producer", "PRODUCER" },
+  { "WM/ContentGroupDescription", "GROUPING" },
+  { "WM/SubTitle", "SUBTITLE" },
+  { "WM/SetSubTitle", "DISCSUBTITLE" },
+  { "WM/TrackNumber", "TRACKNUMBER" },
+  { "WM/PartOfSet", "DISCNUMBER" },
+  { "WM/Genre", "GENRE" },
+  { "WM/BeatsPerMinute", "BPM" },
+  { "WM/Mood", "MOOD" },
+  { "WM/ISRC", "ISRC" },
+  { "WM/Lyrics", "LYRICS" },
+  { "WM/Media", "MEDIA" },
+  { "WM/Publisher", "LABEL" },
+  { "WM/CatalogNo", "CATALOGNUMBER" },
+  { "WM/Barcode", "BARCODE" },
+  { "WM/EncodedBy", "ENCODEDBY" },
+  { "WM/AlbumSortOrder", "ALBUMSORT" },
+  { "WM/AlbumArtistSortOrder", "ALBUMARTISTSORT" },
+  { "WM/ArtistSortOrder", "ARTISTSORT" },
+  { "WM/TitleSortOrder", "TITLESORT" },
+  { "WM/Script", "SCRIPT" },
+  { "WM/Language", "LANGUAGE" },
+  { "MusicBrainz/Track Id", "MUSICBRAINZ_TRACKID" },
+  { "MusicBrainz/Artist Id", "MUSICBRAINZ_ARTISTID" },
+  { "MusicBrainz/Album Id", "MUSICBRAINZ_ALBUMID" },
+  { "MusicBrainz/Album Artist Id", "MUSICBRAINZ_ALBUMARTISTID" },
+  { "MusicBrainz/Release Group Id", "MUSICBRAINZ_RELEASEGROUPID" },
+  { "MusicBrainz/Work Id", "MUSICBRAINZ_WORKID" },
+  { "MusicIP/PUID", "MUSICIP_PUID" },
+  { "Acoustid/Id", "ACOUSTID_ID" },
+  { "Acoustid/Fingerprint", "ACOUSTID_FINGERPRINT" },
+};
+const size_t keyTranslationSize = sizeof(keyTranslation) / sizeof(keyTranslation[0]);
 
-  String translateKey(const String &key)
-  {
-    for(size_t i = 0; i < keyTranslationSize; ++i) {
-      if(key == keyTranslation[i][0])
-        return keyTranslation[i][1];
-    }
+String translateKey(const String &key) {
 
-    return String();
+  for (size_t i = 0; i < keyTranslationSize; ++i) {
+    if (key == keyTranslation[i][0])
+      return keyTranslation[i][1];
   }
-}
 
-PropertyMap ASF::Tag::properties() const
-{
+  return String();
+
+}
+}  // namespace
+
+PropertyMap ASF::Tag::properties() const {
+
   PropertyMap props;
 
-  if(!d->title.isEmpty()) {
+  if (!d->title.isEmpty()) {
     props["TITLE"] = d->title;
   }
-  if(!d->artist.isEmpty()) {
+  if (!d->artist.isEmpty()) {
     props["ARTIST"] = d->artist;
   }
-  if(!d->copyright.isEmpty()) {
+  if (!d->copyright.isEmpty()) {
     props["COPYRIGHT"] = d->copyright;
   }
-  if(!d->comment.isEmpty()) {
+  if (!d->comment.isEmpty()) {
     props["COMMENT"] = d->comment;
   }
 
   ASF::AttributeListMap::ConstIterator it = d->attributeListMap.begin();
-  for(; it != d->attributeListMap.end(); ++it) {
+  for (; it != d->attributeListMap.end(); ++it) {
     const String key = translateKey(it->first);
-    if(!key.isEmpty()) {
+    if (!key.isEmpty()) {
       AttributeList::ConstIterator it2 = it->second.begin();
-      for(; it2 != it->second.end(); ++it2) {
-        if(key == "TRACKNUMBER") {
-          if(it2->type() == ASF::Attribute::DWordType)
+      for (; it2 != it->second.end(); ++it2) {
+        if (key == "TRACKNUMBER") {
+          if (it2->type() == ASF::Attribute::DWordType)
             props.insert(key, String::number(it2->toUInt()));
           else
             props.insert(key, it2->toString());
@@ -305,39 +446,41 @@ 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)
+  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()) {
+  if (reverseKeyMap.isEmpty()) {
     int numKeys = sizeof(keyTranslation) / sizeof(keyTranslation[0]);
-    for(int i = 0; i < numKeys; i++) {
+    for (int i = 0; i < numKeys; i++) {
       reverseKeyMap[keyTranslation[i][1]] = keyTranslation[i][0];
     }
   }
 
   PropertyMap origProps = properties();
   PropertyMap::ConstIterator it = origProps.begin();
-  for(; it != origProps.end(); ++it) {
-    if(!props.contains(it->first) || props[it->first].isEmpty()) {
-      if(it->first == "TITLE") {
+  for (; it != origProps.end(); ++it) {
+    if (!props.contains(it->first) || props[it->first].isEmpty()) {
+      if (it->first == "TITLE") {
         d->title.clear();
       }
-      else if(it->first == "ARTIST") {
+      else if (it->first == "ARTIST") {
         d->artist.clear();
       }
-      else if(it->first == "COMMENT") {
+      else if (it->first == "COMMENT") {
         d->comment.clear();
       }
-      else if(it->first == "COPYRIGHT") {
+      else if (it->first == "COPYRIGHT") {
         d->copyright.clear();
       }
       else {
@@ -348,25 +491,25 @@ PropertyMap ASF::Tag::setProperties(const PropertyMap &props)
 
   PropertyMap ignoredProps;
   it = props.begin();
-  for(; it != props.end(); ++it) {
-    if(reverseKeyMap.contains(it->first)) {
+  for (; it != props.end(); ++it) {
+    if (reverseKeyMap.contains(it->first)) {
       String name = reverseKeyMap[it->first];
       removeItem(name);
       StringList::ConstIterator it2 = it->second.begin();
-      for(; it2 != it->second.end(); ++it2) {
+      for (; it2 != it->second.end(); ++it2) {
         addAttribute(name, *it2);
       }
     }
-    else if(it->first == "TITLE") {
+    else if (it->first == "TITLE") {
       d->title = it->second.toString();
     }
-    else if(it->first == "ARTIST") {
+    else if (it->first == "ARTIST") {
       d->artist = it->second.toString();
     }
-    else if(it->first == "COMMENT") {
+    else if (it->first == "COMMENT") {
       d->comment = it->second.toString();
     }
-    else if(it->first == "COPYRIGHT") {
+    else if (it->first == "COPYRIGHT") {
       d->copyright = it->second.toString();
     }
     else {
@@ -375,4 +518,5 @@ PropertyMap ASF::Tag::setProperties(const PropertyMap &props)
   }
 
   return ignoredProps;
+
 }

3rdparty/taglib/asf/asftag.h

@@ -35,177 +35,167 @@
 namespace Strawberry_TagLib {
 namespace TagLib {
 
-  namespace ASF {
+namespace ASF {
 
-    typedef List<Attribute> AttributeList;
-    typedef Map<String, AttributeList> AttributeListMap;
+typedef List<Attribute> AttributeList;
+typedef Map<String, AttributeList> AttributeListMap;
 
-    class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag {
+class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag {
 
-      friend class File;
+  friend class File;
 
-    public:
+ public:
+  explicit Tag();
 
-      Tag();
+  ~Tag() override;
 
-      virtual ~Tag();
+  /*!
+   * Returns the track name.
+   */
+  String title() const override;
 
-      /*!
-       * Returns the track name.
-       */
-      virtual String title() const;
+  /*!
+   * Returns the artist name.
+   */
+  String artist() const override;
 
-      /*!
-       * Returns the artist name.
-       */
-      virtual String artist() const;
+  /*!
+   * Returns the album name; if no album name is present in the tag String::null will be returned.
+   */
+  String album() const override;
 
-      /*!
-       * Returns the album name; if no album name is present in the tag
-       * String::null will be returned.
-       */
-      virtual String album() const;
+  /*!
+   * Returns the track comment.
+   */
+  String comment() const override;
 
-      /*!
-       * Returns the track comment.
-       */
-      virtual String comment() const;
+  /*!
+   * Returns the genre name; if no genre is present in the tag String::null will be returned.
+   */
+  String genre() const override;
 
-      /*!
-       * Returns the genre name; if no genre is present in the tag String::null
-       * will be returned.
-       */
-      virtual String genre() const;
+  /*!
+   * Returns the rating.
+   */
+  virtual String rating() const;
 
-      /*!
-       * Returns the rating.
-       */
-      virtual String rating() const;
+  /*!
+   * Returns the genre name; if no genre is present in the tag String::null will be returned.
+   */
+  virtual String copyright() const;
 
-      /*!
-       * 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.
+   */
+  unsigned int year() const override;
 
-      /*!
-       * Returns the year; if there is no year set, this will return 0.
-       */
-      virtual unsigned int year() const;
+  /*!
+   * Returns the track number; if there is no track number set, this will return 0.
+   */
+  unsigned int track() const override;
 
-      /*!
-       * Returns the track number; if there is no track number set, this will
-       * return 0.
-       */
-      virtual unsigned int track() const;
+  PictureMap pictures() const override;
 
-      /*!
-       * Sets the title to \a s.
-       */
-      virtual void setTitle(const String &s);
+  /*!
+   * Sets the title to \a s.
+   */
+  void setTitle(const String &value) override;
 
-      /*!
-       * Sets the artist to \a s.
-       */
-      virtual void setArtist(const String &s);
+  /*!
+   * Sets the artist to \a 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.
-       */
-      virtual void setAlbum(const String &s);
+  /*!
+   * Sets the album to \a s.  If \a s is String::null then this value will be cleared.
+   */
+  void setAlbum(const String &value) override;
 
-      /*!
-       * Sets the comment to \a s.
-       */
-      virtual void setComment(const String &s);
+  /*!
+   * Sets the comment to \a s.
+   */
+  void setComment(const String &value) override;
 
-      /*!
-       * Sets the rating to \a s.
-       */
-      virtual void setRating(const String &s);
+  /*!
+   * Sets the rating to \a s.
+   */
+  virtual void setRating(const String &value);
 
-      /*!
-       * Sets the copyright to \a s.
-       */
-      virtual void setCopyright(const String &s);
+  /*!
+   * Sets the copyright to \a s.
+   */
+  virtual void setCopyright(const String &value);
 
-      /*!
-       * Sets the genre to \a s.
-       */
-      virtual void setGenre(const String &s);
+  /*!
+   * Sets the genre to \a 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);
+  /*!
+   * Sets the year to \a i.  If \a s is 0 then this value will be cleared.
+   */
+  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);
+  /*!
+   * Sets the track to \a i.  If \a s is 0 then this value will be cleared.
+   */
+  void setTrack(unsigned int value) 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.
-       */
-      virtual bool isEmpty() const;
+  void setPictures(const PictureMap&) override;
 
-      /*!
-       * \deprecated
-       */
-      AttributeListMap &attributeListMap();
+  /*!
+   * 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.
+   */
+  bool isEmpty() const override;
 
-      /*!
-       * Returns a reference to the item list map.  This is an AttributeListMap of
-       * all of the items in the tag.
-       */
-      const AttributeListMap &attributeListMap() const;
+  /*!
+   * 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;
+  /*!
+   * \return True if a value for \a attribute is currently set.
+   */
+  bool contains(const String &key) const;
 
-      /*!
-       * Removes the \a key attribute from the tag
-       */
-      void removeItem(const String &name);
+  /*!
+   * Removes the \a key attribute from the tag
+   */
+  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.
-       */
-      AttributeList attribute(const String &name) const;
+  /*!
+   * \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.
-       */
-      void setAttribute(const String &name, const Attribute &attribute);
+  /*!
+   * 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);
 
-      /*!
-       * Sets multiple \a values to the key \a name.
-       */
-      void setAttribute(const String &name, const AttributeList &values);
+  /*!
+   * Sets multiple \a values to the key \a name.
+   */
+  void setAttribute(const String &name, const AttributeList &values);
 
-      /*!
-       * Sets the \a key attribute to the value of \a attribute. If an attribute
-       * with the \a key is already present, it will be added to the list.
-       */
-      void addAttribute(const String &name, const Attribute &attribute);
+  /*!
+   * Sets the \a key attribute to the value of \a attribute. If an attribute
+   * with the \a key is already present, it will be added to the list.
+   */
+  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:
+ private:
+  class TagPrivate;
+  TagPrivate *d;
+};
+
+}  // namespace ASF
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
-      class TagPrivate;
-      TagPrivate *d;
-    };
-  }
-}
-}
 #endif

3rdparty/taglib/asf/asfutils.h

@@ -31,76 +31,70 @@
 #ifndef DO_NOT_DOCUMENT  // tell Doxygen not to document this header
 
 namespace Strawberry_TagLib {
-namespace TagLib
-{
-  namespace ASF
-  {
-    namespace
-    {
+namespace TagLib {
+namespace ASF {
+namespace {
 
-      inline unsigned short readWORD(File *file, bool *ok = 0)
-      {
-        const ByteVector v = file->readBlock(2);
-        if(v.size() != 2) {
-          if(ok) *ok = false;
-          return 0;
-        }
-        if(ok) *ok = true;
-        return v.toUShort(false);
-      }
-
-      inline unsigned int readDWORD(File *file, bool *ok = 0)
-      {
-        const ByteVector v = file->readBlock(4);
-        if(v.size() != 4) {
-          if(ok) *ok = false;
-          return 0;
-        }
-        if(ok) *ok = true;
-        return v.toUInt(false);
-      }
-
-      inline long long readQWORD(File *file, bool *ok = 0)
-      {
-        const ByteVector v = file->readBlock(8);
-        if(v.size() != 8) {
-          if(ok) *ok = false;
-          return 0;
-        }
-        if(ok) *ok = true;
-        return v.toLongLong(false);
-      }
-
-      inline String readString(File *file, int length)
-      {
-        ByteVector data = file->readBlock(length);
-        unsigned int size = data.size();
-        while (size >= 2) {
-          if(data[size - 1] != '\0' || data[size - 2] != '\0') {
-            break;
-          }
-          size -= 2;
-        }
-        if(size != data.size()) {
-          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);
-        if(includeLength) {
-          data = ByteVector::fromShort(data.size(), false) + data;
-        }
-        return data;
-      }
-
-    }
+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.toUInt16LE(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.toUInt32LE(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.toInt64LE(0);
+}
+
+inline String readString(File *file, int length) {
+
+  ByteVector data = file->readBlock(length);
+  size_t size = data.size();
+  while (size >= 2) {
+    if (data[size - 1] != '\0' || data[size - 2] != '\0') {
+      break;
+    }
+    size -= 2;
+  }
+  if (size != data.size()) {
+    data.resize(size);
+  }
+  return String(data, String::UTF16LE);
+
+}
+
+inline ByteVector renderString(const String &str, bool includeLength = false) {
+  ByteVector data = str.data(String::UTF16LE) + ByteVector::fromUInt16LE(0);
+  if (includeLength) {
+    data = ByteVector::fromUInt16LE(data.size()) + data;
+  }
+  return data;
+}
+
+}  // namespace
+}  // namespace ASF
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
+
 #endif
 
 #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 Strawberry_TagLib::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
-{
-
-};
-
 ////////////////////////////////////////////////////////////////////////////////
 // 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,103 +27,94 @@
 #define TAGLIB_AUDIOPROPERTIES_H
 
 #include "taglib_export.h"
+#include "tstring.h"
 
 namespace Strawberry_TagLib {
 namespace TagLib {
 
-  //! A simple, abstract interface to common audio properties
+//! 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 Strawberry_TagLib::TagLib::File and Strawberry_TagLib::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
-  {
-  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.
-     */
-    enum ReadStyle {
-      //! Read as little of the file as possible
-      Fast,
-      //! Read more of the file and make better values guesses
-      Average,
-      //! Read as much of the file as needed to report accurate values
-      Accurate
-    };
-
-    /*!
-     * Destroys this AudioProperties instance.
-     */
-    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.
-     *
-     * \see lengthInMilliseconds()
-     */
-    // BIC: make virtual
-    int lengthInSeconds() const;
-
-    /*!
-     * Returns the length of the file in milliseconds.
-     *
-     * \see lengthInSeconds()
-     */
-    // BIC: make virtual
-    int lengthInMilliseconds() const;
-
-    /*!
-     * 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;
-
-    /*!
-     * Returns the sample rate in Hz.
-     */
-    virtual int sampleRate() const = 0;
-
-    /*!
-     * Returns the number of audio channels.
-     */
-    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
-     */
-    AudioProperties(ReadStyle style);
-
-  private:
-    AudioProperties(const AudioProperties &);
-    AudioProperties &operator=(const AudioProperties &);
-
-    class AudioPropertiesPrivate;
-    AudioPropertiesPrivate *d;
+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.
+   */
+  enum ReadStyle {
+    //! Read as little of the file as possible
+    Fast,
+    //! Read more of the file and make better values guesses
+    Average,
+    //! Read as much of the file as needed to report accurate values
+    Accurate
   };
 
-}
-}
+  /*!
+   * Destroys this AudioProperties instance.
+   */
+  virtual ~AudioProperties();
+
+  /*!
+   * Returns the length of the file in seconds.  The length is rounded down to the nearest whole second.
+   *
+   * \see lengthInMilliseconds()
+   */
+  virtual int lengthInSeconds() const = 0;
+
+  /*!
+   * Returns the length of the file in milliseconds.
+   *
+   * \see lengthInSeconds()
+   */
+  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.
+   */
+  virtual int bitrate() const = 0;
+
+  /*!
+   * Returns the sample rate in Hz.
+   */
+  virtual int sampleRate() const = 0;
+
+  /*!
+   * Returns the number of audio channels.
+   */
+  virtual int channels() const = 0;
+
+  /*!
+   * Returns description of the audio file.
+   */
+  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&);
+  AudioProperties &operator=(const AudioProperties&);
+
+  class AudioPropertiesPrivate;
+  AudioPropertiesPrivate *d;
+};
+
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/dsdiff/dsdiffdiintag.cpp

@@ -26,137 +26,122 @@
 #include "dsdiffdiintag.h"
 #include "tstringlist.h"
 #include "tpropertymap.h"
+#include "tpicturemap.h"
 
 using namespace Strawberry_TagLib::TagLib;
 using namespace DSDIFF::DIIN;
 
-class DSDIFF::DIIN::Tag::TagPrivate
-{
-public:
-  TagPrivate()
-  {
+class DSDIFF::DIIN::Tag::TagPrivate {
+ public:
+  TagPrivate() {
   }
 
   String title;
   String artist;
 };
 
-DSDIFF::DIIN::Tag::Tag() : Strawberry_TagLib::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
-    d->title = title;
+PictureMap DSDIFF::DIIN::Tag::pictures() const {
+  return PictureMap();
 }
 
-void DSDIFF::DIIN::Tag::setArtist(const String &artist)
-{
-  if(artist.isNull() || artist.isEmpty())
-    d->artist = String();
-  else
-    d->artist = artist;
+void DSDIFF::DIIN::Tag::setTitle(const String &title) {
+
+  d->title = title;
+
 }
 
-void DSDIFF::DIIN::Tag::setAlbum(const String &)
-{
+void DSDIFF::DIIN::Tag::setArtist(const String &artist) {
+
+  d->artist = artist;
+
 }
 
-void DSDIFF::DIIN::Tag::setComment(const String &)
-{
-}
+void DSDIFF::DIIN::Tag::setAlbum(const String &) {}
 
-void DSDIFF::DIIN::Tag::setGenre(const String &)
-{
-}
+void DSDIFF::DIIN::Tag::setComment(const String &) {}
 
-void DSDIFF::DIIN::Tag::setYear(unsigned int)
-{
-}
+void DSDIFF::DIIN::Tag::setGenre(const String &) {}
 
-void DSDIFF::DIIN::Tag::setTrack(unsigned int)
-{
-}
+void DSDIFF::DIIN::Tag::setYear(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;
 
-  if(properties.contains("TITLE")) {
+  if (properties.contains("TITLE")) {
     d->title = properties["TITLE"].front();
     oneValueSet.append("TITLE");
-  } else
+  }
+  else
     d->title = String();
 
-  if(properties.contains("ARTIST")) {
+  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
   // value list. The others will be returned as unsupported by this format.
-  for(StringList::Iterator it = oneValueSet.begin(); it != oneValueSet.end(); ++it) {
-    if(properties[*it].size() == 1)
+  for (StringList::Iterator it = oneValueSet.begin(); it != oneValueSet.end(); ++it) {
+    if (properties[*it].size() == 1)
       properties.erase(*it);
     else
       properties[*it].erase(properties[*it].begin());
   }
 
   return properties;
-}
 
+}

3rdparty/taglib/dsdiff/dsdiffdiintag.h

@@ -30,123 +30,125 @@
 
 namespace Strawberry_TagLib {
 namespace TagLib {
+namespace DSDIFF {
+namespace DIIN {
 
-  namespace DSDIFF {
+/*!
+ * Tags from the Edited Master Chunk Info
+ *
+ * Only Title and Artist tags are supported
+ */
 
-    namespace DIIN {
+class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag {
+ public:
+  explicit Tag();
+  ~Tag() override;
 
-      /*!
-       * Tags from the Edited Master Chunk Info
-       *
-       * Only Title and Artist tags are supported
-       */
-      class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag
-      {
-      public:
-        Tag();
-        virtual ~Tag();
+  /*!
+   * Returns the track name; if no track name is present in the tag String() will be returned.
+   */
+  String title() const override;
 
-        /*!
-         * Returns the track name; if no track name is present in the tag
-         * String() will be returned.
-         */
-        String title() const;
+  /*!
+   * Returns the artist name; if no artist name is present in the tag String() will be returned.
+   */
+  String artist() const override;
 
-        /*!
-         * Returns the artist name; if no artist name is present in the tag
-         * String() will be returned.
-         */
-        String artist() const;
+  /*!
+   * Not supported.  Therefore always returns String().
+   */
+  String album() const override;
 
-        /*!
-         * Not supported.  Therefore always returns String().
-         */
-        String album() const;
+  /*!
+   * Not supported.  Therefore always returns String().
+   */
+  String comment() const override;
 
-        /*!
-         * Not supported.  Therefore always returns String().
-         */
-        String comment() const;
+  /*!
+   * Not supported.  Therefore always returns String().
+   */
+  String genre() const override;
 
-        /*!
-         * Not supported.  Therefore always returns String().
-         */
-        String genre() const;
+  /*!
+   * Not supported.  Therefore always returns 0.
+   */
+  unsigned int year() const override;
 
-        /*!
-         * Not supported.  Therefore always returns 0.
-         */
-        unsigned int year() const;
+  /*!
+   * Not supported.  Therefore always returns 0.
+   */
+  unsigned int track() const override;
 
-        /*!
-         * Not supported.  Therefore always returns 0.
-         */
-        unsigned int track() const;
+  /*!
+   * Not supported.  Therefore always returns an empty list.
+   */
+  PictureMap pictures() const override;
 
-        /*!
-         * Sets the title to \a title.  If \a title is String() then this
-         * value will be cleared.
-         */
-        void setTitle(const String &title);
+  /*!
+   * Sets the title to \a title.  If \a title is String() then this value will be cleared.
+   */
+  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);
+  /*!
+   * 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);
+  /*!
+   * Not supported and therefore ignored.
+   */
+  void setAlbum(const String &album) override;
 
-        /*!
-         * Not supported and therefore ignored.
-         */
-        void setComment(const String &comment);
+  /*!
+   * Not supported and therefore ignored.
+   */
+  void setComment(const String &comment) override;
 
-        /*!
-         * Not supported and therefore ignored.
-         */
-        void setGenre(const String &genre);
+  /*!
+   * Not supported and therefore ignored.
+   */
+  void setGenre(const String &genre) override;
 
-        /*!
-         * Not supported and therefore ignored.
-         */
-        void setYear(unsigned int year);
+  /*!
+   * Not supported and therefore ignored.
+   */
+  void setYear(unsigned int year) override;
 
-        /*!
-         * Not supported and therefore ignored.
-         */
-        void setTrack(unsigned int track);
+  /*!
+   * Not supported and therefore ignored.
+   */
+  void setTrack(unsigned int track) override;
 
-        /*!
-         * Implements the unified property interface -- export function.
-         * Since the DIIN tag is very limited, the exported map is as well.
-         */
-        PropertyMap properties() const;
+  /*!
+   * Not supported and therefore ignored.
+   */
+  void setPictures(const PictureMap&) 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.
-         */
-        PropertyMap setProperties(const PropertyMap &);
+  /*!
+   * Implements the unified property interface -- export function.
+   * Since the DIIN tag is very limited, the exported map is as well.
+   */
+  PropertyMap properties() const override;
 
-      private:
-        Tag(const Tag &);
-        Tag &operator=(const Tag &);
+  /*!
+   * Implements the unified property interface -- import function.
+   * Because of the limitations of the DIIN file tag, any tags besides
+   * TITLE and ARTIST, will be returned.
+   * Additionally, if the map contains tags with multiple values,
+   * all but the first will be contained in the returned map of unsupported properties.
+   */
+  PropertyMap setProperties(const PropertyMap &) override;
 
-        class TagPrivate;
-        TagPrivate *d;
-      };
-    }
-  }
-}
-}
+ private:
+  Tag(const Tag &);
+  Tag &operator=(const Tag &);
+
+  class TagPrivate;
+  TagPrivate *d;
+};
+}  // namespace DIIN
+}  // namespace DSDIFF
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif
-

3rdparty/taglib/dsdiff/dsdifffile.h

@@ -34,229 +34,232 @@
 namespace Strawberry_TagLib {
 namespace TagLib {
 
-  //! An implementation of DSDIFF metadata
+//! An implementation of DSDIFF metadata
+
+/*!
+ * This is implementation of DSDIFF metadata.
+ *
+ * This supports an ID3v2 tag as well as reading stream from the ID3 RIFF
+ * chunk as well as properties from the file.
+ * Description of the DSDIFF format is available at http://dsd-guide.com/sites/default/files/white-papers/DSDIFF_1.5_Spec.pdf
+ * DSDIFF standard does not 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
+ */
+
+namespace DSDIFF {
+
+//! An implementation of TagLib::File with DSDIFF specific methods
+
+/*!
+ * This implements and provides an interface for DSDIFF files to the
+ * TagLib::Tag and TagLib::AudioProperties interfaces by way of implementing the
+ * abstract TagLib::File API as well as providing some additional information specific to DSDIFF files.
+ */
+
+class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File {
+ public:
+  /*!
+   * 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.
+    NoTags = 0x0000,
+    //! Matches DIIN tags.
+    DIIN = 0x0002,
+    //! Matches ID3v1 tags.
+    ID3v2 = 0x0002,
+    //! Matches all tag types.
+    AllTags = 0xffff
+  };
 
   /*!
-   * This is implementation of DSDIFF metadata.
+   * Constructs an DSDIFF file from \a file.
+   * If \a readProperties is true the file's audio properties will also be read.
    *
-   * This supports an ID3v2 tag as well as reading stream from the ID3 RIFF
-   * chunk as well as properties from the file.
-   * Description of the DSDIFF format is available 
-   * at http://dsd-guide.com/sites/default/files/white-papers/DSDIFF_1.5_Spec.pdf
-   * DSDIFF standard does not explictly specify the ID3V2 chunk
-   * It can be found at the root level, but also sometimes inside the PROP chunk
-   * In addition, title and artist info are stored as part of the standard
+   * \note In the current implementation, \a propertiesStyle is ignored.
    */
+  explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
 
-  namespace DSDIFF {
+  /*!
+   * 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);
 
-    //! An implementation of Strawberry_TagLib::TagLib::File with DSDIFF specific methods
+  /*!
+   * Destroys this instance of the File.
+   */
+  ~File() override;
 
-    /*!
-     * This implements and provides an interface for DSDIFF files to the
-     * 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 DSDIFF files.
-     */
+  /*!
+   * Returns a pointer to a tag that is the union of the ID3v2 and DIIN tags.
+   * The ID3v2 tag is given priority in reading the information -- if requested information exists in both the ID3v2 tag and the ID3v1 tag,
+   * the information from the ID3v2 tag will be returned.
+   *
+   * If you would like more granular control over the content of the tags, with the concession of generality, use the tag-type specific calls.
+   *
+   * \note As this tag is not implemented as an ID3v2 tag or a DIIN tag,
+   * but a union of the two this pointer may not be cast to the specific tag types.
+   *
+   * \see ID3v2Tag()
+   * \see DIINTag()
+   */
+  Tag *tag() const override;
 
-    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.
-       */
-      File(FileName file, bool readProperties = true,
-           Properties::ReadStyle propertiesStyle = Properties::Average);
+  /*!
+   * Returns the ID3V2 Tag for this file.
+   *
+   * \note This always returns a valid pointer regardless of whether or not the file on disk has an ID3v2 tag.
+   * Use hasID3v2Tag() to check if the file on disk actually has an ID3v2 tag.
+   *
+   * \see hasID3v2Tag()
+   */
+  ID3v2::Tag *ID3v2Tag(bool create = false) const;
 
-      /*!
-       * Constructs an DSDIFF file from \a stream.  If \a readProperties is true
-       * the file's audio properties will also be read.
-       *
-       * \note TagLib will *not* take ownership of the stream, the caller is
-       * responsible for deleting it after the File object.
-       *
-       * \note In the current implementation, \a propertiesStyle is ignored.
-       */
-      File(IOStream *stream, bool readProperties = true,
-           Properties::ReadStyle propertiesStyle = Properties::Average);
+  /*!
+   * Returns the DSDIFF DIIN Tag for this file
+   *
+   */
+  DSDIFF::DIIN::Tag *DIINTag(bool create = false) const;
 
-      /*!
-       * Destroys this instance of the File.
-       */
-      virtual ~File();
+  /*!
+   * Implements the unified property interface -- export function.
+   * This method forwards to ID3v2::Tag::properties().
+   */
+  PropertyMap properties() const 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,
-       * the information from the ID3v2 tag will be returned.
-       *
-       * If you would like more granular control over the content of the tags,
-       * with the concession of generality, use the tag-type specific calls.
-       *
-       * \note As this tag is not implemented as an ID3v2 tag or a DIIN tag,
-       * but a union of the two this pointer may not be cast to the specific
-       * tag types.
-       *
-       * \see ID3v2Tag()
-       * \see DIINTag()
-       */
-      virtual Tag *tag() const;
+  void removeUnsupportedProperties(const StringList &properties) 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.
-       *
-       * \see hasID3v2Tag()
-       */
-      virtual ID3v2::Tag *ID3v2Tag() const;
+  /*!
+   * Implements the unified property interface -- import function.
+   * This method forwards to ID3v2::Tag::setProperties().
+   */
+  PropertyMap setProperties(const PropertyMap &properties) override;
 
-      /*!
-       * Returns the DSDIFF DIIN Tag for this file
-       *
-       */
-      DSDIFF::DIIN::Tag *DIINTag() const;
+  /*!
+   * Returns the AIFF::AudioProperties for this file.
+   * If no audio properties were read then this will return a null pointer.
+   */
+  AudioProperties *audioProperties() const override;
 
-      /*!
-       * Implements the unified property interface -- export function.
-       * This method forwards to ID3v2::Tag::properties().
-       */
-      PropertyMap properties() const;
+  /*!
+   * Save the file.  If at least one tag -- ID3v1 or DIIN -- exists this will duplicate its content into the other tag.
+   * This returns true if saving was successful.
+   *
+   * If neither exists or if both tags are empty, this will strip the tags from the file.
+   *
+   * This is the same as calling save(AllTags);
+   *
+   * If you would like more granular control over the content of the tags,
+   * with the concession of generality, use paramaterized save call below.
+   *
+   * \see save(int tags)
+   */
+  bool save() override;
 
-      void removeUnsupportedProperties(const StringList &properties);
+  /*!
+   * 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(TagTypes tags, StripTags strip = StripOthers, ID3v2::Version version = ID3v2::v4);
 
-      /*!
-       * Implements the unified property interface -- import function.
-       * This method forwards to ID3v2::Tag::setProperties().
-       */
-      PropertyMap setProperties(const PropertyMap &);
+  /*!
+   * 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 the AIFF::Properties for this file.  If no audio properties
-       * were read then this will return a null pointer.
-       */
-      virtual Properties *audioProperties() const;
+  /*!
+   * Returns whether or not the file on disk actually has an ID3v2 tag.
+   *
+   * \see ID3v2Tag()
+   */
+  bool hasID3v2Tag() const;
 
-      /*!
-       * Save the file.  If at least one tag -- ID3v1 or DIIN -- exists this
-       * will duplicate its content into the other tag.  This returns true
-       * if saving was successful.
-       *
-       * If neither exists or if both tags are empty, this will strip the tags
-       * from the file.
-       *
-       * This is the same as calling save(AllTags);
-       *
-       * If you would like more granular control over the content of the tags,
-       * with the concession of generality, use paramaterized save call below.
-       *
-       * \see save(int tags)
-       */
-      virtual bool save();
+  /*!
+   * Returns whether or not the file on disk actually has the DSDIFF title and artist tags.
+   *
+   * \see DIINTag()
+   */
+  bool hasDIINTag() const;
 
-      /*!
-       * Save the file.  This will attempt to save all of the tag types that are
-       * specified by OR-ing together TagTypes values.  The save() method above
-       * uses AllTags.  This returns true if saving was successful.
-       *
-       * This strips all tags not included in the mask, but does not modify them
-       * in memory, so later calls to save() which make use of these tags will
-       * remain valid.  This also strips empty tags.
-       */
-      bool save(int tags);
+  /*!
+   * Returns whether or not the given \a stream can be opened as a DSDIFF file.
+   *
+   * \note This method is designed to do a quick check.  The result may not necessarily be correct.
+   */
+  static bool isSupported(IOStream *stream);
 
-      /*!
-       * Returns whether or not the file on disk actually has an ID3v2 tag.
-       *
-       * \see ID3v2Tag()
-       */
-      bool hasID3v2Tag() const;
+ protected:
+  enum Endianness {
+    BigEndian,
+    LittleEndian
+  };
 
-      /*!
-       * Returns whether or not the file on disk actually has the DSDIFF 
-       * Title & Artist tag.
-       *
-       * \see DIINTag()
-       */
-      bool hasDIINTag() const;
+  File(FileName file, Endianness endianness);
+  File(IOStream *stream, Endianness endianness);
 
-      /*!
-       * Returns whether or not the given \a stream can be opened as a DSDIFF
-       * file.
-       *
-       * \note This method is designed to do a quick check.  The result may
-       * not necessarily be correct.
-       */
-       static bool isSupported(IOStream *stream);
+ private:
+  File(const File &);
+  File &operator=(const File &);
 
-    protected:
-      enum Endianness { BigEndian, LittleEndian };
+  void removeRootChunk(const ByteVector &id);
+  void removeRootChunk(unsigned int i);
+  void removeChildChunk(unsigned int i, unsigned int childChunkNum);
 
-      File(FileName file, Endianness endianness);
-      File(IOStream *stream, Endianness endianness);
+  /*!
+   * Sets the data for the the specified chunk at root level to \a data.
+   *
+   * \warning This will update the file immediately.
+   */
+  void setRootChunkData(unsigned int i, const ByteVector &data);
 
-    private:
-      File(const File &);
-      File &operator=(const File &);
+  /*!
+   * Sets the data for the root-level chunk \a name to \a data.
+   * If a root-level chunk with the given name already exists it will be overwritten, otherwise it will be created after the existing chunks.
+   *
+   * \warning This will update the file immediately.
+   */
+  void setRootChunkData(const ByteVector &name, const ByteVector &data);
 
-      /*!
-       * Sets the data for the the specified chunk at root level to \a data.
-       *
-       * \warning This will update the file immediately.
-       */
-      void setRootChunkData(unsigned int i, const ByteVector &data);
+  /*!
+   * Sets the data for the the specified child chunk to \a data.
+   *
+   * If data is null, then remove the chunk
+   *
+   * \warning This will update the file immediately.
+   */
+  void setChildChunkData(unsigned int i, const ByteVector &data, unsigned int childChunkNum);
 
-      /*!
-       * Sets the data for the root-level chunk \a name to \a data.
-       * If a root-level chunk with the given name already exists
-       * it will be overwritten, otherwise it will be
-       * created after the existing chunks.
-       *
-       * \warning This will update the file immediately.
-       */
-      void setRootChunkData(const ByteVector &name, const ByteVector &data);
+  /*!
+   * Sets the data for the 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);
 
-      /*!
-       * Sets the data for the the specified child chunk to \a data.
-       *
-       * If data is null, then remove the chunk
-       *
-       * \warning This will update the file immediately.
-       */
-      void setChildChunkData(unsigned int i, const ByteVector &data,
-                             unsigned int childChunkNum);
+  void updateRootChunksStructure(unsigned int startingChunk);
 
-      /*!
-       * 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 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);
 
-      void updateRootChunksStructure(unsigned int startingChunk);
-
-      void read(bool readProperties, Properties::ReadStyle propertiesStyle);
-      void writeChunk(const ByteVector &name, const ByteVector &data,
-                      unsigned long long offset, unsigned long replace = 0,
-                      unsigned int leadingPadding = 0);
-
-      class FilePrivate;
-      FilePrivate *d;
-    };
-  }
-}
-}
+  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 Strawberry_TagLib::TagLib;
 
-class DSDIFF::Properties::PropertiesPrivate
-{
-public:
-  PropertiesPrivate() :
-  length(0),
-  bitrate(0),
-  sampleRate(0),
-  channels(0),
-  sampleWidth(0),
-  sampleCount(0)
-  {
+class DSDIFF::AudioProperties::AudioPropertiesPrivate {
+ public:
+  explicit AudioPropertiesPrivate() : length(0),
+                                      bitrate(0),
+                                      sampleRate(0),
+                                      channels(0),
+                                      sampleWidth(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->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->sampleRate = sampleRate;
+  d->bitrate = bitrate;
+  d->length = d->sampleRate > 0 ? static_cast<int>((d->sampleCount * 1000.0) / d->sampleRate + 0.5) : 0;
+
 }
 
-DSDIFF::Properties::~Properties()
-{
+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

@@ -30,56 +30,49 @@
 
 namespace Strawberry_TagLib {
 namespace TagLib {
+namespace DSDIFF {
 
-  namespace DSDIFF {
+class File;
 
-    class File;
+//! An implementation of audio property reading for DSDIFF
 
-    //! 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 AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
+ public:
+  /*!
+   * Create an instance of DSDIFF::AudioProperties with the data read from the ByteVector \a data.
+   */
+  explicit AudioProperties(const unsigned int sampleRate, const unsigned short channels, const unsigned long long samplesCount, const int bitrate, ReadStyle);
 
-    class TAGLIB_EXPORT Properties : public AudioProperties
-    {
-    public:
-      /*!
-       * Create an instance of DSDIFF::Properties with the data read from the
-       * ByteVector \a data.
-       */
-      Properties(const unsigned int sampleRate, const unsigned short channels,
-                 const unsigned long long samplesCount, const int bitrate,
-                 ReadStyle style);
+  /*!
+   * Destroys this DSDIFF::AudioProperties instance.
+   */
+  ~AudioProperties() override;
 
-      /*!
-       * Destroys this DSDIFF::Properties instance.
-       */
-      virtual ~Properties();
+  // Reimplementations.
 
-      // Reimplementations.
+  int lengthInSeconds() const override;
+  int lengthInMilliseconds() const override;
+  int bitrate() const override;
+  int sampleRate() const override;
+  int channels() const override;
 
-      virtual int length() const;
-      virtual int lengthInSeconds() const;
-      virtual int lengthInMilliseconds() const;
-      virtual int bitrate() const;
-      virtual int sampleRate() const;
-      virtual int channels() const;
+  int bitsPerSample() const;
+  long long sampleCount() const;
 
-      int bitsPerSample() const;
-      long long sampleCount() const;
+ private:
+  AudioProperties(const AudioProperties &);
+  AudioProperties &operator=(const AudioProperties &);
 
-    private:
-      Properties(const Properties &);
-      Properties &operator=(const Properties &);
+  class AudioPropertiesPrivate;
+  AudioPropertiesPrivate *d;
+};
 
-      class PropertiesPrivate;
-      PropertiesPrivate *d;
-    };
-  }
-}
-}
+}  // namespace DSDIFF
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif
-

3rdparty/taglib/dsf/dsffile.cpp

@@ -23,12 +23,14 @@
  *   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"
 
@@ -36,38 +38,28 @@ 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
-{
-public:
-  FilePrivate() :
-  fileSize(0),
-  metadataOffset(0),
-  properties(nullptr),
-  tag(nullptr)
-  {
-  }
-
-  ~FilePrivate()
-  {
-    delete properties;
-    delete tag;
-  }
+class DSF::File::FilePrivate {
+ public:
+  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)
-{
-    // A DSF file has to start with "DSD "
-    const ByteVector id = Utils::readHeader(stream, 4, false);
-    return id.startsWith("DSD ");
+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 ");
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -75,74 +67,66 @@ bool DSF::File::isSupported(IOStream *stream)
 ////////////////////////////////////////////////////////////////////////////////
 
 DSF::File::File(FileName file, bool readProperties,
-                Properties::ReadStyle propertiesStyle) :
-  Strawberry_TagLib::TagLib::File(file),
-  d(new FilePrivate())
-{
-  if(isOpen())
+  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) :
-  Strawberry_TagLib::TagLib::File(stream),
-  d(new FilePrivate())
-{
-  if(isOpen())
+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()) {
+  if (readOnly()) {
     debug("DSF::File::save() -- File is read only.");
     return false;
   }
 
-  if(!isValid()) {
+  if (!isValid()) {
     debug("DSF::File::save() -- Trying to save invalid file.");
     return false;
   }
 
   // Three things must be updated: the file size, the tag data, and the metadata offset
 
-  if(d->tag->isEmpty()) {
+  if (d->tag->isEmpty()) {
     long long newFileSize = d->metadataOffset ? d->metadataOffset : d->fileSize;
 
     // Update the file size
-    if(d->fileSize != newFileSize) {
-      insert(ByteVector::fromLongLong(newFileSize, false), 12, 8);
+    if (d->fileSize != newFileSize) {
+      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);
+    if (d->metadataOffset) {
+      insert(ByteVector::fromUInt64LE(0ULL), 20, 8);
       d->metadataOffset = 0;
     }
 
@@ -157,14 +141,14 @@ bool DSF::File::save()
     long long oldTagSize = d->fileSize - newMetadataOffset;
 
     // Update the file size
-    if(d->fileSize != newFileSize) {
-      insert(ByteVector::fromLongLong(newFileSize, false), 12, 8);
+    if (d->fileSize != newFileSize) {
+      insert(ByteVector::fromUInt64LE(newFileSize), 12, 8);
       d->fileSize = newFileSize;
     }
 
     // Update the metadata offset
-    if(d->metadataOffset != newMetadataOffset) {
-      insert(ByteVector::fromLongLong(newMetadataOffset, false), 20, 8);
+    if (d->metadataOffset != newMetadataOffset) {
+      insert(ByteVector::fromUInt64LE(newMetadataOffset), 20, 8);
       d->metadataOffset = newMetadataOffset;
     }
 
@@ -173,6 +157,7 @@ bool DSF::File::save()
   }
 
   return true;
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -180,41 +165,41 @@ 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
 
   // DSD chunk
   ByteVector chunkName = readBlock(4);
-  if(chunkName != "DSD ") {
+  if (chunkName != "DSD ") {
     debug("DSF::File::read() -- Not a DSF file.");
     setValid(false);
     return;
   }
 
-  long long chunkSize = readBlock(8).toLongLong(false);
+  long long chunkSize = readBlock(8).toInt64LE(0);
 
   // Integrity check
-  if(28 != chunkSize) {
+  if (28 != chunkSize) {
     debug("DSF::File::read() -- File is corrupted, wrong chunk size");
     setValid(false);
     return;
   }
 
-  d->fileSize = readBlock(8).toLongLong(false);
+  d->fileSize = readBlock(8).toInt64LE(0);
 
   // File is malformed or corrupted
-  if(d->fileSize != length()) {
+  if (d->fileSize != length()) {
     debug("DSF::File::read() -- File is corrupted wrong length");
     setValid(false);
     return;
   }
 
-  d->metadataOffset = readBlock(8).toLongLong(false);
+  d->metadataOffset = readBlock(8).toInt64LE(0);
 
   // File is malformed or corrupted
-  if(d->metadataOffset > d->fileSize) {
+  if (d->metadataOffset > d->fileSize) {
     debug("DSF::File::read() -- Invalid metadata offset.");
     setValid(false);
     return;
@@ -222,22 +207,22 @@ void DSF::File::read(bool readProperties, Properties::ReadStyle propertiesStyle)
 
   // Format chunk
   chunkName = readBlock(4);
-  if(chunkName != "fmt ") {
+  if (chunkName != "fmt ") {
     debug("DSF::File::read() -- Missing 'fmt ' chunk.");
     setValid(false);
     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();
+  if (0 == d->metadataOffset)
+    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

@@ -33,98 +33,93 @@
 namespace Strawberry_TagLib {
 namespace TagLib {
 
-  //! An implementation of DSF metadata
+//! An implementation of DSF metadata
+
+/*!
+ * This is implementation of DSF metadata.
+ *
+ * This supports an ID3v2 tag as well as properties from the file.
+ */
+
+namespace DSF {
+
+//! An implementation of Strawberry_TagLib::TagLib::File with DSF specific methods
+
+/*!
+ * This implements and provides an interface for DSF files to the
+ * 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 Strawberry_TagLib::TagLib::File {
+ public:
+  /*!
+   * 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.
+   */
+  explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
 
   /*!
-   * This is implementation of DSF metadata.
-   *
-   * This supports an ID3v2 tag as well as properties from the file.
+   * 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.
    */
+  explicit File(IOStream *stream, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
 
-  namespace DSF {
+  /*!
+   * Destroys this instance of the File.
+   */
+  ~File() override;
 
-    //! An implementation of Strawberry_TagLib::TagLib::File with DSF specific methods
+  /*!
+   * Returns the Tag for this file.
+   */
+  ID3v2::Tag *tag() const override;
 
-    /*!
-     * This implements and provides an interface for DSF files to the
-     * 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.
-     */
+  /*!
+   * Implements the unified property interface -- export function.
+   * This method forwards to ID3v2::Tag::properties().
+   */
+  PropertyMap properties() const override;
 
-    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.
-       */
-      File(FileName file, bool readProperties = true,
-           Properties::ReadStyle propertiesStyle = Properties::Average);
+  /*!
+   * Implements the unified property interface -- import function.
+   * This method forwards to ID3v2::Tag::setProperties().
+   */
+  PropertyMap setProperties(const PropertyMap &) override;
 
-      /*!
-       * Contructs an DSF file from \a file.  If \a readProperties is true the
-       * file's audio properties will also be read using \a propertiesStyle.  If
-       * false, \a propertiesStyle is ignored.
-       */
-      File(IOStream *stream, bool readProperties = true,
-           Properties::ReadStyle propertiesStyle = Properties::Average);
+  /*!
+   * Returns the DSF::AudioProperties for this file.
+   * If no audio properties were read then this will return a null pointer.
+   */
+  AudioProperties *audioProperties() const override;
 
-      /*!
-       * Destroys this instance of the File.
-       */
-      virtual ~File();
+  /*!
+   * Saves the file.
+   */
+  bool save() override;
 
-      /*!
-       * Returns the Tag for this file.
-       */
-      ID3v2::Tag *tag() const;
+  /*!
+   * Returns whether or not the given \a stream can be opened as a DSF file.
+   *
+   * \note This method is designed to do a quick check.
+   * The result may not necessarily be correct.
+   */
+  static bool isSupported(IOStream *stream);
 
-      /*!
-       * Implements the unified property interface -- export function.
-       * This method forwards to ID3v2::Tag::properties().
-       */
-      PropertyMap properties() const;
+ private:
+  File(const File &);
+  File &operator=(const File &);
 
-      /*!
-       * Implements the unified property interface -- import function.
-       * This method forwards to ID3v2::Tag::setProperties().
-       */
-      PropertyMap setProperties(const PropertyMap &);
+  void read(bool readProperties, AudioProperties::ReadStyle propertiesStyle);
 
-      /*!
-       * Returns the DSF::AudioProperties for this file.  If no audio properties
-       * were read then this will return a null pointer.
-       */
-      virtual Properties *audioProperties() const;
-
-      /*!
-       * Saves the file.
-       */
-      virtual bool save();
-
-      /*!
-       * Returns whether or not the given \a stream can be opened as a DSF
-       * file.
-       *
-       * \note This method is designed to do a quick check.  The result may
-       * not necessarily be correct.
-       */
-      static bool isSupported(IOStream *stream);
-
-    private:
-      File(const File &);
-      File &operator=(const File &);
-
-      void read(bool readProperties, Properties::ReadStyle propertiesStyle);
-
-      class FilePrivate;
-      FilePrivate *d;
-    };
-  }
-}
-}
+  class FilePrivate;
+  FilePrivate *d;
+};
+}  // namespace DSF
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif
-

3rdparty/taglib/dsf/dsfproperties.cpp

@@ -23,28 +23,25 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tstring.h>
-#include <tdebug.h>
+#include "tstring.h"
+#include "tdebug.h"
 
 #include "dsfproperties.h"
 
 using namespace Strawberry_TagLib::TagLib;
 
-class DSF::Properties::PropertiesPrivate
-{
-public:
-  PropertiesPrivate() :
-  formatVersion(0),
-  formatID(0),
-  channelType(0),
-  channelNum(0),
-  samplingFrequency(0),
-  bitsPerSample(0),
-  sampleCount(0),
-  blockSizePerChannel(0),
-  bitrate(0),
-  length(0)
-  {
+class DSF::AudioProperties::AudioPropertiesPrivate {
+ public:
+  explicit AudioPropertiesPrivate() : formatVersion(0),
+                                      formatID(0),
+                                      channelType(0),
+                                      channelNum(0),
+                                      samplingFrequency(0),
+                                      bitsPerSample(0),
+                                      sampleCount(0),
+                                      blockSizePerChannel(0),
+                                      bitrate(0),
+                                      length(0) {
   }
 
   // Nomenclature is from DSF file format specification
@@ -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) : Strawberry_TagLib::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

@@ -30,65 +30,65 @@
 
 namespace Strawberry_TagLib {
 namespace TagLib {
+namespace DSF {
 
-  namespace DSF {
+class File;
 
-    class File;
+//! An implementation of audio property reading for DSF
 
-    //! 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 AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
+ public:
+  /*!
+   * Create an instance of DSF::AudioProperties with the data read from the ByteVector \a data.
+   */
+  explicit AudioProperties(const ByteVector &data, ReadStyle);
 
-    class TAGLIB_EXPORT Properties : public Strawberry_TagLib::TagLib::AudioProperties
-    {
-    public:
-      /*!
-       * Create an instance of DSF::AudioProperties with the data read from the
-       * ByteVector \a data.
-       */
-      Properties(const ByteVector &data, ReadStyle style);
+  /*!
+   * Destroys this DSF::AudioProperties instance.
+   */
+  ~AudioProperties() override;
 
-      /*!
-       * Destroys this DSF::AudioProperties instance.
-        */
-      virtual ~Properties();
+  // Reimplementations.
 
-      // Reimplementations.
+  int lengthInSeconds() const override;
+  int lengthInMilliseconds() const override;
+  int bitrate() const override;
+  int sampleRate() const override;
+  int channels() const override;
 
-      virtual int length() const;
-      virtual int lengthInSeconds() const;
-      virtual int lengthInMilliseconds() const;
-      virtual int bitrate() const;
-      virtual int sampleRate() const;
-      virtual int channels() const;
+  int formatVersion() const;
+  int formatID() const;
 
-      int formatVersion() const;
-      int formatID() const;
+  /*!
+   * Channel type values:
+   * 1 = mono,
+   * 2 = stereo,
+   * 3 = 3 channels,
+   * 4 = quad,
+   * 5 = 4 channels,
+   * 6 = 5 channels,
+   * 7 = 5.1 channels
+   */
+  int channelType() const;
+  int bitsPerSample() const;
+  long long sampleCount() const;
+  int blockSizePerChannel() const;
 
-      /*!
-       * Channel type values: 1 = mono, 2 = stereo, 3 = 3 channels, 
-       * 4 = quad, 5 = 4 channels, 6 = 5 channels, 7 = 5.1 channels
-       */
-      int channelType() const;
-      int bitsPerSample() const;
-      long long sampleCount() const;
-      int blockSizePerChannel() const;
+ private:
+  AudioProperties(const AudioProperties&);
+  AudioProperties &operator=(const AudioProperties&);
 
-    private:
-      Properties(const Properties &);
-      Properties &operator=(const Properties &);
+  void read(const ByteVector &data);
 
-      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"
@@ -57,320 +58,259 @@
 
 using namespace Strawberry_TagLib::TagLib;
 
-namespace
-{
-  typedef List<const FileRef::FileTypeResolver *> ResolverList;
-  ResolverList fileTypeResolvers;
+namespace {
+typedef List<const FileRef::FileTypeResolver*> ResolverList;
+ResolverList fileTypeResolvers;
 
-  // Detect the file type by user-defined resolvers.
+// Detect the file type by user-defined resolvers.
 
-  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);
-      if(file)
-        return file;
-    }
+File *detectByResolvers(FileName fileName, bool readAudioProperties, AudioProperties::ReadStyle audioPropertiesStyle) {
 
-    return nullptr;
-  }
-
-  // Detect the file type based on the file extension.
-
-  File* detectByExtension(IOStream *stream, bool readAudioProperties,
-                          AudioProperties::ReadStyle audioPropertiesStyle)
-  {
-#ifdef _WIN32
-    const String s = stream->name().toString();
-#else
-    const String s(stream->name());
-#endif
-
-    String ext;
-    const int pos = s.rfind(".");
-    if(pos != -1)
-      ext = s.substr(pos + 1).upper();
-
-    // If this list is updated, the method defaultFileExtensions() should also be
-    // updated.  However at some point that list should be created at the same time
-    // that a default file type resolver is created.
-
-    if(ext.isEmpty())
-      return nullptr;
-
-    // .oga can be any audio in the Ogg container. So leave it to content-based detection.
-
-    if(ext == "MP3")
-      return new MPEG::File(stream, ID3v2::FrameFactory::instance(), readAudioProperties, audioPropertiesStyle);
-    if(ext == "OGG")
-      return new Ogg::Vorbis::File(stream, readAudioProperties, audioPropertiesStyle);
-    if(ext == "FLAC")
-      return new FLAC::File(stream, ID3v2::FrameFactory::instance(), readAudioProperties, audioPropertiesStyle);
-    if(ext == "MPC")
-      return new MPC::File(stream, readAudioProperties, audioPropertiesStyle);
-    if(ext == "WV")
-      return new WavPack::File(stream, readAudioProperties, audioPropertiesStyle);
-    if(ext == "SPX")
-      return new Ogg::Speex::File(stream, readAudioProperties, audioPropertiesStyle);
-    if(ext == "OPUS")
-      return new Ogg::Opus::File(stream, readAudioProperties, audioPropertiesStyle);
-    if(ext == "TTA")
-      return new TrueAudio::File(stream, readAudioProperties, audioPropertiesStyle);
-    if(ext == "M4A" || ext == "M4R" || ext == "M4B" || ext == "M4P" || ext == "MP4" || ext == "3G2" || ext == "M4V")
-      return new MP4::File(stream, readAudioProperties, audioPropertiesStyle);
-    if(ext == "WMA" || ext == "ASF")
-      return new ASF::File(stream, readAudioProperties, audioPropertiesStyle);
-    if(ext == "AIF" || ext == "AIFF" || ext == "AFC" || ext == "AIFC")
-      return new RIFF::AIFF::File(stream, readAudioProperties, audioPropertiesStyle);
-    if(ext == "WAV")
-      return new RIFF::WAV::File(stream, readAudioProperties, audioPropertiesStyle);
-    if(ext == "APE")
-      return new APE::File(stream, readAudioProperties, audioPropertiesStyle);
-    // module, nst and wow are possible but uncommon extensions
-    if(ext == "MOD" || ext == "MODULE" || ext == "NST" || ext == "WOW")
-      return new Mod::File(stream, readAudioProperties, audioPropertiesStyle);
-    if(ext == "S3M")
-      return new S3M::File(stream, readAudioProperties, audioPropertiesStyle);
-    if(ext == "IT")
-      return new IT::File(stream, readAudioProperties, audioPropertiesStyle);
-    if(ext == "XM")
-      return new XM::File(stream, readAudioProperties, audioPropertiesStyle);
-    if(ext == "DFF" || ext == "DSDIFF")
-      return new DSDIFF::File(stream, readAudioProperties, audioPropertiesStyle);
-    if(ext == "DSF")
-      return new DSF::File(stream, readAudioProperties, audioPropertiesStyle);
-
-    return 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;
-
-    if(MPEG::File::isSupported(stream))
-      file = new MPEG::File(stream, ID3v2::FrameFactory::instance(), readAudioProperties, audioPropertiesStyle);
-    else if(Ogg::Vorbis::File::isSupported(stream))
-      file = new Ogg::Vorbis::File(stream, readAudioProperties, audioPropertiesStyle);
-    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);
-    else if(MPC::File::isSupported(stream))
-      file = new MPC::File(stream, readAudioProperties, audioPropertiesStyle);
-    else if(WavPack::File::isSupported(stream))
-      file = new WavPack::File(stream, readAudioProperties, audioPropertiesStyle);
-    else if(Ogg::Speex::File::isSupported(stream))
-      file = new Ogg::Speex::File(stream, readAudioProperties, audioPropertiesStyle);
-    else if(Ogg::Opus::File::isSupported(stream))
-      file = new Ogg::Opus::File(stream, readAudioProperties, audioPropertiesStyle);
-    else if(TrueAudio::File::isSupported(stream))
-      file = new TrueAudio::File(stream, readAudioProperties, audioPropertiesStyle);
-    else if(MP4::File::isSupported(stream))
-      file = new MP4::File(stream, readAudioProperties, audioPropertiesStyle);
-    else if(ASF::File::isSupported(stream))
-      file = new ASF::File(stream, readAudioProperties, audioPropertiesStyle);
-    else if(RIFF::AIFF::File::isSupported(stream))
-      file = new RIFF::AIFF::File(stream, readAudioProperties, audioPropertiesStyle);
-    else if(RIFF::WAV::File::isSupported(stream))
-      file = new RIFF::WAV::File(stream, readAudioProperties, audioPropertiesStyle);
-    else if(APE::File::isSupported(stream))
-      file = new APE::File(stream, readAudioProperties, audioPropertiesStyle);
-    else if(DSDIFF::File::isSupported(stream))
-      file = new DSDIFF::File(stream, readAudioProperties, audioPropertiesStyle);
-    else if(DSF::File::isSupported(stream))
-      file = new DSF::File(stream, readAudioProperties, audioPropertiesStyle);
-
-    // isSupported() only does a quick check, so double check the file here.
-
-    if(file) {
-      if(file->isValid())
-        return file;
-      else
-        delete file;
-    }
-
-    return nullptr;
-  }
-
-  // Internal function that supports FileRef::create().
-  // This looks redundant, but necessary in order not to change the previous
-  // behavior of FileRef::create().
-
-  File* createInternal(FileName fileName, bool readAudioProperties,
-                       AudioProperties::ReadStyle audioPropertiesStyle)
-  {
-    File *file = detectByResolvers(fileName, readAudioProperties, audioPropertiesStyle);
-    if(file)
+  ResolverList::ConstIterator it = fileTypeResolvers.begin();
+  for (; it != fileTypeResolvers.end(); ++it) {
+    File *file = (*it)->createFile(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 nullptr;
-
-    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 nullptr;
   }
+
+  return nullptr;
+
 }
 
-class FileRef::FileRefPrivate : public RefCounter
-{
-public:
-  FileRefPrivate() :
-    RefCounter(),
-    file(0),
-    stream(0) {}
+// Detect the file type based on the file extension.
 
-  ~FileRefPrivate() {
+File *detectByExtension(IOStream *stream, bool readAudioProperties, AudioProperties::ReadStyle audioPropertiesStyle) {
+
+#ifdef _WIN32
+  const String s(stream->name().wstr());
+#else
+  const String s(stream->name());
+#endif
+
+  String ext;
+  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
+  // updated.  However at some point that list should be created at the same time
+  // that a default file type resolver is created.
+
+  if (ext.isEmpty())
+    return nullptr;
+
+  // .oga can be any audio in the Ogg container. So leave it to content-based detection.
+
+  if (ext == "MP3")
+    return new MPEG::File(stream, ID3v2::FrameFactory::instance(), readAudioProperties, audioPropertiesStyle);
+  if (ext == "OGG")
+    return new Ogg::Vorbis::File(stream, readAudioProperties, audioPropertiesStyle);
+  if (ext == "FLAC")
+    return new FLAC::File(stream, readAudioProperties, audioPropertiesStyle);
+  if (ext == "MPC")
+    return new MPC::File(stream, readAudioProperties, audioPropertiesStyle);
+  if (ext == "WV")
+    return new WavPack::File(stream, readAudioProperties, audioPropertiesStyle);
+  if (ext == "SPX")
+    return new Ogg::Speex::File(stream, readAudioProperties, audioPropertiesStyle);
+  if (ext == "OPUS")
+    return new Ogg::Opus::File(stream, readAudioProperties, audioPropertiesStyle);
+  if (ext == "TTA")
+    return new TrueAudio::File(stream, readAudioProperties, audioPropertiesStyle);
+  if (ext == "M4A" || ext == "M4R" || ext == "M4B" || ext == "M4P" || ext == "MP4" || ext == "3G2" || ext == "M4V")
+    return new MP4::File(stream, readAudioProperties, audioPropertiesStyle);
+  if (ext == "WMA" || ext == "ASF")
+    return new ASF::File(stream, readAudioProperties, audioPropertiesStyle);
+  if (ext == "AIF" || ext == "AIFF" || ext == "AFC" || ext == "AIFC")
+    return new RIFF::AIFF::File(stream, readAudioProperties, audioPropertiesStyle);
+  if (ext == "WAV")
+    return new RIFF::WAV::File(stream, readAudioProperties, audioPropertiesStyle);
+  if (ext == "APE")
+    return new APE::File(stream, readAudioProperties, audioPropertiesStyle);
+  // module, nst and wow are possible but uncommon extensions
+  if (ext == "MOD" || ext == "MODULE" || ext == "NST" || ext == "WOW")
+    return new Mod::File(stream, readAudioProperties, audioPropertiesStyle);
+  if (ext == "S3M")
+    return new S3M::File(stream, readAudioProperties, audioPropertiesStyle);
+  if (ext == "IT")
+    return new IT::File(stream, readAudioProperties, audioPropertiesStyle);
+  if (ext == "XM")
+    return new XM::File(stream, readAudioProperties, audioPropertiesStyle);
+  if (ext == "DFF" || ext == "DSDIFF")
+    return new DSDIFF::File(stream, readAudioProperties, audioPropertiesStyle);
+  if (ext == "DSF")
+    return new DSF::File(stream, readAudioProperties, audioPropertiesStyle);
+
+  return nullptr;
+
+}
+
+// Detect the file type based on the actual content of the stream.
+
+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);
+  else if (Ogg::Vorbis::File::isSupported(stream))
+    file = new Ogg::Vorbis::File(stream, readAudioProperties, audioPropertiesStyle);
+  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, readAudioProperties, audioPropertiesStyle);
+  else if (MPC::File::isSupported(stream))
+    file = new MPC::File(stream, readAudioProperties, audioPropertiesStyle);
+  else if (WavPack::File::isSupported(stream))
+    file = new WavPack::File(stream, readAudioProperties, audioPropertiesStyle);
+  else if (Ogg::Speex::File::isSupported(stream))
+    file = new Ogg::Speex::File(stream, readAudioProperties, audioPropertiesStyle);
+  else if (Ogg::Opus::File::isSupported(stream))
+    file = new Ogg::Opus::File(stream, readAudioProperties, audioPropertiesStyle);
+  else if (TrueAudio::File::isSupported(stream))
+    file = new TrueAudio::File(stream, readAudioProperties, audioPropertiesStyle);
+  else if (MP4::File::isSupported(stream))
+    file = new MP4::File(stream, readAudioProperties, audioPropertiesStyle);
+  else if (ASF::File::isSupported(stream))
+    file = new ASF::File(stream, readAudioProperties, audioPropertiesStyle);
+  else if (RIFF::AIFF::File::isSupported(stream))
+    file = new RIFF::AIFF::File(stream, readAudioProperties, audioPropertiesStyle);
+  else if (RIFF::WAV::File::isSupported(stream))
+    file = new RIFF::WAV::File(stream, readAudioProperties, audioPropertiesStyle);
+  else if (APE::File::isSupported(stream))
+    file = new APE::File(stream, readAudioProperties, audioPropertiesStyle);
+  else if (DSDIFF::File::isSupported(stream))
+    file = new DSDIFF::File(stream, readAudioProperties, audioPropertiesStyle);
+  else if (DSF::File::isSupported(stream))
+    file = new DSF::File(stream, readAudioProperties, audioPropertiesStyle);
+
+  // isSupported() only does a quick check, so double check the file here.
+
+  if (file) {
+    if (file->isValid())
+      return file;
+    else
+      delete file;
+  }
+
+  return nullptr;
+
+}
+
+struct FileRefData {
+  FileRefData() : file(nullptr), stream(nullptr) {}
+
+  ~FileRefData() {
     delete file;
     delete stream;
   }
 
-  File     *file;
+  File *file;
   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() {
+  delete d;
 }
 
-FileRef::~FileRef()
-{
-  if(d->deref())
-    delete d;
-}
+Tag *FileRef::tag() const {
 
-Tag *FileRef::tag() const
-{
-  if(isNull()) {
+  if (isNull()) {
     debug("FileRef::tag() - Called without a valid file.");
     return nullptr;
   }
-  return d->file->tag();
+  return d->data->file->tag();
+
 }
 
-AudioProperties *FileRef::audioProperties() const
-{
-  if(isNull()) {
+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 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()
-{
-  if(isNull()) {
+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");
@@ -395,97 +335,90 @@ StringList FileRef::defaultFileExtensions()
   l.append("wav");
   l.append("ape");
   l.append("mod");
-  l.append("module"); // alias for "mod"
-  l.append("nst"); // alias for "mod"
-  l.append("wow"); // alias for "mod"
+  l.append("module");  // alias for "mod"
+  l.append("nst");     // alias for "mod"
+  l.append("wow");     // alias for "mod"
   l.append("s3m");
   l.append("it");
   l.append("xm");
   l.append("dsf");
   l.append("dff");
-  l.append("dsdiff"); // alias for "dff"
+  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,42 +30,37 @@
 #include "tstringlist.h"
 
 #include "taglib_export.h"
+#include "tpropertymap.h"
 #include "audioproperties.h"
 
 namespace Strawberry_TagLib {
 namespace TagLib {
 
-  class Tag;
+class Tag;
 
-  //! This class provides a simple abstraction for creating and handling files
+//! 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 Strawberry_TagLib::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
-  {
-  public:
-
+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:
    *
@@ -85,205 +80,204 @@ 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
-    public:
-      /*!
-       * 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.
-       */
-      virtual File *createFile(FileName fileName,
-                               bool readAudioProperties = true,
-                               AudioProperties::ReadStyle
-                               audioPropertiesStyle = AudioProperties::Average) const = 0;
-    };
-
+  class TAGLIB_EXPORT FileTypeResolver {
+   public:
+    virtual ~FileTypeResolver() {}
     /*!
-     * Creates a null FileRef.
-     */
-    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.
+     * 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.
      *
-     * Also see the note in the class documentation about why you may not want to
-     * use this method in your application.
+     * \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.
      */
-    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.
-     *
-     * 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.
-     */
-    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.
-     */
-    explicit FileRef(File *file);
-
-    /*!
-     * Make a copy of \a ref.
-     */
-    FileRef(const FileRef &ref);
-
-    /*!
-     * Destroys this FileRef instance.
-     */
-    virtual ~FileRef();
-
-    /*!
-     * Returns a pointer to represented file's tag.
-     *
-     * \warning This pointer will become invalid when this FileRef and all
-     * copies pass out of scope.
-     *
-     * \warning Do not cast it to any subclasses of \class Tag.
-     * Use tag returning methods of appropriate subclasses of \class File instead.
-     *
-     * \see File::tag()
-     */
-    Tag *tag() const;
-
-    /*!
-     * Returns the audio properties for this FileRef.  If no audio properties
-     * were read then this will returns a null pointer.
-     */
-    AudioProperties *audioProperties() const;
-
-    /*!
-     * Returns a pointer to the file represented by this handler class.
-     *
-     * As a general rule this call should be avoided since if you need to work
-     * with file objects directly, you are probably better served instantiating
-     * the File subclasses (i.e. MPEG::File) manually and working with their APIs.
-     *
-     * This <i>handle</i> exists to provide a minimal, generic and value-based
-     * wrapper around a File.  Accessing the file directly generally indicates
-     * a moving away from this simplicity (and into things beyond the scope of
-     * FileRef).
-     *
-     * \warning This pointer will become invalid when this FileRef and all
-     * copies pass out of scope.
-     */
-    File *file() const;
-
-    /*!
-     * Saves the file.  Returns true on success.
-     */
-    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.
-     *
-     * 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).
-     *
-     * \see FileTypeResolver
-     */
-    static const FileTypeResolver *addFileTypeResolver(const FileTypeResolver *resolver);
-
-    /*!
-     * As is mentioned elsewhere in this class's documentation, the default file
-     * 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.
-     *
-     * The extensions are all returned in lowercase, though the comparison used
-     * by TagLib for resolution is case-insensitive.
-     *
-     * \note This does not account for any additional file type resolvers that
-     * are plugged in.  Also note that this is not intended to replace a proper
-     * mime-type resolution system, but is just here for reference.
-     *
-     * \see FileTypeResolver
-     */
-    static StringList defaultFileExtensions();
-
-    /*!
-     * Returns true if the file (and as such other pointers) are null.
-     */
-    bool isNull() const;
-
-    /*!
-     * Assign the file pointed to by \a ref to this FileRef.
-     */
-    FileRef &operator=(const FileRef &ref);
-
-    /*!
-     * Exchanges the content of the FileRef by the content of \a ref.
-     */
-    void swap(FileRef &ref);
-
-    /*!
-     * Returns true if this FileRef and \a ref point to the same File object.
-     */
-    bool operator==(const FileRef &ref) const;
-
-    /*!
-     * 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);
-
-    class FileRefPrivate;
-    FileRefPrivate *d;
+    virtual File *createFile(FileName fileName, bool readAudioProperties = true, AudioProperties::ReadStyle audioPropertiesStyle = AudioProperties::Average) const = 0;
   };
 
-}
-} // namespace Strawberry_TagLib::TagLib
+  /*!
+   * Creates a null FileRef.
+   */
+  explicit FileRef();
 
-#endif
+  /*!
+   * 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);
+
+  /*!
+   * 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.
+   *
+   * \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);
+
+  /*!
+   * 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);
+
+  /*!
+   * Make a copy of \a ref.
+   */
+  FileRef(const FileRef &ref);
+
+  /*!
+   * Destroys this FileRef instance.
+   */
+  virtual ~FileRef();
+
+  /*!
+   * Returns a pointer to represented file's tag.
+   *
+   * \warning This pointer will become invalid when this FileRef and all
+   * copies pass out of scope.
+   *
+   * \warning Do not cast it to any subclasses of \class Tag.
+   * Use tag returning methods of appropriate subclasses of \class File instead.
+   *
+   * \see File::tag()
+   */
+  Tag *tag() const;
+
+  /*!
+   * 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;
+
+  /*!
+   * Returns a pointer to the file represented by this handler class.
+   *
+   * As a general rule this call should be avoided since if you need to work
+   * with file objects directly, you are probably better served instantiating
+   * the File subclasses (i.e. MPEG::File) manually and working with their APIs.
+   *
+   * This <i>handle</i> exists to provide a minimal, generic and value-based
+   * wrapper around a File.  Accessing the file directly generally indicates
+   * a moving away from this simplicity (and into things beyond the scope of
+   * FileRef).
+   *
+   * \warning This pointer will become invalid when this FileRef and all
+   * copies pass out of scope.
+   */
+  File *file() const;
+
+  /*!
+   * Saves the file.  Returns true on success.
+   */
+  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.
+   *
+   * 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).
+   *
+   * \see FileTypeResolver
+   */
+  static const FileTypeResolver *addFileTypeResolver(const FileTypeResolver *resolver);
+
+  /*!
+   * As is mentioned elsewhere in this class's documentation, the default file
+   * 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.
+   *
+   * The extensions are all returned in lowercase, though the comparison used
+   * by TagLib for resolution is case-insensitive.
+   *
+   * \note This does not account for any additional file type resolvers that
+   * are plugged in.  Also note that this is not intended to replace a proper
+   * mime-type resolution system, but is just here for reference.
+   *
+   * \see FileTypeResolver
+   */
+  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.
+   */
+  bool isNull() const;
+
+  /*!
+   * Assign the file pointed to by \a ref to this FileRef.
+   */
+  FileRef &operator=(const FileRef &ref);
+
+  /*!
+   * Exchanges the content of the FileRef by the content of \a ref.
+   */
+  void swap(FileRef &ref);
+
+  /*!
+   * Returns true if this FileRef and \a ref point to the same File object.
+   */
+  bool operator==(const FileRef &ref) const;
+
+  /*!
+   * Returns true if this FileRef and \a ref do not point to the same File object.
+   */
+  bool operator!=(const FileRef &ref) const;
+
+ private:
+  void parse(FileName fileName, bool readAudioProperties, AudioProperties::ReadStyle audioPropertiesStyle);
+  void parse(IOStream *stream, bool readAudioProperties, AudioProperties::ReadStyle audioPropertiesStyle);
+
+  class FileRefPrivate;
+  FileRefPrivate *d;
+};
+
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
+
+#endif  // TAGLIB_FILEREF_H

3rdparty/taglib/flac/flacfile.cpp

@@ -23,18 +23,20 @@
  *   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"
@@ -43,55 +45,63 @@
 
 using namespace Strawberry_TagLib::TagLib;
 
-namespace
-{
-  typedef List<FLAC::MetadataBlock *> BlockList;
-  typedef BlockList::Iterator BlockIterator;
-  typedef BlockList::Iterator BlockConstIterator;
+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';
+const char LastBlockFlag = '\x80';
+}  // namespace
+
+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:
-  explicit FilePrivate(const ID3v2::FrameFactory *frameFactory = ID3v2::FrameFactory::instance()) :
-    ID3v2FrameFactory(frameFactory),
-    ID3v2Location(-1),
-    ID3v2OriginalSize(0),
-    ID3v1Location(-1),
-    properties(0),
-    flacStart(0),
-    streamStart(0),
-    scanned(false)
-  {
-    blocks.setAutoDelete(true);
-  }
+class FLAC::File::FilePrivate {
+ public:
+  explicit FilePrivate(const ID3v2::FrameFactory *frameFactory) : ID3v2FrameFactory(ID3v2::FrameFactory::instance()),
+                                                                  ID3v2Location(-1),
+                                                                  ID3v2OriginalSize(0),
+                                                                  ID3v1Location(-1),
+                                                                  flacStart(0),
+                                                                  streamStart(0),
+                                                                  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,111 +109,85 @@ 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) :
-  Strawberry_TagLib::TagLib::File(file),
-  d(new FilePrivate())
-{
-  if(isOpen())
+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) :
-  Strawberry_TagLib::TagLib::File(file),
-  d(new FilePrivate(frameFactory))
-{
-  if(isOpen())
+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) :
-  Strawberry_TagLib::TagLib::File(stream),
-  d(new FilePrivate(frameFactory))
-{
-  if(isOpen())
-    read(readProperties);
-}
-
-FLAC::File::~File()
-{
+FLAC::File::~File() {
   delete d;
 }
 
-Strawberry_TagLib::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()
-{
-  if(readOnly()) {
+bool FLAC::File::save() {
+
+  if (readOnly()) {
     debug("FLAC::File::save() - Cannot save to a read only file.");
     return false;
   }
 
-  if(!isValid()) {
+  if (!isValid()) {
     debug("FLAC::File::save() -- Trying to save invalid file.");
     return false;
   }
 
   // Create new vorbis comments
-  if(!hasXiphComment())
+  if (!hasXiphComment())
     Tag::duplicate(&d->tag, xiphComment(true), false);
 
   d->xiphCommentData = xiphComment()->render(false);
 
   // Replace metadata blocks
 
-  for(BlockIterator it = d->blocks.begin(); it != d->blocks.end(); ++it) {
-    if((*it)->code() == MetadataBlock::VorbisComment) {
+  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) {
+  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,27 +195,27 @@ 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) {
+  if (paddingLength <= 0) {
     paddingLength = MinPaddingLength;
   }
   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);
 
-    if(paddingLength > threshold)
+    if (paddingLength > threshold)
       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
 
@@ -239,25 +223,25 @@ bool FLAC::File::save()
 
   d->streamStart += (static_cast<long>(data.size()) - originalLength);
 
-  if(d->ID3v1Location >= 0)
+  if (d->ID3v1Location >= 0)
     d->ID3v1Location += (static_cast<long>(data.size()) - originalLength);
 
   // Update ID3 tags
 
-  if(ID3v2Tag() && !ID3v2Tag()->isEmpty()) {
+  if (ID3v2Tag() && !ID3v2Tag()->isEmpty()) {
 
     // ID3v2 tag is not empty. Update the old one or create a new one.
 
-    if(d->ID3v2Location < 0)
+    if (d->ID3v2Location < 0)
       d->ID3v2Location = 0;
 
     data = ID3v2Tag()->render();
     insert(data, d->ID3v2Location, d->ID3v2OriginalSize);
 
-    d->flacStart   += (static_cast<long>(data.size()) - d->ID3v2OriginalSize);
+    d->flacStart += (static_cast<long>(data.size()) - d->ID3v2OriginalSize);
     d->streamStart += (static_cast<long>(data.size()) - d->ID3v2OriginalSize);
 
-    if(d->ID3v1Location >= 0)
+    if (d->ID3v1Location >= 0)
       d->ID3v1Location += (static_cast<long>(data.size()) - d->ID3v2OriginalSize);
 
     d->ID3v2OriginalSize = data.size();
@@ -266,13 +250,13 @@ bool FLAC::File::save()
 
     // ID3v2 tag is empty. Remove the old one.
 
-    if(d->ID3v2Location >= 0) {
+    if (d->ID3v2Location >= 0) {
       removeBlock(d->ID3v2Location, d->ID3v2OriginalSize);
 
-      d->flacStart   -= d->ID3v2OriginalSize;
+      d->flacStart -= d->ID3v2OriginalSize;
       d->streamStart -= d->ID3v2OriginalSize;
 
-      if(d->ID3v1Location >= 0)
+      if (d->ID3v1Location >= 0)
         d->ID3v1Location -= d->ID3v2OriginalSize;
 
       d->ID3v2Location = -1;
@@ -280,11 +264,11 @@ bool FLAC::File::save()
     }
   }
 
-  if(ID3v1Tag() && !ID3v1Tag()->isEmpty()) {
+  if (ID3v1Tag() && !ID3v1Tag()->isEmpty()) {
 
     // ID3v1 tag is not empty. Update the old one or create a new one.
 
-    if(d->ID3v1Location >= 0) {
+    if (d->ID3v1Location >= 0) {
       seek(d->ID3v1Location);
     }
     else {
@@ -298,113 +282,90 @@ bool FLAC::File::save()
 
     // ID3v1 tag is empty. Remove the old one.
 
-    if(d->ID3v1Location >= 0) {
+    if (d->ID3v1Location >= 0) {
       truncate(d->ID3v1Location);
       d->ID3v1Location = -1;
     }
   }
 
   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);
-    if(picture) {
+  for (BlockConstIterator it = d->blocks.begin(); it != d->blocks.end(); ++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())
+  if (it != d->blocks.end())
     d->blocks.erase(it);
 
-  if(del)
-    delete picture;
 }
 
-void FLAC::File::removePictures()
-{
-  for(BlockIterator it = d->blocks.begin(); it != d->blocks.end(); ) {
-    if(dynamic_cast<Picture *>(*it)) {
-      delete *it;
+void FLAC::File::removePictures() {
+
+  for (BlockIterator it = d->blocks.begin(); it != d->blocks.end();) {
+    if (dynamic_cast<Picture *>(it->get())) {
       it = d->blocks.erase(it);
     }
     else {
       ++it;
     }
   }
+
 }
 
-void FLAC::File::strip(int tags)
-{
-  if(tags & ID3v1)
-    d->tag.set(FlacID3v1Index, 0);
+void FLAC::File::strip(int tags) {
 
-  if(tags & ID3v2)
-    d->tag.set(FlacID3v2Index, 0);
+  if (tags & ID3v1)
+    d->tag.set(FlacID3v1Index, nullptr);
 
-  if(tags & XiphComment) {
+  if (tags & ID3v2)
+    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,13 +373,13 @@ 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);
 
-  if(d->ID3v2Location >= 0) {
+  if (d->ID3v2Location >= 0) {
     d->tag.set(FlacID3v2Index, new ID3v2::Tag(this, d->ID3v2Location, d->ID3v2FrameFactory));
     d->ID3v2OriginalSize = ID3v2Tag()->header()->completeTagSize();
   }
@@ -427,56 +388,57 @@ void FLAC::File::read(bool readProperties)
 
   d->ID3v1Location = Utils::findID3v1(this);
 
-  if(d->ID3v1Location >= 0)
+  if (d->ID3v1Location >= 0)
     d->tag.set(FlacID3v1Index, new ID3v1::Tag(this, d->ID3v1Location));
 
   // Look for FLAC metadata, including vorbis comments
 
   scan();
 
-  if(!isValid())
+  if (!isValid())
     return;
 
-  if(!d->xiphCommentData.isEmpty())
+  if (!d->xiphCommentData.isEmpty())
     d->tag.set(FlacXiphIndex, new Ogg::XiphComment(d->xiphCommentData));
   else
     d->tag.set(FlacXiphIndex, new Ogg::XiphComment());
 
-  if(readProperties) {
+  if (readProperties) {
 
     // First block should be the stream_info metadata
 
     const ByteVector infoData = d->blocks.front()->render();
 
-    long streamLength;
+    long long streamLength;
 
-    if(d->ID3v1Location >= 0)
+    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)
+  if (d->scanned)
     return;
 
-  if(!isValid())
+  if (!isValid())
     return;
 
-  long nextBlockOffset;
+  long long nextBlockOffset;
 
-  if(d->ID3v2Location >= 0)
+  if (d->ID3v2Location >= 0)
     nextBlockOffset = find("fLaC", d->ID3v2Location + d->ID3v2OriginalSize);
   else
     nextBlockOffset = find("fLaC");
 
-  if(nextBlockOffset < 0) {
+  if (nextBlockOffset < 0) {
     debug("FLAC::File::scan() -- FLAC stream not found");
     setValid(false);
     return;
@@ -485,7 +447,7 @@ void FLAC::File::scan()
   nextBlockOffset += 4;
   d->flacStart = nextBlockOffset;
 
-  while(true) {
+  while (true) {
 
     seek(nextBlockOffset);
     const ByteVector header = readBlock(4);
@@ -504,66 +466,63 @@ 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
 
-    if(d->blocks.isEmpty() && blockType != MetadataBlock::StreamInfo) {
+    if (d->blocks.isEmpty() && blockType != MetadataBlock::StreamInfo) {
       debug("FLAC::File::scan() -- First block should be the stream_info metadata");
       setValid(false);
       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;
     }
 
     const ByteVector data = readBlock(blockLength);
-    if(data.size() != blockLength) {
+    if (data.size() != blockLength) {
       debug("FLAC::File::scan() -- Failed to read a metadata block");
       setValid(false);
       return;
     }
 
-    MetadataBlock *block = 0;
+    std::shared_ptr<MetadataBlock> block;
 
     // Found the vorbis-comment
-    if(blockType == MetadataBlock::VorbisComment) {
-      if(d->xiphCommentData.isEmpty()) {
+    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();
-      if(picture->parse(data)) {
+    else if (blockType == MetadataBlock::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) {
+    else if (blockType == MetadataBlock::Padding) {
       // Skip all padding blocks.
     }
     else {
-      block = new UnknownMetadataBlock(blockType, data);
+      block.reset(new UnknownMetadataBlock(blockType, data));
     }
 
-    if(block)
+    if (block)
       d->blocks.append(block);
 
     nextBlockOffset += blockLength + 4;
 
-    if(isLastBlock)
+    if (isLastBlock)
       break;
   }
 
@@ -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"
@@ -37,309 +39,240 @@
 namespace Strawberry_TagLib {
 namespace TagLib {
 
-  class Tag;
-  namespace ID3v2 { class FrameFactory; class Tag; }
-  namespace ID3v1 { class Tag; }
-  namespace Ogg { class XiphComment; }
+class Tag;
+namespace ID3v2 {
+class FrameFactory;
+class Tag;
+}  // namespace ID3v2
+namespace ID3v1 {
+class Tag;
+}
+namespace Ogg {
+class XiphComment;
+}
 
-  //! An implementation of FLAC metadata
+//! An implementation of FLAC metadata
+
+/*!
+ * This is implementation of FLAC metadata for non-Ogg FLAC files.  At some
+ * point when Ogg / FLAC is more common there will be a similar implementation
+ * under the Ogg hierarchy.
+ *
+ * This supports ID3v1, ID3v2 and Xiph style comments as well as reading stream
+ * properties from the file.
+ */
+
+namespace FLAC {
+
+//! 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.
+ *
+ */
+
+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.
+   */
+  enum TagTypes {
+    //! Empty set.  Matches no tag types.
+    NoTags = 0x0000,
+    //! Matches Vorbis comments.
+    XiphComment = 0x0001,
+    //! Matches ID3v1 tags.
+    ID3v1 = 0x0002,
+    //! Matches ID3v2 tags.
+    ID3v2 = 0x0004,
+    //! Matches all tag types.
+    AllTags = 0xffff
+  };
 
   /*!
-   * This is implementation of FLAC metadata for non-Ogg FLAC files.  At some
-   * point when Ogg / FLAC is more common there will be a similar implementation
-   * under the Ogg hierarchy.
+   * Constructs an FLAC file from \a file.
+   * If \a readProperties is true the file's audio properties will also be read.
    *
-   * This supports ID3v1, ID3v2 and Xiph style comments as well as reading stream
-   * properties from the file.
+   * If this file contains and ID3v2 tag the frames will be created using \a frameFactory.
+   *
+   * \note In the current implementation, \a propertiesStyle is ignored.
    */
+  explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average, ID3v2::FrameFactory *frameFactory = nullptr);
 
-  namespace FLAC {
+  /*!
+   * 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
+  explicit File(IOStream *stream, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average, ID3v2::FrameFactory *frameFactory = nullptr);
 
-    //! An implementation of Strawberry_TagLib::TagLib::File with FLAC specific methods
+  /*!
+   * Destroys this instance of the File.
+   */
+  ~File() override;
 
-    /*!
-     * This implements and provides an interface for FLAC files to the
-     * 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 FLAC files.
-     */
+  /*!
+   * Returns the Tag for this file.  This will be a union of XiphComment, ID3v1 and ID3v2 tags.
+   *
+   * \see ID3v2Tag()
+   * \see ID3v1Tag()
+   * \see XiphComment()
+   */
+  Strawberry_TagLib::TagLib::Tag *tag() const override;
 
-    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.
-       */
-      enum TagTypes {
-        //! Empty set.  Matches no tag types.
-        NoTags      = 0x0000,
-        //! Matches Vorbis comments.
-        XiphComment = 0x0001,
-        //! Matches ID3v1 tags.
-        ID3v1       = 0x0002,
-        //! Matches ID3v2 tags.
-        ID3v2       = 0x0004,
-        //! Matches all tag types.
-        AllTags     = 0xffff
-      };
+  /*!
+   * 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.
+   */
+  PropertyMap setProperties(const PropertyMap &) override;
 
-      /*!
-       * Constructs a FLAC 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.
-       *
-       * \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);
+  /*!
+   * Returns the FLAC::AudioProperties for this file.  If no audio properties were read then this will return a null pointer.
+   */
+  AudioProperties *audioProperties() const override;
 
-      /*!
-       * 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.
-       */
-      // BIC: merge with the above constructor
-      File(FileName file, ID3v2::FrameFactory *frameFactory,
-           bool readProperties = true,
-           Properties::ReadStyle propertiesStyle = Properties::Average);
+  /*!
+   * 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.
+   */
+  bool save() override;
 
-      /*!
-       * 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);
+  /*!
+   * 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.
+   *
+   * \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.
+   *
+   * \see hasID3v2Tag()
+   */
+  ID3v2::Tag *ID3v2Tag(bool create = false);
 
-      /*!
-       * Destroys this instance of the File.
-       */
-      virtual ~File();
+  /*!
+   * 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.
+   *
+   * \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.
+   *
+   * \see hasID3v1Tag()
+   */
+  ID3v1::Tag *ID3v1Tag(bool create = false);
 
-      /*!
-       * Returns the Tag for this file.  This will be a union of XiphComment,
-       * ID3v1 and ID3v2 tags.
-       *
-       * \see ID3v2Tag()
-       * \see ID3v1Tag()
-       * \see XiphComment()
-       */
-      virtual Strawberry_TagLib::TagLib::Tag *tag() const;
+  /*!
+   * 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.
+   *
+   * \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.
+   *
+   * \see hasXiphComment()
+   */
+  Ogg::XiphComment *xiphComment(bool create = false);
 
-      /*!
-       * 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;
+  /*!
+   * Returns a list of pictures attached to the FLAC file.
+   */
+  List<Picture *> pictureList();
 
-      void removeUnsupportedProperties(const StringList &);
+  /*!
+   * Removes an attached picture. The picture's memory will be freed.
+   */
+  void removePicture(Picture *picture);
 
-      /*!
-       * 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.
-       */
-      PropertyMap setProperties(const PropertyMap &);
+  /*!
+   * Remove all attached images.
+   */
+  void removePictures();
 
-      /*!
-       * Returns the FLAC::Properties for this file.  If no audio properties
-       * were read then this will return a null pointer.
-       */
-      virtual Properties *audioProperties() const;
+  /*!
+   * 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);
 
-      /*!
-       * 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();
+  /*!
+   * 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.
+   *
+   * \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.
+   */
+  void strip(int tags = AllTags);
 
-      /*!
-       * 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.
-       *
-       * \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.
-       *
-       * \see hasID3v2Tag()
-       */
-      ID3v2::Tag *ID3v2Tag(bool create = false);
+  /*!
+   * Returns whether or not the file on disk actually has a XiphComment.
+   *
+   * \see xiphComment()
+   */
+  bool hasXiphComment() const;
 
-      /*!
-       * 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.
-       *
-       * \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.
-       *
-       * \see hasID3v1Tag()
-       */
-      ID3v1::Tag *ID3v1Tag(bool create = false);
+  /*!
+   * Returns whether or not the file on disk actually has an ID3v1 tag.
+   *
+   * \see ID3v1Tag()
+   */
+  bool hasID3v1Tag() const;
 
-      /*!
-       * 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.
-       *
-       * \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.
-       *
-       * \see hasXiphComment()
-       */
-      Ogg::XiphComment *xiphComment(bool create = false);
+  /*!
+   * Returns whether or not the file on disk actually has an ID3v2 tag.
+   *
+   * \see ID3v2Tag()
+   */
+  bool hasID3v2Tag() const;
 
-      /*!
-       * 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 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.
+   */
+  static bool isSupported(IOStream *stream);
 
-      /*!
-       * Returns the block of data used by FLAC::Properties for parsing the
-       * stream properties.
-       *
-       * \deprecated Always returns an empty vector.
-       */
-      ByteVector streamInfoData(); // BIC: remove
+ private:
+  File(const File&);
+  File &operator=(const File&);
 
-      /*!
-       * Returns the length of the audio-stream, used by FLAC::Properties for
-       * calculating the bitrate.
-       *
-       * \deprecated Always returns zero.
-       */
-      long streamLength();  // BIC: remove
+  void read(bool readProperties);
+  void scan();
 
-      /*!
-       * 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.
-       */
-      void removePicture(Picture *picture, bool del = true);
-
-      /*!
-       * Remove all attached images.
-       */
-      void removePictures();
-
-      /*!
-       * 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.
-       *
-       * \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 This won't remove the Vorbis comment block completely.  The
-       * vendor ID will be preserved.
-       */
-      void strip(int tags = AllTags);
-
-      /*!
-       * Returns whether or not the file on disk actually has a XiphComment.
-       *
-       * \see xiphComment()
-       */
-      bool hasXiphComment() const;
-
-      /*!
-       * Returns whether or not the file on disk actually has an ID3v1 tag.
-       *
-       * \see ID3v1Tag()
-       */
-      bool hasID3v1Tag() const;
-
-      /*!
-       * Returns whether or not the file on disk actually has an ID3v2 tag.
-       *
-       * \see ID3v2Tag()
-       */
-      bool hasID3v2Tag() const;
-
-      /*!
-       * 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.
-       */
-      static bool isSupported(IOStream *stream);
-
-    private:
-      File(const File &);
-      File &operator=(const File &);
-
-      void read(bool readProperties);
-      void scan();
-
-      class FilePrivate;
-      FilePrivate *d;
-    };
-  }
-}
-}
+  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 Strawberry_TagLib::TagLib;
 
-class FLAC::MetadataBlock::MetadataBlockPrivate
-{
-public:
+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

@@ -32,46 +32,43 @@
 
 namespace Strawberry_TagLib {
 namespace TagLib {
+namespace FLAC {
 
-  namespace FLAC {
+class TAGLIB_EXPORT MetadataBlock {
+ public:
+  explicit MetadataBlock();
+  virtual ~MetadataBlock();
 
-    class TAGLIB_EXPORT MetadataBlock
-    {
-    public:
-      MetadataBlock();
-      virtual ~MetadataBlock();
+  enum BlockType {
+    StreamInfo = 0,
+    Padding,
+    Application,
+    SeekTable,
+    VorbisComment,
+    CueSheet,
+    Picture
+  };
 
-      enum BlockType {
-        StreamInfo = 0,
-        Padding,
-        Application,
-        SeekTable,
-        VorbisComment,
-        CueSheet,
-        Picture
-      };
+  /*!
+   * Returns the FLAC metadata block type.
+   */
+  virtual int code() const = 0;
 
-      /*!
-       * Returns the FLAC metadata block type.
-       */
-      virtual int code() const = 0;
+  /*!
+   * Render the content of the block.
+   */
+  virtual ByteVector render() const = 0;
 
-      /*!
-       * Render the content of the block.
-       */
-      virtual ByteVector render() const = 0;
+ private:
+  MetadataBlock(const MetadataBlock &item);
+  MetadataBlock &operator=(const MetadataBlock &item);
 
-    private:
-      MetadataBlock(const MetadataBlock &item);
-      MetadataBlock &operator=(const MetadataBlock &item);
+  class MetadataBlockPrivate;
+  MetadataBlockPrivate *d;
+};
 
-      class MetadataBlockPrivate;
-      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 Strawberry_TagLib::TagLib;
 
-class FLAC::Picture::PicturePrivate
-{
-public:
-  PicturePrivate() :
-    type(FLAC::Picture::Other),
-    width(0),
-    height(0),
-    colorDepth(0),
-    numColors(0)
-    {}
+class FLAC::Picture::PicturePrivate {
+ public:
+  explicit PicturePrivate() : type(FLAC::Picture::Other),
+                              width(0),
+                              height(0),
+                              colorDepth(0),
+                              numColors(0) {
+  }
 
   Type type;
   String mimeType;
@@ -50,168 +48,147 @@ 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)
-{
-  if(data.size() < 32) {
+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()) {
+  if (pos + mimeTypeLength + 24 > data.size()) {
     debug("Invalid picture block.");
     return false;
   }
   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()) {
+  if (pos + descriptionLength + 20 > data.size()) {
     debug("Invalid picture block.");
     return false;
   }
   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()) {
+  if (pos + dataLength > data.size()) {
     debug("Invalid picture block.");
     return false;
   }
   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

@@ -35,176 +35,169 @@
 namespace Strawberry_TagLib {
 namespace TagLib {
 
-  namespace FLAC {
+namespace FLAC {
 
-    class TAGLIB_EXPORT Picture : public MetadataBlock
-    {
-    public:
+class TAGLIB_EXPORT Picture : public MetadataBlock {
+ public:
+  /*!
+   * This describes the function or content of the picture.
+   */
+  enum Type {
+    //! A type not enumerated below
+    Other = 0x00,
+    //! 32x32 PNG image that should be used as the file icon
+    FileIcon = 0x01,
+    //! File icon of a different size or format
+    OtherFileIcon = 0x02,
+    //! Front cover image of the album
+    FrontCover = 0x03,
+    //! Back cover image of the album
+    BackCover = 0x04,
+    //! Inside leaflet page of the album
+    LeafletPage = 0x05,
+    //! Image from the album itself
+    Media = 0x06,
+    //! Picture of the lead artist or soloist
+    LeadArtist = 0x07,
+    //! Picture of the artist or performer
+    Artist = 0x08,
+    //! Picture of the conductor
+    Conductor = 0x09,
+    //! Picture of the band or orchestra
+    Band = 0x0A,
+    //! Picture of the composer
+    Composer = 0x0B,
+    //! Picture of the lyricist or text writer
+    Lyricist = 0x0C,
+    //! Picture of the recording location or studio
+    RecordingLocation = 0x0D,
+    //! Picture of the artists during recording
+    DuringRecording = 0x0E,
+    //! Picture of the artists during performance
+    DuringPerformance = 0x0F,
+    //! Picture from a movie or video related to the track
+    MovieScreenCapture = 0x10,
+    //! Picture of a large, coloured fish
+    ColouredFish = 0x11,
+    //! Illustration related to the track
+    Illustration = 0x12,
+    //! Logo of the band or performer
+    BandLogo = 0x13,
+    //! Logo of the publisher (record company)
+    PublisherLogo = 0x14
+  };
 
-      /*!
-       * This describes the function or content of the picture.
-       */
-      enum Type {
-        //! A type not enumerated below
-        Other              = 0x00,
-        //! 32x32 PNG image that should be used as the file icon
-        FileIcon           = 0x01,
-        //! File icon of a different size or format
-        OtherFileIcon      = 0x02,
-        //! Front cover image of the album
-        FrontCover         = 0x03,
-        //! Back cover image of the album
-        BackCover          = 0x04,
-        //! Inside leaflet page of the album
-        LeafletPage        = 0x05,
-        //! Image from the album itself
-        Media              = 0x06,
-        //! Picture of the lead artist or soloist
-        LeadArtist         = 0x07,
-        //! Picture of the artist or performer
-        Artist             = 0x08,
-        //! Picture of the conductor
-        Conductor          = 0x09,
-        //! Picture of the band or orchestra
-        Band               = 0x0A,
-        //! Picture of the composer
-        Composer           = 0x0B,
-        //! Picture of the lyricist or text writer
-        Lyricist           = 0x0C,
-        //! Picture of the recording location or studio
-        RecordingLocation  = 0x0D,
-        //! Picture of the artists during recording
-        DuringRecording    = 0x0E,
-        //! Picture of the artists during performance
-        DuringPerformance  = 0x0F,
-        //! Picture from a movie or video related to the track
-        MovieScreenCapture = 0x10,
-        //! Picture of a large, coloured fish
-        ColouredFish       = 0x11,
-        //! Illustration related to the track
-        Illustration       = 0x12,
-        //! Logo of the band or performer
-        BandLogo           = 0x13,
-        //! Logo of the publisher (record company)
-        PublisherLogo      = 0x14
-      };
+  explicit Picture();
+  explicit Picture(const ByteVector &data);
+  ~Picture() override;
 
-      Picture();
-      Picture(const ByteVector &data);
-      ~Picture();
+  /*!
+   * Returns the type of the image.
+   */
+  Type type() const;
 
-      /*!
-       * Returns the type of the image.
-       */
-      Type type() const;
+  /*!
+   * Sets the type of the image.
+   */
+  void setType(Type type);
 
-      /*!
-       * Sets the type of the image.
-       */
-      void setType(Type type);
+  /*!
+   * Returns the mime type of the image.  This should in most cases be "image/png" or "image/jpeg".
+   */
+  String mimeType() const;
 
-      /*!
-       * 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".
+   */
+  void setMimeType(const String &m);
 
-      /*!
-       * Sets the mime type of the image.  This should in most cases be
-       * "image/png" or "image/jpeg".
-       */
-      void setMimeType(const String &m);
+  /*!
+   * Returns a text description of the image.
+   */
 
-      /*!
-       * Returns a text description of the image.
-       */
+  String description() const;
 
-      String description() const;
+  /*!
+   * Sets a textual description of the image to \a desc.
+   */
 
-      /*!
-       * Sets a textual description of the image to \a desc.
-       */
+  void setDescription(const String &desc);
 
-      void setDescription(const String &desc);
+  /*!
+   * Returns the width of the image.
+   */
+  int width() const;
 
-      /*!
-       * Returns the width of the image.
-       */
-      int width() const;
+  /*!
+   * Sets the width of the image.
+   */
+  void setWidth(int w);
 
-      /*!
-       * Sets the width of the image.
-       */
-      void setWidth(int w);
+  /*!
+   * Returns the height of the image.
+   */
+  int height() const;
 
-      /*!
-       * Returns the height of the image.
-       */
-      int height() const;
+  /*!
+   * Sets the height of the image.
+   */
+  void setHeight(int h);
 
-      /*!
-       * Sets the height of the image.
-       */
-      void setHeight(int h);
+  /*!
+   * Returns the color depth (in bits-per-pixel) of the image.
+   */
+  int colorDepth() const;
 
-      /*!
-       * Returns the color depth (in bits-per-pixel) of the image.
-       */
-      int colorDepth() const;
+  /*!
+   * Sets the color depth (in bits-per-pixel) of the image.
+   */
+  void setColorDepth(int depth);
 
-      /*!
-       * Sets the color depth (in bits-per-pixel) of the image.
-       */
-      void setColorDepth(int depth);
+  /*!
+   * Returns the number of colors used on the image..
+   */
+  int numColors() const;
 
-      /*!
-       * Returns the number of colors used on the image..
-       */
-      int numColors() const;
+  /*!
+   * Sets the number of colors used on the image (for indexed images).
+   */
+  void setNumColors(int numColors);
 
-      /*!
-       * Sets the number of colors used on the image (for indexed images).
-       */
-      void setNumColors(int numColors);
+  /*!
+   * Returns the image data.
+   */
+  ByteVector data() const;
 
-      /*!
-       * Returns the image data.
-       */
-      ByteVector data() const;
+  /*!
+   * Sets the image data.
+   */
+  void setData(const ByteVector &data);
 
-      /*!
-       * Sets the image data.
-       */
-      void setData(const ByteVector &data);
+  /*!
+   * Returns the FLAC metadata block type.
+   */
+  int code() const override;
 
-      /*!
-       * Returns the FLAC metadata block type.
-       */
-      int code() const;
+  /*!
+   * Render the content to the FLAC picture block format.
+   */
+  ByteVector render() const override;
 
-      /*!
-       * Render the content to the FLAC picture block format.
-       */
-      ByteVector render() const;
+  /*!
+   * Parse the picture data in the FLAC picture block format.
+   */
+  bool parse(const ByteVector &rawData);
 
-      /*!
-       * Parse the picture data in the FLAC picture block format.
-       */
-      bool parse(const ByteVector &rawData);
+ private:
+  Picture(const Picture &item);
+  Picture &operator=(const Picture &item);
 
-    private:
-      Picture(const Picture &item);
-      Picture &operator=(const Picture &item);
+  class PicturePrivate;
+  PicturePrivate *d;
+};
 
-      class PicturePrivate;
-      PicturePrivate *d;
-    };
-
-    typedef List<Picture> PictureList;
-
-  }
-
-}
-}
+}  // namespace FLAC
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/flac/flacproperties.cpp

@@ -23,24 +23,22 @@
  *   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 Strawberry_TagLib::TagLib;
 
-class FLAC::Properties::PropertiesPrivate
-{
-public:
-  PropertiesPrivate() :
-    length(0),
-    bitrate(0),
-    sampleRate(0),
-    bitsPerSample(0),
-    channels(0),
-    sampleFrames(0) {}
+class FLAC::AudioProperties::AudioPropertiesPrivate {
+ public:
+  explicit AudioPropertiesPrivate() : length(0),
+                                      bitrate(0),
+                                      sampleRate(0),
+                                      bitsPerSample(0),
+                                      channels(0),
+                                      sampleFrames(0) {}
 
   int length;
   int bitrate;
@@ -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)
-{
-  if(data.size() < 18) {
-    debug("FLAC::Properties::read() - FLAC properties must contain at least 18 bytes.");
+void FLAC::AudioProperties::read(const ByteVector &data, long long streamLength) {
+
+  if (data.size() < 18) {
+    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,28 +118,29 @@ 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;
-  d->channels      = ((flags >> 9) &  7) + 1;
+  d->sampleRate = flags >> 12;
+  d->channels = ((flags >> 9) & 7) + 1;
   d->bitsPerSample = ((flags >> 4) & 31) + 1;
 
   // The last 4 bits are the most significant 4 bits for the 36 bit
   // 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;
 
-  if(d->sampleFrames > 0 && d->sampleRate > 0) {
+  if (d->sampleFrames > 0 && d->sampleRate > 0) {
     const double length = d->sampleFrames * 1000.0 / d->sampleRate;
-    d->length  = static_cast<int>(length + 0.5);
+    d->length = static_cast<int>(length + 0.5);
     d->bitrate = static_cast<int>(streamLength * 8.0 / length + 0.5);
   }
 
-  if(data.size() >= pos + 16)
+  if (data.size() >= pos + 16)
     d->signature = data.mid(pos, 16);
+
 }

3rdparty/taglib/flac/flacproperties.h

@@ -32,119 +32,80 @@
 namespace Strawberry_TagLib {
 namespace TagLib {
 
-  namespace FLAC {
+namespace FLAC {
 
-    class File;
+class File;
 
-    //! An implementation of audio property reading for FLAC
+//! 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
-    {
-    public:
-      /*!
-       * Create an instance of FLAC::Properties with the data read from the
-       * ByteVector \a data.
-       */
-       // BIC: switch to const reference
-      Properties(ByteVector data, long streamLength, ReadStyle style = Average);
+class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
+ public:
+  /*!
+   * Create an instance of FLAC::AudioProperties with the data read from the ByteVector \a data.
+   */
+  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.
-       */
-       // BIC: remove
-      Properties(File *file, ReadStyle style = Average);
+  /*!
+   * Destroys this FLAC::AudioProperties instance.
+   */
+  ~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.
+   *
+   * \see lengthInMilliseconds()
+   */
+  int lengthInSeconds() const 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 milliseconds.
+   *
+   * \see lengthInSeconds()
+   */
+  int lengthInMilliseconds() const override;
 
-      /*!
-       * 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;
+  /*!
+   * Returns the average bit rate of the file in kb/s.
+   */
+  int bitrate() const override;
 
-      /*!
-       * Returns the length of the file in milliseconds.
-       *
-       * \see lengthInSeconds()
-       */
-      // BIC: make virtual
-      int lengthInMilliseconds() const;
+  /*!
+   * Returns the sample rate in Hz.
+   */
+  int sampleRate() const override;
 
-      /*!
-       * Returns the average bit rate of the file in kb/s.
-       */
-      virtual int bitrate() const;
+  /*!
+   * Returns the number of audio channels.
+   */
+  int channels() const override;
 
-      /*!
-       * Returns the sample rate in Hz.
-       */
-      virtual int sampleRate() const;
+  /*!
+   * Returns the number of bits per audio sample as read from the FLAC identification header.
+   */
+  int bitsPerSample() const;
 
-      /*!
-       * Returns the number of audio channels.
-       */
-      virtual int channels() const;
+  /*!
+   * Return the number of sample frames.
+   */
+  unsigned long long sampleFrames() const;
 
-      /*!
-       * Returns the number of bits per audio sample as read from the FLAC
-       * identification header.
-       */
-      int bitsPerSample() const;
+  /*!
+   * Returns the MD5 signature of the uncompressed audio stream as read from the stream info header.
+   */
+  ByteVector signature() 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;
+ private:
+  void read(const ByteVector &data, long long streamLength);
 
-      /*!
-       * 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.
-       */
-      ByteVector signature() const;
-
-    private:
-      Properties(const Properties &);
-      Properties &operator=(const Properties &);
-
-      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 Strawberry_TagLib::TagLib;
 
-class FLAC::UnknownMetadataBlock::UnknownMetadataBlockPrivate
-{
-public:
-  UnknownMetadataBlockPrivate() : code(0) {}
+class FLAC::UnknownMetadataBlock::UnknownMetadataBlockPrivate {
+ public:
+  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

@@ -33,51 +33,48 @@
 
 namespace Strawberry_TagLib {
 namespace TagLib {
+namespace FLAC {
 
-  namespace FLAC {
+class TAGLIB_EXPORT UnknownMetadataBlock : public MetadataBlock {
+ public:
+  explicit UnknownMetadataBlock(int code, const ByteVector &data);
+  ~UnknownMetadataBlock() override;
 
-    class TAGLIB_EXPORT UnknownMetadataBlock : public MetadataBlock
-    {
-    public:
-      UnknownMetadataBlock(int blockType, const ByteVector &data);
-      ~UnknownMetadataBlock();
+  /*!
+   * Returns the FLAC metadata block type.
+   */
+  int code() const override;
 
-      /*!
-       * Returns the FLAC metadata block type.
-       */
-      int code() const;
+  /*!
+   * Sets the FLAC metadata block type.
+   */
+  void setCode(int code);
 
-      /*!
-       * Sets the FLAC metadata block type.
-       */
-      void setCode(int code);
+  /*!
+   * Returns the FLAC metadata block type.
+   */
+  ByteVector data() const;
 
-      /*!
-       * Returns the FLAC metadata block type.
-       */
-      ByteVector data() const;
+  /*!
+   * Sets the FLAC metadata block type.
+   */
+  void setData(const ByteVector &data);
 
-      /*!
-       * Sets the FLAC metadata block type.
-       */
-      void setData(const ByteVector &data);
+  /*!
+   * Render the content of the block.
+   */
+  ByteVector render() const override;
 
-      /*!
-       * Render the content of the block.
-       */
-      ByteVector render() const;
+ private:
+  explicit UnknownMetadataBlock(const MetadataBlock &item);
+  UnknownMetadataBlock &operator=(const MetadataBlock &item);
 
-    private:
-      UnknownMetadataBlock(const MetadataBlock &item);
-      UnknownMetadataBlock &operator=(const MetadataBlock &item);
+  class UnknownMetadataBlockPrivate;
+  UnknownMetadataBlockPrivate *d;
+};
 
-      class UnknownMetadataBlockPrivate;
-      UnknownMetadataBlockPrivate *d;
-    };
-
-  }
-
-}
-}
+}  // namespace FLAC
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/it/itfile.cpp

@@ -33,65 +33,43 @@
 using namespace Strawberry_TagLib::TagLib;
 using namespace IT;
 
-class IT::File::FilePrivate
-{
-public:
-  explicit FilePrivate(AudioProperties::ReadStyle propertiesStyle)
-    : tag(), properties(propertiesStyle)
-  {
-  }
+class IT::File::FilePrivate {
+ public:
+  explicit FilePrivate(AudioProperties::ReadStyle propertiesStyle) : properties(propertiesStyle) {}
 
-  Mod::Tag       tag;
-  IT::Properties properties;
+  Mod::Tag tag;
+  IT::AudioProperties properties;
 };
 
-IT::File::File(FileName file, bool readProperties,
-               AudioProperties::ReadStyle propertiesStyle) :
-  Mod::FileBase(file),
-  d(new FilePrivate(propertiesStyle))
-{
-  if(isOpen())
+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))
-{
-  if(isOpen())
+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;
   }
@@ -105,37 +83,37 @@ bool IT::File::save()
   unsigned short instrumentCount = 0;
   unsigned short sampleCount = 0;
 
-  if(!readU16L(length) || !readU16L(instrumentCount) || !readU16L(sampleCount))
+  if (!readU16L(length) || !readU16L(instrumentCount) || !readU16L(sampleCount))
     return false;
 
   seek(15, Current);
 
   // 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;
-    if(!readU32L(instrumentOffset))
+  for (unsigned short i = 0; i < instrumentCount; ++i) {
+    seek(192L + length + (static_cast<long>(i) << 2));
+    unsigned int instrumentOffset = 0;
+    if (!readU32L(instrumentOffset))
       return false;
 
     seek(instrumentOffset + 32);
 
-    if(i < lines.size())
+    if (i < lines.size())
       writeString(lines[i], 25);
     else
       writeString(String(), 25);
     writeByte(0);
   }
 
-  for(unsigned short i = 0; i < sampleCount; ++ i) {
-    seek(192L + length + ((long)instrumentCount << 2) + ((long)i << 2));
-    unsigned long sampleOffset = 0;
-    if(!readU32L(sampleOffset))
+  for (unsigned short i = 0; i < sampleCount; ++i) {
+    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);
@@ -144,41 +122,40 @@ bool IT::File::save()
 
   // write rest as message:
   StringList messageLines;
-  for(unsigned int i = instrumentCount + sampleCount; i < lines.size(); ++ i)
+  for (unsigned int i = instrumentCount + sampleCount; i < lines.size(); ++i)
     messageLines.append(lines[i]);
   ByteVector message = messageLines.toString("\r").data(String::Latin1);
 
   // it's actually not really stated if the message needs a
   // terminating NUL but it does not hurt to add one:
-  if(message.size() > 7999)
+  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))
+  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))
+    if (!readU16L(messageLength) || !readU32L(messageOffset))
       return false;
 
-    if(messageLength == 0)
+    if (messageLength == 0)
       messageOffset = fileSize;
   }
-  else
-  {
+  else {
     messageOffset = fileSize;
     seek(46);
     writeU16L(special | 0x1);
   }
 
-  if(messageOffset + messageLength >= fileSize) {
+  if (messageOffset + messageLength >= fileSize) {
     // append new message
     seek(54);
     writeU16L(message.size());
@@ -199,9 +176,8 @@ bool IT::File::save()
   return true;
 }
 
-void IT::File::read(bool)
-{
-  if(!isOpen())
+void IT::File::read(bool) {
+  if (!isOpen())
     return;
 
   seek(0);
@@ -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;
@@ -249,26 +225,26 @@ void IT::File::read(bool)
   seek(64);
 
   ByteVector pannings = readBlock(64);
-  ByteVector volumes  = readBlock(64);
+  ByteVector volumes = readBlock(64);
   READ_ASSERT(pannings.size() == 64 && volumes.size() == 64);
   int channels = 0;
-  for(int i = 0; i < 64; ++ i) {
+  for (int i = 0; i < 64; ++i) {
     // Strictly speaking an IT file has always 64 channels, but
     // I don't count disabled and muted channels.
     // 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)
-        ++channels;
+    if (static_cast<unsigned char>(pannings[i]) < 128 && volumes[i] > 0)
+      ++channels;
   }
   d->properties.setChannels(channels);
 
   // real length might be shorter because of skips and terminator
   unsigned short realLength = 0;
-  for(unsigned short i = 0; i < length; ++ i) {
+  for (unsigned short i = 0; i < length; ++i) {
     READ_BYTE_AS(order);
-    if(order == 255) break;
-    if(order != 254) ++ realLength;
+    if (order == 255) break;
+    if (order != 254) ++realLength;
   }
   d->properties.setLengthInPatterns(realLength);
 
@@ -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));
+  for (unsigned short i = 0; i < instrumentCount; ++i) {
+    seek(192L + length + (static_cast<long>(i) << 2));
     READ_U32L_AS(instrumentOffset);
     seek(instrumentOffset);
 
@@ -295,8 +271,8 @@ void IT::File::read(bool)
     comment.append(instrumentName);
   }
 
-  for(unsigned short i = 0; i < sampleCount; ++ i) {
-    seek(192L + length + ((long)instrumentCount << 2) + ((long)i << 2));
+  for (unsigned short i = 0; i < sampleCount; ++i) {
+    seek(192L + length + (static_cast<long>(instrumentCount) << 2) + (static_cast<long>(i) << 2));
     READ_U32L_AS(sampleOffset);
 
     seek(sampleOffset);
@@ -328,8 +304,9 @@ void IT::File::read(bool)
     comment.append(sampleName);
   }
 
-  if(message.size() > 0)
+  if (message.size() > 0)
     comment.append(message);
   d->tag.setComment(comment.toString("\n"));
   d->tag.setTrackerName("Impulse Tracker");
+
 }

3rdparty/taglib/it/itfile.h

@@ -31,81 +31,61 @@
 
 namespace Strawberry_TagLib {
 namespace TagLib {
+namespace IT {
 
-  namespace IT {
+class TAGLIB_EXPORT File : public Mod::FileBase {
+ public:
+  /*!
+   * 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.
+   */
+  explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
 
-    class TAGLIB_EXPORT File : public Mod::FileBase {
-      public:
-        /*!
-         * 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.
-         */
-        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 TagLib will *not* take ownership of the stream, the caller is responsible for deleting it after the File object.
+   */
+  explicit File(IOStream *stream, 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 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);
+  /*!
+   * Destroys this instance of the File.
+   */
+  ~File() override;
 
-        /*!
-         * Destroys this instance of the File.
-         */
-        virtual ~File();
+  Mod::Tag *tag() const override;
 
-        Mod::Tag *tag() const;
+  /*!
+   * Returns the IT::AudioProperties for this file. If no audio properties
+   * were read then this will return a null pointer.
+   */
+  IT::AudioProperties *audioProperties() const override;
 
-        /*!
-         * Forwards to Mod::Tag::properties().
-         * BIC: will be removed once File::toDict() is made virtual
-         */
-        PropertyMap properties() const;
+  /*!
+   * Save the file.
+   * This is the same as calling save(AllTags);
+   *
+   * \note Saving Impulse Tracker tags is not supported.
+   */
+  bool save() override;
 
-        /*!
-         * Forwards to Mod::Tag::setProperties().
-         * BIC: will be removed once File::setProperties() is made virtual
-         */
-        PropertyMap setProperties(const PropertyMap &);
+ private:
+  File(const File&);
+  File &operator=(const File&);
 
-        /*!
-         * Returns the IT::Properties for this file. If no audio properties
-         * were read then this will return a null pointer.
-         */
-        IT::Properties *audioProperties() const;
+  void read(bool readProperties);
 
-        /*!
-         * Save the file.
-         * This is the same as calling save(AllTags);
-         *
-         * \note Saving Impulse Tracker tags is not supported.
-         */
-        bool save();
+  class FilePrivate;
+  FilePrivate *d;
+};
 
-
-      private:
-        File(const File &);
-        File &operator=(const File &);
-
-        void read(bool readProperties);
-
-        class FilePrivate;
-        FilePrivate *d;
-    };
-  }
-}
-}
+}  // namespace IT
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/it/itproperties.cpp

@@ -29,29 +29,26 @@
 using namespace Strawberry_TagLib::TagLib;
 using namespace IT;
 
-class IT::Properties::PropertiesPrivate
-{
-public:
-  PropertiesPrivate() :
-    channels(0),
-    lengthInPatterns(0),
-    instrumentCount(0),
-    sampleCount(0),
-    patternCount(0),
-    version(0),
-    compatibleVersion(0),
-    flags(0),
-    special(0),
-    globalVolume(0),
-    mixVolume(0),
-    tempo(0),
-    bpmSpeed(0),
-    panningSeparation(0),
-    pitchWheelDepth(0)
-  {
+class IT::AudioProperties::AudioPropertiesPrivate {
+ public:
+  explicit AudioPropertiesPrivate() : channels(0),
+                                      lengthInPatterns(0),
+                                      instrumentCount(0),
+                                      sampleCount(0),
+                                      patternCount(0),
+                                      version(0),
+                                      compatibleVersion(0),
+                                      flags(0),
+                                      special(0),
+                                      globalVolume(0),
+                                      mixVolume(0),
+                                      tempo(0),
+                                      bpmSpeed(0),
+                                      panningSeparation(0),
+                                      pitchWheelDepth(0) {
   }
 
-  int            channels;
+  int channels;
   unsigned short lengthInPatterns;
   unsigned short instrumentCount;
   unsigned short sampleCount;
@@ -60,201 +57,160 @@ public:
   unsigned short compatibleVersion;
   unsigned short flags;
   unsigned short special;
-  unsigned char  globalVolume;
-  unsigned char  mixVolume;
-  unsigned char  tempo;
-  unsigned char  bpmSpeed;
-  unsigned char  panningSeparation;
-  unsigned char  pitchWheelDepth;
+  unsigned char globalVolume;
+  unsigned char mixVolume;
+  unsigned char tempo;
+  unsigned char bpmSpeed;
+  unsigned char panningSeparation;
+  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

@@ -31,79 +31,77 @@
 
 namespace Strawberry_TagLib {
 namespace TagLib {
-  namespace IT {
-    class TAGLIB_EXPORT Properties : public AudioProperties {
-      friend class File;
-    public:
-      /*! Flag bits. */
-      enum {
-        Stereo                  =   1,
-        Vol0MixOptimizations    =   2,
-        UseInstruments          =   4,
-        LinearSlides            =   8,
-        OldEffects              =  16,
-        LinkEffects             =  32,
-        UseMidiPitchController  =  64,
-        RequestEmbeddedMidiConf = 128
-      };
+namespace IT {
+class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
+  friend class File;
 
-      /*! Special bits. */
-      enum {
-        MessageAttached  = 1,
-        MidiConfEmbedded = 8
-      };
+ public:
+  /*! Flag bits. */
+  enum {
+    Stereo = 1,
+    Vol0MixOptimizations = 2,
+    UseInstruments = 4,
+    LinearSlides = 8,
+    OldEffects = 16,
+    LinkEffects = 32,
+    UseMidiPitchController = 64,
+    RequestEmbeddedMidiConf = 128
+  };
 
-      Properties(AudioProperties::ReadStyle propertiesStyle);
-      virtual ~Properties();
+  /*! Special bits. */
+  enum {
+    MessageAttached = 1,
+    MidiConfEmbedded = 8
+  };
 
-      int length()               const;
-      int lengthInSeconds()      const;
-      int lengthInMilliseconds() const;
-      int bitrate()              const;
-      int sampleRate()           const;
-      int channels()             const;
+  explicit AudioProperties(AudioProperties::ReadStyle);
+  ~AudioProperties() override;
 
-      unsigned short lengthInPatterns()  const;
-      bool           stereo()            const;
-      unsigned short instrumentCount()   const;
-      unsigned short sampleCount()       const;
-      unsigned short patternCount()      const;
-      unsigned short version()           const;
-      unsigned short compatibleVersion() const;
-      unsigned short flags()             const;
-      unsigned short special()           const;
-      unsigned char  globalVolume()      const;
-      unsigned char  mixVolume()         const;
-      unsigned char  tempo()             const;
-      unsigned char  bpmSpeed()          const;
-      unsigned char  panningSeparation() const;
-      unsigned char  pitchWheelDepth()   const;
+  int lengthInSeconds() const override;
+  int lengthInMilliseconds() const override;
+  int bitrate() const override;
+  int sampleRate() const override;
+  int channels() const override;
 
-      void setChannels(int channels);
-      void setLengthInPatterns(unsigned short lengthInPatterns);
-      void setInstrumentCount(unsigned short instrumentCount);
-      void setSampleCount (unsigned short sampleCount);
-      void setPatternCount(unsigned short patternCount);
-      void setVersion     (unsigned short version);
-      void setCompatibleVersion(unsigned short compatibleVersion);
-      void setFlags       (unsigned short flags);
-      void setSpecial     (unsigned short special);
-      void setGlobalVolume(unsigned char globalVolume);
-      void setMixVolume   (unsigned char mixVolume);
-      void setTempo       (unsigned char tempo);
-      void setBpmSpeed    (unsigned char bpmSpeed);
-      void setPanningSeparation(unsigned char panningSeparation);
-      void setPitchWheelDepth  (unsigned char pitchWheelDepth);
+  unsigned short lengthInPatterns() const;
+  bool stereo() const;
+  unsigned short instrumentCount() const;
+  unsigned short sampleCount() const;
+  unsigned short patternCount() const;
+  unsigned short version() const;
+  unsigned short compatibleVersion() const;
+  unsigned short flags() const;
+  unsigned short special() const;
+  unsigned char globalVolume() const;
+  unsigned char mixVolume() const;
+  unsigned char tempo() const;
+  unsigned char bpmSpeed() const;
+  unsigned char panningSeparation() const;
+  unsigned char pitchWheelDepth() const;
 
-    private:
-      Properties(const Properties&);
-      Properties &operator=(const Properties&);
+ private:
+  void setChannels(int channels);
+  void setLengthInPatterns(unsigned short lengthInPatterns);
+  void setInstrumentCount(unsigned short instrumentCount);
+  void setSampleCount(unsigned short sampleCount);
+  void setPatternCount(unsigned short patternCount);
+  void setVersion(unsigned short version);
+  void setCompatibleVersion(unsigned short compatibleVersion);
+  void setFlags(unsigned short flags);
+  void setSpecial(unsigned short special);
+  void setGlobalVolume(unsigned char globalVolume);
+  void setMixVolume(unsigned char mixVolume);
+  void setTempo(unsigned char tempo);
+  void setBpmSpeed(unsigned char bpmSpeed);
+  void setPanningSeparation(unsigned char panningSeparation);
+  void setPitchWheelDepth(unsigned char pitchWheelDepth);
 
-      class PropertiesPrivate;
-      PropertiesPrivate *d;
-    };
-  }
-}
-}
+ private:
+  class AudioPropertiesPrivate;
+  AudioPropertiesPrivate *d;
+};
+}  // namespace IT
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/mod/modfile.cpp

@@ -33,115 +33,95 @@
 using namespace Strawberry_TagLib::TagLib;
 using namespace Mod;
 
-class Mod::File::FilePrivate
-{
-public:
-  explicit FilePrivate(AudioProperties::ReadStyle propertiesStyle)
-    : properties(propertiesStyle)
-  {
-  }
+class Mod::File::FilePrivate {
+ public:
+  explicit FilePrivate(AudioProperties::ReadStyle propertiesStyle) : properties(propertiesStyle) {}
 
-  Mod::Tag        tag;
-  Mod::Properties properties;
+  Mod::Tag tag;
+  Mod::AudioProperties properties;
 };
 
-Mod::File::File(FileName file, bool readProperties,
-                AudioProperties::ReadStyle propertiesStyle) :
-  Mod::FileBase(file),
-  d(new FilePrivate(propertiesStyle))
-{
-  if(isOpen())
+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))
-{
-  if(isOpen())
+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()) {
+  if (readOnly()) {
     debug("Mod::File::save() - Cannot save to a read only file.");
     return false;
   }
   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)
-{
-  if(!isOpen())
+void Mod::File::read(bool) {
+
+  if (!isOpen())
     return;
 
   seek(1080);
   ByteVector modId = readBlock(4);
   READ_ASSERT(modId.size() == 4);
 
-  int          channels    =  4;
+  int channels = 4;
   unsigned int instruments = 31;
-  if(modId == "M.K." || modId == "M!K!" || modId == "M&K!" || modId == "N.T.") {
+  if (modId == "M.K." || modId == "M!K!" || modId == "M&K!" || modId == "N.T.") {
     d->tag.setTrackerName("ProTracker");
     channels = 4;
   }
-  else if(modId.startsWith("FLT") || modId.startsWith("TDZ")) {
+  else if (modId.startsWith("FLT") || modId.startsWith("TDZ")) {
     d->tag.setTrackerName("StarTrekker");
     char digit = modId[3];
     READ_ASSERT(digit >= '0' && digit <= '9');
     channels = digit - '0';
   }
-  else if(modId.endsWith("CHN")) {
+  else if (modId.endsWith("CHN")) {
     d->tag.setTrackerName("StarTrekker");
     char digit = modId[0];
     READ_ASSERT(digit >= '0' && digit <= '9');
     channels = digit - '0';
   }
-  else if(modId == "CD81" || modId == "OKTA") {
+  else if (modId == "CD81" || modId == "OKTA") {
     d->tag.setTrackerName("Atari Oktalyzer");
     channels = 8;
   }
-  else if(modId.endsWith("CH") || modId.endsWith("CN")) {
+  else if (modId.endsWith("CH") || modId.endsWith("CN")) {
     d->tag.setTrackerName("TakeTracker");
     char digit = modId[0];
     READ_ASSERT(digit >= '0' && digit <= '9');
@@ -153,8 +133,8 @@ void Mod::File::read(bool)
   else {
     // Not sure if this is correct. I'd need a file
     // created with NoiseTracker to check this.
-    d->tag.setTrackerName("NoiseTracker"); // probably
-    channels    =  4;
+    d->tag.setTrackerName("NoiseTracker");  // probably
+    channels = 4;
     instruments = 15;
   }
   d->properties.setChannels(channels);
@@ -164,7 +144,7 @@ void Mod::File::read(bool)
   READ_STRING(d->tag.setTitle, 20);
 
   StringList comment;
-  for(unsigned int i = 0; i < instruments; ++ i) {
+  for (unsigned int i = 0; i < instruments; ++i) {
     READ_STRING_AS(instrumentName, 22);
     // value in words, * 2 (<< 1) for bytes:
     READ_U16B_AS(sampleLength);
@@ -172,10 +152,10 @@ void Mod::File::read(bool)
     READ_BYTE_AS(fineTuneByte);
     int fineTune = fineTuneByte & 0xF;
     // > 7 means negative value
-    if(fineTune > 7) fineTune -= 16;
+    if (fineTune > 7) fineTune -= 16;
 
     READ_BYTE_AS(volume);
-    if(volume > 64) volume = 64;
+    if (volume > 64) volume = 64;
     // volume in decibels: 20 * log10(volume / 64)
 
     // value in words, * 2 (<< 1) for bytes:
@@ -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

@@ -35,82 +35,61 @@
 
 namespace Strawberry_TagLib {
 namespace TagLib {
+namespace Mod {
 
-  namespace Mod {
+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.
+   */
+  explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
 
-    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.
-       */
-      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 TagLib will *not* take ownership of the stream, the caller is
+   * responsible for deleting it after the File object.
+   */
+  explicit File(IOStream *stream, 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 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);
+  /*!
+   * Destroys this instance of the File.
+   */
+  ~File() override;
 
-      /*!
-       * Destroys this instance of the File.
-       */
-      virtual ~File();
+  Mod::Tag *tag() const override;
 
-      Mod::Tag *tag() const;
+  /*!
+   * Returns the Mod::AudioProperties for this file. If no audio properties were read then this will return a null pointer.
+   */
+  Mod::AudioProperties *audioProperties() const override;
 
-      /*!
-       * Implements the unified property interface -- export function.
-       * Forwards to Mod::Tag::properties().
-       */
-      PropertyMap properties() const;
+  /*!
+   * Save the file.
+   * This is the same as calling save(AllTags);
+   *
+   * \note Saving Protracker tags is not supported.
+   */
+  bool save() override;
 
-      /*!
-       * 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;
+ private:
+  File(const File &);
+  File &operator=(const File &);
 
-      /*!
-       * Save the file.
-       * This is the same as calling save(AllTags);
-       *
-       * \note Saving Protracker tags is not supported.
-       */
-      bool save();
+  void read(bool readProperties);
 
-    private:
-      File(const File &);
-      File &operator=(const File &);
+  class FilePrivate;
+  FilePrivate *d;
+};
 
-      void read(bool readProperties);
-
-      class FilePrivate;
-      FilePrivate *d;
-    };
-
-  }
-
-}
-}
+}  // namespace Mod
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/mod/modfilebase.cpp

@@ -30,96 +30,93 @@
 using namespace Strawberry_TagLib::TagLib;
 using namespace Mod;
 
-Mod::FileBase::FileBase(FileName file) : Strawberry_TagLib::TagLib::File(file)
-{
-}
+Mod::FileBase::FileBase(FileName file) : Strawberry_TagLib::TagLib::File(file) {}
 
-Mod::FileBase::FileBase(IOStream *stream) : Strawberry_TagLib::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)
-  {
+  if (data.size() < size) return false;
+  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];
+  if (data.size() < 1) return false;
+  _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);
+  if (data.size() < 2) return 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);
+  if (data.size() < 4) return 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);
+  if (data.size() < 2) return false;
+  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);
+  if (data.size() < 4) return false;
+  number = data.toUInt32BE(0);
   return true;
+
 }

3rdparty/taglib/mod/modfilebase.h

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

3rdparty/taglib/mod/modfileprivate.h

@@ -24,44 +24,43 @@
 
 // some helper-macros only used internally by (s3m|it|xm)file.cpp
 #define READ_ASSERT(cond) \
-  if(!(cond)) \
-  { \
-    setValid(false); \
-    return; \
+  if (!(cond)) {          \
+    setValid(false);      \
+    return;               \
   }
 
-#define READ(setter,type,read) \
-  { \
-    type number; \
-    READ_ASSERT(read(number)); \
-    setter(number); \
+#define READ(setter, type, read) \
+  {                              \
+    type number;                 \
+    READ_ASSERT(read(number));   \
+    setter(number);              \
   }
 
-#define READ_BYTE(setter) READ(setter,unsigned char,readByte)
-#define READ_U16L(setter) READ(setter,unsigned short,readU16L)
-#define READ_U32L(setter) READ(setter,unsigned long,readU32L)
-#define READ_U16B(setter) READ(setter,unsigned short,readU16B)
-#define READ_U32B(setter) READ(setter,unsigned long,readU32B)
+#define READ_BYTE(setter) READ(setter, unsigned char, readByte)
+#define READ_U16L(setter) READ(setter, unsigned short, readU16L)
+#define READ_U32L(setter) READ(setter, unsigned int, readU32L)
+#define READ_U16B(setter) READ(setter, unsigned short, readU16B)
+#define READ_U32B(setter) READ(setter, unsigned int, readU32B)
 
-#define READ_STRING(setter,size) \
-  { \
-    String s; \
+#define READ_STRING(setter, size)     \
+  {                                   \
+    String s;                         \
     READ_ASSERT(readString(s, size)); \
-    setter(s); \
+    setter(s);                        \
   }
 
-#define READ_AS(type,name,read) \
-  type name = 0; \
+#define READ_AS(type, name, read) \
+  type name = 0;                  \
   READ_ASSERT(read(name));
 
-#define READ_BYTE_AS(name) READ_AS(unsigned char,name,readByte)
-#define READ_U16L_AS(name) READ_AS(unsigned short,name,readU16L)
-#define READ_U32L_AS(name) READ_AS(unsigned long,name,readU32L)
-#define READ_U16B_AS(name) READ_AS(unsigned short,name,readU16B)
-#define READ_U32B_AS(name) READ_AS(unsigned long,name,readU32B)
+#define READ_BYTE_AS(name) READ_AS(unsigned char, name, readByte)
+#define READ_U16L_AS(name) READ_AS(unsigned short, name, readU16L)
+#define READ_U32L_AS(name) READ_AS(unsigned int, name, readU32L)
+#define READ_U16B_AS(name) READ_AS(unsigned short, name, readU16B)
+#define READ_U32B_AS(name) READ_AS(unsigned int, name, readU32B)
 
-#define READ_STRING_AS(name,size) \
-  String name; \
+#define READ_STRING_AS(name, size) \
+  String name;                     \
   READ_ASSERT(readString(name, size));
 
 #endif

3rdparty/taglib/mod/modproperties.cpp

@@ -29,83 +29,66 @@
 using namespace Strawberry_TagLib::TagLib;
 using namespace Mod;
 
-class Mod::Properties::PropertiesPrivate
-{
-public:
-  PropertiesPrivate() :
-    channels(0),
-    instrumentCount(0),
-    lengthInPatterns(0)
-  {
-  }
+class Mod::AudioProperties::AudioPropertiesPrivate {
+ public:
+  explicit AudioPropertiesPrivate() : channels(0), instrumentCount(0), lengthInPatterns(0) {}
 
-  int           channels;
-  unsigned int  instrumentCount;
+  int channels;
+  unsigned int instrumentCount;
   unsigned char lengthInPatterns;
 };
 
-Mod::Properties::Properties(AudioProperties::ReadStyle propertiesStyle) :
-  AudioProperties(propertiesStyle),
-  d(new PropertiesPrivate())
-{
+////////////////////////////////////////////////////////////////////////////////
+// public members
+////////////////////////////////////////////////////////////////////////////////
+
+Mod::AudioProperties::AudioProperties(AudioProperties::ReadStyle) : Strawberry_TagLib::TagLib::AudioProperties(), d(new AudioPropertiesPrivate()) {
 }
 
-Mod::Properties::~Properties()
-{
+Mod::AudioProperties::~AudioProperties() {
   delete d;
 }
 
-int Mod::Properties::length() const
-{
+int Mod::AudioProperties::lengthInSeconds() const {
   return 0;
 }
 
-int Mod::Properties::lengthInSeconds() const
-{
+int Mod::AudioProperties::lengthInMilliseconds() const {
   return 0;
 }
 
-int Mod::Properties::lengthInMilliseconds() const
-{
+int Mod::AudioProperties::bitrate() const {
   return 0;
 }
 
-int Mod::Properties::bitrate() const
-{
+int Mod::AudioProperties::sampleRate() const {
   return 0;
 }
 
-int Mod::Properties::sampleRate() const
-{
-  return 0;
-}
-
-int Mod::Properties::channels() const
-{
+int Mod::AudioProperties::channels() const {
   return d->channels;
 }
 
-unsigned int Mod::Properties::instrumentCount() const
-{
+unsigned int Mod::AudioProperties::instrumentCount() const {
   return d->instrumentCount;
 }
 
-unsigned char Mod::Properties::lengthInPatterns() const
-{
+unsigned char Mod::AudioProperties::lengthInPatterns() const {
   return d->lengthInPatterns;
 }
 
-void Mod::Properties::setChannels(int channels)
-{
+////////////////////////////////////////////////////////////////////////////////
+// private members
+////////////////////////////////////////////////////////////////////////////////
+
+void Mod::AudioProperties::setChannels(int channels) {
   d->channels = channels;
 }
 
-void Mod::Properties::setInstrumentCount(unsigned int instrumentCount)
-{
+void Mod::AudioProperties::setInstrumentCount(unsigned int instrumentCount) {
   d->instrumentCount = instrumentCount;
 }
 
-void Mod::Properties::setLengthInPatterns(unsigned char lengthInPatterns)
-{
+void Mod::AudioProperties::setLengthInPatterns(unsigned char lengthInPatterns) {
   d->lengthInPatterns = lengthInPatterns;
 }

3rdparty/taglib/mod/modproperties.h

@@ -31,43 +31,36 @@
 
 namespace Strawberry_TagLib {
 namespace TagLib {
+namespace Mod {
 
-  namespace Mod {
+class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
+  friend class File;
 
-    class TAGLIB_EXPORT Properties : public AudioProperties
-    {
-    public:
-      Properties(AudioProperties::ReadStyle propertiesStyle);
-      virtual ~Properties();
+ public:
+  explicit AudioProperties(AudioProperties::ReadStyle propertiesStyle);
+  ~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 int  instrumentCount()  const;
-      unsigned char lengthInPatterns() const;
+  unsigned int instrumentCount() const;
+  unsigned char lengthInPatterns() const;
 
-      void setChannels(int channels);
+ private:
+  void setChannels(int channels);
 
-      void setInstrumentCount(unsigned int sampleCount);
-      void setLengthInPatterns(unsigned char lengthInPatterns);
+  void setInstrumentCount(unsigned int instrumentCount);
+  void setLengthInPatterns(unsigned char lengthInPatterns);
 
-    private:
-      friend class File;
+  class AudioPropertiesPrivate;
+  AudioPropertiesPrivate *d;
+};
 
-      Properties(const Properties&);
-      Properties &operator=(const Properties&);
-
-      class PropertiesPrivate;
-      PropertiesPrivate *d;
-    };
-
-  }
-
-}
-}
+}  // namespace Mod
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/mod/modtag.cpp

@@ -27,148 +27,136 @@
 #include "modtag.h"
 #include "tstringlist.h"
 #include "tpropertymap.h"
+#include "tpicturemap.h"
 
 using namespace Strawberry_TagLib::TagLib;
 using namespace Mod;
 
-class Mod::Tag::TagPrivate
-{
-public:
-  TagPrivate()
-  {
-  }
+class Mod::Tag::TagPrivate {
+ public:
+  explicit TagPrivate() {}
 
   String title;
   String comment;
   String trackerName;
 };
 
-Mod::Tag::Tag() :
-  Strawberry_TagLib::TagLib::Tag(),
-  d(new TagPrivate())
-{
-}
+Mod::Tag::Tag() : d(new TagPrivate()) {}
 
-Mod::Tag::~Tag()
-{
+Mod::Tag::~Tag() {
   delete d;
 }
 
-String Mod::Tag::title() const
-{
+String Mod::Tag::title() const {
   return d->title;
 }
 
-String Mod::Tag::artist() const
-{
+String Mod::Tag::artist() const {
   return String();
 }
 
-String Mod::Tag::album() const
-{
+String Mod::Tag::album() const {
   return String();
 }
 
-String Mod::Tag::comment() const
-{
+String Mod::Tag::comment() const {
   return d->comment;
 }
 
-String Mod::Tag::genre() const
-{
+String Mod::Tag::genre() const {
   return String();
 }
 
-unsigned int Mod::Tag::year() const
-{
+unsigned int Mod::Tag::year() const {
   return 0;
 }
 
-unsigned int Mod::Tag::track() const
-{
+unsigned int Mod::Tag::track() const {
   return 0;
 }
 
-String Mod::Tag::trackerName() const
-{
+Strawberry_TagLib::TagLib::PictureMap Mod::Tag::pictures() const {
+  return PictureMap();
+}
+
+String Mod::Tag::trackerName() const {
   return d->trackerName;
 }
 
-void Mod::Tag::setTitle(const String &title)
-{
+void Mod::Tag::setTitle(const String &title) {
   d->title = title;
 }
 
-void Mod::Tag::setArtist(const String &)
-{
+void Mod::Tag::setArtist(const String &) {
 }
 
-void Mod::Tag::setAlbum(const String &)
-{
+void Mod::Tag::setAlbum(const String &) {
 }
 
-void Mod::Tag::setComment(const String &comment)
-{
+void Mod::Tag::setComment(const String &comment) {
   d->comment = comment;
 }
 
-void Mod::Tag::setGenre(const String &)
-{
+void Mod::Tag::setGenre(const String &) {
 }
 
-void Mod::Tag::setYear(unsigned int)
-{
+void Mod::Tag::setYear(unsigned int) {
 }
 
-void Mod::Tag::setTrack(unsigned int)
-{
+void Mod::Tag::setTrack(unsigned int) {
 }
 
-void Mod::Tag::setTrackerName(const String &trackerName)
-{
+void Mod::Tag::setPictures(const PictureMap&) {}
+
+void Mod::Tag::setTrackerName(const String &trackerName) {
   d->trackerName = trackerName;
 }
 
-PropertyMap Mod::Tag::properties() const
-{
+PropertyMap Mod::Tag::properties() const {
+
   PropertyMap properties;
   properties["TITLE"] = d->title;
   properties["COMMENT"] = d->comment;
-  if(!(d->trackerName.isEmpty()))
+  if (!(d->trackerName.isEmpty()))
     properties["TRACKERNAME"] = d->trackerName;
   return properties;
+
 }
 
-PropertyMap Mod::Tag::setProperties(const PropertyMap &origProps)
-{
+PropertyMap Mod::Tag::setProperties(const PropertyMap &origProps) {
+
   PropertyMap properties(origProps);
   properties.removeEmpty();
   StringList oneValueSet;
-  if(properties.contains("TITLE")) {
+  if (properties.contains("TITLE")) {
     d->title = properties["TITLE"].front();
     oneValueSet.append("TITLE");
-  } else
+  }
+  else
     d->title.clear();
 
-  if(properties.contains("COMMENT")) {
+  if (properties.contains("COMMENT")) {
     d->comment = properties["COMMENT"].front();
     oneValueSet.append("COMMENT");
-  } else
+  }
+  else
     d->comment.clear();
 
-  if(properties.contains("TRACKERNAME")) {
+  if (properties.contains("TRACKERNAME")) {
     d->trackerName = properties["TRACKERNAME"].front();
     oneValueSet.append("TRACKERNAME");
-  } else
+  }
+  else
     d->trackerName.clear();
 
   // for each tag that has been set above, remove the first entry in the corresponding
   // value list. The others will be returned as unsupported by this format.
-  for(StringList::ConstIterator it = oneValueSet.begin(); it != oneValueSet.end(); ++it) {
-    if(properties[*it].size() == 1)
+  for (StringList::ConstIterator it = oneValueSet.begin(); it != oneValueSet.end(); ++it) {
+    if (properties[*it].size() == 1)
       properties.erase(*it);
     else
-      properties[*it].erase( properties[*it].begin() );
+      properties[*it].erase(properties[*it].begin());
   }
   return properties;
+
 }

3rdparty/taglib/mod/modtag.h

@@ -30,167 +30,157 @@
 
 namespace Strawberry_TagLib {
 namespace TagLib {
+namespace Mod {
 
-  namespace Mod {
+/*!
+ * Tags for module files (Mod, S3M, IT, XM).
+ *
+ * Note that only the \a title is supported as such by most module file formats.
+ * Except for XM files the \a trackerName is derived from the file format or the flavour of the file format.
+ * For XM files it is stored in the file.
+ *
+ * The \a comment tag is not strictly supported by module files,
+ * but it is common practice to abuse instrument/sample/pattern names as multiline comments.
+ * TagLib does so as well.
+ *
+ */
+class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag {
+ public:
+  explicit Tag();
+  ~Tag() override;
 
-    /*!
-     * Tags for module files (Mod, S3M, IT, XM).
-     *
-     * Note that only the \a title is supported as such by most
-     * module file formats.  Except for XM files the \a trackerName
-     * is derived from the file format or the flavour of the file
-     * format.  For XM files it is stored in the file.
-     *
-     * The \a comment tag is not strictly supported by module files,
-     * but it is common practice to abuse instrument/sample/pattern
-     * names as multiline comments.  TagLib does so as well.
-     */
-    class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag
-    {
-    public:
-      Tag();
-      virtual ~Tag();
+  /*!
+   * Returns the track name; if no track name is present in the tag String::null will be returned.
+   */
+  String title() const override;
 
-      /*!
-       * Returns the track name; if no track name is present in the tag
-       * String::null will be returned.
-       */
-      virtual String title() const;
+  /*!
+   * Not supported by module files.  Therefore always returns String::null.
+   */
+  String artist() const override;
 
-      /*!
-       * Not supported by module files.  Therefore always returns String::null.
-       */
-      virtual String artist() const;
+  /*!
+   * Not supported by module files.  Therefore always returns String::null.
+   */
+  String album() const override;
 
-      /*!
-       * Not supported by module files.  Therefore always returns String::null.
-       */
-      virtual String album() const;
+  /*!
+   * Returns the track comment derived from the instrument/sample/pattern
+   * names; if no comment is present in the tag String::null will be returned.
+   */
+  String comment() const override;
 
-      /*!
-       * Returns the track comment derived from the instrument/sample/pattern
-       * names; if no comment is present in the tag String::null will be
-       * returned.
-       */
-      virtual String comment() const;
+  /*!
+   * Not supported by module files.  Therefore always returns String::null.
+   */
+  String genre() const override;
 
-      /*!
-       * Not supported by module files.  Therefore always returns String::null.
-       */
-      virtual String genre() const;
+  /*!
+   * Not supported by module files.  Therefore always returns 0.
+   */
+  unsigned int year() const override;
 
-      /*!
-       * Not supported by module files.  Therefore always returns 0.
-       */
-      virtual unsigned int year() const;
+  /*!
+   * Not supported by module files.  Therefore always returns 0.
+   */
+  unsigned int track() const override;
 
-      /*!
-       * Not supported by module files.  Therefore always returns 0.
-       */
-      virtual unsigned int track() const;
+  PictureMap pictures() const override;
 
-      /*!
-       * Returns the name of the tracker used to create/edit the module file.
-       * Only XM files store this tag to the file as such, for other formats
-       * (Mod, S3M, IT) this is derived from the file type or the flavour of
-       * the file type.  Therefore only XM files might have an empty
-       * (String::null) tracker name.
-       */
-      String trackerName() const;
+  /*!
+   * Returns the name of the tracker used to create/edit the module file.
+   * Only XM files store this tag to the file as such, for other formats
+   * (Mod, S3M, IT) this is derived from the file type or the flavour of the file type.
+   * Therefore only XM files might have an empty (String::null) tracker name.
+   */
+  String trackerName() const;
 
-      /*!
-       * Sets the title to \a title.  If \a title is String::null then this
-       * value will be cleared.
-       *
-       * The length limits per file type are (1 character = 1 byte):
-       * Mod 20 characters, S3M 27 characters, IT 25 characters and XM 20
-       * characters.
-       */
-      virtual void setTitle(const String &title);
+  /*!
+   * Sets the title to \a title.
+   * If \a title is String::null then this value will be cleared.
+   *
+   * The length limits per file type are (1 character = 1 byte):
+   * Mod 20 characters, S3M 27 characters, IT 25 characters and XM 20 characters.
+   */
+  void setTitle(const String &title) override;
 
-      /*!
-       * Not supported by module files and therefore ignored.
-       */
-      virtual void setArtist(const String &artist);
+  /*!
+   * Not supported by module files and therefore ignored.
+   */
+  void setArtist(const String &artist) override;
 
-      /*!
-       * Not supported by module files and therefore ignored.
-       */
-      virtual void setAlbum(const String &album);
+  /*!
+   * Not supported by module files and therefore ignored.
+   */
+  void setAlbum(const String &album) override;
 
-      /*!
-       * Sets the comment to \a comment.  If \a comment is String::null then
-       * this value will be cleared.
-       *
-       * Note that module file formats don't actually support a comment tag.
-       * Instead the names of instruments/patterns/samples are abused as
-       * a multiline comment. Because of this the number of lines in a
-       * module file is fixed to the number of instruments/patterns/samples.
-       *
-       * Also note that the instrument/pattern/sample name length is limited
-       * an thus the line length in comments are limited. Too big comments
-       * will be truncated.
-       *
-       * The line length limits per file type are (1 character = 1 byte):
-       * Mod 22 characters, S3M 27 characters, IT 25 characters and XM 22
-       * characters.
-       */
-      virtual void setComment(const String &comment);
+  /*!
+   * Sets the comment to \a comment.
+   * If \a comment is String::null then this value will be cleared.
+   *
+   * Note that module file formats don't actually support a comment tag.
+   * Instead the names of instruments/patterns/samples are abused as a multiline comment.
+   * Because of this the number of lines in a module file is fixed to the number of instruments/patterns/samples.
+   *
+   * Also note that the instrument/pattern/sample name length is limited an thus the line length in comments are limited.
+   * Too big comments will be truncated.
+   *
+   * The line length limits per file type are (1 character = 1 byte):
+   * Mod 22 characters, S3M 27 characters, IT 25 characters and XM 22 characters.
+   */
+  void setComment(const String &comment) override;
 
-      /*!
-       * Not supported by module files and therefore ignored.
-       */
-      virtual void setGenre(const String &genre);
+  /*!
+   * Not supported by module files and therefore ignored.
+   */
+  void setGenre(const String &genre) override;
 
-      /*!
-       * Not supported by module files and therefore ignored.
-       */
-      virtual void setYear(unsigned int year);
+  /*!
+   * Not supported by module files and therefore ignored.
+   */
+  void setYear(unsigned int year) override;
 
-      /*!
-       * Not supported by module files and therefore ignored.
-       */
-      virtual void setTrack(unsigned int track);
+  /*!
+   * Not supported by module files and therefore ignored.
+   */
+  void setTrack(unsigned int track) override;
 
-      /*!
-       * Sets the tracker name to \a trackerName.  If \a trackerName is
-       * String::null then this value will be cleared.
-       *
-       * Note that only XM files support this tag.  Setting the
-       * tracker name for other module file formats will be ignored.
-       *
-       * The length of this tag is limited to 20 characters (1 character
-       * = 1 byte).
-       */
-      void setTrackerName(const String &trackerName);
+  void setPictures(const PictureMap &l) override;
 
-      /*!
-       * Implements the unified property interface -- export function.
-       * Since the module tag is very limited, the exported map is as well.
-       */
-      PropertyMap properties() const;
+  /*!
+   * Sets the tracker name to \a trackerName.
+   * If \a trackerName is String::null then this value will be cleared.
+   *
+   * Note that only XM files support this tag.
+   * Setting the tracker name for other module file formats will be ignored.
+   *
+   * The length of this tag is limited to 20 characters (1 character = 1 byte).
+   */
+  void setTrackerName(const String &trackerName);
 
-      /*!
-       * Implements the unified property interface -- import function.
-       * Because of the limitations of the module file tag, any tags besides
-       * COMMENT, TITLE and, if it is an XM file, TRACKERNAME, 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 &);
+  /*!
+   * Implements the unified property interface -- export function.
+   * Since the module tag is very limited, the exported map is as well.
+   */
+  PropertyMap properties() const override;
 
-    private:
-      Tag(const Tag &);
-      Tag &operator=(const Tag &);
+  /*!
+   * Implements the unified property interface -- import function.
+   * Because of the limitations of the module file tag, any tags besides COMMENT, TITLE and, if it is an XM file, TRACKERNAME, 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 &) override;
 
-      class TagPrivate;
-      TagPrivate *d;
-    };
+ private:
+  Tag(const Tag&);
+  Tag &operator=(const Tag&);
 
-  }
+  class TagPrivate;
+  TagPrivate *d;
+};
 
-}
-}
+}  // namespace Mod
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/mp4/mp4atom.cpp

@@ -25,25 +25,21 @@
 
 #include <climits>
 
-#include <tdebug.h>
-#include <tstring.h>
+#include "tdebug.h"
+#include "tstring.h"
 #include "mp4atom.h"
 
 using namespace Strawberry_TagLib::TagLib;
 
-const char *MP4::Atom::containers[11] = {
-    "moov", "udta", "mdia", "meta", "ilst",
-    "stbl", "minf", "moof", "traf", "trak",
-    "stsd"
-};
+const char *MP4::Atom::containers[11] = { "moov", "udta", "mdia", "meta", "ilst", "stbl", "minf", "moof", "traf", "trak", "stsd" };
+
+MP4::Atom::Atom(File *file) {
 
-MP4::Atom::Atom(File *file)
-{
   children.setAutoDelete(true);
 
   offset = file->tell();
   ByteVector header = file->readBlock(8);
-  if(header.size() != 8) {
+  if (header.size() != 8) {
     // The atom header must be 8 bytes long, otherwise there is either
     // trailing garbage or the file is truncated
     debug("MP4: Couldn't read 8 bytes of data for atom header");
@@ -52,28 +48,18 @@ MP4::Atom::Atom(File *file)
     return;
   }
 
-  length = header.toUInt();
+  length = header.toUInt32BE(0);
 
-  if(length == 0) {
+  if (length == 0) {
     // The last atom which extends to the end of the file.
     length = file->length() - offset;
   }
-  else if(length == 1) {
+  else if (length == 1) {
     // The atom has a 64-bit length.
-    const long long longLength = file->readBlock(8).toLongLong();
-    if(longLength <= LONG_MAX) {
-      // The actual length fits in long. That's always the case if long is 64-bit.
-      length = static_cast<long>(longLength);
-    }
-    else {
-      debug("MP4: 64-bit atoms are not supported");
-      length = 0;
-      file->seek(0, File::End);
-      return;
-    }
+    length = file->readBlock(8).toInt64BE(0);
   }
 
-  if(length < 8) {
+  if (length < 8) {
     debug("MP4: Invalid atom size");
     length = 0;
     file->seek(0, File::End);
@@ -82,18 +68,18 @@ MP4::Atom::Atom(File *file)
 
   name = header.mid(4, 4);
 
-  for(int i = 0; i < numContainers; i++) {
-    if(name == containers[i]) {
-      if(name == "meta") {
+  for (int i = 0; i < numContainers; i++) {
+    if (name == containers[i]) {
+      if (name == "meta") {
         file->seek(4, File::Current);
       }
-      else if(name == "stsd") {
+      else if (name == "stsd") {
         file->seek(8, File::Current);
       }
-      while(file->tell() < offset + length) {
+      while (file->tell() < offset + length) {
         MP4::Atom *child = new MP4::Atom(file);
         children.append(child);
-        if(child->length == 0)
+        if (child->length == 0)
           return;
       }
       return;
@@ -101,97 +87,95 @@ MP4::Atom::Atom(File *file)
   }
 
   file->seek(offset + length);
+
 }
 
-MP4::Atom::~Atom()
-{
-}
+MP4::Atom::~Atom() {}
 
-MP4::Atom *
-MP4::Atom::find(const char *name1, const char *name2, const char *name3, const char *name4)
-{
-  if(name1 == 0) {
+MP4::Atom *MP4::Atom::find(const char *name1, const char *name2, const char *name3, const char *name4) {
+
+  if (!name1) {
     return this;
   }
-  for(AtomList::ConstIterator it = children.begin(); it != children.end(); ++it) {
-    if((*it)->name == name1) {
+  for (AtomList::ConstIterator it = children.begin(); it != children.end(); ++it) {
+    if ((*it)->name == name1) {
       return (*it)->find(name2, name3, name4);
     }
   }
   return nullptr;
+
 }
 
-MP4::AtomList
-MP4::Atom::findall(const char *name, bool recursive)
-{
+MP4::AtomList MP4::Atom::findall(const char *_name, bool recursive) {
+
   MP4::AtomList result;
-  for(AtomList::ConstIterator it = children.begin(); it != children.end(); ++it) {
-    if((*it)->name == name) {
+  for (AtomList::ConstIterator it = children.begin(); it != children.end(); ++it) {
+    if ((*it)->name == _name) {
       result.append(*it);
     }
-    if(recursive) {
-      result.append((*it)->findall(name, recursive));
+    if (recursive) {
+      result.append((*it)->findall(_name, recursive));
     }
   }
   return result;
+
 }
 
-bool
-MP4::Atom::path(MP4::AtomList &path, const char *name1, const char *name2, const char *name3)
-{
+bool MP4::Atom::path(MP4::AtomList &path, const char *name1, const char *name2, const char *name3) {
+
   path.append(this);
-  if(name1 == 0) {
+  if (!name1) {
     return true;
   }
-  for(AtomList::ConstIterator it = children.begin(); it != children.end(); ++it) {
-    if((*it)->name == name1) {
+  for (AtomList::ConstIterator it = children.begin(); it != children.end(); ++it) {
+    if ((*it)->name == name1) {
       return (*it)->path(path, name2, name3);
     }
   }
   return false;
+
 }
 
-MP4::Atoms::Atoms(File *file)
-{
+MP4::Atoms::Atoms(File *file) {
+
   atoms.setAutoDelete(true);
 
   file->seek(0, File::End);
-  long end = file->tell();
+  long long end = file->tell();
   file->seek(0);
-  while(file->tell() + 8 <= end) {
+  while (file->tell() + 8 <= end) {
     MP4::Atom *atom = new MP4::Atom(file);
     atoms.append(atom);
     if (atom->length == 0)
       break;
   }
+
 }
 
-MP4::Atoms::~Atoms()
-{
-}
+MP4::Atoms::~Atoms() {}
 
-MP4::Atom *
-MP4::Atoms::find(const char *name1, const char *name2, const char *name3, const char *name4)
-{
-  for(AtomList::ConstIterator it = atoms.begin(); it != atoms.end(); ++it) {
-    if((*it)->name == name1) {
+MP4::Atom *MP4::Atoms::find(const char *name1, const char *name2, const char *name3, const char *name4) {
+
+  for (AtomList::ConstIterator it = atoms.begin(); it != atoms.end(); ++it) {
+    if ((*it)->name == name1) {
       return (*it)->find(name2, name3, name4);
     }
   }
   return nullptr;
+
 }
 
-MP4::AtomList
-MP4::Atoms::path(const char *name1, const char *name2, const char *name3, const char *name4)
-{
+MP4::AtomList MP4::Atoms::path(const char *name1, const char *name2, const char *name3, const char *name4) {
+
   MP4::AtomList path;
-  for(AtomList::ConstIterator it = atoms.begin(); it != atoms.end(); ++it) {
-    if((*it)->name == name1) {
-      if(!(*it)->path(path, name2, name3, name4)) {
+  for (AtomList::ConstIterator it = atoms.begin(); it != atoms.end(); ++it) {
+    if ((*it)->name == name1) {
+      if (!(*it)->path(path, name2, name3, name4)) {
         path.clear();
       }
       return path;
     }
   }
   return path;
+
 }

3rdparty/taglib/mp4/mp4atom.h

@@ -27,87 +27,85 @@
 
 #ifndef DO_NOT_DOCUMENT
 
-#ifndef TAGLIB_MP4ATOM_H
-#define TAGLIB_MP4ATOM_H
+#  ifndef TAGLIB_MP4ATOM_H
+#    define TAGLIB_MP4ATOM_H
 
-#include "tfile.h"
-#include "tlist.h"
+#    include "tfile.h"
+#    include "tlist.h"
 
 namespace Strawberry_TagLib {
 namespace TagLib {
+namespace MP4 {
 
-  namespace MP4 {
+class Atom;
+typedef Strawberry_TagLib::TagLib::List<Atom *> AtomList;
 
-    class Atom;
-    typedef Strawberry_TagLib::TagLib::List<Atom *> AtomList;
+enum AtomDataType {
+  TypeImplicit = 0,    // for use with tags for which no type needs to be indicated because only one type is allowed
+  TypeUTF8 = 1,        // without any count or null terminator
+  TypeUTF16 = 2,       // also known as UTF-16BE
+  TypeSJIS = 3,        // deprecated unless it is needed for special Japanese characters
+  TypeHTML = 6,        // the HTML file header specifies which HTML version
+  TypeXML = 7,         // the XML header must identify the DTD or schemas
+  TypeUUID = 8,        // also known as GUID; stored as 16 bytes in binary (valid as an ID)
+  TypeISRC = 9,        // stored as UTF-8 text (valid as an ID)
+  TypeMI3P = 10,       // stored as UTF-8 text (valid as an ID)
+  TypeGIF = 12,        // (deprecated) a GIF image
+  TypeJPEG = 13,       // a JPEG image
+  TypePNG = 14,        // a PNG image
+  TypeURL = 15,        // absolute, in UTF-8 characters
+  TypeDuration = 16,   // in milliseconds, 32-bit integer
+  TypeDateTime = 17,   // in UTC, counting seconds since midnight, January 1, 1904; 32 or 64-bits
+  TypeGenred = 18,     // a list of enumerated values
+  TypeInteger = 21,    // a signed big-endian integer with length one of { 1,2,3,4,8 } bytes
+  TypeRIAAPA = 24,     // RIAA parental advisory; { -1=no, 1=yes, 0=unspecified }, 8-bit integer
+  TypeUPC = 25,        // Universal Product Code, in text UTF-8 format (valid as an ID)
+  TypeBMP = 27,        // Windows bitmap image
+  TypeUndefined = 255  // undefined
+};
 
-    enum AtomDataType
-    {
-      TypeImplicit  = 0,  // for use with tags for which no type needs to be indicated because only one type is allowed
-      TypeUTF8      = 1,  // without any count or null terminator
-      TypeUTF16     = 2,  // also known as UTF-16BE
-      TypeSJIS      = 3,  // deprecated unless it is needed for special Japanese characters
-      TypeHTML      = 6,  // the HTML file header specifies which HTML version
-      TypeXML       = 7,  // the XML header must identify the DTD or schemas
-      TypeUUID      = 8,  // also known as GUID; stored as 16 bytes in binary (valid as an ID)
-      TypeISRC      = 9,  // stored as UTF-8 text (valid as an ID)
-      TypeMI3P      = 10, // stored as UTF-8 text (valid as an ID)
-      TypeGIF       = 12, // (deprecated) a GIF image
-      TypeJPEG      = 13, // a JPEG image
-      TypePNG       = 14, // a PNG image
-      TypeURL       = 15, // absolute, in UTF-8 characters
-      TypeDuration  = 16, // in milliseconds, 32-bit integer
-      TypeDateTime  = 17, // in UTC, counting seconds since midnight, January 1, 1904; 32 or 64-bits
-      TypeGenred    = 18, // a list of enumerated values
-      TypeInteger   = 21, // a signed big-endian integer with length one of { 1,2,3,4,8 } bytes
-      TypeRIAAPA    = 24, // RIAA parental advisory; { -1=no, 1=yes, 0=unspecified }, 8-bit integer
-      TypeUPC       = 25, // Universal Product Code, in text UTF-8 format (valid as an ID)
-      TypeBMP       = 27, // Windows bitmap image
-      TypeUndefined = 255 // undefined
-    };
+struct AtomData {
+  explicit AtomData(AtomDataType _type, ByteVector _data) : type(_type), locale(0), data(_data) {}
+  AtomDataType type;
+  int locale;
+  ByteVector data;
+};
 
-    struct AtomData {
-      AtomData(AtomDataType type, ByteVector data) : type(type), locale(0), data(data) {}
-      AtomDataType type;
-      int locale;
-      ByteVector data;
-    };
+typedef Strawberry_TagLib::TagLib::List<AtomData> AtomDataList;
 
-    typedef Strawberry_TagLib::TagLib::List<AtomData> AtomDataList;
+class Atom {
+ public:
+  explicit Atom(File *file);
+  ~Atom();
 
-    class Atom
-    {
-    public:
-      Atom(File *file);
-      ~Atom();
-      Atom *find(const char *name1, const char *name2 = 0, const char *name3 = 0, const char *name4 = 0);
-      bool path(AtomList &path, const char *name1, const char *name2 = 0, const char *name3 = 0);
-      AtomList findall(const char *name, bool recursive = false);
-      long offset;
-      long length;
-      Strawberry_TagLib::TagLib::ByteVector name;
-      AtomList children;
-    private:
-      static const int numContainers = 11;
-      static const char *containers[11];
-    };
+  Atom *find(const char *name1, const char *name2 = nullptr, const char *name3 = nullptr, const char *name4 = nullptr);
+  bool path(AtomList &path, const char *name1, const char *name2 = nullptr, const char *name3 = nullptr);
+  AtomList findall(const char *name, bool recursive = false);
+  long long offset;
+  long long length;
+  Strawberry_TagLib::TagLib::ByteVector name;
+  AtomList children;
 
-    //! Root-level atoms
-    class Atoms
-    {
-    public:
-      Atoms(File *file);
-      ~Atoms();
-      Atom *find(const char *name1, const char *name2 = 0, const char *name3 = 0, const char *name4 = 0);
-      AtomList path(const char *name1, const char *name2 = 0, const char *name3 = 0, const char *name4 = 0);
-      AtomList atoms;
-    };
+ private:
+  static const int numContainers = 11;
+  static const char *containers[11];
+};
 
-  }
+//! Root-level atoms
+class Atoms {
+ public:
+  explicit Atoms(File *file);
+  ~Atoms();
 
-}
-}
-
-#endif
+  Atom *find(const char *name1, const char *name2 = nullptr, const char *name3 = nullptr, const char *name4 = nullptr);
+  AtomList path(const char *name1, const char *name2 = nullptr, const char *name3 = nullptr, const char *name4 = nullptr);
+  AtomList atoms;
+};
+
+}  // namespace MP4
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
+
+#  endif
 
 #endif

3rdparty/taglib/mp4/mp4coverart.cpp

@@ -23,71 +23,63 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <taglib.h>
-#include <tdebug.h>
-#include "trefcounter.h"
+#include <memory>
+
+#include "taglib.h"
+#include "tdebug.h"
 #include "mp4coverart.h"
 
 using namespace Strawberry_TagLib::TagLib;
 
-class MP4::CoverArt::CoverArtPrivate : public RefCounter
-{
-public:
-  CoverArtPrivate() :
-    RefCounter(),
-    format(MP4::CoverArt::JPEG) {}
+namespace {
 
-  Format format;
+struct CoverArtData {
+  MP4::CoverArt::Format format;
   ByteVector data;
 };
 
+}  // namespace
+
+class MP4::CoverArt::CoverArtPrivate {
+ public:
+  explicit CoverArtPrivate(Format f, const ByteVector &v) : data(new CoverArtData()) {
+    data->format = f;
+    data->data = v;
+  }
+
+  std::shared_ptr<CoverArtData> data;
+};
+
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-MP4::CoverArt::CoverArt(Format format, const ByteVector &data) :
-  d(new CoverArtPrivate())
-{
-  d->format = format;
-  d->data = data;
-}
+MP4::CoverArt::CoverArt(Format format, const ByteVector &data) : d(new CoverArtPrivate(format, data)) {}
 
-MP4::CoverArt::CoverArt(const CoverArt &item) :
-  d(item.d)
-{
-  d->ref();
-}
+MP4::CoverArt::CoverArt(const CoverArt &item) : d(new CoverArtPrivate(*item.d)) {}
 
 MP4::CoverArt &
-MP4::CoverArt::operator=(const CoverArt &item)
-{
+MP4::CoverArt::operator=(const CoverArt &item) {
   CoverArt(item).swap(*this);
   return *this;
 }
 
-void
-MP4::CoverArt::swap(CoverArt &item)
-{
+void MP4::CoverArt::swap(CoverArt &item) {
   using std::swap;
 
   swap(d, item.d);
 }
 
-MP4::CoverArt::~CoverArt()
-{
-  if(d->deref()) {
-    delete d;
-  }
+MP4::CoverArt::~CoverArt() {
+  delete d;
 }
 
 MP4::CoverArt::Format
-MP4::CoverArt::format() const
-{
-  return d->format;
+MP4::CoverArt::format() const {
+  return d->data->format;
 }
 
 ByteVector
-MP4::CoverArt::data() const
-{
-  return d->data;
+MP4::CoverArt::data() const {
+  return d->data->data;
 }

3rdparty/taglib/mp4/mp4coverart.h

@@ -33,54 +33,51 @@
 
 namespace Strawberry_TagLib {
 namespace TagLib {
+namespace MP4 {
 
-  namespace MP4 {
+class TAGLIB_EXPORT CoverArt {
+ public:
+  /*!
+   * This describes the image type.
+   */
+  enum Format {
+    JPEG = TypeJPEG,
+    PNG = TypePNG,
+    BMP = TypeBMP,
+    GIF = TypeGIF,
+    Unknown = TypeImplicit,
+  };
 
-    class TAGLIB_EXPORT CoverArt
-    {
-    public:
-      /*!
-       * This describes the image type.
-       */
-      enum Format {
-        JPEG    = TypeJPEG,
-        PNG     = TypePNG,
-        BMP     = TypeBMP,
-        GIF     = TypeGIF,
-        Unknown = TypeImplicit,
-      };
+  explicit CoverArt(Format format, const ByteVector &data);
+  ~CoverArt();
 
-      CoverArt(Format format, const ByteVector &data);
-      ~CoverArt();
+  CoverArt(const CoverArt &item);
 
-      CoverArt(const CoverArt &item);
+  /*!
+   * Copies the contents of \a item into this CoverArt.
+   */
+  CoverArt &operator=(const CoverArt &item);
 
-      /*!
-       * Copies the contents of \a item into this CoverArt.
-       */
-      CoverArt &operator=(const CoverArt &item);
+  /*!
+   * Exchanges the content of the CoverArt by the content of \a item.
+   */
+  void swap(CoverArt &item);
 
-      /*!
-       * Exchanges the content of the CoverArt by the content of \a item.
-       */
-      void swap(CoverArt &item);
+  //! Format of the image
+  Format format() const;
 
-      //! Format of the image
-      Format format() const;
+  //! The image data
+  ByteVector data() const;
 
-      //! The image data
-      ByteVector data() const;
+ private:
+  class CoverArtPrivate;
+  CoverArtPrivate *d;
+};
 
-    private:
-      class CoverArtPrivate;
-      CoverArtPrivate *d;
-    };
+typedef List<CoverArt> CoverArtList;
 
-    typedef List<CoverArt> CoverArtList;
-
-  }
-
-}
-}
+}  // namespace MP4
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/mp4/mp4file.cpp

@@ -23,10 +23,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tstring.h>
-#include <tpropertymap.h>
-#include <tagutils.h>
+#include "tdebug.h"
+#include "tstring.h"
+#include "tpropertymap.h"
+#include "tagutils.h"
 
 #include "mp4atom.h"
 #include "mp4tag.h"
@@ -34,149 +34,123 @@
 
 using namespace Strawberry_TagLib::TagLib;
 
-namespace
-{
-  bool checkValid(const MP4::AtomList &list)
-  {
-    for(MP4::AtomList::ConstIterator it = list.begin(); it != list.end(); ++it) {
+namespace {
+bool checkValid(const MP4::AtomList &list) {
 
-      if((*it)->length == 0)
-        return false;
+  for (MP4::AtomList::ConstIterator it = list.begin(); it != list.end(); ++it) {
 
-      if(!checkValid((*it)->children))
-        return false;
-    }
+    if ((*it)->length == 0)
+      return false;
 
-    return true;
+    if (!checkValid((*it)->children))
+      return false;
   }
+
+  return true;
+
 }
+}  // namespace
 
-class MP4::File::FilePrivate
-{
-public:
-  FilePrivate() :
-    tag(0),
-    atoms(0),
-    properties(0) {}
+class MP4::File::FilePrivate {
+ public:
+  explicit FilePrivate() : tag(nullptr), atoms(nullptr), properties(nullptr) {}
 
-  ~FilePrivate()
-  {
+  ~FilePrivate() {
     delete atoms;
     delete tag;
     delete properties;
   }
 
-  MP4::Tag        *tag;
-  MP4::Atoms      *atoms;
-  MP4::Properties *properties;
+  MP4::Tag *tag;
+  MP4::Atoms *atoms;
+  MP4::AudioProperties *properties;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // static members
 ////////////////////////////////////////////////////////////////////////////////
 
-bool MP4::File::isSupported(IOStream *stream)
-{
+bool MP4::File::isSupported(IOStream *stream) {
+
   // An MP4 file has to have an "ftyp" box first.
 
   const ByteVector id = Utils::readHeader(stream, 8, false);
   return id.containsAt("ftyp", 4);
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-MP4::File::File(FileName file, bool readProperties, AudioProperties::ReadStyle) :
-  Strawberry_TagLib::TagLib::File(file),
-  d(new FilePrivate())
-{
-  if(isOpen())
+MP4::File::File(FileName file, bool readProperties, AudioProperties::ReadStyle) : Strawberry_TagLib::TagLib::File(file), d(new FilePrivate()) {
+
+  if (isOpen())
     read(readProperties);
+
 }
 
-MP4::File::File(IOStream *stream, bool readProperties, AudioProperties::ReadStyle) :
-  Strawberry_TagLib::TagLib::File(stream),
-  d(new FilePrivate())
-{
-  if(isOpen())
+MP4::File::File(IOStream *stream, bool readProperties, AudioProperties::ReadStyle) : Strawberry_TagLib::TagLib::File(stream), d(new FilePrivate()) {
+
+  if (isOpen())
     read(readProperties);
+
 }
 
-MP4::File::~File()
-{
+MP4::File::~File() {
   delete d;
 }
 
 MP4::Tag *
-MP4::File::tag() const
-{
+MP4::File::tag() const {
   return d->tag;
 }
 
-PropertyMap MP4::File::properties() const
-{
-  return d->tag->properties();
-}
-
-void MP4::File::removeUnsupportedProperties(const StringList &properties)
-{
-  d->tag->removeUnsupportedProperties(properties);
-}
-
-PropertyMap MP4::File::setProperties(const PropertyMap &properties)
-{
-  return d->tag->setProperties(properties);
-}
-
-MP4::Properties *
-MP4::File::audioProperties() const
-{
+MP4::AudioProperties *
+MP4::File::audioProperties() const {
   return d->properties;
 }
 
-void
-MP4::File::read(bool readProperties)
-{
-  if(!isValid())
+void MP4::File::read(bool readProperties) {
+
+  if (!isValid())
     return;
 
   d->atoms = new Atoms(this);
-  if(!checkValid(d->atoms->atoms)) {
+  if (!checkValid(d->atoms->atoms)) {
     setValid(false);
     return;
   }
 
   // must have a moov atom, otherwise consider it invalid
-  if(!d->atoms->find("moov")) {
+  if (!d->atoms->find("moov")) {
     setValid(false);
     return;
   }
 
   d->tag = new Tag(this, d->atoms);
-  if(readProperties) {
-    d->properties = new Properties(this, d->atoms);
+  if (readProperties) {
+    d->properties = new AudioProperties(this, d->atoms);
   }
+
 }
 
-bool
-MP4::File::save()
-{
-  if(readOnly()) {
+bool MP4::File::save() {
+
+  if (readOnly()) {
     debug("MP4::File::save() -- File is read only.");
     return false;
   }
 
-  if(!isValid()) {
+  if (!isValid()) {
     debug("MP4::File::save() -- Trying to save invalid file.");
     return false;
   }
 
   return d->tag->save();
+
 }
 
-bool
-MP4::File::hasMP4Tag() const
-{
-  return (d->atoms->find("moov", "udta", "meta", "ilst") != 0);
+bool MP4::File::hasMP4Tag() const {
+  return (d->atoms->find("moov", "udta", "meta", "ilst") != nullptr);
 }

3rdparty/taglib/mp4/mp4file.h

@@ -35,111 +35,86 @@
 namespace Strawberry_TagLib {
 namespace TagLib {
 
-  //! An implementation of MP4 (AAC, ALAC, ...) metadata
-  namespace MP4 {
+//! An implementation of MP4 (AAC, ALAC, ...) metadata
+namespace MP4 {
 
-    class Atoms;
+class Atoms;
 
-    /*!
-     * This implements and provides an interface for MP4 files to the
-     * 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 MP4 files.
-     */
-    class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File
-    {
-    public:
-      /*!
-       * Constructs an MP4 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 audioPropertiesStyle = Properties::Average);
+/*!
+ * This implements and provides an interface for MP4 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 MP4 files.
+ */
+class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File {
+ public:
+  /*!
+   * Constructs an MP4 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.
+   */
+  explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle audioPropertiesStyle = AudioProperties::Average);
 
-      /*!
-       * Constructs an MP4 file from \a stream.  If \a readProperties is true the
-       * file's audio properties will also be read.
-       *
-       * \note TagLib will *not* take ownership of the stream, the caller is
-       * responsible for deleting it after the File object.
-       *
-       * \note In the current implementation, \a propertiesStyle is ignored.
-       */
-      File(IOStream *stream, bool readProperties = true,
-           Properties::ReadStyle audioPropertiesStyle = Properties::Average);
+  /*!
+   * Constructs an MP4 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 audioPropertiesStyle = AudioProperties::Average);
 
-      /*!
-       * Destroys this instance of the File.
-       */
-      virtual ~File();
+  /*!
+   * Destroys this instance of the File.
+   */
+  ~File() override;
 
-      /*!
-       * Returns a pointer to the MP4 tag of the file.
-       *
-       * MP4::Tag implements the tag interface, so this serves as the
-       * reimplementation of Strawberry_TagLib::TagLib::File::tag().
-       *
-       * \note The Tag <b>is still</b> owned by the MP4::File and should not be
-       * deleted by the user.  It will be deleted when the file (object) is
-       * destroyed.
-       */
-      Tag *tag() const;
+  /*!
+   * Returns a pointer to the MP4 tag of the file.
+   *
+   * MP4::Tag implements the tag interface, so this serves as the reimplementation of TagLib::File::tag().
+   *
+   * \note The Tag <b>is still</b> owned by the MP4::File and should not be deleted by the user.
+   * It will be deleted when the file (object) is destroyed.
+   */
+  Tag *tag() const override;
 
-      /*!
-       * Implements the unified property interface -- export function.
-       */
-      PropertyMap properties() const;
+  /*!
+   * Returns the MP4 audio properties for this file.
+   */
+  AudioProperties *audioProperties() const override;
 
-      /*!
-       * Removes unsupported properties. Forwards to the actual Tag's
-       * removeUnsupportedProperties() function.
-       */
-      void removeUnsupportedProperties(const StringList &properties);
+  /*!
+   * Save the file.
+   *
+   * This returns true if the save was successful.
+   */
+  bool save() override;
 
-      /*!
-       * Implements the unified property interface -- import function.
-       */
-      PropertyMap setProperties(const PropertyMap &);
+  /*!
+   * Returns whether or not the file on disk actually has an MP4 tag, or the file has a Metadata Item List (ilst) atom.
+   */
+  bool hasMP4Tag() const;
 
-      /*!
-       * Returns the MP4 audio properties for this file.
-       */
-      Properties *audioProperties() const;
+  /*!
+   * 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.
+   */
+  static bool isSupported(IOStream *stream);
 
-      /*!
-       * Save the file.
-       *
-       * This returns true if the save was successful.
-       */
-      bool save();
+ private:
+  void read(bool readProperties);
 
-      /*!
-       * Returns whether or not the file on disk actually has an MP4 tag, or the
-       * file has a Metadata Item List (ilst) atom.
-       */
-      bool hasMP4Tag() const;
+  class FilePrivate;
+  FilePrivate *d;
+};
 
-      /*!
-       * 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.
-       */
-      static bool isSupported(IOStream *stream);
-
-    private:
-      void read(bool readProperties);
-
-      class FilePrivate;
-      FilePrivate *d;
-    };
-
-  }
-
-}
-}
+}  // namespace MP4
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/mp4/mp4item.cpp

@@ -23,27 +23,25 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <taglib.h>
-#include <tdebug.h>
-#include "trefcounter.h"
+#include <memory>
+
+#include "taglib.h"
+#include "tdebug.h"
 #include "mp4item.h"
+#include "tutils.h"
 
 using namespace Strawberry_TagLib::TagLib;
 
-class MP4::Item::ItemPrivate : public RefCounter
-{
-public:
-  ItemPrivate() :
-    RefCounter(),
-    valid(true),
-    atomDataType(TypeUndefined) {}
+namespace {
+struct ItemData {
 
   bool valid;
-  AtomDataType atomDataType;
+  MP4::AtomDataType atomDataType;
+  MP4::Item::ItemType type;
   union {
     bool m_bool;
     int m_int;
-    IntPair m_intPair;
+    MP4::Item::IntPair m_intPair;
     unsigned char m_byte;
     unsigned int m_uint;
     long long m_longlong;
@@ -52,161 +50,166 @@ public:
   ByteVectorList m_byteVectorList;
   MP4::CoverArtList m_coverArtList;
 };
+}  // namespace
 
-MP4::Item::Item() :
-  d(new ItemPrivate())
-{
-  d->valid = false;
+class MP4::Item::ItemPrivate {
+ public:
+  explicit ItemPrivate() : data(new ItemData()) {
+    data->valid = true;
+    data->atomDataType = MP4::TypeUndefined;
+    data->type = MP4::Item::TypeUndefined_;
+  }
+
+  std::shared_ptr<ItemData> data;
+};
+
+MP4::Item::Item() : d(new ItemPrivate()) {
+  d->data->valid = false;
 }
 
-MP4::Item::Item(const Item &item) :
-  d(item.d)
-{
-  d->ref();
-}
+MP4::Item::Item(const Item &item) : d(new ItemPrivate(*item.d)) {}
 
-MP4::Item &
-MP4::Item::operator=(const Item &item)
-{
+MP4::Item &MP4::Item::operator=(const Item &item) {
   Item(item).swap(*this);
   return *this;
 }
 
-void
-MP4::Item::swap(Item &item)
-{
+void MP4::Item::swap(Item &item) {
   using std::swap;
 
   swap(d, item.d);
 }
 
-MP4::Item::~Item()
-{
-  if(d->deref())
-    delete d;
+MP4::Item::~Item() {
+  delete d;
 }
 
-MP4::Item::Item(bool value) :
-  d(new ItemPrivate())
-{
-  d->m_bool = value;
+MP4::Item::Item(bool value) : d(new ItemPrivate()) {
+  d->data->m_bool = value;
+  d->data->type = TypeBool;
 }
 
-MP4::Item::Item(int value) :
-  d(new ItemPrivate())
-{
-  d->m_int = value;
+MP4::Item::Item(int value) : d(new ItemPrivate()) {
+  d->data->m_int = value;
+  d->data->type = TypeInt;
 }
 
-MP4::Item::Item(unsigned char value) :
-  d(new ItemPrivate())
-{
-  d->m_byte = value;
+MP4::Item::Item(unsigned char value) : d(new ItemPrivate()) {
+  d->data->m_byte = value;
+  d->data->type = TypeByte;
 }
 
-MP4::Item::Item(unsigned int value) :
-  d(new ItemPrivate())
-{
-  d->m_uint = value;
+MP4::Item::Item(unsigned int value) : d(new ItemPrivate()) {
+  d->data->m_uint = value;
+  d->data->type = TypeUInt;
 }
 
-MP4::Item::Item(long long value) :
-  d(new ItemPrivate())
-{
-  d->m_longlong = value;
+MP4::Item::Item(long long value) : d(new ItemPrivate()) {
+  d->data->m_longlong = value;
+  d->data->type = TypeLongLong;
 }
 
-MP4::Item::Item(int value1, int value2) :
-  d(new ItemPrivate())
-{
-  d->m_intPair.first = value1;
-  d->m_intPair.second = value2;
+MP4::Item::Item(int value1, int value2) : d(new ItemPrivate()) {
+  d->data->m_intPair.first = value1;
+  d->data->m_intPair.second = value2;
+  d->data->type = TypeIntPair;
 }
 
-MP4::Item::Item(const ByteVectorList &value) :
-  d(new ItemPrivate())
-{
-  d->m_byteVectorList = value;
+MP4::Item::Item(const ByteVectorList &value) : d(new ItemPrivate()) {
+  d->data->m_byteVectorList = value;
+  d->data->type = TypeByteVectorList;
 }
 
-MP4::Item::Item(const StringList &value) :
-  d(new ItemPrivate())
-{
-  d->m_stringList = value;
+MP4::Item::Item(const StringList &value) : d(new ItemPrivate()) {
+  d->data->m_stringList = value;
+  d->data->type = TypeStringList;
 }
 
-MP4::Item::Item(const MP4::CoverArtList &value) :
-  d(new ItemPrivate())
-{
-  d->m_coverArtList = value;
+MP4::Item::Item(const MP4::CoverArtList &value) : d(new ItemPrivate()) {
+  d->data->m_coverArtList = value;
+  d->data->type = TypeCoverArtList;
 }
 
-void MP4::Item::setAtomDataType(MP4::AtomDataType type)
-{
-  d->atomDataType = type;
+void MP4::Item::setAtomDataType(MP4::AtomDataType type) {
+  d->data->atomDataType = type;
 }
 
-MP4::AtomDataType MP4::Item::atomDataType() const
-{
-  return d->atomDataType;
+MP4::AtomDataType MP4::Item::atomDataType() const {
+  return d->data->atomDataType;
 }
 
-bool
-MP4::Item::toBool() const
-{
-  return d->m_bool;
+bool MP4::Item::toBool() const {
+  return d->data->m_bool;
 }
 
-int
-MP4::Item::toInt() const
-{
-  return d->m_int;
+int MP4::Item::toInt() const {
+  return d->data->m_int;
 }
 
-unsigned char
-MP4::Item::toByte() const
-{
-  return d->m_byte;
+unsigned char MP4::Item::toByte() const {
+  return d->data->m_byte;
 }
 
-unsigned int
-MP4::Item::toUInt() const
-{
-  return d->m_uint;
+unsigned int MP4::Item::toUInt() const {
+  return d->data->m_uint;
 }
 
-long long
-MP4::Item::toLongLong() const
-{
-  return d->m_longlong;
+long long MP4::Item::toLongLong() const {
+  return d->data->m_longlong;
 }
 
-MP4::Item::IntPair
-MP4::Item::toIntPair() const
-{
-  return d->m_intPair;
+MP4::Item::IntPair MP4::Item::toIntPair() const {
+  return d->data->m_intPair;
 }
 
-StringList
-MP4::Item::toStringList() const
-{
-  return d->m_stringList;
+StringList MP4::Item::toStringList() const {
+  return d->data->m_stringList;
 }
 
-ByteVectorList
-MP4::Item::toByteVectorList() const
-{
-  return d->m_byteVectorList;
+ByteVectorList MP4::Item::toByteVectorList() const {
+  return d->data->m_byteVectorList;
 }
 
-MP4::CoverArtList
-MP4::Item::toCoverArtList() const
-{
-  return d->m_coverArtList;
+MP4::CoverArtList MP4::Item::toCoverArtList() const {
+  return d->data->m_coverArtList;
 }
 
-bool
-MP4::Item::isValid() const
-{
-  return d->valid;
+bool MP4::Item::isValid() const {
+  return d->data->valid;
+}
+
+String MP4::Item::toString() const {
+
+  StringList desc;
+  switch (d->data->type) {
+    case TypeBool:
+      return d->data->m_bool ? "true" : "false";
+    case TypeInt:
+      return Utils::formatString("%d", d->data->m_int);
+    case TypeIntPair:
+      return Utils::formatString("%d/%d", d->data->m_intPair.first, d->data->m_intPair.second);
+    case TypeByte:
+      return Utils::formatString("%d", d->data->m_byte);
+    case TypeUInt:
+      return Utils::formatString("%u", d->data->m_uint);
+    case TypeLongLong:
+      return Utils::formatString("%lld", d->data->m_longlong);
+    case TypeStringList:
+      return d->data->m_stringList.toString(" / ");
+    case TypeByteVectorList:
+      for (size_t i = 0; i < d->data->m_byteVectorList.size(); i++) {
+        desc.append(Utils::formatString(
+          "[%d bytes of data]", static_cast<int>(d->data->m_byteVectorList[i].size())));
+      }
+      return desc.toString(", ");
+    case TypeCoverArtList:
+      for (size_t i = 0; i < d->data->m_coverArtList.size(); i++) {
+        desc.append(Utils::formatString("[%d bytes of data]", static_cast<int>(d->data->m_coverArtList[i].data().size())));
+      }
+      return desc.toString(", ");
+    case TypeUndefined_:
+      return "[unknown]";
+  }
+  return String();
+
 }

3rdparty/taglib/mp4/mp4item.h

@@ -32,64 +32,78 @@
 
 namespace Strawberry_TagLib {
 namespace TagLib {
+namespace MP4 {
 
-  namespace MP4 {
+class TAGLIB_EXPORT Item {
+ public:
+  struct IntPair {
+    int first, second;
+  };
 
-    class TAGLIB_EXPORT Item
-    {
-    public:
-      struct IntPair {
-        int first, second;
-      };
+  enum ItemType {
+    TypeUndefined_ = 0,
+    TypeBool,
+    TypeInt,
+    TypeIntPair,
+    TypeByte,
+    TypeUInt,
+    TypeLongLong,
+    TypeStringList,
+    TypeByteVectorList,
+    TypeCoverArtList,
+  };
 
-      Item();
-      Item(const Item &item);
+  explicit Item();
+  Item(const Item &item);
 
-      /*!
-       * Copies the contents of \a item into this Item.
-       */
-      Item &operator=(const Item &item);
+  /*!
+   * Copies the contents of \a item into this Item.
+   */
+  Item &operator=(const Item &item);
 
-      /*!
-       * Exchanges the content of the Item by the content of \a item.
-       */
-      void swap(Item &item);
+  /*!
+   * Exchanges the content of the Item by the content of \a item.
+   */
+  void swap(Item &item);
 
-      ~Item();
+  ~Item();
 
-      Item(int value);
-      Item(unsigned char value);
-      Item(unsigned int value);
-      Item(long long value);
-      Item(bool value);
-      Item(int first, int second);
-      Item(const StringList &value);
-      Item(const ByteVectorList &value);
-      Item(const CoverArtList &value);
+  Item(int value);
+  Item(unsigned char value);
+  Item(unsigned int value);
+  Item(long long value);
+  Item(bool value);
+  Item(int first, int second);
+  Item(const StringList &value);
+  Item(const ByteVectorList &value);
+  Item(const CoverArtList &value);
 
-      void setAtomDataType(AtomDataType type);
-      AtomDataType atomDataType() const;
+  void setAtomDataType(AtomDataType type);
+  AtomDataType atomDataType() const;
 
-      int toInt() const;
-      unsigned char toByte() const;
-      unsigned int toUInt() const;
-      long long toLongLong() const;
-      bool toBool() const;
-      IntPair toIntPair() const;
-      StringList toStringList() const;
-      ByteVectorList toByteVectorList() const;
-      CoverArtList toCoverArtList() const;
+  int toInt() const;
+  unsigned char toByte() const;
+  unsigned int toUInt() const;
+  long long toLongLong() const;
+  bool toBool() const;
+  IntPair toIntPair() const;
+  StringList toStringList() const;
+  ByteVectorList toByteVectorList() const;
+  CoverArtList toCoverArtList() const;
 
-      bool isValid() const;
+  ItemType type() const;
 
-    private:
-      class ItemPrivate;
-      ItemPrivate *d;
-    };
+  bool isValid() const;
 
-  }
+  String toString() const;
 
-}
-}
+ private:
+  class ItemPrivate;
+  ItemPrivate *d;
+};
+
+}  // namespace MP4
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/mp4/mp4properties.cpp

@@ -23,25 +23,23 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tdebug.h>
-#include <tstring.h>
+#include "tdebug.h"
+#include "tstring.h"
 #include "mp4file.h"
 #include "mp4atom.h"
 #include "mp4properties.h"
 
 using namespace Strawberry_TagLib::TagLib;
 
-class MP4::Properties::PropertiesPrivate
-{
-public:
-  PropertiesPrivate() :
-    length(0),
-    bitrate(0),
-    sampleRate(0),
-    channels(0),
-    bitsPerSample(0),
-    encrypted(false),
-    codec(MP4::Properties::Unknown) {}
+class MP4::AudioProperties::AudioPropertiesPrivate {
+ public:
+  explicit AudioPropertiesPrivate() : length(0),
+                                      bitrate(0),
+                                      sampleRate(0),
+                                      channels(0),
+                                      bitsPerSample(0),
+                                      encrypted(false),
+                                      codec(MP4::AudioProperties::Unknown) {}
 
   int length;
   int bitrate;
@@ -56,110 +54,104 @@ public:
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-MP4::Properties::Properties(File *file, MP4::Atoms *atoms, ReadStyle style) :
-  AudioProperties(style),
-  d(new PropertiesPrivate())
-{
+MP4::AudioProperties::AudioProperties(File *file, MP4::Atoms *atoms, ReadStyle) : Strawberry_TagLib::TagLib::AudioProperties(), d(new AudioPropertiesPrivate()) {
   read(file, atoms);
 }
 
-MP4::Properties::~Properties()
-{
+MP4::AudioProperties::~AudioProperties() {
   delete d;
 }
 
-int
-MP4::Properties::channels() const
-{
+int MP4::AudioProperties::channels() const {
   return d->channels;
 }
 
-int
-MP4::Properties::sampleRate() const
-{
+int MP4::AudioProperties::sampleRate() const {
   return d->sampleRate;
 }
 
-int
-MP4::Properties::length() const
-{
-  return lengthInSeconds();
-}
-
-int
-MP4::Properties::lengthInSeconds() const
-{
+int MP4::AudioProperties::lengthInSeconds() const {
   return d->length / 1000;
 }
 
-int
-MP4::Properties::lengthInMilliseconds() const
-{
+int MP4::AudioProperties::lengthInMilliseconds() const {
   return d->length;
 }
 
-int
-MP4::Properties::bitrate() const
-{
+int MP4::AudioProperties::bitrate() const {
   return d->bitrate;
 }
 
-int
-MP4::Properties::bitsPerSample() const
-{
+int MP4::AudioProperties::bitsPerSample() const {
   return d->bitsPerSample;
 }
 
-bool
-MP4::Properties::isEncrypted() const
-{
+bool MP4::AudioProperties::isEncrypted() const {
   return d->encrypted;
 }
 
-MP4::Properties::Codec
-MP4::Properties::codec() const
-{
+MP4::AudioProperties::Codec
+MP4::AudioProperties::codec() const {
   return d->codec;
 }
 
+String MP4::AudioProperties::toString() const {
+
+  String format;
+  if (d->codec == AAC) {
+    format = "AAC";
+  }
+  else if (d->codec == ALAC) {
+    format = "ALAC";
+  }
+  else {
+    format = "Unknown";
+  }
+  StringList desc;
+  desc.append("MPEG-4 audio (" + format + ")");
+  desc.append(String::number(lengthInSeconds()) + " seconds");
+  desc.append(String::number(bitrate()) + " kbps");
+  return desc.toString(", ");
+
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // private members
 ////////////////////////////////////////////////////////////////////////////////
 
-void
-MP4::Properties::read(File *file, Atoms *atoms)
-{
+void MP4::AudioProperties::read(File *file, Atoms *atoms) {
+
   MP4::Atom *moov = atoms->find("moov");
-  if(!moov) {
+  if (!moov) {
     debug("MP4: Atom 'moov' not found");
     return;
   }
 
-  MP4::Atom *trak = 0;
+  MP4::Atom *trak = nullptr;
   ByteVector data;
 
   const MP4::AtomList trakList = moov->findall("trak");
-  for(MP4::AtomList::ConstIterator it = trakList.begin(); it != trakList.end(); ++it) {
+  for (MP4::AtomList::ConstIterator it = trakList.begin(); it != trakList.end(); ++it) {
     trak = *it;
     MP4::Atom *hdlr = trak->find("mdia", "hdlr");
-    if(!hdlr) {
+    if (!hdlr) {
       debug("MP4: Atom 'trak.mdia.hdlr' not found");
       return;
     }
     file->seek(hdlr->offset);
     data = file->readBlock(hdlr->length);
-    if(data.containsAt("soun", 16)) {
+    if (data.containsAt("soun", 16)) {
       break;
     }
-    trak = 0;
+    trak = nullptr;
   }
-  if(!trak) {
+  if (!trak) {
     debug("MP4: No audio tracks");
     return;
   }
 
   MP4::Atom *mdhd = trak->find("mdia", "mdhd");
-  if(!mdhd) {
+  if (!mdhd) {
     debug("MP4: Atom 'trak.mdia.mdhd' not found");
     return;
   }
@@ -170,65 +162,66 @@ MP4::Properties::read(File *file, Atoms *atoms)
   const unsigned int version = data[8];
   long long unit;
   long long length;
-  if(version == 1) {
-    if(data.size() < 36 + 8) {
+  if (version == 1) {
+    if (data.size() < 36 + 8) {
       debug("MP4: Atom 'trak.mdia.mdhd' is smaller than expected");
       return;
     }
-    unit   = data.toUInt(28U);
-    length = data.toLongLong(32U);
+    unit = data.toUInt32BE(28);
+    length = data.toInt64BE(32);
   }
   else {
-    if(data.size() < 24 + 8) {
+    if (data.size() < 24 + 8) {
       debug("MP4: Atom 'trak.mdia.mdhd' is smaller than expected");
       return;
     }
-    unit   = data.toUInt(20U);
-    length = data.toUInt(24U);
+    unit = data.toUInt32BE(20);
+    length = data.toUInt32BE(24);
   }
-  if(unit > 0 && length > 0)
+  if (unit > 0 && length > 0)
     d->length = static_cast<int>(length * 1000.0 / unit + 0.5);
 
   MP4::Atom *atom = trak->find("mdia", "minf", "stbl", "stsd");
-  if(!atom) {
+  if (!atom) {
     return;
   }
 
   file->seek(atom->offset);
   data = file->readBlock(atom->length);
-  if(data.containsAt("mp4a", 20)) {
-    d->codec         = AAC;
-    d->channels      = data.toShort(40U);
-    d->bitsPerSample = data.toShort(42U);
-    d->sampleRate    = data.toUInt(46U);
-    if(data.containsAt("esds", 56) && data[64] == 0x03) {
+  if (data.containsAt("mp4a", 20)) {
+    d->codec = AAC;
+    d->channels = data.toUInt16BE(40);
+    d->bitsPerSample = data.toUInt16BE(42);
+    d->sampleRate = data.toUInt32BE(46);
+    if (data.containsAt("esds", 56) && data[64] == 0x03) {
       unsigned int pos = 65;
-      if(data.containsAt("\x80\x80\x80", pos)) {
+      if (data.containsAt("\x80\x80\x80", pos)) {
         pos += 3;
       }
       pos += 4;
-      if(data[pos] == 0x04) {
+      if (data[pos] == 0x04) {
         pos += 1;
-        if(data.containsAt("\x80\x80\x80", pos)) {
+        if (data.containsAt("\x80\x80\x80", pos)) {
           pos += 3;
         }
         pos += 10;
-        d->bitrate = static_cast<int>((data.toUInt(pos) + 500) / 1000.0 + 0.5);
+        d->bitrate = static_cast<int>((data.toUInt32BE(pos) + 500) / 1000.0 + 0.5);
       }
     }
   }
-  else if(data.containsAt("alac", 20)) {
-    if(atom->length == 88 && data.containsAt("alac", 56)) {
-      d->codec         = ALAC;
+  else if (data.containsAt("alac", 20)) {
+    if (atom->length == 88 && data.containsAt("alac", 56)) {
+      d->codec = ALAC;
       d->bitsPerSample = data.at(69);
-      d->channels      = data.at(73);
-      d->bitrate       = static_cast<int>(data.toUInt(80U) / 1000.0 + 0.5);
-      d->sampleRate    = data.toUInt(84U);
+      d->channels = data.at(73);
+      d->bitrate = static_cast<int>(data.toUInt32BE(80) / 1000.0 + 0.5);
+      d->sampleRate = data.toUInt32BE(84);
     }
   }
 
   MP4::Atom *drms = atom->find("drms");
-  if(drms) {
+  if (drms) {
     d->encrypted = true;
   }
+
 }

3rdparty/taglib/mp4/mp4properties.h

@@ -31,92 +31,78 @@
 
 namespace Strawberry_TagLib {
 namespace TagLib {
+namespace MP4 {
 
-  namespace MP4 {
+class Atoms;
+class File;
 
-    class Atoms;
-    class File;
+//! An implementation of MP4 audio properties
+class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
+ public:
+  enum Codec {
+    Unknown = 0,
+    AAC,
+    ALAC
+  };
 
-    //! An implementation of MP4 audio properties
-    class TAGLIB_EXPORT Properties : public AudioProperties
-    {
-    public:
-      enum Codec {
-        Unknown = 0,
-        AAC,
-        ALAC
-      };
+  explicit AudioProperties(File *file, Atoms *atoms, ReadStyle style = Average);
+  ~AudioProperties() override;
 
-      Properties(File *file, Atoms *atoms, ReadStyle style = Average);
-      virtual ~Properties();
+  /*!
+   * Returns the length of the file in seconds.  The length is rounded down to the nearest whole second.
+   *
+   * \see lengthInMilliseconds()
+   */
+  int lengthInSeconds() const 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 milliseconds.
+   *
+   * \see lengthInSeconds()
+   */
+  int lengthInMilliseconds() const override;
 
-      /*!
-       * 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;
+  /*!
+   * Returns the average bit rate of the file in kb/s.
+   */
+  int bitrate() const override;
 
-      /*!
-       * Returns the length of the file in milliseconds.
-       *
-       * \see lengthInSeconds()
-       */
-      // BIC: make virtual
-      int lengthInMilliseconds() const;
+  /*!
+   * Returns the sample rate in Hz.
+   */
+  int sampleRate() const override;
 
-      /*!
-       * Returns the average bit rate of the file in kb/s.
-       */
-      virtual int bitrate() const;
+  /*!
+   * Returns the number of audio channels.
+   */
+  int channels() const override;
 
-      /*!
-       * Returns the sample rate in Hz.
-       */
-      virtual int sampleRate() const;
+  /*!
+   * Returns the number of bits per audio sample.
+   */
+  virtual int bitsPerSample() const;
 
-      /*!
-       * Returns the number of audio channels.
-       */
-      virtual int channels() const;
+  /*!
+   * Returns whether or not the file is encrypted.
+   */
+  bool isEncrypted() const;
 
-      /*!
-       * Returns the number of bits per audio sample.
-       */
-      virtual int bitsPerSample() const;
+  /*!
+   * Returns the codec used in the file.
+   */
+  Codec codec() const;
 
-      /*!
-       * Returns whether or not the file is encrypted.
-       */
-      bool isEncrypted() const;
+  String toString() const override;
 
-      /*!
-       * Returns the codec used in the file.
-       */
-      Codec codec() const;
+ private:
+  void read(File *file, Atoms *atoms);
 
-    private:
-      void read(File *file, Atoms *atoms);
+  class AudioPropertiesPrivate;
+  AudioPropertiesPrivate *d;
+};
 
-      class PropertiesPrivate;
-      PropertiesPrivate *d;
-    };
-
-  }
-
-}
-}
+}  // namespace MP4
+}  // namespace TagLib
+}  // namespace Strawberry_TagLib
 
 #endif