Release 0.6.11

Fixes #433

.circleci/config.yml

@@ -0,0 +1,544 @@
+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
+            libxine-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
+            libplist-devel
+            libmtp-devel
+            libusbmuxd-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-devel
+            qt5-qtbase-devel
+            qt5-qtx11extras-devel
+            qt5-qttools-devel
+            gstreamer1-devel
+            gstreamer1-plugins-base-devel
+            taglib-devel
+            libcdio-devel
+            libgpod-devel
+            libplist-devel
+            libusbmuxd-devel
+            libmtp-devel
+            libchromaprint-devel
+            fftw-devel
+            desktop-file-utils
+            libappstream-glib
+            hicolor-icon-theme
+
+
+  install_mageia_dependencies:
+    description: Install Mageia dependencies
+    steps:
+      - run:
+          name: Add extra media
+          command: urpmi.addmedia --distrib http://www.mirrorservice.org/sites/mageia.org/pub/mageia/distrib/7/x86_64
+      - run:
+          name: Update packages
+          command: urpmi.update -a
+      - run:
+          name: Configure auto update
+          command: urpmi --auto-update
+      - run:
+          name: Install dependencies
+          command: >
+            urpmi --force
+            urpmi-debuginfo-install
+            git
+            tar
+            rpmdevtools
+            make
+            cmake
+            glibc
+            binutils
+            gcc-c++
+            man
+            gettext
+            notification-daemon
+            dbus-devel
+            libgnutls-devel
+            lib64boost-devel
+            lib64protobuf-devel
+            protobuf-compiler
+            lib64sqlite3-devel
+            lib64alsa2-devel
+            lib64pulseaudio-devel
+            lib64notify-devel
+            lib64qt5core-devel
+            lib64qt5gui-devel
+            lib64qt5widgets-devel
+            lib64qt5network-devel
+            lib64qt5concurrent-devel
+            lib64qt5sql-devel
+            lib64qt5dbus-devel
+            lib64qt5x11extras-devel
+            lib64qt5help-devel
+            libqt5test-devel
+            lib64gstreamer1.0-devel
+            lib64gstreamer-plugins-base1.0-devel
+            lib64cdio-devel
+            lib64gpod-devel
+            lib64plist-devel
+            lib64usbmuxd-devel
+            lib64mtp-devel
+            lib64raw1394-devel
+            lib64chromaprint-devel
+            libfftw-devel
+            desktop-file-utils
+            appstream-util
+            libappstream-glib8
+            hicolor-icon-theme
+            qt5ct
+            lib64mesaegl1
+
+
+  install_debian_dependencies:
+    description: Install Debian dependencies
+    steps:
+      - run:
+          name: Install Debian dependencies
+          command: >
+            apt-get update && apt-get install -y
+            build-essential
+            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
+            libimobiledevice-dev
+            libplist-dev
+            libusbmuxd-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
+            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
+            libimobiledevice-dev
+            libplist-dev
+            libusbmuxd-dev
+
+
+jobs:
+
+  build_source:
+    docker:
+      - image: opensuse/leap:15.1
+    steps:
+      - install_opensuse_dependencies
+      - checkout
+      - cmake
+      - build_source
+
+
+  build_opensuse_tumbleweed:
+    docker:
+      - image: opensuse/tumbleweed
+    environment:
+      RPM_BUILD_NCPUS: "2"
+    steps:
+      - run:
+          name: Update packages
+          command: zypper --non-interactive --gpg-auto-import-keys ref
+      - run:
+          name: Upgrade packages
+          command: zypper --non-interactive --gpg-auto-import-keys dup
+      - install_opensuse_dependencies
+      - checkout
+      - cmake
+      - build_source
+      - build_rpm
+
+  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_30:
+    docker:
+      - image: fedora:30
+    environment:
+      RPM_BUILD_NCPUS: "2"
+    steps:
+      - install_fedora_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_mageia_7:
+    docker:
+      - image: mageia:7
+    environment:
+      RPM_BUILD_NCPUS: "2"
+    steps:
+      - install_mageia_dependencies
+      - checkout
+      - cmake
+      - build_source
+      - build_rpm
+
+
+  build_debian_stretch:
+    docker:
+      - image: debian:stretch
+    steps:
+      - install_debian_dependencies
+      - checkout
+      - cmake
+      - build_deb
+
+  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_eoan:
+    docker:
+      - image: ubuntu:eoan
+    steps:
+      - install_ubuntu_dependencies
+      - checkout
+      - cmake
+      - build_deb
+
+  build_ubuntu_focal:
+    docker:
+      - image: ubuntu:focal
+    steps:
+      - install_ubuntu_dependencies
+      - checkout
+      - cmake
+      - build_deb
+
+workflows:
+  version: 2
+  build_all:
+    jobs:
+
+      - build_source:
+          filters:
+            tags:
+              only: /.*/
+
+
+      - build_opensuse_tumbleweed:
+          filters:
+            tags:
+              only: /.*/
+      - build_opensuse_lp151:
+          filters:
+            tags:
+              only: /.*/
+      - build_opensuse_lp152:
+          filters:
+            tags:
+              only: /.*/
+
+
+      - build_fedora_30:
+          filters:
+            tags:
+              only: /.*/
+      - build_fedora_31:
+          filters:
+            tags:
+              only: /.*/
+
+
+      - build_mageia_7:
+          filters:
+            tags:
+              only: /.*/
+
+
+      - build_debian_stretch:
+          filters:
+            tags:
+              only: /.*/
+      - build_debian_buster:
+          filters:
+            tags:
+              only: /.*/
+      - build_debian_bullseye:
+          filters:
+            tags:
+              only: /.*/
+
+
+      - build_ubuntu_eoan:
+          filters:
+            tags:
+              only: /.*/
+      - build_ubuntu_bionic:
+          filters:
+            tags:
+              only: /.*/
+      - build_ubuntu_focal:
+          filters:
+            tags:
+              only: /.*/

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+For general technical questions and help with technical issues please use the forum on https://forum.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.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/workflows/ccpp.yml

@@ -0,0 +1,51 @@
+name: C/C++ CI
+on: [push, pull_request]
+
+jobs:
+
+  build-linux:
+    runs-on: ubuntu-latest
+    container:
+      image: opensuse/leap:15.1
+    steps:
+    - uses: actions/checkout@v1
+    - name: Update Packages
+      run: zypper ref
+    - name: Install Packages
+      run: 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 libxine-devel vlc-devel taglib-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 libplist-devel libmtp-devel libusbmuxd-devel libchromaprint-devel desktop-file-utils update-desktop-files appstream-glib hicolor-icon-theme
+    - name: Create Build Environment
+      run: mkdir -p build
+    - name: Configure CMake
+      working-directory: build
+      shell: bash
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+    - name: Build
+      working-directory: build
+      shell: bash
+      run: cmake --build . --config $BUILD_TYPE
+
+  build-macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Unlink python
+      run: brew unlink python@2
+    - name: Install Packages
+      run: brew install glib pkgconfig boost libffi protobuf protobuf-c qt gettext gnutls fftw sqlite chromaprint gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav libcdio libmtp libimobiledevice libplist create-dmg taglib
+    - name: Create Build Environment
+      run: cmake -E make_directory ${{runner.workspace}}/build
+    - name: Configure CMake
+      env:
+        Qt5_DIR: /usr/local/opt/qt5/lib/cmake
+        Qt5LinguistTools_DIR: /usr/local/opt/qt5/lib/cmake/Qt5LinguistTools
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DUSE_BUNDLE=ON -DUSE_SYSTEM_TAGLIB=ON
+    - name: Build
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      run: cmake --build . --config $BUILD_TYPE
+    - name: Install
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      run: make install

.gitignore

@@ -73,6 +73,11 @@ CMakeLists.txt.user*
 target_wrapper.*
 compile_commands.json
 
+*.kdev4
+*.vscode
+*.code-workspace
+*.sublime-workspace
+
 # Temporary files
 *~
 *.autosave

.travis.yml

@@ -1,13 +1,11 @@
 sudo: required
 language: C++
 os:
-  - linux
   - osx
 services:
   - docker
 compiler:
   - gcc
-  - clang
 
 before_install:
   - if ! [ "$DEPLOY_KEY_ENC" == "" ]; then
@@ -17,33 +15,31 @@ before_install:
   - 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;
+      docker exec build git clone https://github.com/strawberrymusicplayer/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 unlink python@2 || travis_terminate 1;
+      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 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;
+      export PKG_CONFIG_PATH="/usr/local/opt/libffi/lib/pkgconfig/:/usr/local/opt/zlib/lib/pkgconfig:$PKG_CONFIG_PATH";
       ls /usr/local/lib/gstreamer-1.0;
-      ls /usr/local/lib/gio/modules;
     fi
 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
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir build; cd build; cmake .. -DUSE_BUNDLE=ON -DUSE_SYSTEM_TAGLIB=ON ; fi
 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;
+      make dmg;
   fi
 after_success:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ls -lh strawberry*.dmg; fi
@@ -51,7 +47,7 @@ after_success:
       if [[ "$TRAVIS_BRANCH" == "master" ]]; then
         rsync -e "ssh -o StrictHostKeyChecking=no" -va strawberry*.dmg travis@echoes.jkvinge.net:/home/travis/builds/macos;
       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;
       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,25 @@
-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})
+add_library(singleapplication STATIC ${SINGLEAPP-SOURCES} ${SINGLEAPP-SOURCES-MOC})
 target_link_libraries(singleapplication Qt5::Core Qt5::Widgets Qt5::Network)
 
 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})
+add_library(singlecoreapplication STATIC ${SINGLECOREAPP-SOURCES} ${SINGLECOREAPP-SOURCES-MOC})
 target_link_libraries(singlecoreapplication Qt5::Core Qt5::Widgets Qt5::Network)
+
+configure_file(config.h.in "${CMAKE_CURRENT_BINARY_DIR}/config.h")
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})

3rdparty/singleapplication/config.h.in

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

3rdparty/singleapplication/singleapplication.cpp

@@ -20,156 +20,170 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include <QApplication>
-#include <QtCore/QTime>
-#include <QtCore/QThread>
-#include <QtCore/QDateTime>
-#include <QtCore/QByteArray>
-#include <QtCore/QSharedMemory>
+//
+//  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 <stdlib.h>
+#include <limits>
+
+#include <QtGlobal>
+#include <QCoreApplication>
+#include <QThread>
+#include <QSharedMemory>
+#include <QLocalSocket>
+#include <QByteArray>
+#include <QDateTime>
+#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
  */
-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();
 
 #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 );
+  // 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 );
-        }
+  // 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);
     }
+  }
 
-    InstancesInfo* inst = static_cast<InstancesInfo*>( d->memory->data() );
-    QTime time;
-    time.start();
+  InstancesInfo* inst = static_cast<InstancesInfo*>(d->memory->data());
+  QElapsedTimer time;
+  time.start();
 
-    // Make sure the shared memory block is initialised and in consistent state
-    while( true ) {
-        d->memory->lock();
+  // Make sure the shared memory block is initialised and in consistent state
+  while (true) {
+    d->memory->lock();
 
-        if( d->blockChecksum() == inst->checksum ) break;
+    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 ) );
-    }
-
-    if( inst->primary == false) {
-        d->startPrimary();
-        d->memory->unlock();
-        return;
-    }
-
-    // Check if another instance can be started
-    if( allowSecondary ) {
-        inst->secondary += 1;
-        inst->checksum = d->blockChecksum();
-        d->instanceNumber = inst->secondary;
-        d->startSecondary();
-        if( d->options & Mode::SecondaryNotification ) {
-            d->connectToPrimary( timeout, SingleApplicationPrivate::SecondaryInstance );
-        }
-        d->memory->unlock();
-        return;
+    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();
 
-    d->connectToPrimary( timeout, SingleApplicationPrivate::NewInstance );
+    // 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));
+  }
 
-    delete d;
+  if (inst->primary == false) {
+    d->startPrimary();
+    d->memory->unlock();
+    return;
+  }
+
+  // Check if another instance can be started
+  if (allowSecondary) {
+    inst->secondary += 1;
+    inst->checksum = d->blockChecksum();
+    d->instanceNumber = inst->secondary;
+    d->startSecondary();
+    if (d->options & Mode::SecondaryNotification) {
+      d->connectToPrimary(timeout, SingleApplicationPrivate::SecondaryInstance);
+    }
+    d->memory->unlock();
+    return;
+  }
+
+  d->memory->unlock();
+
+  d->connectToPrimary(timeout, SingleApplicationPrivate::NewInstance);
+
+  delete d;
+
+  ::exit(EXIT_SUCCESS);
 
-    ::exit( EXIT_SUCCESS );
 }
 
 /**
  * @brief Destructor
  */
-SingleApplication::~SingleApplication()
-{
-    Q_D(SingleApplication);
-    delete d;
+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;
 }
 
-bool SingleApplication::isSecondary()
-{
-    Q_D(SingleApplication);
-    return d->server == nullptr;
+bool SingleApplication::isSecondary() {
+  Q_D(SingleApplication);
+  return d->server == nullptr;
 }
 
-quint32 SingleApplication::instanceId()
-{
-    Q_D(SingleApplication);
-    return d->instanceNumber;
+quint32 SingleApplication::instanceId() {
+  Q_D(SingleApplication);
+  return d->instanceNumber;
 }
 
-qint64 SingleApplication::primaryPid()
-{
-    Q_D(SingleApplication);
-    return d->primaryPid();
+qint64 SingleApplication::primaryPid() {
+  Q_D(SingleApplication);
+  return d->primaryPid();
 }
 
-bool SingleApplication::sendMessage( QByteArray message, int timeout )
-{
-    Q_D(SingleApplication);
+bool SingleApplication::sendMessage(QByteArray message, int timeout) {
 
-    // Nobody to connect to
-    if( isPrimary() ) return false;
+  Q_D(SingleApplication);
 
-    // Make sure the socket is connected
-    d->connectToPrimary( timeout,  SingleApplicationPrivate::Reconnect );
+  // 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;
 
-    d->socket->write( message );
-    bool dataWritten = d->socket->waitForBytesWritten( timeout );
-    d->socket->flush();
-    return dataWritten;
 }

3rdparty/singleapplication/singleapplication.h

@@ -20,12 +20,24 @@
 // 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;
 
@@ -34,95 +46,95 @@ class SingleApplicationPrivate;
  * Application
  * @see QCoreApplication
  */
-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)
+  /**
+   * @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();
 
-    /**
-     * @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 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 );
 
-Q_SIGNALS:
-    void instanceStarted();
-    void receivedMessage( quint32 instanceId, QByteArray message );
+ signals:
+  void instanceStarted();
+  void receivedMessage( quint32 instanceId, QByteArray message );
+
+ private:
+  SingleApplicationPrivate *d_ptr;
+  Q_DECLARE_PRIVATE(SingleApplication)
 
-private:
-    SingleApplicationPrivate *d_ptr;
-    Q_DECLARE_PRIVATE(SingleApplication)
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(SingleApplication::Options)

3rdparty/singleapplication/singleapplication_p.cpp

@@ -24,381 +24,378 @@
 //  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 <QIODevice>
+#include <QSharedMemory>
+#include <QByteArray>
+#include <QDataStream>
+#include <QCryptographicHash>
+#include <QLocalServer>
+#include <QLocalSocket>
+#include <QDir>
 
 #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 *_q_ptr)
+  : q_ptr(_q_ptr),
+    memory(nullptr),
+    socket(nullptr),
+    server(nullptr),
+    instanceNumber(-1)
+    {}
 
-SingleApplicationPrivate::~SingleApplicationPrivate()
-{
-    if( socket != nullptr ) {
-        socket->close();
-        delete socket;
-    }
+SingleApplicationPrivate::~SingleApplicationPrivate() {
 
-    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();
+  if (socket != nullptr) {
+    socket->close();
+    delete socket;
+  }
 
-    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()
-            );
-        }
-#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() );
+  memory->lock();
+  InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
+  if (server != nullptr) {
+    server->close();
+    delete server;
     inst->primary = false;
-    inst->secondary = 0;
     inst->primaryPid = -1;
     inst->checksum = blockChecksum();
+  }
+  memory->unlock();
+
+  delete memory;
+
 }
 
-void SingleApplicationPrivate::startPrimary()
-{
-    Q_Q(SingleApplication);
+void SingleApplicationPrivate::genBlockServerName() {
 
-    // Successful creation means that no main process exists
-    // So we start a QLocalServer to listen for connections
-    QLocalServer::removeServer( blockServerName );
-    server = new QLocalServer();
+  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());
 
-    // 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 );
-    }
+  if (!(options & SingleApplication::Mode::ExcludeAppVersion)) {
+    appData.addData(SingleApplication::app_t::applicationVersion().toUtf8());
+  }
 
-    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 (! (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
+  }
 
-        writeStream << blockServerName.toLatin1();
-        writeStream << static_cast<quint8>(connectionType);
-        writeStream << instanceNumber;
-        quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
-        writeStream << checksum;
-
-        // The header indicates the message length that follows
-        QByteArray header;
-        QDataStream headerStream(&header, QIODevice::WriteOnly);
-
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-        headerStream.setVersion(QDataStream::Qt_5_6);
-#endif
-        headerStream << static_cast <quint64>( initMsg.length() );
-
-        socket->write( header );
-        socket->write( initMsg );
-        socket->flush();
-        socket->waitForBytesWritten( msecs );
+  // User level block requires a user specific data in the hash
+  if (options & SingleApplication::Mode::User) {
+#ifdef Q_OS_UNIX
+    QByteArray username;
+#if defined(HAVE_GETEUID) && defined(HAVE_GETPWUID)
+    struct passwd *pw = getpwuid(geteuid());
+    if (pw) {
+      username = pw->pw_name;
     }
+#endif
+    if (username.isEmpty()) username = qgetenv("USER");
+    appData.addData(username);
+#endif
+#ifdef Q_OS_WIN
+    wchar_t username [ UNLEN + 1 ];
+    // Specifies size of the buffer on input
+    DWORD usernameLength = UNLEN + 1;
+    if (GetUserNameW(username, &usernameLength)) {
+      appData.addData(QString::fromWCharArray(username).toUtf8());
+    }
+    else {
+      appData.addData(qgetenv("USERNAME"));
+    }
+#endif
+  }
+
+  // Replace the backslash in RFC 2045 Base64 [a-zA-Z0-9+/=] to comply with server naming requirements.
+  blockServerName = appData.result().toBase64().replace("/", "_");
+
 }
 
-quint16 SingleApplicationPrivate::blockChecksum()
-{
-    return qChecksum(
-       static_cast <const char *>( memory->data() ),
-       offsetof( InstancesInfo, checksum )
-   );
+void SingleApplicationPrivate::initializeMemoryBlock() {
+
+  InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
+  inst->primary = false;
+  inst->secondary = 0;
+  inst->primaryPid = -1;
+  inst->checksum = blockChecksum();
+
 }
 
-qint64 SingleApplicationPrivate::primaryPid()
-{
-    qint64 pid;
+void SingleApplicationPrivate::startPrimary() {
 
-    memory->lock();
-    InstancesInfo* inst = static_cast<InstancesInfo*>( memory->data() );
-    pid = inst->primaryPid;
-    memory->unlock();
+  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(const int msecs, const 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);
+
+    writeStream.setVersion(QDataStream::Qt_5_6);
+
+    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);
+
+    headerStream.setVersion(QDataStream::Qt_5_6);
+
+    headerStream << static_cast <quint64>(initMsg.length());
+
+    socket->write(header);
+    socket->write(initMsg);
+    socket->flush();
+    socket->waitForBytesWritten(msecs);
+  }
+
+}
+
+quint16 SingleApplicationPrivate::blockChecksum() {
+
+  return qChecksum(static_cast <const char *>(memory->data()), offsetof(InstancesInfo, checksum));
+
+}
+
+qint64 SingleApplicationPrivate::primaryPid() {
+
+  qint64 pid;
+
+  memory->lock();
+  InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
+  pid = inst->primaryPid;
+  memory->unlock();
+
+  return pid;
 
-    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() < (qint64) sizeof(quint64)) {
+    return;
+  }
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-    headerStream.setVersion( QDataStream::Qt_5_6 );
-#endif
+  QDataStream headerStream(sock);
 
-    // Read the header to know the message length
-    quint64 msgLen = 0;
-    headerStream >> msgLen;
-    ConnectionInfo &info = connectionMap[sock];
-    info.stage = StageBody;
-    info.msgLen = msgLen;
+  headerStream.setVersion(QDataStream::Qt_5_6);
+
+  // 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() >= (qint64) msgLen) {
+    readInitMessageBody(sock);
+  }
 
-    if ( sock->bytesAvailable() >= (qint64) msgLen ) {
-        readInitMessageBody( sock );
-    }
 }
 
-void SingleApplicationPrivate::readInitMessageBody( QLocalSocket *sock )
-{
-    Q_Q(SingleApplication);
+void SingleApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
 
-    if (!connectionMap.contains( sock )) {
-        return;
-    }
+  Q_Q(SingleApplication);
 
-    ConnectionInfo &info = connectionMap[sock];
-    if( sock->bytesAvailable() < ( qint64 )info.msgLen ) {
-        return;
-    }
+  if (!connectionMap.contains(sock)) {
+    return;
+  }
 
-    // Read the message body
-    QByteArray msgBytes = sock->read(info.msgLen);
-    QDataStream readStream(msgBytes);
+  ConnectionInfo &info = connectionMap[sock];
+  if (sock->bytesAvailable() < (qint64)info.msgLen) {
+    return;
+  }
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-    readStream.setVersion( QDataStream::Qt_5_6 );
-#endif
+  // Read the message body
+  QByteArray msgBytes = sock->read(info.msgLen);
+  QDataStream readStream(msgBytes);
 
-    // server name
-    QByteArray latin1Name;
-    readStream >> latin1Name;
+  readStream.setVersion(QDataStream::Qt_5_6);
 
-    // connection type
-    ConnectionType connectionType = InvalidConnection;
-    quint8 connTypeVal = InvalidConnection;
-    readStream >> connTypeVal;
-    connectionType = static_cast <ConnectionType>( connTypeVal );
+  // server name
+  QByteArray latin1Name;
+  readStream >> latin1Name;
 
-    // instance id
-    quint32 instanceId = 0;
-    readStream >> instanceId;
+  // connection type
+  ConnectionType connectionType = InvalidConnection;
+  quint8 connTypeVal = InvalidConnection;
+  readStream >> connTypeVal;
+  connectionType = static_cast <ConnectionType>(connTypeVal);
 
-    // checksum
-    quint16 msgChecksum = 0;
-    readStream >> msgChecksum;
+  // instance id
+  quint32 instanceId = 0;
+  readStream >> instanceId;
 
-    const quint16 actualChecksum = qChecksum( msgBytes.constData(), static_cast<quint32>( msgBytes.length() - sizeof( quint16 ) ) );
+  // checksum
+  quint16 msgChecksum = 0;
+  readStream >> msgChecksum;
 
-    bool isValid = readStream.status() == QDataStream::Ok &&
-                   QLatin1String(latin1Name) == blockServerName &&
-                   msgChecksum == actualChecksum;
+  const quint16 actualChecksum = qChecksum(msgBytes.constData(), static_cast<quint32>(msgBytes.length() - sizeof(quint16)));
 
-    if( !isValid ) {
-        sock->close();
-        return;
-    }
+  bool isValid = readStream.status() == QDataStream::Ok && QLatin1String(latin1Name) == blockServerName && msgChecksum == actualChecksum;
 
-    info.instanceId = instanceId;
-    info.stage = StageConnected;
+  if (!isValid) {
+    sock->close();
+    return;
+  }
 
-    if( connectionType == NewInstance ||
-        ( connectionType == SecondaryInstance &&
-          options & SingleApplication::Mode::SecondaryNotification ) )
-    {
-        Q_EMIT q->instanceStarted();
-    }
+  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() > 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::slotDataAvailable(QLocalSocket *dataSocket, const quint32 instanceId) {
+
+  Q_Q(SingleApplication);
+  Q_EMIT q->receivedMessage(instanceId, dataSocket->readAll());
+
 }
 
-void SingleApplicationPrivate::slotClientConnectionClosed( QLocalSocket *closedSocket, quint32 instanceId )
-{
-    if( closedSocket->bytesAvailable() > 0 )
-        Q_EMIT slotDataAvailable( closedSocket, instanceId  );
+void SingleApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSocket, const quint32 instanceId) {
+
+  if (closedSocket->bytesAvailable() > 0)
+    Q_EMIT slotDataAvailable(closedSocket, instanceId);
+
 }

3rdparty/singleapplication/singleapplication_p.h

@@ -24,76 +24,82 @@
 //  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 <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;
+  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
+ 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)
 
-    SingleApplicationPrivate( SingleApplication *q_ptr );
-     ~SingleApplicationPrivate();
+  SingleApplicationPrivate(SingleApplication *_q_ptr);
+  ~SingleApplicationPrivate();
 
-    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);
+  void genBlockServerName();
+  void initializeMemoryBlock();
+  void startPrimary();
+  void startSecondary();
+  void connectToPrimary(const int msecs, const ConnectionType connectionType);
+  quint16 blockChecksum();
+  qint64 primaryPid();
+  void readInitMessageHeader(QLocalSocket *socket);
+  void readInitMessageBody(QLocalSocket *socket);
 
-    SingleApplication *q_ptr;
-    QSharedMemory *memory;
-    QLocalSocket *socket;
-    QLocalServer *server;
-    quint32 instanceNumber;
-    QString blockServerName;
-    SingleApplication::Options options;
-    QMap<QLocalSocket*, ConnectionInfo> connectionMap;
+  SingleApplication *q_ptr;
+  QSharedMemory *memory;
+  QLocalSocket *socket;
+  QLocalServer *server;
+  quint32 instanceNumber;
+  QString blockServerName;
+  SingleApplication::Options options;
+  QMap<QLocalSocket*, ConnectionInfo> connectionMap;
 
-public Q_SLOTS:
-    void slotConnectionEstablished();
-    void slotDataAvailable( QLocalSocket*, quint32 );
-    void slotClientConnectionClosed( QLocalSocket*, quint32 );
+ 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

@@ -20,12 +20,29 @@
 // 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 <stdlib.h>
+#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 <QDateTime>
+#include <QElapsedTimer>
+#include <QtDebug>
 
 #include "singlecoreapplication.h"
 #include "singlecoreapplication_p.h"
@@ -37,139 +54,137 @@
  * @param argv
  * @param {bool} allowSecondaryInstances
  */
-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();
 
 #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 );
+  // 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 );
-        }
+  // 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);
     }
+  }
 
-    InstancesInfo* inst = static_cast<InstancesInfo*>( d->memory->data() );
-    QTime time;
-    time.start();
+  InstancesInfo* inst = static_cast<InstancesInfo*>(d->memory->data());
+  QElapsedTimer time;
+  time.start();
 
-    // Make sure the shared memory block is initialised and in consistent state
-    while( true ) {
-        d->memory->lock();
+  // Make sure the shared memory block is initialised and in consistent state
+  while (true) {
+    d->memory->lock();
 
-        if( d->blockChecksum() == inst->checksum ) break;
+    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 ) );
-    }
-
-    if( inst->primary == false) {
-        d->startPrimary();
-        d->memory->unlock();
-        return;
-    }
-
-    // Check if another instance can be started
-    if( allowSecondary ) {
-        inst->secondary += 1;
-        inst->checksum = d->blockChecksum();
-        d->instanceNumber = inst->secondary;
-        d->startSecondary();
-        if( d->options & Mode::SecondaryNotification ) {
-            d->connectToPrimary( timeout, SingleCoreApplicationPrivate::SecondaryInstance );
-        }
-        d->memory->unlock();
-        return;
+    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();
 
-    d->connectToPrimary( timeout, SingleCoreApplicationPrivate::NewInstance );
+    // 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));
+  }
 
-    delete d;
+  if (inst->primary == false) {
+    d->startPrimary();
+    d->memory->unlock();
+    return;
+  }
+
+  // Check if another instance can be started
+  if (allowSecondary) {
+    inst->secondary += 1;
+    inst->checksum = d->blockChecksum();
+    d->instanceNumber = inst->secondary;
+    d->startSecondary();
+    if(d->options & Mode::SecondaryNotification) {
+      d->connectToPrimary(timeout, SingleCoreApplicationPrivate::SecondaryInstance);
+    }
+    d->memory->unlock();
+    return;
+  }
+
+  d->memory->unlock();
+
+  d->connectToPrimary(timeout, SingleCoreApplicationPrivate::NewInstance);
+
+  delete d;
+
+  ::exit(EXIT_SUCCESS);
 
-    ::exit( EXIT_SUCCESS );
 }
 
 /**
  * @brief Destructor
  */
-SingleCoreApplication::~SingleCoreApplication()
-{
-    Q_D(SingleCoreApplication);
-    delete d;
+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;
 }
 
-bool SingleCoreApplication::isSecondary()
-{
-    Q_D(SingleCoreApplication);
-    return d->server == nullptr;
+bool SingleCoreApplication::isSecondary() {
+  Q_D(SingleCoreApplication);
+  return d->server == nullptr;
 }
 
-quint32 SingleCoreApplication::instanceId()
-{
-    Q_D(SingleCoreApplication);
-    return d->instanceNumber;
+quint32 SingleCoreApplication::instanceId() {
+  Q_D(SingleCoreApplication);
+  return d->instanceNumber;
 }
 
-qint64 SingleCoreApplication::primaryPid()
-{
-    Q_D(SingleCoreApplication);
-    return d->primaryPid();
+qint64 SingleCoreApplication::primaryPid() {
+  Q_D(SingleCoreApplication);
+  return d->primaryPid();
 }
 
-bool SingleCoreApplication::sendMessage( QByteArray message, int timeout )
-{
-    Q_D(SingleCoreApplication);
+bool SingleCoreApplication::sendMessage(QByteArray message, int timeout) {
 
-    // Nobody to connect to
-    if( isPrimary() ) return false;
+  Q_D(SingleCoreApplication);
 
-    // Make sure the socket is connected
-    d->connectToPrimary( timeout,  SingleCoreApplicationPrivate::Reconnect );
+  // 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;
 
-    d->socket->write( message );
-    bool dataWritten = d->socket->waitForBytesWritten( timeout );
-    d->socket->flush();
-    return dataWritten;
 }

3rdparty/singleapplication/singlecoreapplication.h

@@ -20,109 +20,120 @@
 // 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
+ * @brief The SingleCoreApplication class handles multiple 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)
+  /**
+   * @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.
+   * @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 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 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 );
 
-Q_SIGNALS:
-    void instanceStarted();
-    void receivedMessage( quint32 instanceId, QByteArray message );
+ signals:
+  void instanceStarted();
+  void receivedMessage( quint32 instanceId, QByteArray message );
 
 private:
-    SingleCoreApplicationPrivate *d_ptr;
-    Q_DECLARE_PRIVATE(SingleCoreApplication)
+  SingleCoreApplicationPrivate *d_ptr;
+  Q_DECLARE_PRIVATE(SingleCoreApplication)
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(SingleCoreApplication::Options)

3rdparty/singleapplication/singlecoreapplication_p.cpp

@@ -24,381 +24,378 @@
 //  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 <QIODevice>
+#include <QSharedMemory>
+#include <QByteArray>
+#include <QDataStream>
+#include <QCryptographicHash>
+#include <QLocalServer>
+#include <QLocalSocket>
+#include <QDir>
 
 #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 *_q_ptr)
+  : q_ptr(_q_ptr),
+    memory(nullptr),
+    socket(nullptr),
+    server(nullptr),
+    instanceNumber(-1)
+    {}
 
-SingleCoreApplicationPrivate::~SingleCoreApplicationPrivate()
-{
-    if( socket != nullptr ) {
-        socket->close();
-        delete socket;
-    }
+SingleCoreApplicationPrivate::~SingleCoreApplicationPrivate() {
 
-    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();
+  if (socket != nullptr) {
+    socket->close();
+    delete socket;
+  }
 
-    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()
-            );
-        }
-#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() );
+  memory->lock();
+  InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
+  if (server != nullptr) {
+    server->close();
+    delete server;
     inst->primary = false;
-    inst->secondary = 0;
     inst->primaryPid = -1;
     inst->checksum = blockChecksum();
+  }
+  memory->unlock();
+
+  delete memory;
+
 }
 
-void SingleCoreApplicationPrivate::startPrimary()
-{
-    Q_Q(SingleCoreApplication);
+void SingleCoreApplicationPrivate::genBlockServerName() {
 
-    // Successful creation means that no main process exists
-    // So we start a QLocalServer to listen for connections
-    QLocalServer::removeServer( blockServerName );
-    server = new QLocalServer();
+  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());
 
-    // 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 );
-    }
+  if (!(options & SingleCoreApplication::Mode::ExcludeAppVersion)) {
+    appData.addData(SingleCoreApplication::app_t::applicationVersion().toUtf8());
+  }
 
-    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 (!(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
+  }
 
-        writeStream << blockServerName.toLatin1();
-        writeStream << static_cast<quint8>(connectionType);
-        writeStream << instanceNumber;
-        quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
-        writeStream << checksum;
-
-        // The header indicates the message length that follows
-        QByteArray header;
-        QDataStream headerStream(&header, QIODevice::WriteOnly);
-
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-        headerStream.setVersion(QDataStream::Qt_5_6);
-#endif
-        headerStream << static_cast <quint64>( initMsg.length() );
-
-        socket->write( header );
-        socket->write( initMsg );
-        socket->flush();
-        socket->waitForBytesWritten( msecs );
+  // User level block requires a user specific data in the hash
+  if (options & SingleCoreApplication::Mode::User) {
+#ifdef Q_OS_UNIX
+    QByteArray username;
+#if defined(HAVE_GETEUID) && defined(HAVE_GETPWUID)
+    struct passwd *pw = getpwuid(geteuid());
+    if (pw) {
+      username = pw->pw_name;
     }
+#endif
+    if (username.isEmpty()) username = qgetenv("USER");
+    appData.addData(username);
+#endif
+#ifdef Q_OS_WIN
+    wchar_t username [ UNLEN + 1 ];
+    // Specifies size of the buffer on input
+    DWORD usernameLength = UNLEN + 1;
+    if (GetUserNameW(username, &usernameLength)) {
+      appData.addData(QString::fromWCharArray(username).toUtf8());
+    }
+    else {
+      appData.addData(qgetenv("USERNAME"));
+    }
+#endif
+  }
+
+  // Replace the backslash in RFC 2045 Base64 [a-zA-Z0-9+/=] to comply with server naming requirements.
+  blockServerName = appData.result().toBase64().replace("/", "_");
+
 }
 
-quint16 SingleCoreApplicationPrivate::blockChecksum()
-{
-    return qChecksum(
-       static_cast <const char *>( memory->data() ),
-       offsetof( InstancesInfo, checksum )
-   );
+void SingleCoreApplicationPrivate::initializeMemoryBlock() {
+
+  InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
+  inst->primary = false;
+  inst->secondary = 0;
+  inst->primaryPid = -1;
+  inst->checksum = blockChecksum();
+
 }
 
-qint64 SingleCoreApplicationPrivate::primaryPid()
-{
-    qint64 pid;
+void SingleCoreApplicationPrivate::startPrimary() {
 
-    memory->lock();
-    InstancesInfo* inst = static_cast<InstancesInfo*>( memory->data() );
-    pid = inst->primaryPid;
-    memory->unlock();
+  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(const int msecs, const 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);
+
+    writeStream.setVersion(QDataStream::Qt_5_6);
+
+    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);
+
+    headerStream.setVersion(QDataStream::Qt_5_6);
+
+    headerStream << static_cast <quint64>(initMsg.length());
+
+    socket->write(header);
+    socket->write(initMsg);
+    socket->flush();
+    socket->waitForBytesWritten(msecs);
+  }
+
+}
+
+quint16 SingleCoreApplicationPrivate::blockChecksum() {
+
+  return qChecksum(static_cast <const char*> (memory->data()), offsetof(InstancesInfo, checksum));
+
+}
+
+qint64 SingleCoreApplicationPrivate::primaryPid() {
+
+  qint64 pid;
+
+  memory->lock();
+  InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
+  pid = inst->primaryPid;
+  memory->unlock();
+
+  return pid;
 
-    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() < (qint64)sizeof(quint64)) {
+    return;
+  }
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-    headerStream.setVersion( QDataStream::Qt_5_6 );
-#endif
+  QDataStream headerStream(sock);
 
-    // Read the header to know the message length
-    quint64 msgLen = 0;
-    headerStream >> msgLen;
-    ConnectionInfo &info = connectionMap[sock];
-    info.stage = StageBody;
-    info.msgLen = msgLen;
+  headerStream.setVersion(QDataStream::Qt_5_6);
+
+  // 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() >= (qint64) msgLen) {
+    readInitMessageBody(sock);
+  }
 
-    if ( sock->bytesAvailable() >= (qint64) msgLen ) {
-        readInitMessageBody( sock );
-    }
 }
 
-void SingleCoreApplicationPrivate::readInitMessageBody( QLocalSocket *sock )
-{
-    Q_Q(SingleCoreApplication);
+void SingleCoreApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
 
-    if (!connectionMap.contains( sock )) {
-        return;
-    }
+  Q_Q(SingleCoreApplication);
 
-    ConnectionInfo &info = connectionMap[sock];
-    if( sock->bytesAvailable() < ( qint64 )info.msgLen ) {
-        return;
-    }
+  if (!connectionMap.contains(sock)) {
+    return;
+  }
 
-    // Read the message body
-    QByteArray msgBytes = sock->read(info.msgLen);
-    QDataStream readStream(msgBytes);
+  ConnectionInfo &info = connectionMap[sock];
+  if (sock->bytesAvailable() < (qint64)info.msgLen) {
+    return;
+  }
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-    readStream.setVersion( QDataStream::Qt_5_6 );
-#endif
+  // Read the message body
+  QByteArray msgBytes = sock->read(info.msgLen);
+  QDataStream readStream(msgBytes);
 
-    // server name
-    QByteArray latin1Name;
-    readStream >> latin1Name;
+  readStream.setVersion(QDataStream::Qt_5_6);
 
-    // connection type
-    ConnectionType connectionType = InvalidConnection;
-    quint8 connTypeVal = InvalidConnection;
-    readStream >> connTypeVal;
-    connectionType = static_cast <ConnectionType>( connTypeVal );
+  // server name
+  QByteArray latin1Name;
+  readStream >> latin1Name;
 
-    // instance id
-    quint32 instanceId = 0;
-    readStream >> instanceId;
+  // connection type
+  ConnectionType connectionType = InvalidConnection;
+  quint8 connTypeVal = InvalidConnection;
+  readStream >> connTypeVal;
+  connectionType = static_cast <ConnectionType>(connTypeVal);
 
-    // checksum
-    quint16 msgChecksum = 0;
-    readStream >> msgChecksum;
+  // instance id
+  quint32 instanceId = 0;
+  readStream >> instanceId;
 
-    const quint16 actualChecksum = qChecksum( msgBytes.constData(), static_cast<quint32>( msgBytes.length() - sizeof( quint16 ) ) );
+  // checksum
+  quint16 msgChecksum = 0;
+  readStream >> msgChecksum;
 
-    bool isValid = readStream.status() == QDataStream::Ok &&
-                   QLatin1String(latin1Name) == blockServerName &&
-                   msgChecksum == actualChecksum;
+  const quint16 actualChecksum = qChecksum(msgBytes.constData(), static_cast<quint32>(msgBytes.length() - sizeof(quint16)));
 
-    if( !isValid ) {
-        sock->close();
-        return;
-    }
+  bool isValid = readStream.status() == QDataStream::Ok && QLatin1String(latin1Name) == blockServerName && msgChecksum == actualChecksum;
 
-    info.instanceId = instanceId;
-    info.stage = StageConnected;
+  if (!isValid) {
+    sock->close();
+    return;
+  }
 
-    if( connectionType == NewInstance ||
-        ( connectionType == SecondaryInstance &&
-          options & SingleCoreApplication::Mode::SecondaryNotification ) )
-    {
-        Q_EMIT q->instanceStarted();
-    }
+  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() > 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::slotDataAvailable(QLocalSocket *dataSocket, const quint32 instanceId) {
+
+  Q_Q(SingleCoreApplication);
+  Q_EMIT q->receivedMessage(instanceId, dataSocket->readAll());
+
 }
 
-void SingleCoreApplicationPrivate::slotClientConnectionClosed( QLocalSocket *closedSocket, quint32 instanceId )
-{
-    if( closedSocket->bytesAvailable() > 0 )
-        Q_EMIT slotDataAvailable( closedSocket, instanceId  );
+void SingleCoreApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSocket, const quint32 instanceId) {
+
+  if (closedSocket->bytesAvailable() > 0)
+    Q_EMIT slotDataAvailable(closedSocket, instanceId);
+
 }

3rdparty/singleapplication/singlecoreapplication_p.h

@@ -24,76 +24,82 @@
 //  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 <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;
+  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
+ 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)
 
-    SingleCoreApplicationPrivate( SingleCoreApplication *q_ptr );
-     ~SingleCoreApplicationPrivate();
+  SingleCoreApplicationPrivate(SingleCoreApplication *_q_ptr);
+  ~SingleCoreApplicationPrivate();
 
-    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);
+  void genBlockServerName();
+  void initializeMemoryBlock();
+  void startPrimary();
+  void startSecondary();
+  void connectToPrimary(const int msecs, const ConnectionType connectionType);
+  quint16 blockChecksum();
+  qint64 primaryPid();
+  void readInitMessageHeader(QLocalSocket *socket);
+  void readInitMessageBody(QLocalSocket *socket);
 
-    SingleCoreApplication *q_ptr;
-    QSharedMemory *memory;
-    QLocalSocket *socket;
-    QLocalServer *server;
-    quint32 instanceNumber;
-    QString blockServerName;
-    SingleCoreApplication::Options options;
-    QMap<QLocalSocket*, ConnectionInfo> connectionMap;
+  SingleCoreApplication *q_ptr;
+  QSharedMemory *memory;
+  QLocalSocket *socket;
+  QLocalServer *server;
+  quint32 instanceNumber;
+  QString blockServerName;
+  SingleCoreApplication::Options options;
+  QMap<QLocalSocket*, ConnectionInfo> connectionMap;
 
-public Q_SLOTS:
-    void slotConnectionEstablished();
-    void slotDataAvailable( QLocalSocket*, quint32 );
-    void slotClientConnectionClosed( QLocalSocket*, quint32 );
+ 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)
@@ -93,6 +89,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

3rdparty/taglib/ape/apefile.cpp

@@ -87,12 +87,15 @@ public:
 // static members
 ////////////////////////////////////////////////////////////////////////////////
 
-bool APE::File::isSupported(IOStream *stream)
+bool APE::File::isSupported(IOStream*)
 {
   // 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);
+  // FIXME:
+  //const ByteVector buffer = Utils::readHeader(stream, bufferSize(), true);
+  //return (buffer.find("MAC ") >= 0);
+
+  return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

3rdparty/taglib/ape/apefile.h

@@ -57,12 +57,12 @@ namespace TagLib {
 
   namespace APE {
 
-    //! An implementation of Strawberry_TagLib::TagLib::File with APE specific methods
+    //! An implementation of TagLib::File with APE specific methods
 
     /*!
      * 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
+     * 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.
      */
 

3rdparty/taglib/ape/apeproperties.h

@@ -56,7 +56,7 @@ namespace TagLib {
        *
        * \deprecated
        */
-      Properties(File *file, ReadStyle style = Average);
+      TAGLIB_DEPRECATED Properties(File *file, ReadStyle style = Average);
 
       /*!
        * Create an instance of APE::Properties with the data read from the
@@ -77,7 +77,7 @@ namespace TagLib {
        *
        * \deprecated
        */
-      virtual int length() const;
+      TAGLIB_DEPRECATED virtual int length() const;
 
       /*!
        * Returns the length of the file in seconds.  The length is rounded down to

3rdparty/taglib/asf/asfattribute.cpp

@@ -264,6 +264,7 @@ int ASF::Attribute::dataSize() const
   case BytesType:
     if(d->pictureValue.isValid())
       return d->pictureValue.dataSize();
+    break;
   case GuidType:
     return d->byteVectorValue.size();
   }
@@ -305,6 +306,7 @@ ByteVector ASF::Attribute::render(const String &name, int kind) const
       data.append(d->pictureValue.render());
       break;
     }
+    break;
   case GuidType:
     data.append(d->byteVectorValue);
     break;

3rdparty/taglib/asf/asfattribute.h

@@ -81,7 +81,7 @@ namespace TagLib
        * 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.
+       * 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);

3rdparty/taglib/asf/asffile.h

@@ -40,8 +40,8 @@ namespace TagLib {
 
     /*!
      * 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
+     * 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
@@ -80,7 +80,7 @@ namespace TagLib {
        * 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().
+       * 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

3rdparty/taglib/asf/asftag.h

@@ -161,6 +161,7 @@ namespace TagLib {
        * Returns a reference to the item list map.  This is an AttributeListMap of
        * all of the items in the tag.
        */
+      // BIC: return by value
       const AttributeListMap &attributeListMap() const;
 
       /*!

3rdparty/taglib/audioproperties.h

@@ -36,7 +36,7 @@ namespace TagLib {
   /*!
    * 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
+   * compliment the TagLib::File and TagLib::Tag APIs in providing a simple
    * interface that is sufficient for most applications.
    */
 

3rdparty/taglib/dsdiff/dsdifffile.cpp

@@ -33,18 +33,45 @@
 #include "tagunion.h"
 #include "dsdifffile.h"
 
-using namespace Strawberry_TagLib::TagLib;
+#include <array>
 
-struct Chunk64
-{
-  ByteVector name;
-  unsigned long long offset;
-  unsigned long long size;
-  char padding;
-};
+using namespace Strawberry_TagLib::TagLib;
 
 namespace
 {
+  struct Chunk64
+  {
+    ByteVector name;
+    unsigned long long offset;
+    unsigned long long size;
+    char padding;
+  };
+
+  typedef std::vector<Chunk64> ChunkList;
+
+  int chunkIndex(const ChunkList &chunks, const ByteVector &id)
+  {
+    for (unsigned long int i = 0 ; i < chunks.size() ; i++) {
+      if(chunks[i].name == id)
+        return i;
+    }
+
+    return -1;
+  }
+
+  bool isValidChunkID(const ByteVector &name)
+  {
+    if(name.size() != 4)
+      return false;
+
+    for (int i = 0 ; i < 4 ; i++) {
+      if (name[i] < 32)
+        return false;
+    }
+
+    return true;
+  }
+
   enum {
     ID3v2Index = 0,
     DIINIndex = 1
@@ -59,14 +86,14 @@ class DSDIFF::File::FilePrivate
 {
 public:
   FilePrivate() :
-  endianness(BigEndian),
-  size(0),
-  isID3InPropChunk(false),
-  duplicateID3V2chunkIndex(-1),
-  properties(0),
-  id3v2TagChunkID("ID3 "),
-  hasID3v2(false),
-  hasDiin(false)
+    endianness(BigEndian),
+    size(0),
+    isID3InPropChunk(false),
+    duplicateID3V2chunkIndex(-1),
+    properties(0),
+    id3v2TagChunkID("ID3 "),
+    hasID3v2(false),
+    hasDiin(false)
   {
     childChunkIndex[ID3v2Index] = -1;
     childChunkIndex[DIINIndex] = -1;
@@ -81,12 +108,18 @@ public:
   ByteVector type;
   unsigned long long size;
   ByteVector format;
-  std::vector<Chunk64> chunks;
-  std::vector<Chunk64> childChunks[2];
-  int childChunkIndex[2];
-  bool isID3InPropChunk; // Two possibilities can be found: ID3V2 chunk inside PROP chunk or at root level
-  int duplicateID3V2chunkIndex; // 2 ID3 chunks are present. This is then the index of the one in
-                                // PROP chunk that will be removed upon next save to remove duplicates.
+  ChunkList chunks;
+  std::array<ChunkList, 2> childChunks;
+  std::array<int, 2> childChunkIndex;
+  /*
+   * Two possibilities can be found: ID3V2 chunk inside PROP chunk or at root level
+   */
+  bool isID3InPropChunk;
+  /*
+   * ID3 chunks are present. This is then the index of the one in PROP chunk that
+   * will be removed upon next save to remove duplicates.
+   */
+  int duplicateID3V2chunkIndex;
 
   Properties *properties;
 
@@ -142,9 +175,9 @@ Strawberry_TagLib::TagLib::Tag *DSDIFF::File::tag() const
   return &d->tag;
 }
 
-ID3v2::Tag *DSDIFF::File::ID3v2Tag() const
+ID3v2::Tag *DSDIFF::File::ID3v2Tag(bool create) const
 {
-  return d->tag.access<ID3v2::Tag>(ID3v2Index, false);
+  return d->tag.access<ID3v2::Tag>(ID3v2Index, create);
 }
 
 bool DSDIFF::File::hasID3v2Tag() const
@@ -152,9 +185,9 @@ bool DSDIFF::File::hasID3v2Tag() const
   return d->hasID3v2;
 }
 
-DSDIFF::DIIN::Tag *DSDIFF::File::DIINTag() const
+DSDIFF::DIIN::Tag *DSDIFF::File::DIINTag(bool create) const
 {
-  return d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, false);
+  return d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, create);
 }
 
 bool DSDIFF::File::hasDIINTag() const
@@ -190,6 +223,11 @@ DSDIFF::Properties *DSDIFF::File::audioProperties() const
 }
 
 bool DSDIFF::File::save()
+{
+  return save(AllTags);
+}
+
+bool DSDIFF::File::save(TagTypes tags, StripTags, ID3v2::Version version)
 {
   if(readOnly()) {
     debug("DSDIFF::File::save() -- File is read only.");
@@ -201,36 +239,44 @@ bool DSDIFF::File::save()
     return false;
   }
 
+  //if(strip == StripOthers || strip == StripAll)
+    //File::strip(static_cast<TagTypes>(AllTags & ~tags));
+
   // First: save ID3V2 chunk
+
   ID3v2::Tag *id3v2Tag = d->tag.access<ID3v2::Tag>(ID3v2Index, false);
-  if(d->isID3InPropChunk) {
-    if(id3v2Tag != NULL && !id3v2Tag->isEmpty()) {
-      setChildChunkData(d->id3v2TagChunkID, id3v2Tag->render(), PROPChunk);
-      d->hasID3v2 = true;
+
+  if(tags & ID3v2 && id3v2Tag) {
+    if(d->isID3InPropChunk) {
+      if(id3v2Tag && !id3v2Tag->isEmpty()) {
+        setChildChunkData(d->id3v2TagChunkID, id3v2Tag->render(version), PROPChunk);
+        d->hasID3v2 = true;
+      }
+      else {
+        // Empty tag: remove it
+        setChildChunkData(d->id3v2TagChunkID, ByteVector(), PROPChunk);
+        d->hasID3v2 = false;
+      }
     }
     else {
-      // Empty tag: remove it
-      setChildChunkData(d->id3v2TagChunkID, ByteVector(), PROPChunk);
-      d->hasID3v2 = false;
-    }
-  }
-  else {
-    if(id3v2Tag != NULL && !id3v2Tag->isEmpty()) {
-      setRootChunkData(d->id3v2TagChunkID, id3v2Tag->render());
-      d->hasID3v2 = true;
-    }
-    else {
-      // Empty tag: remove it
-      setRootChunkData(d->id3v2TagChunkID, ByteVector());
-      d->hasID3v2 = false;
+      if(id3v2Tag && !id3v2Tag->isEmpty()) {
+        setRootChunkData(d->id3v2TagChunkID, id3v2Tag->render(version));
+        d->hasID3v2 = true;
+      }
+      else {
+        // Empty tag: remove it
+        setRootChunkData(d->id3v2TagChunkID, ByteVector());
+        d->hasID3v2 = false;
+      }
     }
   }
 
   // Second: save the DIIN chunk
-  if(d->hasDiin) {
-    DSDIFF::DIIN::Tag *diinTag = d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, false);
 
-    if(!diinTag->title().isNull() && !diinTag->title().isEmpty()) {
+  DSDIFF::DIIN::Tag *diinTag = d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, false);
+
+  if(tags & DIIN && diinTag) {
+    if(!diinTag->title().isEmpty()) {
       ByteVector diinTitle;
       diinTitle.append(ByteVector::fromUInt(diinTag->title().size(), d->endianness == BigEndian));
       diinTitle.append(ByteVector::fromCString(diinTag->title().toCString()));
@@ -239,7 +285,7 @@ bool DSDIFF::File::save()
     else
       setChildChunkData("DITI", ByteVector(), DIINChunk);
 
-    if(!diinTag->artist().isNull() && !diinTag->artist().isEmpty()) {
+    if(!diinTag->artist().isEmpty()) {
       ByteVector diinArtist;
       diinArtist.append(ByteVector::fromUInt(diinTag->artist().size(), d->endianness == BigEndian));
       diinArtist.append(ByteVector::fromCString(diinTag->artist().toCString()));
@@ -258,46 +304,80 @@ bool DSDIFF::File::save()
   return true;
 }
 
+void DSDIFF::File::strip(TagTypes tags)
+{
+  if(tags & ID3v2) {
+    removeRootChunk("ID3 ");
+    removeRootChunk("id3 ");
+    d->hasID3v2 = false;
+    d->tag.set(ID3v2Index, new ID3v2::Tag);
+
+    /// TODO: needs to also account for ID3v2 tags under the PROP chunk
+  }
+  if(tags & DIIN) {
+    removeRootChunk("DITI");
+    removeRootChunk("DIAR");
+    d->hasDiin = false;
+    d->tag.set(DIINIndex, new DIIN::Tag);
+  }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // private members
 ////////////////////////////////////////////////////////////////////////////////
 
-void DSDIFF::File::setRootChunkData(unsigned int i, const ByteVector &data)
+void DSDIFF::File::removeRootChunk(unsigned int i)
 {
-  if(data.isNull() || data.isEmpty()) {
-    // Null data: remove chunk
-    // Update global size
-    unsigned long long removedChunkTotalSize = d->chunks[i].size + d->chunks[i].padding + 12;
-    d->size -= removedChunkTotalSize;
+    unsigned long long chunkSize = d->chunks[i].size + d->chunks[i].padding + 12;
+
+    d->size -= chunkSize;
     insert(ByteVector::fromLongLong(d->size, d->endianness == BigEndian), 4, 8);
 
-    removeBlock(d->chunks[i].offset - 12, removedChunkTotalSize);
+    removeBlock(d->chunks[i].offset - 12, chunkSize);
 
     // Update the internal offsets
+
     for(unsigned long r = i + 1; r < d->chunks.size(); r++)
       d->chunks[r].offset = d->chunks[r - 1].offset + 12
         + d->chunks[r - 1].size + d->chunks[r - 1].padding;
 
     d->chunks.erase(d->chunks.begin() + i);
+}
+
+void DSDIFF::File::removeRootChunk(const ByteVector &id)
+{
+  int i = chunkIndex(d->chunks, id);
+
+  if(i >= 0)
+    removeRootChunk(i);
+}
+
+void DSDIFF::File::setRootChunkData(unsigned int i, const ByteVector &data)
+{
+  if(data.isEmpty()) {
+    removeRootChunk(i);
+    return;
   }
-  else {
-    // Non null data: update chunk
-    // First we update the global size
-    d->size += ((data.size() + 1) & ~1) - (d->chunks[i].size + d->chunks[i].padding);
-    insert(ByteVector::fromLongLong(d->size, d->endianness == BigEndian), 4, 8);
 
-    // Now update the specific chunk
-    writeChunk(d->chunks[i].name,
-               data,
-               d->chunks[i].offset - 12,
-               d->chunks[i].size + d->chunks[i].padding + 12);
+  // Non null data: update chunk
+  // First we update the global size
 
-    d->chunks[i].size = data.size();
-    d->chunks[i].padding = (data.size() & 0x01) ? 1 : 0;
+  d->size += ((data.size() + 1) & ~1) - (d->chunks[i].size + d->chunks[i].padding);
+  insert(ByteVector::fromLongLong(d->size, d->endianness == BigEndian), 4, 8);
 
-    // Finally update the internal offsets
-    updateRootChunksStructure(i + 1);
-  }
+  // Now update the specific chunk
+
+  writeChunk(d->chunks[i].name,
+             data,
+             d->chunks[i].offset - 12,
+             d->chunks[i].size + d->chunks[i].padding + 12);
+
+  d->chunks[i].size = data.size();
+  d->chunks[i].padding = (data.size() & 0x01) ? 1 : 0;
+
+  // Finally update the internal offsets
+
+  updateRootChunksStructure(i + 1);
 }
 
 void DSDIFF::File::setRootChunkData(const ByteVector &name, const ByteVector &data)
@@ -307,15 +387,15 @@ void DSDIFF::File::setRootChunkData(const ByteVector &name, const ByteVector &da
     return;
   }
 
-  for(unsigned int i = 0; i < d->chunks.size(); i++) {
-    if(d->chunks[i].name == name) {
-      setRootChunkData(i, data);
-      return;
-    }
+  int i = chunkIndex(d->chunks, name);
+
+  if(i >= 0) {
+    setRootChunkData(i, data);
+    return;
   }
 
   // Couldn't find an existing chunk, so let's create a new one.
-  unsigned int i = d->chunks.size() - 1;
+  i = d->chunks.size() - 1;
   unsigned long offset = d->chunks[i].offset + d->chunks[i].size + d->chunks[i].padding;
 
   // First we update the global size
@@ -338,28 +418,29 @@ void DSDIFF::File::setRootChunkData(const ByteVector &name, const ByteVector &da
   d->chunks.push_back(chunk);
 }
 
-void DSDIFF::File::setChildChunkData(unsigned int i,
-                                     const ByteVector &data,
-                                     unsigned int childChunkNum)
+void DSDIFF::File::removeChildChunk(unsigned int i, unsigned int childChunkNum)
 {
-  std::vector<Chunk64> &childChunks = d->childChunks[childChunkNum];
+    ChunkList &childChunks = d->childChunks[childChunkNum];
 
-  if(data.isNull() || data.isEmpty()) {
-    // Null data: remove chunk
     // Update global size
+
     unsigned long long removedChunkTotalSize = childChunks[i].size + childChunks[i].padding + 12;
     d->size -= removedChunkTotalSize;
     insert(ByteVector::fromLongLong(d->size, d->endianness == BigEndian), 4, 8);
+
     // Update child chunk size
+
     d->chunks[d->childChunkIndex[childChunkNum]].size -= removedChunkTotalSize;
     insert(ByteVector::fromLongLong(d->chunks[d->childChunkIndex[childChunkNum]].size,
                                     d->endianness == BigEndian),
            d->chunks[d->childChunkIndex[childChunkNum]].offset - 8, 8);
     // Remove the chunk
+
     removeBlock(childChunks[i].offset - 12, removedChunkTotalSize);
 
     // Update the internal offsets
     // For child chunks
+
     if((i + 1) < childChunks.size()) {
       childChunks[i + 1].offset = childChunks[i].offset;
       i++;
@@ -369,49 +450,65 @@ void DSDIFF::File::setChildChunkData(unsigned int i,
     }
 
     // And for root chunks
+
     for(i = d->childChunkIndex[childChunkNum] + 1; i < d->chunks.size(); i++)
       d->chunks[i].offset = d->chunks[i - 1].offset + 12
         + d->chunks[i - 1].size + d->chunks[i - 1].padding;
 
     childChunks.erase(childChunks.begin() + i);
+}
+
+void DSDIFF::File::setChildChunkData(unsigned int i,
+                                     const ByteVector &data,
+                                     unsigned int childChunkNum)
+{
+  ChunkList &childChunks = d->childChunks[childChunkNum];
+
+  if(data.isEmpty()) {
+    removeChildChunk(i, childChunkNum);
+    return;
   }
-  else {
-    // Non null data: update chunk
-    // First we update the global size
-    d->size += ((data.size() + 1) & ~1) - (childChunks[i].size + childChunks[i].padding);
-    insert(ByteVector::fromLongLong(d->size, d->endianness == BigEndian), 4, 8);
-    // And the PROP chunk size
-    d->chunks[d->childChunkIndex[childChunkNum]].size += ((data.size() + 1) & ~1)
-      - (childChunks[i].size + childChunks[i].padding);
-    insert(ByteVector::fromLongLong(d->chunks[d->childChunkIndex[childChunkNum]].size,
-                                    d->endianness == BigEndian),
-           d->chunks[d->childChunkIndex[childChunkNum]].offset - 8, 8);
 
-    // Now update the specific chunk
-    writeChunk(childChunks[i].name,
-               data,
-               childChunks[i].offset - 12,
-               childChunks[i].size + childChunks[i].padding + 12);
+  // Non null data: update chunk
+  // First we update the global size
 
-    childChunks[i].size = data.size();
-    childChunks[i].padding = (data.size() & 0x01) ? 1 : 0;
+  d->size += ((data.size() + 1) & ~1) - (childChunks[i].size + childChunks[i].padding);
 
-    // Now update the internal offsets
-    // For child Chunks
-    for(i++; i < childChunks.size(); i++)
-      childChunks[i].offset = childChunks[i - 1].offset + 12
-      + childChunks[i - 1].size + childChunks[i - 1].padding;
+  insert(ByteVector::fromLongLong(d->size, d->endianness == BigEndian), 4, 8);
 
-    // And for root chunks
-    updateRootChunksStructure(d->childChunkIndex[childChunkNum] + 1);
-  }
+  // And the PROP chunk size
+
+  d->chunks[d->childChunkIndex[childChunkNum]].size +=
+    ((data.size() + 1) & ~1) - (childChunks[i].size + childChunks[i].padding);
+  insert(ByteVector::fromLongLong(d->chunks[d->childChunkIndex[childChunkNum]].size,
+                                  d->endianness == BigEndian),
+         d->chunks[d->childChunkIndex[childChunkNum]].offset - 8, 8);
+
+  // Now update the specific chunk
+
+  writeChunk(childChunks[i].name,
+             data,
+             childChunks[i].offset - 12,
+             childChunks[i].size + childChunks[i].padding + 12);
+
+  childChunks[i].size = data.size();
+  childChunks[i].padding = (data.size() & 0x01) ? 1 : 0;
+
+  // Now update the internal offsets
+  // For child Chunks
+  for(i++; i < childChunks.size(); i++)
+    childChunks[i].offset = childChunks[i - 1].offset + 12
+                            + childChunks[i - 1].size + childChunks[i - 1].padding;
+
+  // And for root chunks
+  updateRootChunksStructure(d->childChunkIndex[childChunkNum] + 1);
 }
 
 void DSDIFF::File::setChildChunkData(const ByteVector &name,
                                      const ByteVector &data,
                                      unsigned int childChunkNum)
 {
-  std::vector<Chunk64> &childChunks = d->childChunks[childChunkNum];
+  ChunkList &childChunks = d->childChunks[childChunkNum];
 
   if(childChunks.size() == 0) {
     debug("DSDIFF::File::setPropChunkData - No valid chunks found.");
@@ -426,17 +523,22 @@ void DSDIFF::File::setChildChunkData(const ByteVector &name,
   }
 
   // Do not attempt to remove a non existing chunk
-  if(data.isNull() || data.isEmpty())
+
+  if(data.isEmpty())
     return;
 
   // Couldn't find an existing chunk, so let's create a new one.
+
   unsigned int i = childChunks.size() - 1;
   unsigned long offset = childChunks[i].offset + childChunks[i].size + childChunks[i].padding;
 
   // First we update the global size
+
   d->size += (offset & 1) + ((data.size() + 1) & ~1) + 12;
   insert(ByteVector::fromLongLong(d->size, d->endianness == BigEndian), 4, 8);
+
   // And the child chunk size
+
   d->chunks[d->childChunkIndex[childChunkNum]].size += (offset & 1)
     + ((data.size() + 1) & ~1) + 12;
   insert(ByteVector::fromLongLong(d->chunks[d->childChunkIndex[childChunkNum]].size,
@@ -444,6 +546,7 @@ void DSDIFF::File::setChildChunkData(const ByteVector &name,
          d->chunks[d->childChunkIndex[childChunkNum]].offset - 8, 8);
 
   // Now add the chunk to the file
+
   unsigned long long nextRootChunkIdx = length();
   if((d->childChunkIndex[childChunkNum] + 1) < static_cast<int>(d->chunks.size()))
     nextRootChunkIdx = d->chunks[d->childChunkIndex[childChunkNum] + 1].offset - 12;
@@ -453,6 +556,7 @@ void DSDIFF::File::setChildChunkData(const ByteVector &name,
              (offset & 1) ? 1 : 0);
 
   // For root chunks
+
   updateRootChunksStructure(d->childChunkIndex[childChunkNum] + 1);
 
   Chunk64 chunk;
@@ -464,19 +568,6 @@ void DSDIFF::File::setChildChunkData(const ByteVector &name,
   childChunks.push_back(chunk);
 }
 
-static bool isValidChunkID(const ByteVector &name)
-{
-  if(name.size() != 4)
-    return false;
-
-  for(int i = 0; i < 4; i++) {
-    if(name[i] < 32 || name[i] > 127)
-      return false;
-  }
-
-  return true;
-}
-
 void DSDIFF::File::updateRootChunksStructure(unsigned int startingChunk)
 {
   for(unsigned int i = startingChunk; i < d->chunks.size(); i++)
@@ -484,17 +575,19 @@ void DSDIFF::File::updateRootChunksStructure(unsigned int startingChunk)
       + d->chunks[i - 1].size + d->chunks[i - 1].padding;
 
   // Update childchunks structure as well
+
   if(d->childChunkIndex[PROPChunk] >= static_cast<int>(startingChunk)) {
-    std::vector<Chunk64> &childChunksToUpdate = d->childChunks[PROPChunk];
+    ChunkList &childChunksToUpdate = d->childChunks[PROPChunk];
     if(childChunksToUpdate.size() > 0) {
       childChunksToUpdate[0].offset = d->chunks[d->childChunkIndex[PROPChunk]].offset + 12;
       for(unsigned int i = 1; i < childChunksToUpdate.size(); i++)
         childChunksToUpdate[i].offset = childChunksToUpdate[i - 1].offset + 12
           + childChunksToUpdate[i - 1].size + childChunksToUpdate[i - 1].padding;
     }
+
   }
   if(d->childChunkIndex[DIINChunk] >= static_cast<int>(startingChunk)) {
-    std::vector<Chunk64> &childChunksToUpdate = d->childChunks[DIINChunk];
+    ChunkList &childChunksToUpdate = d->childChunks[DIINChunk];
     if(childChunksToUpdate.size() > 0) {
       childChunksToUpdate[0].offset = d->chunks[d->childChunkIndex[DIINChunk]].offset + 12;
       for(unsigned int i = 1; i < childChunksToUpdate.size(); i++)
@@ -513,6 +606,7 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
   d->format = readBlock(4);
 
   // + 12: chunk header at least, fix for additional junk bytes
+
   while(tell() + 12 <= length()) {
     ByteVector chunkName = readBlock(4);
     unsigned long long chunkSize = readBlock(8).toLongLong(bigEndian);
@@ -523,7 +617,8 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
       break;
     }
 
-    if(static_cast<unsigned long long>(tell()) + chunkSize > static_cast<unsigned long long>(length())) {
+    if(static_cast<unsigned long long>(tell()) + chunkSize >
+       static_cast<unsigned long long>(length())) {
       debug("DSDIFF::File::read() -- Chunk '" + chunkName
             + "' has invalid size (larger than the file size)");
       setValid(false);
@@ -538,6 +633,7 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
     seek(chunk.size, Current);
 
     // Check padding
+
     chunk.padding = 0;
     long uPosNotPadded = tell();
     if((uPosNotPadded & 0x01) != 0) {
@@ -551,10 +647,14 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
     d->chunks.push_back(chunk);
   }
 
-  unsigned long long lengthDSDSamplesTimeChannels = 0; // For DSD uncompressed
-  unsigned long long audioDataSizeinBytes = 0; // For computing bitrate
-  unsigned long dstNumFrames = 0; // For DST compressed frames
-  unsigned short dstFrameRate = 0; // For DST compressed frames
+  // For DSD uncompressed
+  unsigned long long lengthDSDSamplesTimeChannels = 0;
+  // For computing bitrate
+  unsigned long long audioDataSizeinBytes = 0;
+  // For DST compressed frames
+  unsigned long dstNumFrames = 0;
+  // For DST compressed frames
+  unsigned short dstFrameRate = 0;
 
   for(unsigned int i = 0; i < d->chunks.size(); i++) {
     if(d->chunks[i].name == "DSD ") {
@@ -589,7 +689,8 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
           // Found the DST frame information chunk
           dstNumFrames = readBlock(4).toUInt(bigEndian);
           dstFrameRate = readBlock(2).toUShort(bigEndian);
-          break; // Found the wanted one, no need to look at the others
+          // Found the wanted one, no need to look at the others
+          break;
         }
 
         seek(dstChunkSize, Current);
@@ -608,7 +709,8 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
       d->childChunkIndex[PROPChunk] = i;
       // Now decodes the chunks inside the PROP chunk
       long long propChunkEnd = d->chunks[i].offset + d->chunks[i].size;
-      seek(d->chunks[i].offset + 4); // +4 to remove the 'SND ' marker at beginning of 'PROP' chunk
+      // +4 to remove the 'SND ' marker at beginning of 'PROP' chunk
+      seek(d->chunks[i].offset + 4);
       while(tell() + 12 <= propChunkEnd) {
         ByteVector propChunkName = readBlock(4);
         long long propChunkSize = readBlock(8).toLongLong(bigEndian);
@@ -650,7 +752,9 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
     else if(d->chunks[i].name == "DIIN") {
       d->childChunkIndex[DIINChunk] = i;
       d->hasDiin = true;
+
       // Now decode the chunks inside the DIIN chunk
+
       long long diinChunkEnd = d->chunks[i].offset + d->chunks[i].size;
       seek(d->chunks[i].offset);
 
@@ -679,8 +783,10 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
         seek(chunk.size, Current);
 
         // Check padding
+
         chunk.padding = 0;
         long uPosNotPadded = tell();
+
         if((uPosNotPadded & 0x01) != 0) {
           ByteVector iByte = readBlock(1);
           if((iByte.size() != 1) || (iByte[0] != 0))
@@ -715,10 +821,12 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
   unsigned short channels=0;
 
   for(unsigned int i = 0; i < d->childChunks[PROPChunk].size(); i++) {
-    if(d->childChunks[PROPChunk][i].name == "ID3 " || d->childChunks[PROPChunk][i].name == "id3 ") {
+    if(d->childChunks[PROPChunk][i].name == "ID3 " ||
+       d->childChunks[PROPChunk][i].name == "id3 ") {
       if(d->hasID3v2) {
         d->duplicateID3V2chunkIndex = i;
-        continue; // ID3V2 tag has already been found at root level
+        // ID3V2 tag has already been found at root level
+        continue;
       }
       d->id3v2TagChunkID = d->childChunks[PROPChunk][i].name;
       d->tag.set(ID3v2Index, new ID3v2::Tag(this, d->childChunks[PROPChunk][i].offset));
@@ -738,6 +846,7 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
   }
 
   // Read title & artist from DIIN chunk
+
   d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, true);
 
   if(d->hasDiin) {
@@ -765,8 +874,9 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
     if(lengthDSDSamplesTimeChannels == 0) {
       // DST compressed signal : need to compute length of DSD uncompressed frames
       if(dstFrameRate > 0)
-        lengthDSDSamplesTimeChannels = (unsigned long long)dstNumFrames
-          * (unsigned long long)sampleRate / (unsigned long long)dstFrameRate;
+        lengthDSDSamplesTimeChannels = (unsigned long long) dstNumFrames *
+                                       (unsigned long long) sampleRate /
+                                       (unsigned long long) dstFrameRate;
       else
         lengthDSDSamplesTimeChannels = 0;
     }
@@ -777,7 +887,7 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
     }
     int bitrate = 0;
     if(lengthDSDSamplesTimeChannels > 0)
-      bitrate = (audioDataSizeinBytes*8*sampleRate) / lengthDSDSamplesTimeChannels / 1000;
+      bitrate = (audioDataSizeinBytes * 8 * sampleRate) / lengthDSDSamplesTimeChannels / 1000;
 
     d->properties = new Properties(sampleRate,
                                    channels,
@@ -788,7 +898,8 @@ void DSDIFF::File::read(bool readProperties, Properties::ReadStyle propertiesSty
 
   if(!ID3v2Tag()) {
     d->tag.access<ID3v2::Tag>(ID3v2Index, true);
-    d->isID3InPropChunk = false; // By default, ID3 chunk is at root level
+    // By default, ID3 chunk is at root level
+    d->isID3InPropChunk = false;
     d->hasID3v2 = false;
   }
 }

3rdparty/taglib/dsdiff/dsdifffile.h

@@ -41,27 +41,43 @@ namespace TagLib {
    *
    * This supports an ID3v2 tag as well as reading stream from the ID3 RIFF
    * chunk as well as properties from the file.
-   * Description of the DSDIFF format is available 
+   * 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
+   * 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 Strawberry_TagLib::TagLib::File with DSDIFF specific methods
+    //! An implementation of TagLib::File with DSDIFF specific methods
 
     /*!
      * 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
+     * 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
+      };
+
       /*!
        * Constructs an DSDIFF file from \a file.  If \a readProperties is true
        * the file's audio properties will also be read.
@@ -115,13 +131,13 @@ namespace TagLib {
        *
        * \see hasID3v2Tag()
        */
-      virtual ID3v2::Tag *ID3v2Tag() const;
+      ID3v2::Tag *ID3v2Tag(bool create = false) const;
 
       /*!
        * Returns the DSDIFF DIIN Tag for this file
        *
        */
-      DSDIFF::DIIN::Tag *DIINTag() const;
+      DSDIFF::DIIN::Tag *DIINTag(bool create = false) const;
 
       /*!
        * Implements the unified property interface -- export function.
@@ -161,15 +177,21 @@ namespace TagLib {
       virtual bool save();
 
       /*!
-       * Save the file.  This will attempt to save all of the tag types that are
-       * specified by OR-ing together TagTypes values.  The save() method above
-       * uses AllTags.  This returns true if saving was successful.
-       *
-       * This strips all tags not included in the mask, but does not modify them
-       * in memory, so later calls to save() which make use of these tags will
-       * remain valid.  This also strips empty tags.
+       * Save the file.  If \a strip is specified, it is possible to choose if
+       * tags not specified in \a tags should be stripped from the file or
+       * retained.  With \a version, it is possible to specify whether ID3v2.4
+       * or ID3v2.3 should be used.
        */
-      bool save(int tags);
+      bool save(TagTypes tags, StripTags strip = StripOthers, ID3v2::Version version = ID3v2::v4);
+
+      /*!
+       * This will strip the tags that match the OR-ed together TagTypes from the
+       * file.  By default it strips all tags.  It returns true if the tags are
+       * successfully stripped.
+       *
+       * \note This will update the file immediately.
+       */
+      void strip(TagTypes tags = AllTags);
 
       /*!
        * Returns whether or not the file on disk actually has an ID3v2 tag.
@@ -179,8 +201,8 @@ namespace TagLib {
       bool hasID3v2Tag() const;
 
       /*!
-       * Returns whether or not the file on disk actually has the DSDIFF 
-       * Title & Artist tag.
+       * Returns whether or not the file on disk actually has the DSDIFF
+       * title and artist tags.
        *
        * \see DIINTag()
        */
@@ -205,6 +227,10 @@ namespace TagLib {
       File(const File &);
       File &operator=(const File &);
 
+      void removeRootChunk(const ByteVector &id);
+      void removeRootChunk(unsigned int chunk);
+      void removeChildChunk(unsigned int i, unsigned int chunk);
+
       /*!
        * Sets the data for the the specified chunk at root level to \a data.
        *

3rdparty/taglib/dsf/dsffile.cpp

@@ -180,7 +180,7 @@ bool DSF::File::save()
 ////////////////////////////////////////////////////////////////////////////////
 
 
-void DSF::File::read(bool readProperties, Properties::ReadStyle propertiesStyle)
+void DSF::File::read(bool, Properties::ReadStyle propertiesStyle)
 {
   // A DSF file consists of four chunks: DSD chunk, format chunk, data chunk, and metadata chunk
   // The file format is not chunked in the sense of a RIFF File, though

3rdparty/taglib/dsf/dsffile.h

@@ -56,7 +56,7 @@ namespace TagLib {
     {
     public:
       /*!
-       * Contructs an DSF file from \a file.  If \a readProperties is true the
+       * 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.
        */
@@ -64,7 +64,7 @@ namespace TagLib {
            Properties::ReadStyle propertiesStyle = Properties::Average);
 
       /*!
-       * Contructs an DSF file from \a file.  If \a readProperties is true the
+       * 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.
        */

3rdparty/taglib/fileref.cpp

@@ -228,10 +228,10 @@ namespace
       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;
+      File *file_flac = new Ogg::FLAC::File(fileName, readAudioProperties, audioPropertiesStyle);
+      if (file_flac->isValid())
+        return file_flac;
+      delete file_flac;
       return new Ogg::Vorbis::File(fileName, readAudioProperties, audioPropertiesStyle);
     }
     if(ext == "FLAC")

3rdparty/taglib/fileref.h

@@ -42,7 +42,7 @@ namespace TagLib {
   /*!
    * 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
+   * 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
@@ -92,8 +92,8 @@ namespace TagLib {
 
     class TAGLIB_EXPORT FileTypeResolver
     {
-      TAGLIB_IGNORE_MISSING_DESTRUCTOR
     public:
+      virtual ~FileTypeResolver();
       /*!
        * This method must be overridden to provide an additional file type
        * resolver.  If the resolver is able to determine the file type it should
@@ -286,4 +286,4 @@ namespace TagLib {
 }
 } // namespace Strawberry_TagLib::TagLib
 
-#endif
+#endif  // TAGLIB_FILEREF_H

3rdparty/taglib/flac/flacfile.h

@@ -55,12 +55,12 @@ namespace TagLib {
 
   namespace FLAC {
 
-    //! An implementation of Strawberry_TagLib::TagLib::File with FLAC specific methods
+    //! An implementation of TagLib::File with FLAC specific methods
 
     /*!
      * 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
+     * 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.
      */
 
@@ -241,7 +241,7 @@ namespace TagLib {
        * \see ID3v2FrameFactory
        * \deprecated This value should be passed in via the constructor
        */
-      void setID3v2FrameFactory(const ID3v2::FrameFactory *factory);
+      TAGLIB_DEPRECATED void setID3v2FrameFactory(const ID3v2::FrameFactory *factory);
 
       /*!
        * Returns the block of data used by FLAC::Properties for parsing the
@@ -249,7 +249,7 @@ namespace TagLib {
        *
        * \deprecated Always returns an empty vector.
        */
-      ByteVector streamInfoData(); // BIC: remove
+      TAGLIB_DEPRECATED ByteVector streamInfoData(); // BIC: remove
 
       /*!
        * Returns the length of the audio-stream, used by FLAC::Properties for
@@ -257,7 +257,7 @@ namespace TagLib {
        *
        * \deprecated Always returns zero.
        */
-      long streamLength();  // BIC: remove
+      TAGLIB_DEPRECATED long streamLength();  // BIC: remove
 
       /*!
        * Returns a list of pictures attached to the FLAC file.

3rdparty/taglib/flac/flacproperties.h

@@ -73,7 +73,7 @@ namespace TagLib {
        *
        * \deprecated
        */
-      virtual int length() const;
+      TAGLIB_DEPRECATED virtual int length() const;
 
       /*!
        * Returns the length of the file in seconds.  The length is rounded down to
@@ -121,7 +121,7 @@ namespace TagLib {
        *
        * \deprecated
        */
-      int sampleWidth() const;
+      TAGLIB_DEPRECATED int sampleWidth() const;
 
       /*!
        * Return the number of sample frames.

3rdparty/taglib/it/itfile.cpp

@@ -277,7 +277,7 @@ 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));

3rdparty/taglib/mod/modfilebase.cpp

@@ -60,9 +60,9 @@ bool Mod::FileBase::readString(String &s, unsigned long size)
   return true;
 }
 
-void Mod::FileBase::writeByte(unsigned char byte)
+void Mod::FileBase::writeByte(unsigned char _byte)
 {
-  ByteVector data(1, byte);
+  ByteVector data(1, _byte);
   writeBlock(data);
 }
 
@@ -86,11 +86,11 @@ void Mod::FileBase::writeU32B(unsigned long number)
   writeBlock(ByteVector::fromUInt(number, true));
 }
 
-bool Mod::FileBase::readByte(unsigned char &byte)
+bool Mod::FileBase::readByte(unsigned char &_byte)
 {
   ByteVector data(readBlock(1));
   if(data.size() < 1) return false;
-  byte = data[0];
+  _byte = data[0];
   return true;
 }
 

3rdparty/taglib/mp4/mp4atom.cpp

@@ -122,15 +122,15 @@ MP4::Atom::find(const char *name1, const char *name2, const char *name3, const c
 }
 
 MP4::AtomList
-MP4::Atom::findall(const char *name, bool recursive)
+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) {
+    if((*it)->name == _name) {
       result.append(*it);
     }
     if(recursive) {
-      result.append((*it)->findall(name, recursive));
+      result.append((*it)->findall(_name, recursive));
     }
   }
   return result;

3rdparty/taglib/mp4/mp4atom.h

@@ -67,7 +67,7 @@ namespace TagLib {
     };
 
     struct AtomData {
-      AtomData(AtomDataType type, ByteVector data) : type(type), locale(0), data(data) {}
+      AtomData(AtomDataType _type, ByteVector _data) : type(_type), locale(0), data(_data) {}
       AtomDataType type;
       int locale;
       ByteVector data;

3rdparty/taglib/mp4/mp4file.h

@@ -42,8 +42,8 @@ namespace TagLib {
 
     /*!
      * 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
+     * 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
@@ -79,7 +79,7 @@ namespace TagLib {
        * 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().
+       * 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

3rdparty/taglib/mp4/mp4properties.h

@@ -58,7 +58,7 @@ namespace TagLib {
        *
        * \deprecated
        */
-      virtual int length() const;
+      TAGLIB_DEPRECATED virtual int length() const;
 
       /*!
        * Returns the length of the file in seconds.  The length is rounded down to

3rdparty/taglib/mp4/mp4tag.cpp

@@ -74,9 +74,20 @@ MP4::Tag::Tag(Strawberry_TagLib::TagLib::File *file, MP4::Atoms *atoms) :
             atom->name == "hdvd" || atom->name == "shwm") {
       parseBool(atom);
     }
-    else if(atom->name == "tmpo" || atom->name == "rate" || atom->name == "\251mvi" || atom->name == "\251mvc") {
+    else if(atom->name == "tmpo" || atom->name == "\251mvi" || atom->name == "\251mvc") {
       parseInt(atom);
     }
+    else if(atom->name == "rate") {
+      AtomDataList data = parseData2(atom);
+      if(!data.isEmpty()) {
+        AtomData val = data[0];
+        if (val.type == TypeUTF8) {
+          addItem(atom->name, StringList(String(val.data, String::UTF8)));
+        } else {
+          addItem(atom->name, (int)(val.data.toShort()));
+        }
+      }
+    }
     else if(atom->name == "tvsn" || atom->name == "tves" || atom->name == "cnID" ||
             atom->name == "sfID" || atom->name == "atID" || atom->name == "geID" ||
             atom->name == "cmID") {
@@ -480,9 +491,19 @@ MP4::Tag::save()
             name == "shwm") {
       data.append(renderBool(name.data(String::Latin1), it->second));
     }
-    else if(name == "tmpo" || name == "rate" || name == "\251mvi" || name == "\251mvc") {
+    else if(name == "tmpo" || name == "\251mvi" || name == "\251mvc") {
       data.append(renderInt(name.data(String::Latin1), it->second));
     }
+    else if (name == "rate") {
+      const MP4::Item& item = it->second;
+      StringList value = item.toStringList();
+      if (value.isEmpty()) {
+        data.append(renderInt(name.data(String::Latin1), item));
+      }
+      else {
+        data.append(renderText(name.data(String::Latin1), item));
+      }
+    }
     else if(name == "tvsn" || name == "tves" || name == "cnID" ||
             name == "sfID" || name == "atID" || name == "geID" ||
             name == "cmID") {
@@ -784,13 +805,23 @@ MP4::Tag::setGenre(const String &value)
 void
 MP4::Tag::setYear(unsigned int value)
 {
-  d->items["\251day"] = StringList(String::number(value));
+  if (value == 0) {
+    d->items.erase("\251day");
+  }
+  else {
+    d->items["\251day"] = StringList(String::number(value));
+  }
 }
 
 void
 MP4::Tag::setTrack(unsigned int value)
 {
-  d->items["trkn"] = MP4::Item(value, 0);
+  if (value == 0) {
+    d->items.erase("trkn");
+  }
+  else {
+    d->items["trkn"] = MP4::Item(value, 0);
+  }
 }
 
 bool MP4::Tag::isEmpty() const

3rdparty/taglib/mp4/mp4tag.h

@@ -43,7 +43,7 @@ namespace TagLib {
     /*!
      * \deprecated
      */
-    typedef Strawberry_TagLib::TagLib::Map<String, Item> ItemListMap;
+    TAGLIB_DEPRECATED typedef Strawberry_TagLib::TagLib::Map<String, Item> ItemListMap;
     typedef Strawberry_TagLib::TagLib::Map<String, Item> ItemMap;
 
     class TAGLIB_EXPORT Tag: public Strawberry_TagLib::TagLib::Tag
@@ -75,7 +75,7 @@ namespace TagLib {
         /*!
          * \deprecated Use the item() and setItem() API instead
          */
-        ItemMap &itemListMap();
+        TAGLIB_DEPRECATED ItemMap &itemListMap();
 
         /*!
          * Returns a string-keyed map of the MP4::Items for this tag.

3rdparty/taglib/mpc/mpcfile.h

@@ -54,12 +54,12 @@ namespace TagLib {
 
   namespace MPC {
 
-    //! An implementation of Strawberry_TagLib::TagLib::File with MPC specific methods
+    //! An implementation of TagLib::File with MPC specific methods
 
     /*!
      * This implements and provides an interface for MPC 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
+     * TagLib::Tag and TagLib::AudioProperties interfaces by way of implementing
+     * the abstract TagLib::File API as well as providing some additional
      * information specific to MPC files.
      * The only invalid tag combination supported is an ID3v1 tag after an APE tag.
      */
@@ -199,7 +199,7 @@ namespace TagLib {
        * \deprecated
        * \see strip
        */
-      void remove(int tags = AllTags);
+      TAGLIB_DEPRECATED void remove(int tags = AllTags);
 
       /*!
        * Returns whether or not the file on disk actually has an ID3v1 tag.

3rdparty/taglib/mpc/mpcproperties.cpp

@@ -49,18 +49,17 @@ public:
     albumGain(0),
     albumPeak(0) {}
 
-  int          version;
-  int          length;
-  int          bitrate;
-  int          sampleRate;
-  int          channels;
+  int version;
+  int length;
+  int bitrate;
+  int sampleRate;
+  int channels;
   unsigned int totalFrames;
   unsigned int sampleFrames;
-  unsigned int trackGain;
-  unsigned int trackPeak;
-  unsigned int albumGain;
-  unsigned int albumPeak;
-  String       flags;
+  int trackGain;
+  int trackPeak;
+  int albumGain;
+  int albumPeak;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -312,9 +311,9 @@ void MPC::Properties::readSV7(const ByteVector &data, long streamLength)
     const unsigned int gapless = data.toUInt(5, false);
 
     d->trackGain = data.toShort(14, false);
-    d->trackPeak = data.toShort(12, false);
+    d->trackPeak = data.toUShort(12, false);
     d->albumGain = data.toShort(18, false);
-    d->albumPeak = data.toShort(16, false);
+    d->albumPeak = data.toUShort(16, false);
 
     // convert gain info
     if(d->trackGain != 0) {

3rdparty/taglib/mpc/mpcproperties.h

@@ -75,7 +75,7 @@ namespace TagLib {
        *
        * \deprecated
        */
-      virtual int length() const;
+      TAGLIB_DEPRECATED virtual int length() const;
 
       /*!
        * Returns the length of the file in seconds.  The length is rounded down to

3rdparty/taglib/mpeg/id3v1/id3v1tag.h

@@ -89,7 +89,7 @@ namespace TagLib {
      * This is an implementation of the ID3v1 format.  ID3v1 is both the simplest
      * and most common of tag formats but is rather limited.  Because of its
      * pervasiveness and the way that applications have been written around the
-     * fields that it provides, the generic Strawberry_TagLib::TagLib::Tag API is a mirror of what is
+     * fields that it provides, the generic TagLib::Tag API is a mirror of what is
      * provided by ID3v1.
      *
      * ID3v1 tags should generally only contain Latin1 information.  However because

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

@@ -267,7 +267,7 @@ void ChapterFrame::parseFields(const ByteVector &data)
     return;
 
   while(embPos < size - header()->size()) {
-    Frame *frame = FrameFactory::instance()->createFrame(data.mid(pos + embPos), (d->tagHeader != 0));
+    Frame *frame = FrameFactory::instance()->createFrame(data.mid(pos + embPos), d->tagHeader);
 
     if(!frame)
       return;

3rdparty/taglib/mpeg/id3v2/frames/relativevolumeframe.h

@@ -132,12 +132,12 @@ namespace TagLib {
       /*!
        * \deprecated Always returns master volume.
        */
-      ChannelType channelType() const;
+      TAGLIB_DEPRECATED ChannelType channelType() const;
 
       /*!
        * \deprecated This method no longer has any effect.
        */
-      void setChannelType(ChannelType t);
+      TAGLIB_DEPRECATED void setChannelType(ChannelType t);
 
       /*
        * There was a terrible API goof here, and while this can't be changed to

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

@@ -55,7 +55,7 @@ public:
 namespace {
 
   // These functions are needed to try to aim for backward compatibility with
-  // an API that previously (unreasonably) required null bytes to be appeneded
+  // an API that previously (unreasonably) required null bytes to be appended
   // at the end of identifiers explicitly by the API user.
 
   // BIC: remove these
@@ -304,7 +304,7 @@ void TableOfContentsFrame::parseFields(const ByteVector &data)
     return;
 
   while(embPos < size - header()->size()) {
-    Frame *frame = FrameFactory::instance()->createFrame(data.mid(pos + embPos), (d->tagHeader != 0));
+    Frame *frame = FrameFactory::instance()->createFrame(data.mid(pos + embPos), d->tagHeader);
 
     if(!frame)
       return;
@@ -334,14 +334,14 @@ ByteVector TableOfContentsFrame::renderFields() const
   data.append(flags);
   data.append((char)(entryCount()));
   ByteVectorList::ConstIterator it = d->childElements.begin();
-  while(it != d->childElements.end()) {
+  while (it != d->childElements.end()) {
     data.append(*it);
     data.append('\0');
     it++;
   }
   FrameList l = d->embeddedFrameList;
-  for(FrameList::ConstIterator it = l.begin(); it != l.end(); ++it)
-    data.append((*it)->render());
+  for (FrameList::ConstIterator it2 = l.begin(); it2 != l.end(); ++it2)
+    data.append((*it2)->render());
 
   return data;
 }

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

@@ -277,7 +277,7 @@ PropertyMap TextIdentificationFrame::makeTIPLProperties() const
         break;
       }
     if(!found){
-      // invalid involved role -> mark whole frame as unsupported in order to be consisten with writing
+      // invalid involved role -> mark whole frame as unsupported in order to be consistent with writing
       map.clear();
       map.unsupportedData().append(frameID());
       return map;

3rdparty/taglib/mpeg/id3v2/id3v2.h

@@ -0,0 +1,26 @@
+#ifndef TAGLIB_ID3V2_H
+#define TAGLIB_ID3V2_H
+
+namespace Strawberry_TagLib {
+namespace TagLib {
+  //! An ID3v2 implementation
+
+  /*!
+   * This is a relatively complete and flexible framework for working with ID3v2
+   * tags.
+   *
+   * \see ID3v2::Tag
+   */
+  namespace ID3v2 {
+    /*!
+     * Used to specify which version of the ID3 standard to use when saving tags.
+     */
+    enum Version {
+      v3 = 3, //<! ID3v2.3
+      v4 = 4  //<! ID3v2.4
+    };
+  }
+}
+}
+
+#endif

3rdparty/taglib/mpeg/id3v2/id3v2extendedheader.h

@@ -39,7 +39,7 @@ namespace TagLib {
 
     /*!
      * This class implements ID3v2 extended headers.  It attempts to follow,
-     * both semantically and programatically, the structure specified in
+     * both semantically and programmatically, the structure specified in
      * the ID3v2 standard.  The API is based on the properties of ID3v2 extended
      * headers specified there.  If any of the terms used in this documentation
      * are unclear please check the specification in the linked section.

3rdparty/taglib/mpeg/id3v2/id3v2frame.cpp

@@ -111,8 +111,8 @@ Frame *Frame::createTextualFrame(const String &key, const StringList &values) //
   // check if the key is contained in the key<=>frameID mapping
   ByteVector frameID = keyToFrameID(key);
   if(!frameID.isEmpty()) {
-    // Apple proprietary WFED (Podcast URL), MVNM (Movement Name), MVIN (Movement Number) are in fact text frames.
-    if(frameID[0] == 'T' || frameID == "WFED" || frameID == "MVNM" || frameID == "MVIN"){ // text frame
+    // Apple proprietary WFED (Podcast URL), MVNM (Movement Name), MVIN (Movement Number), GRP1 (Grouping) are in fact text frames.
+    if(frameID[0] == 'T' || frameID == "WFED" || frameID == "MVNM" || frameID == "MVIN" || frameID == "GRP1"){ // text frame
       TextIdentificationFrame *frame = new TextIdentificationFrame(frameID, String::UTF8);
       frame->setText(values);
       return frame;
@@ -394,6 +394,7 @@ namespace
     { "WFED", "PODCASTURL" },
     { "MVNM", "MOVEMENTNAME" },
     { "MVIN", "MOVEMENTNUMBER" },
+    { "GRP1", "GROUPING" },
   };
   const size_t frameTranslationSize = sizeof(frameTranslation) / sizeof(frameTranslation[0]);
 
@@ -416,7 +417,7 @@ namespace
     {"TYER", "TDRC"}, // 2.3 -> 2.4
     {"TIME", "TDRC"}, // 2.3 -> 2.4
   };
-  const size_t deprecatedFramesSize = sizeof(deprecatedFrames) / sizeof(deprecatedFrames[0]);;
+  const size_t deprecatedFramesSize = sizeof(deprecatedFrames) / sizeof(deprecatedFrames[0]);
 }
 
 String Frame::frameIDToKey(const ByteVector &id)
@@ -476,8 +477,8 @@ PropertyMap Frame::asProperties() const
   // workaround until this function is virtual
   if(id == "TXXX")
     return dynamic_cast< const UserTextIdentificationFrame* >(this)->asProperties();
-  // Apple proprietary WFED (Podcast URL), MVNM (Movement Name), MVIN (Movement Number) are in fact text frames.
-  else if(id[0] == 'T' || id == "WFED" || id == "MVNM" || id == "MVIN")
+  // Apple proprietary WFED (Podcast URL), MVNM (Movement Name), MVIN (Movement Number), GRP1 (Grouping) are in fact text frames.
+  else if(id[0] == 'T' || id == "WFED" || id == "MVNM" || id == "MVIN" || id == "GRP1")
     return dynamic_cast< const TextIdentificationFrame* >(this)->asProperties();
   else if(id == "WXXX")
     return dynamic_cast< const UserUrlLinkFrame* >(this)->asProperties();

3rdparty/taglib/mpeg/id3v2/id3v2frame.h

@@ -90,14 +90,15 @@ namespace TagLib {
        * non-binary compatible release this will be made into a non-static
        * member that checks the internal ID3v2 version.
        */
-      static unsigned int headerSize(); // BIC: remove and make non-static
+      static unsigned int headerSize(); // BIC: make non-static
 
       /*!
        * Returns the size of the frame header for the given ID3v2 version.
        *
        * \deprecated Please see the explanation above.
        */
-      static unsigned int headerSize(unsigned int version); // BIC: remove and make non-static
+      // BIC: remove
+      static unsigned int headerSize(unsigned int version);
 
       /*!
        * Sets the data that will be used as the frame.  Since the length is not
@@ -225,7 +226,7 @@ namespace TagLib {
        * This is useful for reading strings sequentially.
        */
       String readStringField(const ByteVector &data, String::Type encoding,
-                             int *positon = 0);
+                             int *position = 0);
 
       /*!
        * Checks a the list of string values to see if they can be used with the
@@ -256,7 +257,7 @@ namespace TagLib {
 
 
       /*!
-       * Parses the contents of this frame as PropertyMap. If that fails, the returend
+       * Parses the contents of this frame as PropertyMap. If that fails, the returned
        * PropertyMap will be empty, and its unsupportedData() will contain this frame's
        * ID.
        * BIC: Will be a virtual function in future releases.
@@ -335,7 +336,7 @@ namespace TagLib {
        * \deprecated Please use the constructor below that accepts a version
        * number.
        */
-      Header(const ByteVector &data, bool synchSafeInts);
+      TAGLIB_DEPRECATED Header(const ByteVector &data, bool synchSafeInts);
 
       /*!
        * Construct a Frame Header based on \a data.  \a data must at least
@@ -412,6 +413,7 @@ namespace TagLib {
        * removed in the next binary incompatible release (2.0) and will be
        * replaced with a non-static method that checks the frame version.
        */
+      // BIC: make non-static
       static unsigned int size();
 
       /*!
@@ -420,6 +422,7 @@ namespace TagLib {
        *
        * \deprecated Please see the explanation in the version above.
        */
+      // BIC: remove
       static unsigned int size(unsigned int version);
 
       /*!
@@ -503,7 +506,7 @@ namespace TagLib {
       /*!
        * \deprecated
        */
-      bool frameAlterPreservation() const;
+      TAGLIB_DEPRECATED bool frameAlterPreservation() const;
 
     private:
       Header(const Header &);

3rdparty/taglib/mpeg/id3v2/id3v2framefactory.cpp

@@ -126,6 +126,11 @@ Frame *FrameFactory::createFrame(const ByteVector &data, unsigned int version) c
 }
 
 Frame *FrameFactory::createFrame(const ByteVector &origData, Header *tagHeader) const
+{
+    return createFrame(origData, const_cast<const Header *>(tagHeader));
+}
+
+Frame *FrameFactory::createFrame(const ByteVector &origData, const Header *tagHeader) const
 {
   ByteVector data = origData;
   unsigned int version = tagHeader->majorVersion();
@@ -198,8 +203,8 @@ Frame *FrameFactory::createFrame(const ByteVector &origData, Header *tagHeader)
 
   // Text Identification (frames 4.2)
 
-  // Apple proprietary WFED (Podcast URL), MVNM (Movement Name), MVIN (Movement Number) are in fact text frames.
-  if(frameID.startsWith("T") || frameID == "WFED" || frameID == "MVNM" || frameID == "MVIN") {
+  // Apple proprietary WFED (Podcast URL), MVNM (Movement Name), MVIN (Movement Number), GRP1 (Grouping) are in fact text frames.
+  if(frameID.startsWith("T") || frameID == "WFED" || frameID == "MVNM" || frameID == "MVIN" || frameID == "GRP1") {
 
     TextIdentificationFrame *f = frameID != "TXXX"
       ? new TextIdentificationFrame(data, header)
@@ -459,6 +464,7 @@ namespace
     { "WFD", "WFED" },
     { "MVN", "MVNM" },
     { "MVI", "MVIN" },
+    { "GP1", "GRP1" },
   };
   const size_t frameConversion2Size = sizeof(frameConversion2) / sizeof(frameConversion2[0]);
 

3rdparty/taglib/mpeg/id3v2/id3v2framefactory.h

@@ -87,12 +87,17 @@ namespace TagLib {
        */
       Frame *createFrame(const ByteVector &data, unsigned int version = 4) const;
 
+      /*!
+       * \deprecated
+       */
+      // BIC: remove
+      Frame *createFrame(const ByteVector &data, Header *tagHeader) const;
       /*!
        * Create a frame based on \a data.  \a tagHeader should be a valid
        * ID3v2::Header instance.
        */
       // BIC: make virtual
-      Frame *createFrame(const ByteVector &data, Header *tagHeader) const;
+      Frame *createFrame(const ByteVector &data, const Header *tagHeader) const;
 
       /*!
        * After a tag has been read, this tries to rebuild some of them

3rdparty/taglib/mpeg/id3v2/id3v2header.cpp

@@ -207,14 +207,14 @@ void Header::parse(const ByteVector &data)
 
   if(sizeData.size() != 4) {
     d->tagSize = 0;
-    debug("Strawberry_TagLib::TagLib::ID3v2::Header::parse() - The tag size as read was 0 bytes!");
+    debug("TagLib::ID3v2::Header::parse() - The tag size as read was 0 bytes!");
     return;
   }
 
   for(ByteVector::ConstIterator it = sizeData.begin(); it != sizeData.end(); it++) {
     if(static_cast<unsigned char>(*it) >= 128) {
       d->tagSize = 0;
-      debug("Strawberry_TagLib::TagLib::ID3v2::Header::parse() - One of the size bytes in the id3v2 header was greater than the allowed 128.");
+      debug("TagLib::ID3v2::Header::parse() - One of the size bytes in the id3v2 header was greater than the allowed 128.");
       return;
     }
   }

3rdparty/taglib/mpeg/id3v2/id3v2header.h

@@ -28,6 +28,7 @@
 
 #include "tbytevector.h"
 #include "taglib_export.h"
+#include "id3v2.h"
 
 namespace Strawberry_TagLib {
 namespace TagLib {

3rdparty/taglib/mpeg/id3v2/id3v2tag.cpp

@@ -462,7 +462,7 @@ PropertyMap ID3v2::Tag::setProperties(const PropertyMap &origProps)
 
 ByteVector ID3v2::Tag::render() const
 {
-  return render(4);
+  return render(ID3v2::v4);
 }
 
 void ID3v2::Tag::downgradeFrames(FrameList *frames, FrameList *newFrames) const
@@ -568,17 +568,17 @@ void ID3v2::Tag::downgradeFrames(FrameList *frames, FrameList *newFrames) const
 }
 
 ByteVector ID3v2::Tag::render(int version) const
+{
+  return render(version == 3 ? v3 : v4);
+}
+
+ByteVector ID3v2::Tag::render(Version version) const
 {
   // We need to render the "tag data" first so that we have to correct size to
   // render in the tag's header.  The "tag data" -- everything that is included
   // in ID3v2::Header::tagSize() -- includes the extended header, frames and
   // padding, but does not include the tag's header or footer.
 
-  if(version != 3 && version != 4) {
-    debug("Unknown ID3v2 version, using ID3v2.4");
-    version = 4;
-  }
-
   // TODO: Render the extended header.
 
   // Downgrade the frames that ID3v2.3 doesn't support.
@@ -587,7 +587,7 @@ ByteVector ID3v2::Tag::render(int version) const
   newFrames.setAutoDelete(true);
 
   FrameList frameList;
-  if(version == 4) {
+  if(version == v4) {
     frameList = d->frameList;
   }
   else {
@@ -601,7 +601,7 @@ ByteVector ID3v2::Tag::render(int version) const
   // Loop through the frames rendering them and adding them to the tagData.
 
   for(FrameList::ConstIterator it = frameList.begin(); it != frameList.end(); it++) {
-    (*it)->header()->setVersion(version);
+    (*it)->header()->setVersion(version == v3 ? 3 : 4);
     if((*it)->header()->frameID().size() != 4) {
       debug("An ID3v2 frame of unsupported or unknown type \'"
           + String((*it)->header()->frameID()) + "\' has been discarded");

3rdparty/taglib/mpeg/id3v2/id3v2tag.h

@@ -33,6 +33,7 @@
 #include "tmap.h"
 #include "taglib_export.h"
 
+#include "id3v2.h"
 #include "id3v2framefactory.h"
 
 namespace Strawberry_TagLib {
@@ -40,15 +41,6 @@ namespace TagLib {
 
   class File;
 
-  //! An ID3v2 implementation
-
-  /*!
-   * This is a relatively complete and flexible framework for working with ID3v2
-   * tags.
-   *
-   * \see ID3v2::Tag
-   */
-
   namespace ID3v2 {
 
     class Header;
@@ -126,7 +118,7 @@ namespace TagLib {
      * heart and should not be done without much meditation on the spec.  It's
      * rather long, but if you're planning on messing with this class and others
      * that deal with the details of ID3v2 (rather than the nice, safe, abstract
-     * Strawberry_TagLib::TagLib::Tag and friends), it's worth your time to familiarize yourself
+     * TagLib::Tag and friends), it's worth your time to familiarize yourself
      * with said spec (which is distributed with the TagLib sources).  TagLib
      * tries to do most of the work, but with a little luck, you can still
      * convince it to generate invalid ID3v2 tags.  The APIs for ID3v2 assume a
@@ -202,7 +194,7 @@ namespace TagLib {
        * prone to change my mind, so this gets to stay around until near a
        * release.
        */
-      Footer *footer() const;
+      TAGLIB_DEPRECATED Footer *footer() const;
 
       /*!
        * Returns a reference to the frame list map.  This is an FrameListMap of
@@ -217,7 +209,7 @@ namespace TagLib {
        * beats per minute -- the TBPM frame.
        *
        * \code
-       * Strawberry_TagLib::TagLib::MPEG::File f("foo.mp3");
+       * TagLib::MPEG::File f("foo.mp3");
        *
        * // Check to make sure that it has an ID3v2 tag
        *
@@ -225,7 +217,7 @@ namespace TagLib {
        *
        *   // Get the list of frames for a specific frame type
        *
-       *   Strawberry_TagLib::TagLib::ID3v2::FrameList l = f.ID3v2Tag()->frameListMap()["TBPM"];
+       *   TagLib::ID3v2::FrameList l = f.ID3v2Tag()->frameListMap()["TBPM"];
        *
        *   if(!l.isEmpty())
        *     std::cout << l.front()->toString() << std::endl;
@@ -311,7 +303,7 @@ namespace TagLib {
        *    - otherwise, the key "LYRICS:<description>" is used;
        *  - if the frame ID is "TIPL" (involved peoples list), and if all the
        *    roles defined in the frame are known in TextIdentificationFrame::involvedPeopleMap(),
-       *    then "<role>=<name>" will be contained in the returned obejct for each
+       *    then "<role>=<name>" will be contained in the returned object for each
        *  - if the frame ID is "TMCL" (musician credit list), then
        *    "PERFORMER:<instrument>=<name>" will be contained in the returned
        *    PropertyMap for each defined musician
@@ -346,14 +338,18 @@ namespace TagLib {
        */
       ByteVector render() const;
 
+      /*!
+       * \deprecated
+       */
+      TAGLIB_DEPRECATED ByteVector render(int version) const;
+
       /*!
        * Render the tag back to binary data, suitable to be written to disk.
        *
-       * The \a version parameter specifies the version of the rendered
-       * ID3v2 tag. It can be either 4 or 3.
+       * The \a version parameter specifies whether ID3v2.4 (default) or ID3v2.3
+       * should be used.
        */
-      // BIC: combine with the above method
-      ByteVector render(int version) const;
+      ByteVector render(Version version) const;
 
       /*!
        * Gets the current string handler that decides how the "Latin-1" data
@@ -397,6 +393,9 @@ namespace TagLib {
        */
       void setTextFrame(const ByteVector &id, const String &value);
 
+      /*!
+       * Dowgrade frames from ID3v2.4 (used internally and by default) to ID3v2.3
+       */
       void downgradeFrames(FrameList *existingFrames, FrameList *newFrames) const;
 
     private:

3rdparty/taglib/mpeg/mpegfile.cpp

@@ -109,8 +109,8 @@ bool MPEG::File::isSupported(IOStream *stream)
   const ByteVector buffer = Utils::readHeader(stream, bufferSize(), true, &headerOffset);
 
   if(buffer.isEmpty())
-	  return false;
-  
+    return false;
+
   const long originalPosition = stream->tell();
   AdapterFile file(stream);
 
@@ -200,20 +200,30 @@ bool MPEG::File::save()
 
 bool MPEG::File::save(int tags)
 {
-  return save(tags, true);
+  return save(tags, StripOthers);
 }
 
 bool MPEG::File::save(int tags, bool stripOthers)
 {
-  return save(tags, stripOthers, 4);
+  return save(tags, stripOthers ? StripOthers : StripNone, ID3v2::v4);
 }
 
 bool MPEG::File::save(int tags, bool stripOthers, int id3v2Version)
 {
-  return save(tags, stripOthers, id3v2Version, true);
+  return save(tags,
+              stripOthers ? StripOthers : StripNone,
+              id3v2Version == 3 ? ID3v2::v3 : ID3v2::v4);
 }
 
 bool MPEG::File::save(int tags, bool stripOthers, int id3v2Version, bool duplicateTags)
+{
+  return save(tags,
+              stripOthers ? StripOthers : StripNone,
+              id3v2Version == 3 ? ID3v2::v3 : ID3v2::v4,
+              duplicateTags ? Duplicate : DoNotDuplicate);
+}
+
+bool MPEG::File::save(int tags, StripTags strip, ID3v2::Version version, DuplicateTags duplicate)
 {
   if(readOnly()) {
     debug("MPEG::File::save() -- File is read only.");
@@ -222,22 +232,22 @@ bool MPEG::File::save(int tags, bool stripOthers, int id3v2Version, bool duplica
 
   // Create the tags if we've been asked to.
 
-  if(duplicateTags) {
+  if(duplicate == Duplicate) {
 
     // Copy the values from the tag that does exist into the new tag,
     // except if the existing tag is to be stripped.
 
-    if((tags & ID3v2) && ID3v1Tag() && !(stripOthers && !(tags & ID3v1)))
+    if((tags & ID3v2) && ID3v1Tag() && !(strip == StripOthers && !(tags & ID3v1)))
       Tag::duplicate(ID3v1Tag(), ID3v2Tag(true), false);
 
-    if((tags & ID3v1) && d->tag[ID3v2Index] && !(stripOthers && !(tags & ID3v2)))
+    if((tags & ID3v1) && d->tag[ID3v2Index] && !(strip == StripOthers && !(tags & ID3v2)))
       Tag::duplicate(ID3v2Tag(), ID3v1Tag(true), false);
   }
 
   // Remove all the tags not going to be saved.
 
-  if(stripOthers)
-    strip(~tags, false);
+  if(strip == StripOthers)
+    File::strip(~tags, false);
 
   if(ID3v2 & tags) {
 
@@ -248,7 +258,7 @@ bool MPEG::File::save(int tags, bool stripOthers, int id3v2Version, bool duplica
       if(d->ID3v2Location < 0)
         d->ID3v2Location = 0;
 
-      const ByteVector data = ID3v2Tag()->render(id3v2Version);
+      const ByteVector data = ID3v2Tag()->render(version);
       insert(data, d->ID3v2Location, d->ID3v2OriginalSize);
 
       if(d->APELocation >= 0)
@@ -263,7 +273,7 @@ bool MPEG::File::save(int tags, bool stripOthers, int id3v2Version, bool duplica
 
       // ID3v2 tag is empty. Remove the old one.
 
-      strip(ID3v2, false);
+      File::strip(ID3v2, false);
     }
   }
 
@@ -287,7 +297,7 @@ bool MPEG::File::save(int tags, bool stripOthers, int id3v2Version, bool duplica
 
       // ID3v1 tag is empty. Remove the old one.
 
-      strip(ID3v1, false);
+      File::strip(ID3v1, false);
     }
   }
 
@@ -316,7 +326,7 @@ bool MPEG::File::save(int tags, bool stripOthers, int id3v2Version, bool duplica
 
       // APE tag is empty. Remove the old one.
 
-      strip(APE, false);
+      File::strip(APE, false);
     }
   }
 

3rdparty/taglib/mpeg/mpegfile.h

@@ -32,6 +32,8 @@
 
 #include "mpegproperties.h"
 
+#include "id3v2.h"
+
 namespace Strawberry_TagLib {
 namespace TagLib {
 
@@ -39,14 +41,14 @@ namespace TagLib {
   namespace ID3v1 { class Tag; }
   namespace APE { class Tag; }
 
-  //! An implementation of Strawberry_TagLib::TagLib::File with MPEG (MP3) specific methods
+  //! An implementation of TagLib::File with MPEG (MP3) specific methods
 
   namespace MPEG {
 
     //! An MPEG file class with some useful methods specific to MPEG
 
     /*!
-     * This implements the generic Strawberry_TagLib::TagLib::File API and additionally provides
+     * This implements the generic TagLib::File API and additionally provides
      * access to properties that are distinct to MPEG files, notably access
      * to the different ID3 tags.
      */
@@ -192,49 +194,39 @@ namespace TagLib {
       bool save(int tags);
 
       /*!
-       * 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.
-       *
-       * If \a stripOthers is true 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.
+       * \deprecated
        */
       // BIC: combine with the above method
-      bool save(int tags, bool stripOthers);
+      TAGLIB_DEPRECATED bool save(int tags, bool stripOthers);
+
+      /*!
+       * \deprecated
+       */
+      // BIC: combine with the above method
+      TAGLIB_DEPRECATED bool save(int tags, bool stripOthers, int id3v2Version);
+
+      /*!
+       * \deprecated
+       */
+      // BIC: combine with the above method
+      TAGLIB_DEPRECATED bool save(int tags, bool stripOthers, int id3v2Version, bool duplicateTags);
 
       /*!
        * 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.
+       * specified by OR-ing together TagTypes values.
        *
-       * If \a stripOthers is true 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.
+       * \a strip can be set to strip all tags except those in \a tags.  Those
+       * tags will not be modified in memory, and thus remain valid.
        *
-       * The \a id3v2Version parameter specifies the version of the saved
-       * ID3v2 tag. It can be either 4 or 3.
+       * \a version specifies the ID3v2 version to be used for writing tags.  By
+       * default, the latest standard, ID3v2.4 is used.
+       *
+       * If \a duplicate is set to DuplicateTags and at least one tag -- ID3v1
+       * or ID3v2 -- exists this will duplicate its content into the other tag.
        */
-      // BIC: combine with the above method
-      bool save(int tags, bool stripOthers, int id3v2Version);
-
-      /*!
-       * 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.
-       *
-       * If \a stripOthers is true 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.
-       *
-       * The \a id3v2Version parameter specifies the version of the saved
-       * ID3v2 tag. It can be either 4 or 3.
-       *
-       * If \a duplicateTags is true and at least one tag -- ID3v1 or ID3v2 --
-       * exists this will duplicate its content into the other tag.
-       */
-      // BIC: combine with the above method
-      bool save(int tags, bool stripOthers, int id3v2Version, bool duplicateTags);
+      bool save(int tags, StripTags strip,
+                ID3v2::Version version = ID3v2::v4,
+                DuplicateTags duplicate = Duplicate);
 
       /*!
        * Returns a pointer to the ID3v2 tag of the file.
@@ -326,7 +318,7 @@ namespace TagLib {
        * \see ID3v2FrameFactory
        * \deprecated This value should be passed in via the constructor
        */
-      void setID3v2FrameFactory(const ID3v2::FrameFactory *factory);
+      TAGLIB_DEPRECATED void setID3v2FrameFactory(const ID3v2::FrameFactory *factory);
 
       /*!
        * Returns the position in the file of the first MPEG frame.

3rdparty/taglib/mpeg/mpegheader.cpp

@@ -69,7 +69,7 @@ public:
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-MPEG::Header::Header(const ByteVector &data) :
+MPEG::Header::Header(const ByteVector&) :
   d(new HeaderPrivate())
 {
   debug("MPEG::Header::Header() - This constructor is no longer used.");

3rdparty/taglib/mpeg/mpegheader.h

@@ -53,7 +53,7 @@ namespace TagLib {
        *
        * \deprecated
        */
-      Header(const ByteVector &data);
+      TAGLIB_DEPRECATED Header(const ByteVector &data);
 
       /*!
        * Parses an MPEG header based on \a file and \a offset.

3rdparty/taglib/mpeg/xingheader.h

@@ -112,7 +112,7 @@ namespace TagLib {
        *
        * \deprecated Always returns 0.
        */
-      static int xingHeaderOffset(Strawberry_TagLib::TagLib::MPEG::Header::Version v,
+      TAGLIB_DEPRECATED static int xingHeaderOffset(Strawberry_TagLib::TagLib::MPEG::Header::Version v,
                                   Strawberry_TagLib::TagLib::MPEG::Header::ChannelMode c);
 
     private:

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

@@ -52,12 +52,12 @@ namespace TagLib {
 
     using Strawberry_TagLib::TagLib::FLAC::Properties;
 
-    //! An implementation of Strawberry_TagLib::TagLib::File with Ogg/FLAC specific methods
+    //! An implementation of TagLib::File with Ogg/FLAC specific methods
 
     /*!
      * This implements and provides an interface for Ogg/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
+     * TagLib::Tag and TagLib::AudioProperties interfaces by way of implementing
+     * the abstract TagLib::File API as well as providing some additional
      * information specific to Ogg FLAC files.
      */
 

3rdparty/taglib/ogg/oggfile.cpp

@@ -296,10 +296,10 @@ void Ogg::File::writePacket(unsigned int i, const ByteVector &packet)
         break;
 
       page.setPageSequenceNumber(page.pageSequenceNumber() + numberOfNewPages);
-      const ByteVector data = page.render();
+      const ByteVector data2 = page.render();
 
       seek(pageOffset + 18);
-      writeBlock(data.mid(18, 8));
+      writeBlock(data2.mid(18, 8));
 
       if(page.header()->lastPageOfStream())
         break;

3rdparty/taglib/ogg/oggpage.h

@@ -94,7 +94,7 @@ namespace TagLib {
        *
        * \deprecated Always returns null.
        */
-      Page* getCopyWithNewPageSequenceNumber(int sequenceNumber);
+      TAGLIB_DEPRECATED Page *getCopyWithNewPageSequenceNumber(int sequenceNumber);
 
       /*!
        * Returns the index of the first packet wholly or partially contained in

3rdparty/taglib/ogg/oggpageheader.h

@@ -157,7 +157,7 @@ namespace TagLib {
       /*!
        * A special value of containing the position of the packet to be
        * interpreted by the codec.  It is only supported here so that it may be
-       * coppied from one page to another.
+       * copied from one page to another.
        *
        * \see absoluteGranularPosition()
        */

3rdparty/taglib/ogg/opus/opusfile.h

@@ -85,7 +85,7 @@ namespace TagLib {
         /*!
          * Returns the XiphComment for this file.  XiphComment implements the tag
          * interface, so this serves as the reimplementation of
-         * Strawberry_TagLib::TagLib::File::tag().
+         * TagLib::File::tag().
          */
         virtual Ogg::XiphComment *tag() const;
 

3rdparty/taglib/ogg/opus/opusproperties.cpp

@@ -163,8 +163,14 @@ void Opus::Properties::read(File *file)
 
       if(frameCount > 0) {
         const double length = frameCount * 1000.0 / 48000.0;
+        long fileLengthWithoutOverhead = file->length();
+        // Ignore the two mandatory header packets, see "3. Packet Organization"
+        // in https://tools.ietf.org/html/rfc7845.html
+        for (unsigned int i = 0; i < 2; ++i) {
+          fileLengthWithoutOverhead -= file->packet(i).size();
+        }
         d->length  = static_cast<int>(length + 0.5);
-        d->bitrate = static_cast<int>(file->length() * 8.0 / length + 0.5);
+        d->bitrate = static_cast<int>(fileLengthWithoutOverhead * 8.0 / length + 0.5);
       }
     }
     else {

3rdparty/taglib/ogg/opus/opusproperties.h

@@ -70,7 +70,7 @@ namespace TagLib {
          *
          * \deprecated
          */
-        virtual int length() const;
+        TAGLIB_DEPRECATED virtual int length() const;
 
         /*!
          * Returns the length of the file in seconds.  The length is rounded down to

3rdparty/taglib/ogg/speex/speexfile.cpp

@@ -131,6 +131,7 @@ void Speex::File::read(bool readProperties)
 
   if(!speexHeaderData.startsWith("Speex   ")) {
     debug("Speex::File::read() -- invalid Speex identification header");
+    setValid(false);
     return;
   }
 

3rdparty/taglib/ogg/speex/speexfile.h

@@ -85,7 +85,7 @@ namespace TagLib {
         /*!
          * Returns the XiphComment for this file.  XiphComment implements the tag
          * interface, so this serves as the reimplementation of
-         * Strawberry_TagLib::TagLib::File::tag().
+         * TagLib::File::tag().
          */
         virtual Ogg::XiphComment *tag() const;
 

3rdparty/taglib/ogg/speex/speexproperties.cpp

@@ -182,8 +182,14 @@ void Speex::Properties::read(File *file)
 
       if(frameCount > 0) {
         const double length = frameCount * 1000.0 / d->sampleRate;
+        long fileLengthWithoutOverhead = file->length();
+        // Ignore the two header packets, see "Ogg file format" in
+        // https://www.speex.org/docs/manual/speex-manual/node8.html
+        for (unsigned int i = 0; i < 2; ++i) {
+          fileLengthWithoutOverhead -= file->packet(i).size();
+        }
         d->length  = static_cast<int>(length + 0.5);
-        d->bitrate = static_cast<int>(file->length() * 8.0 / length + 0.5);
+        d->bitrate = static_cast<int>(fileLengthWithoutOverhead * 8.0 / length + 0.5);
       }
     }
     else {

3rdparty/taglib/ogg/speex/speexproperties.h

@@ -70,7 +70,7 @@ namespace TagLib {
          *
          * \deprecated
          */
-        virtual int length() const;
+        TAGLIB_DEPRECATED virtual int length() const;
 
         /*!
          * Returns the length of the file in seconds.  The length is rounded down to

3rdparty/taglib/ogg/vorbis/vorbisfile.h

@@ -92,7 +92,7 @@ namespace TagLib {
       /*!
        * Returns the XiphComment for this file.  XiphComment implements the tag
        * interface, so this serves as the reimplementation of
-       * Strawberry_TagLib::TagLib::File::tag().
+       * TagLib::File::tag().
        */
       virtual Ogg::XiphComment *tag() const;
 

3rdparty/taglib/ogg/vorbis/vorbisproperties.cpp

@@ -188,9 +188,14 @@ void Vorbis::Properties::read(File *file)
 
       if(frameCount > 0) {
         const double length = frameCount * 1000.0 / d->sampleRate;
-
+        long fileLengthWithoutOverhead = file->length();
+        // Ignore the three initial header packets, see "1.3.1. Decode Setup" in
+        // https://xiph.org/vorbis/doc/Vorbis_I_spec.html
+        for (unsigned int i = 0; i < 3; ++i) {
+          fileLengthWithoutOverhead -= file->packet(i).size();
+        }
         d->length  = static_cast<int>(length + 0.5);
-        d->bitrate = static_cast<int>(file->length() * 8.0 / length + 0.5);
+        d->bitrate = static_cast<int>(fileLengthWithoutOverhead * 8.0 / length + 0.5);
       }
     }
     else {

3rdparty/taglib/ogg/vorbis/vorbisproperties.h

@@ -76,7 +76,7 @@ namespace TagLib {
        *
        * \deprecated
        */
-      virtual int length() const;
+      TAGLIB_DEPRECATED virtual int length() const;
 
       /*!
        * Returns the length of the file in seconds.  The length is rounded down to

3rdparty/taglib/ogg/xiphcomment.cpp

@@ -379,8 +379,7 @@ ByteVector Ogg::XiphComment::render(bool addFramingBit) const
   // std::pair<String, StringList> where the first String is the field name and
   // the StringList is the values associated with that field.
 
-  FieldListMap::ConstIterator it = d->fieldListMap.begin();
-  for(; it != d->fieldListMap.end(); ++it) {
+  for(FieldListMap::ConstIterator it = d->fieldListMap.begin() ; it != d->fieldListMap.end() ; ++it) {
 
     // And now iterate over the values of the current list.
 
@@ -398,7 +397,7 @@ ByteVector Ogg::XiphComment::render(bool addFramingBit) const
     }
   }
 
-  for(PictureConstIterator it = d->pictureList.begin(); it != d->pictureList.end(); ++it) {
+  for (PictureConstIterator it = d->pictureList.begin(); it != d->pictureList.end(); ++it) {
     ByteVector picture = (*it)->render().toBase64();
     data.append(ByteVector::fromUInt(picture.size() + 23, false));
     data.append("METADATA_BLOCK_PICTURE=");

3rdparty/taglib/ogg/xiphcomment.h

@@ -187,7 +187,7 @@ namespace TagLib {
        * \deprecated Using this method may lead to a linkage error.
        */
       // BIC: remove and merge with below
-      void removeField(const String &key, const String &value = String::null);
+      TAGLIB_DEPRECATED void removeField(const String &key, const String &value = String());
 
       /*!
        * Remove all the fields specified by \a key.

3rdparty/taglib/riff/aiff/aifffile.cpp

@@ -117,6 +117,11 @@ RIFF::AIFF::Properties *RIFF::AIFF::File::audioProperties() const
 }
 
 bool RIFF::AIFF::File::save()
+{
+    return save(ID3v2::v4);
+}
+
+bool RIFF::AIFF::File::save(ID3v2::Version version)
 {
   if(readOnly()) {
     debug("RIFF::AIFF::File::save() -- File is read only.");
@@ -135,7 +140,7 @@ bool RIFF::AIFF::File::save()
   }
 
   if(tag() && !tag()->isEmpty()) {
-    setChunkData("ID3 ", d->tag->render());
+    setChunkData("ID3 ", d->tag->render(version));
     d->hasID3v2 = true;
   }
 

3rdparty/taglib/riff/aiff/aifffile.h

@@ -46,12 +46,12 @@ namespace TagLib {
 
     namespace AIFF {
 
-      //! An implementation of Strawberry_TagLib::TagLib::File with AIFF specific methods
+      //! An implementation of TagLib::File with AIFF specific methods
 
       /*!
        * This implements and provides an interface for AIFF 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
+       * TagLib::Tag and TagLib::AudioProperties interfaces by way of implementing
+       * the abstract TagLib::File API as well as providing some additional
        * information specific to AIFF files.
        */
 
@@ -120,6 +120,11 @@ namespace TagLib {
          */
         virtual bool save();
 
+        /*!
+         * Save using a specific ID3v2 version (e.g. v3)
+         */
+        bool save(ID3v2::Version version);
+
         /*!
          * Returns whether or not the file on disk actually has an ID3v2 tag.
          *

3rdparty/taglib/riff/aiff/aiffproperties.h

@@ -53,7 +53,7 @@ namespace TagLib {
          *
          * \deprecated
          */
-        Properties(const ByteVector &data, ReadStyle style);
+        TAGLIB_DEPRECATED Properties(const ByteVector &data, ReadStyle style);
 
         /*!
          * Create an instance of AIFF::Properties with the data read from the
@@ -74,7 +74,7 @@ namespace TagLib {
          *
          * \deprecated
          */
-        virtual int length() const;
+        TAGLIB_DEPRECATED virtual int length() const;
 
         /*!
          * Returns the length of the file in seconds.  The length is rounded down to
@@ -120,7 +120,7 @@ namespace TagLib {
          *
          * \deprecated
          */
-        int sampleWidth() const;
+        TAGLIB_DEPRECATED int sampleWidth() const;
 
         /*!
          * Returns the number of sample frames

3rdparty/taglib/riff/rifffile.cpp

@@ -46,8 +46,8 @@ struct Chunk
 class RIFF::File::FilePrivate
 {
 public:
-  explicit FilePrivate(Endianness endianness) :
-    endianness(endianness),
+  explicit FilePrivate(Endianness _endianness) :
+    endianness(_endianness),
     size(0),
     sizeOffset(0) {}
 
@@ -325,9 +325,20 @@ void RIFF::File::read()
     if(offset & 1) {
       seek(offset);
       const ByteVector iByte = readBlock(1);
-      if(iByte.size() == 1 && iByte[0] == '\0') {
-        chunk.padding = 1;
-        offset++;
+      if(iByte.size() == 1) {
+        bool skipPadding = iByte[0] == '\0';
+        if(!skipPadding) {
+          // Padding byte is not zero, check if it is good to ignore it
+          const ByteVector fourCcAfterPadding = readBlock(4);
+          if(isValidChunkName(fourCcAfterPadding)) {
+            // Use the padding, it is followed by a valid chunk name.
+            skipPadding = true;
+          }
+        }
+        if(skipPadding) {
+          chunk.padding = 1;
+          offset++;
+        }
       }
     }
 

3rdparty/taglib/riff/rifffile.h

@@ -32,14 +32,14 @@
 namespace Strawberry_TagLib {
 namespace TagLib {
 
-  //! An implementation of Strawberry_TagLib::TagLib::File with RIFF specific methods
+  //! An implementation of TagLib::File with RIFF specific methods
 
   namespace RIFF {
 
     //! An RIFF file class with some useful methods specific to RIFF
 
     /*!
-     * This implements the generic Strawberry_TagLib::TagLib::File API and additionally provides
+     * This implements the generic TagLib::File API and additionally provides
      * access to properties that are distinct to RIFF files, notably access
      * to the different ID3 tags.
      */

3rdparty/taglib/riff/wav/wavfile.cpp

@@ -151,6 +151,13 @@ bool RIFF::WAV::File::save()
 }
 
 bool RIFF::WAV::File::save(TagTypes tags, bool stripOthers, int id3v2Version)
+{
+  return save(tags,
+              stripOthers ? StripOthers : StripNone,
+              id3v2Version == 3 ? ID3v2::v3 : ID3v2::v4);
+}
+
+bool RIFF::WAV::File::save(TagTypes tags, StripTags strip, ID3v2::Version version)
 {
   if(readOnly()) {
     debug("RIFF::WAV::File::save() -- File is read only.");
@@ -162,14 +169,14 @@ bool RIFF::WAV::File::save(TagTypes tags, bool stripOthers, int id3v2Version)
     return false;
   }
 
-  if(stripOthers)
-    strip(static_cast<TagTypes>(AllTags & ~tags));
+  if(strip == StripOthers)
+    File::strip(static_cast<TagTypes>(AllTags & ~tags));
 
   if(tags & ID3v2) {
     removeTagChunks(ID3v2);
 
     if(ID3v2Tag() && !ID3v2Tag()->isEmpty()) {
-      setChunkData("ID3 ", ID3v2Tag()->render(id3v2Version));
+      setChunkData("ID3 ", ID3v2Tag()->render(version));
       d->hasID3v2 = true;
     }
   }

3rdparty/taglib/riff/wav/wavfile.h

@@ -47,12 +47,12 @@ namespace TagLib {
 
     namespace WAV {
 
-      //! An implementation of Strawberry_TagLib::TagLib::File with WAV specific methods
+      //! An implementation of TagLib::File with WAV specific methods
 
       /*!
        * This implements and provides an interface for WAV 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
+       * TagLib::Tag and TagLib::AudioProperties interfaces by way of implementing
+       * the abstract TagLib::File API as well as providing some additional
        * information specific to WAV files.
        */
 
@@ -160,7 +160,19 @@ namespace TagLib {
          */
         virtual bool save();
 
-        bool save(TagTypes tags, bool stripOthers = true, int id3v2Version = 4);
+        /*!
+         * \deprecated
+         */
+        TAGLIB_DEPRECATED bool save(TagTypes tags, bool stripOthers, int id3v2Version = 4);
+
+        /*!
+         * 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);
 
         /*!
          * Returns whether or not the file on disk actually has an ID3v2 tag.