Release 0.9.1

Fixes strange case where albums are duplicated by drag/drop.

.circleci/config.yml

@@ -80,6 +80,7 @@ commands:
             libpulse-devel
             gstreamer-devel
             gstreamer-plugins-base-devel
+            taglib-devel
             vlc-devel
             libQt5Core-devel
             libQt5Gui-devel
@@ -155,137 +156,6 @@ commands:
             hicolor-icon-theme
 
 
-  install_centos_dependencies:
-    description: Install CentOS dependencies
-    steps:
-      - run:
-          name: Install epel-release
-          command: dnf install -y epel-release
-      - run:
-          name: Install epel-release-latest-8.noarch.rpm
-          command: dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
-      - run:
-          name: Install config-manager
-          command: dnf install -y 'dnf-command(config-manager)'
-      - run:
-          name: PowerTools
-          command: dnf config-manager --set-enabled PowerTools
-      - run:
-          name: DNF Clean All
-          command: dnf clean all
-      - run:
-          name: Update packages
-          command: dnf update -y
-      - run:
-          name: Install CentOS dependencies
-          command: >
-            dnf install -y
-            glibc
-            gcc-c++
-            make
-            libtool
-            cmake3
-            rpmdevtools
-            redhat-lsb-core
-            git
-            man
-            tar
-            gettext
-            boost-devel
-            fuse-devel
-            dbus-devel
-            libnotify-devel
-            gnutls-devel
-            sqlite-devel
-            protobuf-devel
-            protobuf-compiler
-            alsa-lib-devel
-            pulseaudio-libs-devel
-            qt5-devel
-            qt5-qtbase-devel
-            qt5-qtx11extras-devel
-            qt5-qttools-devel
-            fftw-devel
-            libchromaprint-devel
-            libcdio-devel
-            libgpod-devel
-            libmtp-devel
-            libjpeg-devel
-            cairo-devel
-            dbus-x11
-            xorg-x11-server-Xvfb
-            xorg-x11-xauth
-            vim-common
-            desktop-file-utils
-            libappstream-glib
-            appstream-data
-            hicolor-icon-theme
-            python3-pip
-            python3-devel
-            gstreamer1-devel
-            gstreamer1-plugins-base-devel
-
-
-  install_mageia_dependencies:
-    description: Install Mageia dependencies
-    steps:
-      - 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
-            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:
@@ -294,6 +164,7 @@ commands:
           command: >
             apt-get update && apt-get install -y
             build-essential
+            dh-make
             ssh
             git
             make
@@ -313,6 +184,7 @@ commands:
             libgnutls28-dev
             libasound2-dev
             libpulse-dev
+            libtag1-dev
             qtbase5-dev
             qtbase5-dev-tools
             qtbase5-private-dev
@@ -342,6 +214,7 @@ commands:
           command: >
             apt-get update && apt-get install -y
             build-essential
+            dh-make
             ssh
             git
             make
@@ -363,6 +236,7 @@ commands:
             libgnutls28-dev
             libasound2-dev
             libpulse-dev
+            libtag1-dev
             qtbase5-dev
             qtbase5-dev-tools
             qtbase5-private-dev
@@ -384,7 +258,7 @@ jobs:
 
   build_source:
     docker:
-      - image: opensuse/leap:15.1
+      - image: opensuse/leap:15.2
     steps:
       - install_opensuse_dependencies
       - checkout
@@ -392,24 +266,6 @@ jobs:
       - 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
@@ -435,18 +291,6 @@ jobs:
       - build_rpm
 
 
-  build_fedora_31:
-    docker:
-      - image: fedora:31
-    environment:
-      RPM_BUILD_NCPUS: "2"
-    steps:
-      - install_fedora_dependencies
-      - checkout
-      - cmake
-      - build_source
-      - build_rpm
-
   build_fedora_32:
     docker:
       - image: fedora:32
@@ -459,27 +303,13 @@ jobs:
       - build_source
       - build_rpm
 
-
-  build_centos_8:
+  build_fedora_33:
     docker:
-      - image: centos:8
+      - image: fedora:33
     environment:
       RPM_BUILD_NCPUS: "2"
     steps:
-      - install_centos_dependencies
-      - checkout
-      - cmake
-      - build_source
-      - build_rpm
-
-
-  build_mageia_7:
-    docker:
-      - image: mageia:7
-    environment:
-      RPM_BUILD_NCPUS: "2"
-    steps:
-      - install_mageia_dependencies
+      - install_fedora_dependencies
       - checkout
       - cmake
       - build_source
@@ -543,10 +373,6 @@ workflows:
               only: /.*/
 
 
-      - build_opensuse_tumbleweed:
-          filters:
-            tags:
-              only: /.*/
       - build_opensuse_lp151:
           filters:
             tags:
@@ -557,23 +383,11 @@ workflows:
               only: /.*/
 
 
-      - build_fedora_31:
-          filters:
-            tags:
-              only: /.*/
       - build_fedora_32:
           filters:
             tags:
               only: /.*/
-
-
-      - build_mageia_7:
-          filters:
-            tags:
-              only: /.*/
-
-
-      - build_centos_8:
+      - build_fedora_33:
           filters:
             tags:
               only: /.*/

.clang-format

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

.github/FUNDING.yml

@@ -1 +1,2 @@
 github: jonaski
+patreon: jonaskvinge

.github/ISSUE_TEMPLATE.md

@@ -7,7 +7,12 @@ assignees: ''
 
 ---
 
-For general technical questions and help with technical issues please use the forum on https://forum.strawberrymusicplayer.org/
+For technical issues, questions and feature suggestions/requests please use the forum on https://forum.strawberrymusicplayer.org/
+
+Check the Changelog to see if the issue is already fixed:
+https://github.com/strawberrymusicplayer/strawberry/blob/master/Changelog
+
+If it's fixed, try the latest development build from: https://builds.strawberrymusicplayer.org/
 
 **Describe the bug**
 A clear and concise description of what the bug is.

.github/workflows/ccpp.yml

@@ -7,7 +7,7 @@ jobs:
     name: Create source tarball
     runs-on: ubuntu-latest
     container:
-      image: opensuse/leap:15.1
+      image: opensuse/leap:15.2
     steps:
       - uses: actions/checkout@v1.2.0
       - name: Update packages
@@ -39,6 +39,7 @@ jobs:
             gstreamer-devel
             gstreamer-plugins-base-devel
             vlc-devel
+            taglib-devel
             libQt5Core-devel
             libQt5Gui-devel
             libQt5Widgets-devel
@@ -65,7 +66,7 @@ jobs:
       - name: Configure CMake
         shell: bash
         working-directory: build
-        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_WERROR=ON
       - name: Create source tarball
         working-directory: build
         run: ../dist/scripts/maketarball.sh
@@ -107,6 +108,7 @@ jobs:
             gstreamer-devel
             gstreamer-plugins-base-devel
             vlc-devel
+            taglib-devel
             libQt5Core-devel
             libQt5Gui-devel
             libQt5Widgets-devel
@@ -133,7 +135,7 @@ jobs:
       - name: Configure CMake
         shell: bash
         working-directory: build
-        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_WERROR=ON
       - name: Create source tarball
         working-directory: build
         run: ../dist/scripts/maketarball.sh
@@ -147,8 +149,8 @@ jobs:
         run: rpmbuild -ba ../dist/unix/strawberry.spec
 
 
-  build_opensuse_lp152:
-    name: Build openSUSE Leap 15.2
+  build_opensuse_lp152_qt5:
+    name: Build openSUSE Leap 15.2 Qt 5
     runs-on: ubuntu-latest
     container:
       image: opensuse/leap:15.2
@@ -183,6 +185,7 @@ jobs:
             gstreamer-devel
             gstreamer-plugins-base-devel
             vlc-devel
+            taglib-devel
             libQt5Core-devel
             libQt5Gui-devel
             libQt5Widgets-devel
@@ -209,7 +212,7 @@ jobs:
       - name: Configure CMake
         shell: bash
         working-directory: build
-        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_WERROR=ON -DBUILD_WITH_QT5=ON
       - name: Create source tarball
         working-directory: build
         run: ../dist/scripts/maketarball.sh
@@ -222,98 +225,17 @@ jobs:
         working-directory: build
         run: rpmbuild -ba ../dist/unix/strawberry.spec
 
-
-  build_opensuse_tumbleweed:
-    name: Build openSUSE Tumbleweed
+  build_opensuse_lp152_qt6:
+    name: Build openSUSE Leap 15.2 Qt 6
     runs-on: ubuntu-latest
     container:
-      image: opensuse/tumbleweed
+      image: opensuse/leap:15.2
     steps:
       - uses: actions/checkout@v1.2.0
+      - name: Add Qt 6 repo
+        run: zypper -n ar -c -f -n 'repo-qt6' https://download.opensuse.org/repositories/home:/jonaski:/qt6/openSUSE_Leap_15.2/ repo-qt6
       - name: Update packages
         run: zypper --non-interactive --gpg-auto-import-keys ref
-      - name: Upgrade packages
-        run: zypper --non-interactive --gpg-auto-import-keys dup
-      - name: Install openSUSE dependencies
-        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
-            vlc-devel
-            libQt5Core-devel
-            libQt5Gui-devel
-            libQt5Widgets-devel
-            libQt5Concurrent-devel
-            libQt5Network-devel
-            libQt5Sql-devel
-            libQt5DBus-devel
-            libQt5Test-devel
-            libqt5-qtx11extras-devel
-            libqt5-qtbase-common-devel
-            libQt5Sql5-sqlite
-            libqt5-linguist-devel
-            libcdio-devel
-            libgpod-devel
-            libmtp-devel
-            libchromaprint-devel
-            desktop-file-utils
-            update-desktop-files
-            appstream-glib
-            hicolor-icon-theme
-      - name: Create Build Environment
-        shell: bash
-        run: cmake -E make_directory build
-      - name: Configure CMake
-        shell: bash
-        working-directory: build
-        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
-      - name: Create source tarball
-        working-directory: build
-        run: ../dist/scripts/maketarball.sh
-      - name: Create RPM build sources directories
-        run: mkdir -p ~/rpmbuild/SOURCES /usr/src/packages/SOURCES
-      - name: Copy source tarball
-        working-directory: build
-        run: cp strawberry-*.tar.xz /usr/src/packages/SOURCES/
-      - name: Build RPM
-        working-directory: build
-        run: rpmbuild -ba ../dist/unix/strawberry.spec
-
-
-  build_opensuse_qt6:
-    name: Build openSUSE Qt 6
-    runs-on: ubuntu-latest
-    container:
-      image: opensuse/tumbleweed
-    steps:
-      - uses: actions/checkout@v1.2.0
-      - name: Add Qt 6 repository
-        run: zypper -n ar -c -f -n 'repo-qt6' https://download.opensuse.org/repositories/home:/jonaski:/qt6/openSUSE_Tumbleweed/ repo-qt6
-      - name: Update packages
-        run: zypper --non-interactive --gpg-auto-import-keys ref
-      - name: Upgrade packages
-        run: zypper --non-interactive --gpg-auto-import-keys dup
       - name: Install openSUSE dependencies
         run: >
             zypper --non-interactive --gpg-auto-import-keys install
@@ -341,6 +263,7 @@ jobs:
             gstreamer-devel
             gstreamer-plugins-base-devel
             vlc-devel
+            taglib-devel
             qt6-core-devel
             qt6-gui-devel
             qt6-widgets-devel
@@ -349,10 +272,9 @@ jobs:
             qt6-sql-devel
             qt6-dbus-devel
             qt6-test-devel
-            qt6-x11extras-devel
             qt6-base-common-devel
             qt6-sql-sqlite
-            qt6-qt5compat-devel
+            qt6-linguist-devel
             libcdio-devel
             libgpod-devel
             libmtp-devel
@@ -367,10 +289,178 @@ jobs:
       - name: Configure CMake
         shell: bash
         working-directory: build
-        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DWITH_QT6=ON
-      - name: Build
+        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_WERROR=ON -DBUILD_WITH_QT6=ON
+      - name: Create source tarball
         working-directory: build
-        run: cmake --build . --config $BUILD_TYPE
+        run: ../dist/scripts/maketarball.sh
+      - name: Create RPM build sources directories
+        run: mkdir -p ~/rpmbuild/SOURCES /usr/src/packages/SOURCES
+      - name: Copy source tarball
+        working-directory: build
+        run: cp strawberry-*.tar.xz /usr/src/packages/SOURCES/
+      - name: Build RPM
+        working-directory: build
+        run: rpmbuild -ba ../dist/unix/strawberry.spec
+
+  #build_opensuse_tumbleweed_qt5:
+    #name: Build openSUSE Tumbleweed Qt 5
+    #runs-on: ubuntu-latest
+    #container:
+      #image: opensuse/tumbleweed
+    #steps:
+      #- uses: actions/checkout@v1.2.0
+      #- name: Lock packages
+        #run: zypper --non-interactive --gpg-auto-import-keys addlock openssh-server
+      #- name: Update packages
+        #run: zypper --non-interactive --gpg-auto-import-keys ref
+      #- name: Upgrade packages
+        #run: zypper --non-interactive --gpg-auto-import-keys dup
+      #- name: Install openSUSE dependencies
+        #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
+            #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
+            #libmtp-devel
+            #libchromaprint-devel
+            #desktop-file-utils
+            #update-desktop-files
+            #appstream-glib
+            #hicolor-icon-theme
+      #- name: Create Build Environment
+        #shell: bash
+        #run: cmake -E make_directory build
+      #- name: Configure CMake
+        #shell: bash
+        #working-directory: build
+        #run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_WERROR=ON -DBUILD_WITH_QT5=ON
+      #- name: Create source tarball
+        #working-directory: build
+        #run: ../dist/scripts/maketarball.sh
+      #- name: Create RPM build sources directories
+        #run: mkdir -p ~/rpmbuild/SOURCES /usr/src/packages/SOURCES
+      #- name: Copy source tarball
+        #working-directory: build
+        #run: cp strawberry-*.tar.xz /usr/src/packages/SOURCES/
+      #- name: Build RPM
+        #working-directory: build
+        #run: rpmbuild -ba ../dist/unix/strawberry.spec
+
+
+  #build_opensuse_tumbleweed_qt6:
+    #name: Build openSUSE Tumbleweed Qt 6
+    #runs-on: ubuntu-latest
+    #container:
+      #image: opensuse/tumbleweed
+    #steps:
+      #- uses: actions/checkout@v1.2.0
+      #- name: Lock packages
+        #run: zypper --non-interactive --gpg-auto-import-keys addlock openssh-server
+      #- name: Update packages
+        #run: zypper --non-interactive --gpg-auto-import-keys ref
+      #- name: Upgrade packages
+        #run: zypper --non-interactive --gpg-auto-import-keys dup
+      #- name: Install openSUSE dependencies
+        #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
+            #vlc-devel
+            #taglib-devel
+            #qt6-core-devel
+            #qt6-gui-devel
+            #qt6-widgets-devel
+            #qt6-concurrent-devel
+            #qt6-network-devel
+            #qt6-sql-devel
+            #qt6-dbus-devel
+            #qt6-test-devel
+            #qt6-base-common-devel
+            #qt6-sql-sqlite
+            #qt6-linguist-devel
+            #libcdio-devel
+            #libgpod-devel
+            #libmtp-devel
+            #libchromaprint-devel
+            #desktop-file-utils
+            #update-desktop-files
+            #appstream-glib
+            #hicolor-icon-theme
+      #- name: Create Build Environment
+        #shell: bash
+        #run: cmake -E make_directory build
+      #- name: Configure CMake
+        #shell: bash
+        #working-directory: build
+        #run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_WERROR=ON -DBUILD_WITH_QT6=ON
+      #- name: Create source tarball
+        #working-directory: build
+        #run: ../dist/scripts/maketarball.sh
+      #- name: Create RPM build sources directories
+        #run: mkdir -p ~/rpmbuild/SOURCES /usr/src/packages/SOURCES
+      #- name: Copy source tarball
+        #working-directory: build
+        #run: cp strawberry-*.tar.xz /usr/src/packages/SOURCES/
+      #- name: Build RPM
+        #working-directory: build
+        #run: rpmbuild -ba ../dist/unix/strawberry.spec
 
 
   build_fedora_32:
@@ -436,7 +526,84 @@ jobs:
       - name: Configure CMake
         shell: bash
         working-directory: build
-        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_WERROR=ON
+      - name: Create source tarball
+        working-directory: build
+        run: ../dist/scripts/maketarball.sh
+      - name: Create RPM build sources directories
+        working-directory: build
+        run: mkdir -p ~/rpmbuild/SOURCES /usr/src/packages/SOURCES
+      - name: Copy source tarball
+        working-directory: build
+        run: cp strawberry-*.tar.xz ~/rpmbuild/SOURCES/
+      - name: Build RPM
+        working-directory: build
+        run: rpmbuild -ba ../dist/unix/strawberry.spec
+
+
+  build_fedora_33:
+    name: Build Fedora 33
+    runs-on: ubuntu-latest
+    container:
+      image: fedora:33
+    env:
+      RPM_BUILD_NCPUS: "2"
+    steps:
+      - uses: actions/checkout@v1.2.0
+
+      - name: Update packages
+        run: yum update --assumeyes
+
+      - name: Upgrade packages
+        run: yum upgrade --assumeyes
+
+      - name: Install Fedora dependencies
+        run: >
+            dnf install --assumeyes
+            @development-tools
+            redhat-lsb-core
+            git
+            glibc
+            gcc-c++
+            rpmdevtools
+            make
+            cmake
+            pkgconfig
+            glib
+            man
+            tar
+            gettext
+            openssh
+            boost-devel
+            dbus-devel
+            protobuf-devel
+            protobuf-compiler
+            sqlite-devel
+            alsa-lib-devel
+            pulseaudio-libs-devel
+            libnotify-devel
+            gnutls-devel
+            qt5-qtbase-devel
+            qt5-qtx11extras-devel
+            qt5-qttools-devel
+            gstreamer1-devel
+            gstreamer1-plugins-base-devel
+            taglib-devel
+            libcdio-devel
+            libgpod-devel
+            libmtp-devel
+            libchromaprint-devel
+            fftw-devel
+            desktop-file-utils
+            libappstream-glib
+            hicolor-icon-theme
+      - name: Create Build Environment
+        shell: bash
+        run: cmake -E make_directory build
+      - name: Configure CMake
+        shell: bash
+        working-directory: build
+        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_WERROR=ON
       - name: Create source tarball
         working-directory: build
         run: ../dist/scripts/maketarball.sh
@@ -461,15 +628,21 @@ jobs:
     steps:
       - uses: actions/checkout@v1.2.0
 
+      - name: Install dnf-plugins-core
+        run: dnf install -y dnf-plugins-core
       - name: Install epel-release
         run: dnf install -y epel-release
+
       - name:  Install config-manager
         run: dnf install -y 'dnf-command(config-manager)'
-      - name: Enable PowerTools
-        run: dnf config-manager --set-enabled PowerTools
-      - name: DNF Clean All
+
+      - name: Enable powertools
+        run: dnf config-manager --set-enabled powertools
+
+      - name: Clean all
         run: dnf clean all
-      - name: DNF Update
+
+      - name: Update
         run: dnf update -y
 
       - name: Install CentOS dependencies
@@ -495,10 +668,9 @@ jobs:
             gnutls-devel
             sqlite-devel
             protobuf-devel
-            protobuf-compiler
+            protobuf-c
             alsa-lib-devel
             pulseaudio-libs-devel
-            qt5-devel
             qt5-qtbase-devel
             qt5-qtx11extras-devel
             qt5-qttools-devel
@@ -509,6 +681,7 @@ jobs:
             libmtp-devel
             libjpeg-devel
             cairo-devel
+            taglib-devel
             dbus-x11
             xorg-x11-server-Xvfb
             xorg-x11-xauth
@@ -519,97 +692,13 @@ jobs:
             hicolor-icon-theme
             gstreamer1-devel
             gstreamer1-plugins-base-devel
-
       - name: Create Build Environment
         shell: bash
         run: cmake -E make_directory build
       - name: Configure CMake
         shell: bash
         working-directory: build
-        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
-      - name: Create source tarball
-        working-directory: build
-        run: ../dist/scripts/maketarball.sh
-      - name: Create RPM build sources directories
-        working-directory: build
-        run: mkdir -p ~/rpmbuild/SOURCES /usr/src/packages/SOURCES
-      - name: Copy source tarball
-        working-directory: build
-        run: cp strawberry-*.tar.xz ~/rpmbuild/SOURCES/
-      - name: Build RPM
-        working-directory: build
-        run: rpmbuild -ba ../dist/unix/strawberry.spec
-
-
-  build_mageia_7:
-    name: Build Mageia 7
-    runs-on: ubuntu-latest
-    container:
-      image: mageia:7
-    steps:
-      - uses: actions/checkout@v1.2.0
-
-      - name: Update packages
-        run: urpmi.update -a
-
-      - name: Configure auto update
-        run: urpmi --auto-update
-
-      - name: Install Mageia dependencies
-        run: >
-            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
-            lib64mtp-devel
-            lib64raw1394-devel
-            lib64chromaprint-devel
-            libfftw-devel
-            desktop-file-utils
-            appstream-util
-            libappstream-glib8
-            hicolor-icon-theme
-            qt5ct
-            lib64mesaegl1
-      - name: Create Build Environment
-        shell: bash
-        run: cmake -E make_directory build
-      - name: Configure CMake
-        shell: bash
-        working-directory: build
-        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_WERROR=ON
       - name: Create source tarball
         working-directory: build
         run: ../dist/scripts/maketarball.sh
@@ -635,6 +724,7 @@ jobs:
         run: >
             apt-get update && apt-get install -y
             build-essential
+            dh-make
             ssh
             git
             make
@@ -654,6 +744,7 @@ jobs:
             libgnutls28-dev
             libasound2-dev
             libpulse-dev
+            libtag1-dev
             qtbase5-dev
             qtbase5-dev-tools
             qtbase5-private-dev
@@ -691,6 +782,7 @@ jobs:
         run: >
             apt-get update && apt-get install -y
             build-essential
+            dh-make
             ssh
             git
             make
@@ -710,6 +802,7 @@ jobs:
             libgnutls28-dev
             libasound2-dev
             libpulse-dev
+            libtag1-dev
             qtbase5-dev
             qtbase5-dev-tools
             qtbase5-private-dev
@@ -730,7 +823,7 @@ jobs:
       - name: Configure CMake
         shell: bash
         working-directory: build
-        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_WERROR=ON
       - name: make deb
         shell: bash
         run: dpkg-buildpackage -b -d -uc -us -nc -j2
@@ -749,6 +842,7 @@ jobs:
         run: >
             apt-get update && apt-get install -y
             build-essential
+            dh-make
             ssh
             git
             make
@@ -770,6 +864,7 @@ jobs:
             libgnutls28-dev
             libasound2-dev
             libpulse-dev
+            libtag1-dev
             qtbase5-dev
             qtbase5-dev-tools
             qtbase5-private-dev
@@ -791,7 +886,7 @@ jobs:
       - name: Configure CMake
         shell: bash
         working-directory: build
-        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_WERROR=ON
       - name: make deb
         shell: bash
         run: dpkg-buildpackage -b -d -uc -us -nc -j2
@@ -810,6 +905,7 @@ jobs:
         run: >
             apt-get update && apt-get install -y
             build-essential
+            dh-make
             ssh
             git
             make
@@ -831,6 +927,7 @@ jobs:
             libgnutls28-dev
             libasound2-dev
             libpulse-dev
+            libtag1-dev
             qtbase5-dev
             qtbase5-dev-tools
             qtbase5-private-dev
@@ -852,7 +949,7 @@ jobs:
       - name: Configure CMake
         shell: bash
         working-directory: build
-        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_WERROR=ON
       - name: make deb
         shell: bash
         run: dpkg-buildpackage -b -d -uc -us -nc -j2
@@ -871,6 +968,7 @@ jobs:
         run: >
             apt-get update && apt-get install -y
             build-essential
+            dh-make
             ssh
             git
             make
@@ -892,6 +990,7 @@ jobs:
             libgnutls28-dev
             libasound2-dev
             libpulse-dev
+            libtag1-dev
             qtbase5-dev
             qtbase5-dev-tools
             qtbase5-private-dev
@@ -913,19 +1012,17 @@ jobs:
       - name: Configure CMake
         shell: bash
         working-directory: build
-        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_WERROR=ON
       - name: make deb
         shell: bash
         run: dpkg-buildpackage -b -d -uc -us -nc -j2
 
 
-  build-macos:
-    name: Build macOS
-    runs-on: macos-latest
+  build-macos-catalina:
+    name: Build macOS Catalina
+    runs-on: macos-10.15
     steps:
       - uses: actions/checkout@v1.2.0
-      - name: Unlink python
-        run: brew unlink python@2
       - name: Install packages
         run: >
           brew install
@@ -952,9 +1049,14 @@ jobs:
           create-dmg
           taglib
 
-      - name: Delete conflicting taglib system headers
+      - name: Install Sparkle
+        run: brew install --cask sparkle
+
+      - name: Link Sparkle
         shell: bash
-        run: rm -rf /usr/local/include/taglib
+        run: |
+          sudo ln -s /usr/local/Caskroom/sparkle/$(ls /usr/local/Caskroom/sparkle | head -n1)/Sparkle.framework /Library/Frameworks/Sparkle.framework
+          sudo ln -s /usr/local/Caskroom/sparkle/$(ls /usr/local/Caskroom/sparkle | head -n1)/Sparkle.framework.dSYM /Library/Frameworks/Sparkle.framework.dSYM
 
       - name: Create Build Environment
         shell: bash
@@ -962,14 +1064,17 @@ jobs:
       - name: Configure CMake
         shell: bash
         env:
+          BUILD_TYPE: Release
           PKG_CONFIG_PATH: /usr/local/lib/pkgconfig
-          Qt5_DIR: /usr/local/opt/qt5/lib/cmake
-          Qt5LinguistTools_DIR: /usr/local/opt/qt5/lib/cmake/Qt5LinguistTools
+          Qt6_DIR: /usr/local/opt/qt6/lib/cmake
+          Qt5LinguistTools_DIR: /usr/local/opt/qt6/lib/cmake/Qt6LinguistTools
           GST_SCANNER_PATH: /usr/local/opt/gstreamer/libexec/gstreamer-1.0/gst-plugin-scanner
           GST_PLUGIN_PATH: /usr/local/lib/gstreamer-1.0
         working-directory: build
-        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DUSE_BUNDLE=ON
+        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_WITH_QT6=ON -DBUILD_WERROR=ON -DUSE_BUNDLE=ON -DCMAKE_PREFIX_PATH=/usr/local/opt/qt6/lib/cmake
       - name: Build
+        env:
+          BUILD_TYPE: Release
         working-directory: build
         shell: bash
         run: cmake --build . --config $BUILD_TYPE
@@ -977,17 +1082,100 @@ jobs:
         working-directory: build
         shell: bash
         run: make install
-      #- name: Create DMG
-      #  working-directory: build
-      #  shell: bash
-      #  run: make dmg
+      - name: Hack to make macdeployqt find plugins
+        shell: bash
+        run: sudo ln -s /usr/local/Cellar/qt/$(ls /usr/local/Cellar/qt/ | tail -n1)/share/qt/plugins /usr/local/plugins
+      - name: Create DMG
+        working-directory: build
+        shell: bash
+        run: make dmg
+      - uses: actions/upload-artifact@v2
+        with:
+          name: upload-macos-catalina
+          path: build/strawberry-*-catalina-*.dmg
+
+  build-macos-bigsur:
+    name: Build macOS Big Sur
+    runs-on: macos-11.0
+    steps:
+      - uses: actions/checkout@v1.2.0
+      - 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
+          create-dmg
+          taglib
+
+      - name: Install Sparkle
+        run: brew install --cask sparkle
+
+      - name: Link Sparkle
+        shell: bash
+        run: |
+          sudo ln -s /usr/local/Caskroom/sparkle/$(ls /usr/local/Caskroom/sparkle | head -n1)/Sparkle.framework /Library/Frameworks/Sparkle.framework
+          sudo ln -s /usr/local/Caskroom/sparkle/$(ls /usr/local/Caskroom/sparkle | head -n1)/Sparkle.framework.dSYM /Library/Frameworks/Sparkle.framework.dSYM
+
+      - name: Create Build Environment
+        shell: bash
+        run: cmake -E make_directory build
+      - name: Configure CMake
+        shell: bash
+        env:
+          BUILD_TYPE: Release
+          PKG_CONFIG_PATH: /usr/local/lib/pkgconfig
+          Qt5_DIR: /usr/local/opt/qt6/lib/cmake
+          Qt5LinguistTools_DIR: /usr/local/opt/qt6/lib/cmake/Qt6LinguistTools
+          GST_SCANNER_PATH: /usr/local/opt/gstreamer/libexec/gstreamer-1.0/gst-plugin-scanner
+          GST_PLUGIN_PATH: /usr/local/lib/gstreamer-1.0
+        working-directory: build
+        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_WITH_QT6=ON -DBUILD_WERROR=ON -DUSE_BUNDLE=ON -DCMAKE_PREFIX_PATH=/usr/local/opt/qt6/lib/cmake
+      - name: Build
+        env:
+          BUILD_TYPE: Release
+        working-directory: build
+        shell: bash
+        run: cmake --build . --config $BUILD_TYPE
+      - name: Install
+        working-directory: build
+        shell: bash
+        run: make install
+      - name: Hack to make macdeployqt find plugins
+        shell: bash
+        run: sudo ln -s /usr/local/Cellar/qt/$(ls /usr/local/Cellar/qt/ | tail -n1)/share/qt/plugins /usr/local/plugins
+      - name: Create DMG
+        working-directory: build
+        shell: bash
+        run: make dmg
+      - uses: actions/upload-artifact@v2
+        with:
+          name: upload-macos-bigsur
+          path: build/strawberry-*-bigsur-*.dmg
 
 
   build-windows:
     name: Build Windows
     runs-on: ubuntu-latest
     container:
-      image: jonaski/strawberry-mxe
+      image: jonaski/strawberry-mxe2
     steps:
       - uses: actions/checkout@v1.2.0
 
@@ -1008,6 +1196,7 @@ jobs:
           cmake ..
           -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-x86_64-w64-mingw32-shared.cmake
           -DCMAKE_BUILD_TYPE=Release
+          -DBUILD_WERROR=ON
           -DARCH=x86_64
           -DENABLE_WIN32_CONSOLE=OFF
           -DENABLE_DBUS=OFF
@@ -1019,10 +1208,6 @@ jobs:
         working-directory: build
         run: make -j2
 
-      - name: Strip executables
-        working-directory: build
-        run: /usr/src/strawberry-mxe/usr/bin/x86_64-w64-mingw32.shared-strip *.exe
-
       - name: Create directories
         working-directory: build
         run: mkdir -p gio-modules platforms sqldrivers imageformats styles gstreamer-plugins nsisplugins
@@ -1099,13 +1284,9 @@ jobs:
           /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/bin/gstreamer-1.0/libgstlibav.dll
           ${GITHUB_WORKSPACE}/build/gstreamer-plugins/
 
-      - name: Copy killproc.exe
+      - name: Copy extra binaries
         working-directory: build
-        run: cp /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/bin/killproc.exe .
-
-      - name: Copy liborc-0.4-0.dll
-        working-directory: build
-        run: cp /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/bin/liborc-0.4-0.dll .
+        run: cp /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared/bin/{sqlite3.exe,killproc.exe,gst-launch-1.0.exe} .
 
       - name: Copy dependencies
         working-directory: build
@@ -1121,6 +1302,10 @@ jobs:
           -F ./gstreamer-plugins
           -R /usr/src/strawberry-mxe/usr/x86_64-w64-mingw32.shared
 
+      - name: Strip binaries
+        working-directory: build
+        run: find . -type f \( -iname \*.dll -o -iname \*.exe \) -exec /usr/src/strawberry-mxe/usr/bin/x86_64-w64-mingw32.shared-strip {} \;
+
       - name: Copy nsis files
         working-directory: build
         run: cp ${GITHUB_WORKSPACE}/dist/windows/*.nsi ${GITHUB_WORKSPACE}/dist/windows/*.nsh ${GITHUB_WORKSPACE}/dist/windows/*.ico .
@@ -1128,3 +1313,50 @@ jobs:
       - name: Build Windows installer
         working-directory: build
         run: makensis strawberry.nsi
+
+
+  upload-macos-catalina:
+    name: Upload macOS Catalina DMG
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master'
+    needs:
+      - build-macos-catalina
+    steps:
+      - uses: actions/checkout@v1.2.0
+      - uses: actions/download-artifact@v2
+        with:
+          path: uploads
+      - name: Install SSH keys
+        uses: shimataro/ssh-key-action@v2
+        with:
+          known_hosts: ${{ secrets.KNOWN_HOSTS2 }}
+          key: ${{ secrets.SSH_KEY }}
+      - name: rsync
+        run: |
+          set -x
+          for i in $(find uploads -type f -name 'strawberry-*-catalina-*.dmg'); do
+            rsync -e "ssh -p 50220 -o StrictHostKeyChecking=no" -va $i travis@echoes.jkvinge.net:/home/travis/builds/macos/catalina/
+          done
+
+  upload-macos-bigsur:
+    name: Upload macOS Big Sur DMG
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master'
+    needs:
+      - build-macos-bigsur
+    steps:
+      - uses: actions/checkout@v1.2.0
+      - uses: actions/download-artifact@v2
+        with:
+          path: uploads
+      - name: Install SSH keys
+        uses: shimataro/ssh-key-action@v2
+        with:
+          known_hosts: ${{ secrets.KNOWN_HOSTS2 }}
+          key: ${{ secrets.SSH_KEY }}
+      - name: rsync
+        run: |
+          set -x
+          for i in $(find uploads -type f -name 'strawberry-*-bigsur-*.dmg'); do
+            rsync -e "ssh -p 50220 -o StrictHostKeyChecking=no" -va $i travis@echoes.jkvinge.net:/home/travis/builds/macos/bigsur/
+          done

.travis.yml

@@ -1,56 +1,43 @@
 sudo: required
 language: C++
-os:
-  - osx
-services:
-  - docker
-compiler:
-  - gcc
+os: osx
+osx_image: xcode11.3
+compiler: clang
 
 before_install:
   - if ! [ "$DEPLOY_KEY_ENC" == "" ]; then
       echo $DEPLOY_KEY_ENC | base64 --decode | openssl aes-256-cbc -K $encrypted_83a41ac424a6_key -iv $encrypted_83a41ac424a6_iv -out ~/.ssh/id_rsa -d ;
       chmod 600 ~/.ssh/id_rsa ;
     fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-      docker build -f Dockerfile -t strawberry-build . || travis_terminate 1;
-      docker run --name build -itd strawberry-build /bin/bash || travis_terminate 1;
-      docker exec build git clone https://github.com/strawberrymusicplayer/strawberry;
-    fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      git fetch --unshallow || travis_terminate 1;
-      git pull || travis_terminate 1;
-      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;
-      brew install create-dmg;
-      brew cask install sparkle;
-      sudo ln -s /usr/local/Caskroom/sparkle/$(ls /usr/local/Caskroom/sparkle | head -n1)/Sparkle.framework /Library/Frameworks/Sparkle.framework;
-      sudo ln -s /usr/local/Caskroom/sparkle/$(ls /usr/local/Caskroom/sparkle | head -n1)/Sparkle.framework.dSYM /Library/Frameworks/Sparkle.framework.dSYM;
-      export Qt5_DIR=/usr/local/opt/qt5/lib/cmake;
-      export Qt5LinguistTools_DIR=/usr/local/opt/qt5/lib/cmake/Qt5LinguistTools;
-      export PATH="/usr/local/opt/gettext/bin:$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;
-    fi
+  - git fetch --unshallow
+  - git pull
+  - brew update
+  - travis_wait 400 brew upgrade || echo "Failed"
+  - travis_wait 400 brew upgrade || echo "Failed"
+  - brew install glib pkgconfig libffi protobuf protobuf-c qt gettext gnutls fftw sqlite chromaprint zlib taglib
+  - brew install gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav
+  - brew install libcdio libmtp
+  - brew install create-dmg
+  - brew install --cask sparkle
+  - sudo ln -s /usr/local/Caskroom/sparkle/$(ls /usr/local/Caskroom/sparkle | head -n1)/Sparkle.framework /Library/Frameworks/Sparkle.framework
+  - sudo ln -s /usr/local/Caskroom/sparkle/$(ls /usr/local/Caskroom/sparkle | head -n1)/Sparkle.framework.dSYM /Library/Frameworks/Sparkle.framework.dSYM
+  - export Qt6_DIR=/usr/local/opt/qt6/lib/cmake
+  - export Qt6LinguistTools_DIR=/usr/local/opt/qt6/lib/cmake/Qt6LinguistTools
+  - ls /usr/local/lib/gstreamer-1.0
 before_script:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker exec build cmake -Hstrawberry -Bbuild ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir build; cd build; cmake .. -DUSE_BUNDLE=ON ; fi
+  - mkdir build
+  - cd build
+  - cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_QT6=ON -DBUILD_WERROR=ON -DUSE_BUNDLE=ON
 script:
-- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker exec build make -C build -j8 ; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      make -j8 || travis_terminate 1;
-      make install || travis_terminate 1;
-      make dmg;
-  fi
+  - make -j8
+  - make install
+  - sudo ln -s /usr/local/Cellar/qt/$(ls /usr/local/Cellar/qt/ | tail -n1)/share/qt/plugins /usr/local/plugins
+  - make dmg2
 after_success:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ls -lh strawberry*.dmg; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC_FOR_BUILD" == "gcc" ]] && [ -f ~/.ssh/id_rsa ]; then
-      if [[ "$TRAVIS_BRANCH" == "master" ]]; then
-        rsync -e "ssh -o StrictHostKeyChecking=no" -va strawberry*.dmg travis@echoes.jkvinge.net:/home/travis/builds/macos;
-      elif [[ "$TRAVIS_BRANCH" == "macos" ]]; then
-        rsync -e "ssh -o StrictHostKeyChecking=no" -va strawberry*.dmg travis@echoes.jkvinge.net:/home/travis/builds/macos;
+  - ls -lh strawberry*.dmg
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [ -f ~/.ssh/id_rsa ]; then
+      if [[ "$TRAVIS_BRANCH" == "master" ]] || [[ "$TRAVIS_BRANCH" == "travis" ]]; then
+        rsync -e "ssh -o StrictHostKeyChecking=no" -va strawberry*.dmg travis@echoes.jkvinge.net:/home/travis/builds/macos/mojave/;
       fi
     fi
 

3rdparty/README.md

@@ -12,31 +12,8 @@ It is included here because it is not packed by distros and is also used on macO
 URL: https://github.com/itay-grudev/SingleApplication
 
 
-taglib
-------
+SPMediaKeyTap
+-------------
 
-TagLib is a library for reading and editing the meta-data of several popular audio formats. It is also used
-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 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,
-see: https://github.com/taglib/taglib/issues/864
-If you decide to use the systems taglib, make sure it has been patched with the following commit:
-https://github.com/taglib/taglib/commit/9336c82da3a04552168f208cd7a5fa4646701ea4
-
-The current taglib in 3rdparty also has the following features:
-- Audio file detection by content.
-- DSF and DSDIFF support
-
-URL: https://github.com/taglib/taglib
-
-
-utf8-cpp
---------
-
-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/
+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

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

3rdparty/SPMediaKeyTap/LICENSE

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,12 @@
+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 is 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/SPMediaKeyTap.h

@@ -0,0 +1,53 @@
+/*
+ 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.
+ */
+
+#import <Cocoa/Cocoa.h>
+#import <IOKit/hidsystem/ev_keymap.h>
+
+// http://overooped.com/post/2593597587/mediakeys
+
+#define SPSystemDefinedEventMediaKeys 8
+
+@interface SPMediaKeyTap : NSObject
+
+- (id)initWithDelegate:(id)delegate;
+
++ (BOOL)usesGlobalMediaKeyTap;
+- (BOOL)startWatchingMediaKeys;
+- (void)stopWatchingMediaKeys;
+- (void)handleAndReleaseMediaKeyEvent:(NSEvent *)event;
+@end
+
+@interface NSObject (SPMediaKeyTapDelegate)
+- (void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event;
+@end
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern NSString *kIgnoreMediaKeysDefaultsKey;
+
+#ifdef __cplusplus
+}
+#endif

3rdparty/SPMediaKeyTap/SPMediaKeyTap.m

@@ -0,0 +1,361 @@
+/*
+ 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.
+*/
+
+// Copyright (c) 2010 Spotify AB
+#import "SPMediaKeyTap.h"
+
+// Define to enable app list debug output
+// #define DEBUG_SPMEDIAKEY_APPLIST 1
+
+NSString *kIgnoreMediaKeysDefaultsKey = @"SPIgnoreMediaKeys";
+
+@interface SPMediaKeyTap () {
+    CFMachPortRef _eventPort;
+    CFRunLoopSourceRef _eventPortSource;
+    CFRunLoopRef _tapThreadRL;
+    NSThread *_tapThread;
+    BOOL _shouldInterceptMediaKeyEvents;
+    id _delegate;
+    // The app that is frontmost in this list owns media keys
+    NSMutableArray<NSRunningApplication *> *_mediaKeyAppList;
+}
+
+- (BOOL)shouldInterceptMediaKeyEvents;
+- (void)setShouldInterceptMediaKeyEvents:(BOOL)newSetting;
+- (void)startWatchingAppSwitching;
+- (void)stopWatchingAppSwitching;
+- (void)eventTapThread;
+@end
+
+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
+{
+    self = [super init];
+    if (self) {
+        _delegate = delegate;
+        [self startWatchingAppSwitching];
+        _mediaKeyAppList = [NSMutableArray new];
+    }
+    return self;
+}
+
+- (void)dealloc
+{
+    [self stopWatchingMediaKeys];
+    [self stopWatchingAppSwitching];
+    [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
+
+    [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self
+                                                           selector:@selector(frontmostAppChanged:)
+                                                               name:NSWorkspaceDidActivateApplicationNotification
+                                                             object:nil];
+
+
+    [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self
+                                                           selector:@selector(appTerminated:)
+                                                               name:NSWorkspaceDidTerminateApplicationNotification
+                                                             object:nil];
+}
+
+- (void)stopWatchingAppSwitching
+{
+    [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self];
+}
+
+- (BOOL)startWatchingMediaKeys
+{
+    // Prevent having multiple mediaKeys threads
+    [self stopWatchingMediaKeys];
+
+    [self setShouldInterceptMediaKeyEvents:YES];
+
+    // Add an event tap to intercept the system defined media key events
+    _eventPort = CGEventTapCreate(kCGSessionEventTap,
+                                  kCGHeadInsertEventTap,
+                                  kCGEventTapOptionDefault,
+                                  CGEventMaskBit(NX_SYSDEFINED),
+                                  tapEventCallback,
+                                  (__bridge void * __nullable)(self));
+
+    // Can be NULL if the app has no accessibility access permission
+    if (_eventPort == NULL)
+        return NO;
+
+    _eventPortSource = CFMachPortCreateRunLoopSource(kCFAllocatorSystemDefault, _eventPort, 0);
+    assert(_eventPortSource != NULL);
+
+    if (_eventPortSource == NULL)
+        return NO;
+
+    // Let's do this in a separate thread so that a slow app doesn't lag the event tap
+    _tapThread = [[NSThread alloc] initWithTarget:self
+                                         selector:@selector(eventTapThread)
+                                           object:nil];
+    [_tapThread start];
+
+    return YES;
+}
+
+- (void)stopWatchingMediaKeys
+{
+    // Shut down tap thread
+    if(_tapThreadRL){
+        CFRunLoopStop(_tapThreadRL);
+        _tapThreadRL = nil;
+    }
+
+    // Remove tap port
+    if(_eventPort){
+        CFMachPortInvalidate(_eventPort);
+        CFRelease(_eventPort);
+        _eventPort = nil;
+    }
+
+    // Remove tap source
+    if(_eventPortSource){
+        CFRelease(_eventPortSource);
+        _eventPortSource = nil;
+    }
+}
+
+#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
+        ![[NSUserDefaults standardUserDefaults] boolForKey:kIgnoreMediaKeysDefaultsKey]
+        && floor(NSAppKitVersionNumber) >= 949/*NSAppKitVersionNumber10_5*/;
+#endif
+}
+
++ (NSArray*)mediaKeyUserBundleIdentifiers
+{
+    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",
+        @"org.niltsh.MPlayerX",
+        @"com.ilabs.PandorasHelper",
+        @"com.mahasoftware.pandabar",
+        @"com.bitcartel.pandorajam",
+        @"org.clementine-player.clementine",
+        @"fm.last.Last.fm",
+        @"fm.last.Scrobbler",
+        @"com.beatport.BeatportPro",
+        @"com.Timenut.SongKey",
+        @"com.macromedia.fireworks", // the tap messes up their mouse input
+        @"at.justp.Theremin",
+        @"ru.ya.themblsha.YandexMusic",
+        @"com.jriver.MediaCenter18",
+        @"com.jriver.MediaCenter19",
+        @"com.jriver.MediaCenter20",
+        @"co.rackit.mate",
+        @"com.ttitt.b-music",
+        @"com.beardedspice.BeardedSpice",
+        @"com.plug.Plug",
+        @"com.plug.Plug2",
+        @"com.netease.163music",
+        @"org.quodlibet.quodlibet",
+        nil
+    ];
+}
+
+
+- (BOOL)shouldInterceptMediaKeyEvents
+{
+    BOOL shouldIntercept = NO;
+    @synchronized(self) {
+        shouldIntercept = _shouldInterceptMediaKeyEvents;
+    }
+    return shouldIntercept;
+}
+
+- (void)pauseTapOnTapThread:(NSNumber *)yeahno
+{
+    CGEventTapEnable(self->_eventPort, [yeahno boolValue]);
+}
+
+- (void)setShouldInterceptMediaKeyEvents:(BOOL)newSetting
+{
+    BOOL oldSetting;
+    @synchronized(self) {
+        oldSetting = _shouldInterceptMediaKeyEvents;
+        _shouldInterceptMediaKeyEvents = newSetting;
+    }
+    if(_tapThreadRL && oldSetting != newSetting) {
+        [self performSelector:@selector(pauseTapOnTapThread:)
+                     onThread:_tapThread
+                   withObject:@(newSetting)
+                waitUntilDone:NO];
+
+    }
+}
+
+
+#pragma mark -
+#pragma mark Event tap callbacks
+
+// Note: method called on background thread
+
+static CGEventRef tapEventCallback2(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon)
+{
+    #pragma unused(proxy)
+    SPMediaKeyTap *self = (__bridge SPMediaKeyTap *)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 && keyCode != NX_KEYTYPE_PREVIOUS && keyCode != NX_KEYTYPE_NEXT)
+        return event;
+
+    if (![self shouldInterceptMediaKeyEvents])
+        return event;
+
+    [self performSelectorOnMainThread:@selector(handleAndReleaseMediaKeyEvent:) withObject:nsEvent waitUntilDone:NO];
+
+    return NULL;
+}
+
+static CGEventRef tapEventCallback(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon)
+{
+    @autoreleasepool {
+        CGEventRef ret = tapEventCallback2(proxy, type, event, refcon);
+        return ret;
+    }
+}
+
+- (void)handleAndReleaseMediaKeyEvent:(NSEvent *)event
+{
+    [_delegate mediaKeyTap:self receivedMediaKeyEvent:event];
+}
+
+- (void)eventTapThread
+{
+    _tapThreadRL = CFRunLoopGetCurrent();
+    CFRunLoopAddSource(_tapThreadRL, _eventPortSource, kCFRunLoopCommonModes);
+    CFRunLoopRun();
+}
+
+
+#pragma mark -
+#pragma mark Task switching callbacks
+
+- (void)mediaKeyAppListChanged
+{
+    #ifdef DEBUG_SPMEDIAKEY_APPLIST
+    [self debugPrintAppList];
+    #endif
+
+    if([_mediaKeyAppList count] == 0)
+        return;
+
+    NSRunningApplication *thisApp = [NSRunningApplication currentApplication];
+    NSRunningApplication *otherApp = [_mediaKeyAppList firstObject];
+
+    BOOL isCurrent = [thisApp isEqual:otherApp];
+
+    [self setShouldInterceptMediaKeyEvents:isCurrent];
+}
+
+- (void)frontmostAppChanged:(NSNotification *)notification
+{
+    NSRunningApplication *app = [notification.userInfo objectForKey:NSWorkspaceApplicationKey]; 
+    if (app.bundleIdentifier == nil)
+        return;
+
+    if (![[SPMediaKeyTap mediaKeyUserBundleIdentifiers] containsObject:app.bundleIdentifier])
+        return;
+
+    [_mediaKeyAppList removeObject:app];
+    [_mediaKeyAppList insertObject:app atIndex:0];
+    [self mediaKeyAppListChanged];
+}
+
+- (void)appTerminated:(NSNotification *)notification
+{
+    NSRunningApplication *app = [notification.userInfo objectForKey:NSWorkspaceApplicationKey];
+    [_mediaKeyAppList removeObject:app];
+
+    [self mediaKeyAppListChanged];
+}
+
+#ifdef DEBUG_SPMEDIAKEY_APPLIST
+- (void)debugPrintAppList
+{
+    NSMutableString *list = [NSMutableString stringWithCapacity:255];
+    for (NSRunningApplication *app in _mediaKeyAppList) {
+        [list appendFormat:@"     - %@\n", app.bundleIdentifier];
+    }
+    NSLog(@"List: \n%@", list);
+}
+#endif
+
+@end

3rdparty/singleapplication/CMakeLists.txt

@@ -10,17 +10,12 @@ endif()
 
 set(SINGLEAPP-SOURCES singleapplication.cpp singleapplication_p.cpp)
 set(SINGLEAPP-MOC-HEADERS singleapplication.h singleapplication_p.h)
-if(WITH_QT6)
+if(BUILD_WITH_QT6)
   qt6_wrap_cpp(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS})
 else()
   qt5_wrap_cpp(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS})
 endif()
 add_library(singleapplication STATIC ${SINGLEAPP-SOURCES} ${SINGLEAPP-SOURCES-MOC})
-target_include_directories(singleapplication SYSTEM PRIVATE
-  ${QtCore_INCLUDE_DIRS}
-  ${QtWidgets_INCLUDE_DIRS}
-  ${QtNetwork_INCLUDE_DIRS}
-)
 target_include_directories(singleapplication PRIVATE
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
@@ -33,16 +28,12 @@ target_link_libraries(singleapplication PRIVATE
 
 set(SINGLECOREAPP-SOURCES singlecoreapplication.cpp singlecoreapplication_p.cpp)
 set(SINGLECOREAPP-MOC-HEADERS singlecoreapplication.h singlecoreapplication_p.h)
-if(WITH_QT6)
+if(BUILD_WITH_QT6)
   qt6_wrap_cpp(SINGLECOREAPP-SOURCES-MOC ${SINGLECOREAPP-MOC-HEADERS})
 else()
   qt5_wrap_cpp(SINGLECOREAPP-SOURCES-MOC ${SINGLECOREAPP-MOC-HEADERS})
 endif()
 add_library(singlecoreapplication STATIC ${SINGLECOREAPP-SOURCES} ${SINGLECOREAPP-SOURCES-MOC})
-target_include_directories(singlecoreapplication SYSTEM PRIVATE
-  ${QtCore_INCLUDE_DIRS}
-  ${QtNetwork_INCLUDE_DIRS}
-)
 target_include_directories(singlecoreapplication PRIVATE
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}

3rdparty/singleapplication/singleapplication.cpp

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

3rdparty/singleapplication/singleapplication.h

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) Itay Grudev 2015 - 2018
+// Copyright (c) Itay Grudev 2015 - 2020
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -42,16 +42,15 @@
 class SingleApplicationPrivate;
 
 /**
- * @brief The SingleApplication class handles multipe instances of the same
- * Application
- * @see QCoreApplication
+ * @brief The SingleApplication class handles multipe instances of the same Application
+ * @see QApplication
  */
 class SingleApplication : public QApplication {
   Q_OBJECT
 
   typedef QApplication app_t;
 
-public:
+ public:
   /**
    * @brief Mode of operation of SingleApplication.
    * Whether the block should be user-wide or system-wide and whether the
@@ -63,11 +62,11 @@ public:
    * @enum
    */
   enum Mode {
-    User                   = 1 << 0,
-    System                 = 1 << 1,
-    SecondaryNotification  = 1 << 2,
-    ExcludeAppVersion      = 1 << 3,
-    ExcludeAppPath         = 1 << 4
+    User = 1 << 0,
+    System = 1 << 1,
+    SecondaryNotification = 1 << 2,
+    ExcludeAppVersion = 1 << 3,
+    ExcludeAppPath = 1 << 4
   };
   Q_DECLARE_FLAGS(Options, Mode)
 
@@ -91,7 +90,7 @@ public:
    * 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 );
+  explicit SingleApplication(int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 1000);
   ~SingleApplication() override;
 
   /**
@@ -118,6 +117,18 @@ public:
    */
   qint64 primaryPid();
 
+  /**
+   * @brief Returns the username of the user running the primary instance
+   * @returns {QString}
+   */
+  QString primaryUser();
+
+  /**
+   * @brief Returns the username of the current user
+   * @returns {QString}
+   */
+  QString currentUser();
+
   /**
    * @brief Sends a message to the primary instance. Returns true on success.
    * @param {int} timeout - Timeout for connecting
@@ -125,18 +136,18 @@ public:
    * @note sendMessage() will return false if invoked from the primary
    * instance.
    */
-  bool sendMessage( QByteArray message, int timeout = 1000 );
+  bool sendMessage(QByteArray message, int timeout = 1000);
 
  signals:
   void instanceStarted();
-  void receivedMessage( quint32 instanceId, QByteArray message );
+  void receivedMessage(quint32 instanceId, QByteArray message);
 
  private:
   SingleApplicationPrivate *d_ptr;
   Q_DECLARE_PRIVATE(SingleApplication)
-
+  void abortSafely();
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(SingleApplication::Options)
 
-#endif // SINGLEAPPLICATION_H
+#endif  // SINGLEAPPLICATION_H

3rdparty/singleapplication/singleapplication_p.cpp

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) Itay Grudev 2015 - 2018
+// Copyright (c) Itay Grudev 2015 - 2020
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -44,6 +44,8 @@
 #  include <pwd.h>
 #endif
 
+#include <QObject>
+#include <QThread>
 #include <QIODevice>
 #include <QSharedMemory>
 #include <QByteArray>
@@ -52,6 +54,12 @@
 #include <QLocalServer>
 #include <QLocalSocket>
 #include <QDir>
+#include <QElapsedTimer>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+#  include <QRandomGenerator>
+#else
+#  include <QDateTime>
+#endif
 
 #include "singleapplication.h"
 #include "singleapplication_p.h"
@@ -61,33 +69,73 @@
 #  include <lmcons.h>
 #endif
 
-SingleApplicationPrivate::SingleApplicationPrivate(SingleApplication *_q_ptr)
-  : q_ptr(_q_ptr),
-    memory(nullptr),
-    socket(nullptr),
-    server(nullptr),
-    instanceNumber(-1)
-    {}
+SingleApplicationPrivate::SingleApplicationPrivate(SingleApplication *ptr)
+    : q_ptr(ptr),
+      memory_(nullptr),
+      socket_(nullptr),
+      server_(nullptr),
+      instanceNumber_(-1) {}
 
 SingleApplicationPrivate::~SingleApplicationPrivate() {
 
-  if (socket != nullptr) {
-    socket->close();
-    delete socket;
+  if (socket_ != nullptr) {
+    socket_->close();
+    delete socket_;
+    socket_ = nullptr;
   }
 
-  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 (memory_ != nullptr) {
+    memory_->lock();
+    InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+    if (server_ != nullptr) {
+      server_->close();
+      delete server_;
+      inst->primary = false;
+      inst->primaryPid = -1;
+      inst->primaryUser[0] = '\0';
+      inst->checksum = blockChecksum();
+    }
+    memory_->unlock();
 
-  delete memory;
+    delete memory_;
+    memory_ = nullptr;
+  }
+
+}
+
+QString SingleApplicationPrivate::getUsername() {
+
+#ifdef Q_OS_UNIX
+  QString username;
+#if defined(HAVE_GETEUID) && defined(HAVE_GETPWUID)
+  struct passwd *pw = getpwuid(geteuid());
+  if (pw) {
+    username = QString::fromLocal8Bit(pw->pw_name);
+  }
+#endif
+  if (username.isEmpty()) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+    username = qEnvironmentVariable("USER");
+#else
+    username = QString::fromLocal8Bit(qgetenv("USER"));
+#endif
+  }
+  return username;
+#endif
+
+#ifdef Q_OS_WIN
+  wchar_t username[UNLEN + 1];
+  // Specifies size of the buffer on input
+  DWORD usernameLength = UNLEN + 1;
+  if (GetUserNameW(username, &usernameLength)) {
+    return QString::fromWCharArray(username);
+  }
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+  return qEnvironmentVariable("USERNAME");
+#else
+  return QString::fromLocal8Bit(qgetenv("USERNAME"));
+#endif
+#endif
 
 }
 
@@ -99,11 +147,11 @@ void SingleApplicationPrivate::genBlockServerName() {
   appData.addData(SingleApplication::app_t::organizationName().toUtf8());
   appData.addData(SingleApplication::app_t::organizationDomain().toUtf8());
 
-  if (!(options & SingleApplication::Mode::ExcludeAppVersion)) {
+  if (!(options_ & SingleApplication::Mode::ExcludeAppVersion)) {
     appData.addData(SingleApplication::app_t::applicationVersion().toUtf8());
   }
 
-  if (! (options & SingleApplication::Mode::ExcludeAppPath)) {
+  if (!(options_ & SingleApplication::Mode::ExcludeAppPath)) {
 #ifdef Q_OS_WIN
     appData.addData(SingleApplication::app_t::applicationFilePath().toLower().toUtf8());
 #else
@@ -112,42 +160,22 @@ void SingleApplicationPrivate::genBlockServerName() {
   }
 
   // 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
+  if (options_ & SingleApplication::Mode::User) {
+    appData.addData(getUsername().toUtf8());
   }
 
   // Replace the backslash in RFC 2045 Base64 [a-zA-Z0-9+/=] to comply with server naming requirements.
-  blockServerName = appData.result().toBase64().replace("/", "_");
+  blockServerName_ = appData.result().toBase64().replace("/", "_");
 
 }
 
 void SingleApplicationPrivate::initializeMemoryBlock() {
 
-  InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
+  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
   inst->primary = false;
   inst->secondary = 0;
   inst->primaryPid = -1;
+  inst->primaryUser[0] = '\0';
   inst->checksum = blockChecksum();
 
 }
@@ -156,133 +184,161 @@ void SingleApplicationPrivate::startPrimary() {
 
   Q_Q(SingleApplication);
 
-  // Successful creation means that no main process exists
-  // So we start a QLocalServer to listen for connections
-  QLocalServer::removeServer(blockServerName);
-  server = new QLocalServer();
-
-  // Restrict access to the socket according to the
-  // SingleApplication::Mode::User flag on User level or no restrictions
-  if (options & SingleApplication::Mode::User) {
-    server->setSocketOptions(QLocalServer::UserAccessOption);
-  }
-  else {
-    server->setSocketOptions(QLocalServer::WorldAccessOption);
-  }
-
-  server->listen(blockServerName);
-  QObject::connect(server, &QLocalServer::newConnection, this, &SingleApplicationPrivate::slotConnectionEstablished);
-
   // Reset the number of connections
-  InstancesInfo* inst = static_cast <InstancesInfo*>(memory->data());
+  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
 
   inst->primary = true;
   inst->primaryPid = q->applicationPid();
+  qstrncpy(inst->primaryUser, getUsername().toUtf8().data(), sizeof(inst->primaryUser));
   inst->checksum = blockChecksum();
+  instanceNumber_ = 0;
+  // Successful creation means that no main process exists
+  // So we start a QLocalServer to listen for connections
+  QLocalServer::removeServer(blockServerName_);
+  server_ = new QLocalServer();
 
-  instanceNumber = 0;
+  // Restrict access to the socket according to the SingleApplication::Mode::User flag on User level or no restrictions
+  if (options_ & SingleApplication::Mode::User) {
+    server_->setSocketOptions(QLocalServer::UserAccessOption);
+  }
+  else {
+    server_->setSocketOptions(QLocalServer::WorldAccessOption);
+  }
+
+  server_->listen(blockServerName_);
+  QObject::connect(server_, &QLocalServer::newConnection, this, &SingleApplicationPrivate::slotConnectionEstablished);
 
 }
 
-void SingleApplicationPrivate::startSecondary() {}
+void SingleApplicationPrivate::startSecondary() {
 
-void SingleApplicationPrivate::connectToPrimary(const int msecs, const ConnectionType connectionType) {
+  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+
+  inst->secondary += 1;
+  inst->checksum = blockChecksum();
+  instanceNumber_ = inst->secondary;
+
+}
+
+bool SingleApplicationPrivate::connectToPrimary(int timeout, ConnectionType connectionType) {
+
+  QElapsedTimer time;
+  time.start();
 
   // Connect to the Local Server of the Primary Instance if not already connected.
-  if (socket == nullptr) {
-    socket = new QLocalSocket();
+  if (socket_ == nullptr) {
+    socket_ = new QLocalSocket();
   }
 
-  // If already connected - we are done;
-  if (socket->state() == QLocalSocket::ConnectedState)
-    return;
+  if (socket_->state() == QLocalSocket::ConnectedState) return true;
 
-  // If not connect
-  if (socket->state() == QLocalSocket::UnconnectedState ||
-    socket->state() == QLocalSocket::ClosingState) {
-    socket->connectToServer(blockServerName);
-  }
+  if (socket_->state() != QLocalSocket::ConnectedState) {
 
-  // Wait for being connected
-  if (socket->state() == QLocalSocket::ConnectingState) {
-    socket->waitForConnected(msecs);
+    forever {
+      randomSleep();
+
+      if (socket_->state() != QLocalSocket::ConnectingState)
+        socket_->connectToServer(blockServerName_);
+
+      if (socket_->state() == QLocalSocket::ConnectingState) {
+        socket_->waitForConnected(timeout - time.elapsed());
+      }
+
+      // If connected break out of the loop
+      if (socket_->state() == QLocalSocket::ConnectedState) break;
+
+      // If elapsed time since start is longer than the method timeout return
+      if (time.elapsed() >= timeout) return false;
+    }
   }
 
   // Initialisation message according to the SingleApplication protocol
-  if (socket->state() == QLocalSocket::ConnectedState) {
-    // Notify the parent that a new instance had been started;
-    QByteArray initMsg;
-    QDataStream writeStream(&initMsg, QIODevice::WriteOnly);
+  QByteArray initMsg;
+  QDataStream writeStream(&initMsg, QIODevice::WriteOnly);
+  writeStream.setVersion(QDataStream::Qt_5_8);
 
-    writeStream.setVersion(QDataStream::Qt_5_6);
+  writeStream << blockServerName_.toLatin1();
+  writeStream << static_cast<quint8>(connectionType);
+  writeStream << instanceNumber_;
 
-    writeStream << blockServerName.toLatin1();
-    writeStream << static_cast<quint8>(connectionType);
-    writeStream << instanceNumber;
-    quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
-    writeStream << checksum;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+  quint16 checksum = qChecksum(QByteArray(initMsg,  static_cast<quint32>(initMsg.length())));
+#else
+  quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
+#endif
 
-    // The header indicates the message length that follows
-    QByteArray header;
-    QDataStream headerStream(&header, QIODevice::WriteOnly);
+  writeStream << checksum;
 
-    headerStream.setVersion(QDataStream::Qt_5_6);
+  // The header indicates the message length that follows
+  QByteArray header;
+  QDataStream headerStream(&header, QIODevice::WriteOnly);
+  headerStream.setVersion(QDataStream::Qt_5_8);
+  headerStream << static_cast<quint64>(initMsg.length());
 
-    headerStream << static_cast <quint64>(initMsg.length());
+  socket_->write(header);
+  socket_->write(initMsg);
+  bool result = socket_->waitForBytesWritten(timeout - time.elapsed());
+  socket_->flush();
 
-    socket->write(header);
-    socket->write(initMsg);
-    socket->flush();
-    socket->waitForBytesWritten(msecs);
-  }
+  return result;
 
 }
 
 quint16 SingleApplicationPrivate::blockChecksum() {
 
-  return qChecksum(static_cast <const char *>(memory->data()), offsetof(InstancesInfo, checksum));
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+  quint16 checksum = qChecksum(QByteArray(static_cast<const char*>(memory_->constData()), offsetof(InstancesInfo, checksum)));
+#else
+  quint16 checksum = qChecksum(static_cast<const char*>(memory_->constData()), offsetof(InstancesInfo, checksum));
+#endif
+
+  return checksum;
 
 }
 
 qint64 SingleApplicationPrivate::primaryPid() {
 
-  qint64 pid;
-
-  memory->lock();
-  InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
-  pid = inst->primaryPid;
-  memory->unlock();
+  memory_->lock();
+  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+  qint64 pid = inst->primaryPid;
+  memory_->unlock();
 
   return pid;
 
 }
 
+QString SingleApplicationPrivate::primaryUser() {
+
+  memory_->lock();
+  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+  QByteArray username = inst->primaryUser;
+  memory_->unlock();
+
+  return QString::fromUtf8(username);
+
+}
+
 /**
  * @brief Executed when a connection has been made to the LocalServer
  */
 void SingleApplicationPrivate::slotConnectionEstablished() {
 
-  QLocalSocket *nextConnSocket = server->nextPendingConnection();
-  connectionMap.insert(nextConnSocket, ConnectionInfo());
+  QLocalSocket *nextConnSocket = server_->nextPendingConnection();
+  connectionMap_.insert(nextConnSocket, ConnectionInfo());
 
-  QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose,
-    [nextConnSocket, this]() {
-      auto &info = connectionMap[nextConnSocket];
-      Q_EMIT this->slotClientConnectionClosed(nextConnSocket, info.instanceId);
-    }
-  );
+  QObject::connect(nextConnSocket, &QLocalSocket::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::disconnected, [nextConnSocket, this]() {
+    connectionMap_.remove(nextConnSocket);
+    nextConnSocket->deleteLater();
+  });
 
-  QObject::connect(nextConnSocket, &QLocalSocket::readyRead,
-    [nextConnSocket, this]() {
-      auto &info = connectionMap[nextConnSocket];
-      switch(info.stage) {
+  QObject::connect(nextConnSocket, &QLocalSocket::readyRead, [nextConnSocket, this]() {
+    auto &info = connectionMap_[nextConnSocket];
+    switch (info.stage) {
       case StageHeader:
         readInitMessageHeader(nextConnSocket);
         break;
@@ -294,15 +350,14 @@ void SingleApplicationPrivate::slotConnectionEstablished() {
         break;
       default:
         break;
-      };
-    }
-  );
+    };
+  });
 
 }
 
 void SingleApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
 
-  if (!connectionMap.contains(sock)) {
+  if (!connectionMap_.contains(sock)) {
     return;
   }
 
@@ -311,13 +366,12 @@ void SingleApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
   }
 
   QDataStream headerStream(sock);
-
-  headerStream.setVersion(QDataStream::Qt_5_6);
+  headerStream.setVersion(QDataStream::Qt_5_8);
 
   // Read the header to know the message length
   quint64 msgLen = 0;
   headerStream >> msgLen;
-  ConnectionInfo &info = connectionMap[sock];
+  ConnectionInfo &info = connectionMap_[sock];
   info.stage = StageBody;
   info.msgLen = msgLen;
 
@@ -331,11 +385,11 @@ void SingleApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
 
   Q_Q(SingleApplication);
 
-  if (!connectionMap.contains(sock)) {
+  if (!connectionMap_.contains(sock)) {
     return;
   }
 
-  ConnectionInfo &info = connectionMap[sock];
+  ConnectionInfo &info = connectionMap_[sock];
   if (sock->bytesAvailable() < static_cast<qint64>(info.msgLen)) {
     return;
   }
@@ -343,8 +397,7 @@ void SingleApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
   // Read the message body
   QByteArray msgBytes = sock->read(info.msgLen);
   QDataStream readStream(msgBytes);
-
-  readStream.setVersion(QDataStream::Qt_5_6);
+  readStream.setVersion(QDataStream::Qt_5_8);
 
   // server name
   QByteArray latin1Name;
@@ -354,7 +407,7 @@ void SingleApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
   ConnectionType connectionType = InvalidConnection;
   quint8 connTypeVal = InvalidConnection;
   readStream >> connTypeVal;
-  connectionType = static_cast <ConnectionType>(connTypeVal);
+  connectionType = static_cast<ConnectionType>(connTypeVal);
 
   // instance id
   quint32 instanceId = 0;
@@ -364,9 +417,13 @@ void SingleApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
   quint16 msgChecksum = 0;
   readStream >> msgChecksum;
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+  const quint16 actualChecksum = qChecksum(QByteArray(msgBytes, static_cast<quint32>(msgBytes.length() - sizeof(quint16))));
+#else
   const quint16 actualChecksum = qChecksum(msgBytes.constData(), static_cast<quint32>(msgBytes.length() - sizeof(quint16)));
+#endif
 
-  bool isValid = readStream.status() == QDataStream::Ok && QLatin1String(latin1Name) == blockServerName && msgChecksum == actualChecksum;
+  bool isValid = readStream.status() == QDataStream::Ok && QLatin1String(latin1Name) == blockServerName_ && msgChecksum == actualChecksum;
 
   if (!isValid) {
     sock->close();
@@ -376,7 +433,7 @@ void SingleApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
   info.instanceId = instanceId;
   info.stage = StageConnected;
 
-  if (connectionType == NewInstance || (connectionType == SecondaryInstance && options & SingleApplication::Mode::SecondaryNotification)) {
+  if (connectionType == NewInstance || (connectionType == SecondaryInstance && options_ & SingleApplication::Mode::SecondaryNotification)) {
     Q_EMIT q->instanceStarted();
   }
 
@@ -395,7 +452,19 @@ void SingleApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, const
 
 void SingleApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSocket, const quint32 instanceId) {
 
-  if (closedSocket->bytesAvailable() > 0)
+  if (closedSocket->bytesAvailable() > 0) {
     Q_EMIT slotDataAvailable(closedSocket, instanceId);
+  }
+
+}
+
+void SingleApplicationPrivate::randomSleep() {
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+  QThread::msleep(QRandomGenerator::global()->bounded(8u, 18u));
+#else
+  qsrand(QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max());
+  QThread::msleep(8 + static_cast<unsigned long>(static_cast<float>(qrand()) / RAND_MAX * 10));
+#endif
 
 }

3rdparty/singleapplication/singleapplication_p.h

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) Itay Grudev 2015 - 2016
+// Copyright (c) Itay Grudev 2015 - 2020
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -36,6 +36,7 @@
 
 #include <QtGlobal>
 #include <QObject>
+#include <QString>
 #include <QMap>
 
 #include "singleapplication.h"
@@ -48,6 +49,7 @@ struct InstancesInfo {
   bool primary;
   quint32 secondary;
   qint64 primaryPid;
+  char primaryUser[128];
   quint16 checksum;
 };
 
@@ -60,6 +62,7 @@ struct ConnectionInfo {
 
 class SingleApplicationPrivate : public QObject {
   Q_OBJECT
+
  public:
   enum ConnectionType : quint8 {
     InvalidConnection = 0,
@@ -74,27 +77,30 @@ class SingleApplicationPrivate : public QObject {
   };
   Q_DECLARE_PUBLIC(SingleApplication)
 
-  explicit SingleApplicationPrivate(SingleApplication *_q_ptr);
+  explicit SingleApplicationPrivate(SingleApplication *ptr);
   ~SingleApplicationPrivate() override;
 
+  QString getUsername();
   void genBlockServerName();
   void initializeMemoryBlock();
   void startPrimary();
   void startSecondary();
-  void connectToPrimary(const int msecs, const ConnectionType connectionType);
+  bool connectToPrimary(const int msecs, const ConnectionType connectionType);
   quint16 blockChecksum();
   qint64 primaryPid();
+  QString primaryUser();
   void readInitMessageHeader(QLocalSocket *socket);
   void readInitMessageBody(QLocalSocket *socket);
+  void randomSleep();
 
   SingleApplication *q_ptr;
-  QSharedMemory *memory;
-  QLocalSocket *socket;
-  QLocalServer *server;
-  quint32 instanceNumber;
-  QString blockServerName;
-  SingleApplication::Options options;
-  QMap<QLocalSocket*, ConnectionInfo> connectionMap;
+  QSharedMemory *memory_;
+  QLocalSocket *socket_;
+  QLocalServer *server_;
+  quint32 instanceNumber_;
+  QString blockServerName_;
+  SingleApplication::Options options_;
+  QMap<QLocalSocket*, ConnectionInfo> connectionMap_;
 
  public slots:
   void slotConnectionEstablished();

3rdparty/singleapplication/singlecoreapplication.cpp

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

3rdparty/singleapplication/singlecoreapplication.h

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) Itay Grudev 2015 - 2018
+// Copyright (c) Itay Grudev 2015 - 2020
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -42,8 +42,7 @@
 class SingleCoreApplicationPrivate;
 
 /**
- * @brief The SingleCoreApplication class handles multiple instances of the same
- * Application
+ * @brief The SingleCoreApplication class handles multipe instances of the same Application
  * @see QCoreApplication
  */
 class SingleCoreApplication : public QCoreApplication {
@@ -51,7 +50,7 @@ class SingleCoreApplication : public QCoreApplication {
 
   typedef QCoreApplication app_t;
 
-public:
+ public:
   /**
    * @brief Mode of operation of SingleCoreApplication.
    * Whether the block should be user-wide or system-wide and whether the
@@ -63,11 +62,11 @@ public:
    * @enum
    */
   enum Mode {
-    User                   = 1 << 0,
-    System                 = 1 << 1,
-    SecondaryNotification  = 1 << 2,
-    ExcludeAppVersion      = 1 << 3,
-    ExcludeAppPath         = 1 << 4
+    User = 1 << 0,
+    System = 1 << 1,
+    SecondaryNotification = 1 << 2,
+    ExcludeAppVersion = 1 << 3,
+    ExcludeAppPath = 1 << 4
   };
   Q_DECLARE_FLAGS(Options, Mode)
 
@@ -89,9 +88,8 @@ public:
    * operations. It does not guarantee that the SingleCoreApplication
    * initialisation will be completed in given time, though is a good hint.
    * Usually 4*timeout would be the worst case (fail) scenario.
-   * @see See the corresponding QAPPLICATION_CLASS constructor for reference
    */
-  explicit SingleCoreApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 1000 );
+  explicit SingleCoreApplication(int &argc, char *argv[], const bool allowSecondary = false, const Options options = Mode::User, const int timeout = 1000);
   ~SingleCoreApplication() override;
 
   /**
@@ -118,6 +116,18 @@ public:
    */
   qint64 primaryPid();
 
+  /**
+   * @brief Returns the username of the user running the primary instance
+   * @returns {QString}
+   */
+  QString primaryUser();
+
+  /**
+   * @brief Returns the username of the current user
+   * @returns {QString}
+   */
+  QString currentUser();
+
   /**
    * @brief Sends a message to the primary instance. Returns true on success.
    * @param {int} timeout - Timeout for connecting
@@ -125,17 +135,18 @@ public:
    * @note sendMessage() will return false if invoked from the primary
    * instance.
    */
-  bool sendMessage( QByteArray message, int timeout = 1000 );
+  bool sendMessage(QByteArray message, int timeout = 1000);
 
  signals:
   void instanceStarted();
-  void receivedMessage( quint32 instanceId, QByteArray message );
+  void receivedMessage(quint32 instanceId, QByteArray message);
 
-private:
+ private:
   SingleCoreApplicationPrivate *d_ptr;
   Q_DECLARE_PRIVATE(SingleCoreApplication)
+  void abortSafely();
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(SingleCoreApplication::Options)
 
-#endif // SINGLECOREAPPLICATION_H
+#endif  // SINGLECOREAPPLICATION_H

3rdparty/singleapplication/singlecoreapplication_p.cpp

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) Itay Grudev 2015 - 2018
+// Copyright (c) Itay Grudev 2015 - 2020
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -44,6 +44,8 @@
 #  include <pwd.h>
 #endif
 
+#include <QObject>
+#include <QThread>
 #include <QIODevice>
 #include <QSharedMemory>
 #include <QByteArray>
@@ -52,6 +54,12 @@
 #include <QLocalServer>
 #include <QLocalSocket>
 #include <QDir>
+#include <QElapsedTimer>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+#  include <QRandomGenerator>
+#else
+#  include <QDateTime>
+#endif
 
 #include "singlecoreapplication.h"
 #include "singlecoreapplication_p.h"
@@ -61,33 +69,73 @@
 #  include <lmcons.h>
 #endif
 
-SingleCoreApplicationPrivate::SingleCoreApplicationPrivate(SingleCoreApplication *_q_ptr)
-  : q_ptr(_q_ptr),
-    memory(nullptr),
-    socket(nullptr),
-    server(nullptr),
-    instanceNumber(-1)
-    {}
+SingleCoreApplicationPrivate::SingleCoreApplicationPrivate(SingleCoreApplication *ptr)
+    : q_ptr(ptr),
+      memory_(nullptr),
+      socket_(nullptr),
+      server_(nullptr),
+      instanceNumber_(-1) {}
 
 SingleCoreApplicationPrivate::~SingleCoreApplicationPrivate() {
 
-  if (socket != nullptr) {
-    socket->close();
-    delete socket;
+  if (socket_ != nullptr) {
+    socket_->close();
+    delete socket_;
+    socket_ = nullptr;
   }
 
-  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 (memory_ != nullptr) {
+    memory_->lock();
+    InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+    if (server_ != nullptr) {
+      server_->close();
+      delete server_;
+      inst->primary = false;
+      inst->primaryPid = -1;
+      inst->primaryUser[0] = '\0';
+      inst->checksum = blockChecksum();
+    }
+    memory_->unlock();
 
-  delete memory;
+    delete memory_;
+    memory_ = nullptr;
+  }
+
+}
+
+QString SingleCoreApplicationPrivate::getUsername() {
+
+#ifdef Q_OS_UNIX
+  QString username;
+#if defined(HAVE_GETEUID) && defined(HAVE_GETPWUID)
+  struct passwd *pw = getpwuid(geteuid());
+  if (pw) {
+    username = QString::fromLocal8Bit(pw->pw_name);
+  }
+#endif
+  if (username.isEmpty()) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+    username = qEnvironmentVariable("USER");
+#else
+    username = QString::fromLocal8Bit(qgetenv("USER"));
+#endif
+  }
+  return username;
+#endif
+
+#ifdef Q_OS_WIN
+  wchar_t username[UNLEN + 1];
+  // Specifies size of the buffer on input
+  DWORD usernameLength = UNLEN + 1;
+  if (GetUserNameW(username, &usernameLength)) {
+    return QString::fromWCharArray(username);
+  }
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+  return qEnvironmentVariable("USERNAME");
+#else
+  return QString::fromLocal8Bit(qgetenv("USERNAME"));
+#endif
+#endif
 
 }
 
@@ -99,11 +147,11 @@ void SingleCoreApplicationPrivate::genBlockServerName() {
   appData.addData(SingleCoreApplication::app_t::organizationName().toUtf8());
   appData.addData(SingleCoreApplication::app_t::organizationDomain().toUtf8());
 
-  if (!(options & SingleCoreApplication::Mode::ExcludeAppVersion)) {
+  if (!(options_ & SingleCoreApplication::Mode::ExcludeAppVersion)) {
     appData.addData(SingleCoreApplication::app_t::applicationVersion().toUtf8());
   }
 
-  if (!(options & SingleCoreApplication::Mode::ExcludeAppPath)) {
+  if (!(options_ & SingleCoreApplication::Mode::ExcludeAppPath)) {
 #ifdef Q_OS_WIN
     appData.addData(SingleCoreApplication::app_t::applicationFilePath().toLower().toUtf8());
 #else
@@ -112,42 +160,22 @@ void SingleCoreApplicationPrivate::genBlockServerName() {
   }
 
   // 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
+  if (options_ & SingleCoreApplication::Mode::User) {
+    appData.addData(getUsername().toUtf8());
   }
 
   // Replace the backslash in RFC 2045 Base64 [a-zA-Z0-9+/=] to comply with server naming requirements.
-  blockServerName = appData.result().toBase64().replace("/", "_");
+  blockServerName_ = appData.result().toBase64().replace("/", "_");
 
 }
 
 void SingleCoreApplicationPrivate::initializeMemoryBlock() {
 
-  InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
+  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
   inst->primary = false;
   inst->secondary = 0;
   inst->primaryPid = -1;
+  inst->primaryUser[0] = '\0';
   inst->checksum = blockChecksum();
 
 }
@@ -156,133 +184,161 @@ void SingleCoreApplicationPrivate::startPrimary() {
 
   Q_Q(SingleCoreApplication);
 
-  // Successful creation means that no main process exists
-  // So we start a QLocalServer to listen for connections
-  QLocalServer::removeServer(blockServerName);
-  server = new QLocalServer();
-
-  // Restrict access to the socket according to the
-  // SingleCoreApplication::Mode::User flag on User level or no restrictions
-  if (options & SingleCoreApplication::Mode::User) {
-    server->setSocketOptions(QLocalServer::UserAccessOption);
-  }
-  else {
-    server->setSocketOptions(QLocalServer::WorldAccessOption);
-  }
-
-  server->listen(blockServerName);
-  QObject::connect(server, &QLocalServer::newConnection, this, &SingleCoreApplicationPrivate::slotConnectionEstablished);
-
   // Reset the number of connections
-  InstancesInfo* inst = static_cast <InstancesInfo*>(memory->data());
+  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
 
   inst->primary = true;
   inst->primaryPid = q->applicationPid();
+  qstrncpy(inst->primaryUser, getUsername().toUtf8().data(), sizeof(inst->primaryUser));
   inst->checksum = blockChecksum();
+  instanceNumber_ = 0;
+  // Successful creation means that no main process exists
+  // So we start a QLocalServer to listen for connections
+  QLocalServer::removeServer(blockServerName_);
+  server_ = new QLocalServer();
 
-  instanceNumber = 0;
+  // Restrict access to the socket according to the SingleCoreApplication::Mode::User flag on User level or no restrictions
+  if (options_ & SingleCoreApplication::Mode::User) {
+    server_->setSocketOptions(QLocalServer::UserAccessOption);
+  }
+  else {
+    server_->setSocketOptions(QLocalServer::WorldAccessOption);
+  }
+
+  server_->listen(blockServerName_);
+  QObject::connect(server_, &QLocalServer::newConnection, this, &SingleCoreApplicationPrivate::slotConnectionEstablished);
 
 }
 
-void SingleCoreApplicationPrivate::startSecondary() {}
+void SingleCoreApplicationPrivate::startSecondary() {
 
-void SingleCoreApplicationPrivate::connectToPrimary(const int msecs, const ConnectionType connectionType) {
+  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+
+  inst->secondary += 1;
+  inst->checksum = blockChecksum();
+  instanceNumber_ = inst->secondary;
+
+}
+
+bool SingleCoreApplicationPrivate::connectToPrimary(int timeout, ConnectionType connectionType) {
+
+  QElapsedTimer time;
+  time.start();
 
   // Connect to the Local Server of the Primary Instance if not already connected.
-  if (socket == nullptr) {
-    socket = new QLocalSocket();
+  if (socket_ == nullptr) {
+    socket_ = new QLocalSocket();
   }
 
-  // If already connected - we are done;
-  if (socket->state() == QLocalSocket::ConnectedState)
-    return;
+  if (socket_->state() == QLocalSocket::ConnectedState) return true;
 
-  // If not connect
-  if (socket->state() == QLocalSocket::UnconnectedState ||
-    socket->state() == QLocalSocket::ClosingState) {
-    socket->connectToServer(blockServerName);
-  }
+  if (socket_->state() != QLocalSocket::ConnectedState) {
 
-  // Wait for being connected
-  if (socket->state() == QLocalSocket::ConnectingState) {
-    socket->waitForConnected(msecs);
+    forever {
+      randomSleep();
+
+      if (socket_->state() != QLocalSocket::ConnectingState)
+        socket_->connectToServer(blockServerName_);
+
+      if (socket_->state() == QLocalSocket::ConnectingState) {
+        socket_->waitForConnected(timeout - time.elapsed());
+      }
+
+      // If connected break out of the loop
+      if (socket_->state() == QLocalSocket::ConnectedState) break;
+
+      // If elapsed time since start is longer than the method timeout return
+      if (time.elapsed() >= timeout) return false;
+    }
   }
 
   // Initialisation message according to the SingleCoreApplication protocol
-  if (socket->state() == QLocalSocket::ConnectedState) {
-    // Notify the parent that a new instance had been started;
-    QByteArray initMsg;
-    QDataStream writeStream(&initMsg, QIODevice::WriteOnly);
+  QByteArray initMsg;
+  QDataStream writeStream(&initMsg, QIODevice::WriteOnly);
+  writeStream.setVersion(QDataStream::Qt_5_8);
 
-    writeStream.setVersion(QDataStream::Qt_5_6);
+  writeStream << blockServerName_.toLatin1();
+  writeStream << static_cast<quint8>(connectionType);
+  writeStream << instanceNumber_;
 
-    writeStream << blockServerName.toLatin1();
-    writeStream << static_cast<quint8>(connectionType);
-    writeStream << instanceNumber;
-    quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
-    writeStream << checksum;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+  quint16 checksum = qChecksum(QByteArray(initMsg,  static_cast<quint32>(initMsg.length())));
+#else
+  quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
+#endif
 
-    // The header indicates the message length that follows
-    QByteArray header;
-    QDataStream headerStream(&header, QIODevice::WriteOnly);
+  writeStream << checksum;
 
-    headerStream.setVersion(QDataStream::Qt_5_6);
+  // The header indicates the message length that follows
+  QByteArray header;
+  QDataStream headerStream(&header, QIODevice::WriteOnly);
+  headerStream.setVersion(QDataStream::Qt_5_8);
+  headerStream << static_cast<quint64>(initMsg.length());
 
-    headerStream << static_cast <quint64>(initMsg.length());
+  socket_->write(header);
+  socket_->write(initMsg);
+  bool result = socket_->waitForBytesWritten(timeout - time.elapsed());
+  socket_->flush();
 
-    socket->write(header);
-    socket->write(initMsg);
-    socket->flush();
-    socket->waitForBytesWritten(msecs);
-  }
+  return result;
 
 }
 
 quint16 SingleCoreApplicationPrivate::blockChecksum() {
 
-  return qChecksum(static_cast <const char*> (memory->data()), offsetof(InstancesInfo, checksum));
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+  quint16 checksum = qChecksum(QByteArray(static_cast<const char*>(memory_->constData()), offsetof(InstancesInfo, checksum)));
+#else
+  quint16 checksum = qChecksum(static_cast<const char*>(memory_->constData()), offsetof(InstancesInfo, checksum));
+#endif
+
+  return checksum;
 
 }
 
 qint64 SingleCoreApplicationPrivate::primaryPid() {
 
-  qint64 pid;
-
-  memory->lock();
-  InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
-  pid = inst->primaryPid;
-  memory->unlock();
+  memory_->lock();
+  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+  qint64 pid = inst->primaryPid;
+  memory_->unlock();
 
   return pid;
 
 }
 
+QString SingleCoreApplicationPrivate::primaryUser() {
+
+  memory_->lock();
+  InstancesInfo *inst = static_cast<InstancesInfo*>(memory_->data());
+  QByteArray username = inst->primaryUser;
+  memory_->unlock();
+
+  return QString::fromUtf8(username);
+
+}
+
 /**
  * @brief Executed when a connection has been made to the LocalServer
  */
 void SingleCoreApplicationPrivate::slotConnectionEstablished() {
 
-  QLocalSocket *nextConnSocket = server->nextPendingConnection();
-  connectionMap.insert(nextConnSocket, ConnectionInfo());
+  QLocalSocket *nextConnSocket = server_->nextPendingConnection();
+  connectionMap_.insert(nextConnSocket, ConnectionInfo());
 
-  QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose,
-    [nextConnSocket, this]() {
-      auto &info = connectionMap[nextConnSocket];
-      Q_EMIT this->slotClientConnectionClosed(nextConnSocket, info.instanceId);
-    }
-  );
+  QObject::connect(nextConnSocket, &QLocalSocket::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::disconnected, [nextConnSocket, this]() {
+    connectionMap_.remove(nextConnSocket);
+    nextConnSocket->deleteLater();
+  });
 
-  QObject::connect(nextConnSocket, &QLocalSocket::readyRead,
-    [nextConnSocket, this]() {
-      auto &info = connectionMap[nextConnSocket];
-      switch(info.stage) {
+  QObject::connect(nextConnSocket, &QLocalSocket::readyRead, [nextConnSocket, this]() {
+    auto &info = connectionMap_[nextConnSocket];
+    switch (info.stage) {
       case StageHeader:
         readInitMessageHeader(nextConnSocket);
         break;
@@ -294,15 +350,14 @@ void SingleCoreApplicationPrivate::slotConnectionEstablished() {
         break;
       default:
         break;
-      };
-    }
-  );
+    };
+  });
 
 }
 
 void SingleCoreApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
 
-  if (!connectionMap.contains(sock)) {
+  if (!connectionMap_.contains(sock)) {
     return;
   }
 
@@ -311,13 +366,12 @@ void SingleCoreApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
   }
 
   QDataStream headerStream(sock);
-
-  headerStream.setVersion(QDataStream::Qt_5_6);
+  headerStream.setVersion(QDataStream::Qt_5_8);
 
   // Read the header to know the message length
   quint64 msgLen = 0;
   headerStream >> msgLen;
-  ConnectionInfo &info = connectionMap[sock];
+  ConnectionInfo &info = connectionMap_[sock];
   info.stage = StageBody;
   info.msgLen = msgLen;
 
@@ -331,11 +385,11 @@ void SingleCoreApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
 
   Q_Q(SingleCoreApplication);
 
-  if (!connectionMap.contains(sock)) {
+  if (!connectionMap_.contains(sock)) {
     return;
   }
 
-  ConnectionInfo &info = connectionMap[sock];
+  ConnectionInfo &info = connectionMap_[sock];
   if (sock->bytesAvailable() < static_cast<qint64>(info.msgLen)) {
     return;
   }
@@ -343,8 +397,7 @@ void SingleCoreApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
   // Read the message body
   QByteArray msgBytes = sock->read(info.msgLen);
   QDataStream readStream(msgBytes);
-
-  readStream.setVersion(QDataStream::Qt_5_6);
+  readStream.setVersion(QDataStream::Qt_5_8);
 
   // server name
   QByteArray latin1Name;
@@ -354,7 +407,7 @@ void SingleCoreApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
   ConnectionType connectionType = InvalidConnection;
   quint8 connTypeVal = InvalidConnection;
   readStream >> connTypeVal;
-  connectionType = static_cast <ConnectionType>(connTypeVal);
+  connectionType = static_cast<ConnectionType>(connTypeVal);
 
   // instance id
   quint32 instanceId = 0;
@@ -364,9 +417,13 @@ void SingleCoreApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
   quint16 msgChecksum = 0;
   readStream >> msgChecksum;
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+  const quint16 actualChecksum = qChecksum(QByteArray(msgBytes, static_cast<quint32>(msgBytes.length() - sizeof(quint16))));
+#else
   const quint16 actualChecksum = qChecksum(msgBytes.constData(), static_cast<quint32>(msgBytes.length() - sizeof(quint16)));
+#endif
 
-  bool isValid = readStream.status() == QDataStream::Ok && QLatin1String(latin1Name) == blockServerName && msgChecksum == actualChecksum;
+  bool isValid = readStream.status() == QDataStream::Ok && QLatin1String(latin1Name) == blockServerName_ && msgChecksum == actualChecksum;
 
   if (!isValid) {
     sock->close();
@@ -376,7 +433,7 @@ void SingleCoreApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
   info.instanceId = instanceId;
   info.stage = StageConnected;
 
-  if (connectionType == NewInstance || (connectionType == SecondaryInstance && options & SingleCoreApplication::Mode::SecondaryNotification)) {
+  if (connectionType == NewInstance || (connectionType == SecondaryInstance && options_ & SingleCoreApplication::Mode::SecondaryNotification)) {
     Q_EMIT q->instanceStarted();
   }
 
@@ -395,7 +452,19 @@ void SingleCoreApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, c
 
 void SingleCoreApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSocket, const quint32 instanceId) {
 
-  if (closedSocket->bytesAvailable() > 0)
+  if (closedSocket->bytesAvailable() > 0) {
     Q_EMIT slotDataAvailable(closedSocket, instanceId);
+  }
+
+}
+
+void SingleCoreApplicationPrivate::randomSleep() {
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+  QThread::msleep(QRandomGenerator::global()->bounded(8u, 18u));
+#else
+  qsrand(QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max());
+  QThread::msleep(8 + static_cast<unsigned long>(static_cast<float>(qrand()) / RAND_MAX * 10));
+#endif
 
 }

3rdparty/singleapplication/singlecoreapplication_p.h

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) Itay Grudev 2015 - 2016
+// Copyright (c) Itay Grudev 2015 - 2020
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -36,6 +36,7 @@
 
 #include <QtGlobal>
 #include <QObject>
+#include <QString>
 #include <QMap>
 
 #include "singlecoreapplication.h"
@@ -48,6 +49,7 @@ struct InstancesInfo {
   bool primary;
   quint32 secondary;
   qint64 primaryPid;
+  char primaryUser[128];
   quint16 checksum;
 };
 
@@ -60,6 +62,7 @@ struct ConnectionInfo {
 
 class SingleCoreApplicationPrivate : public QObject {
   Q_OBJECT
+
  public:
   enum ConnectionType : quint8 {
     InvalidConnection = 0,
@@ -74,27 +77,30 @@ class SingleCoreApplicationPrivate : public QObject {
   };
   Q_DECLARE_PUBLIC(SingleCoreApplication)
 
-  explicit SingleCoreApplicationPrivate(SingleCoreApplication *_q_ptr);
+  explicit SingleCoreApplicationPrivate(SingleCoreApplication *ptr);
   ~SingleCoreApplicationPrivate() override;
 
+  QString getUsername();
   void genBlockServerName();
   void initializeMemoryBlock();
   void startPrimary();
   void startSecondary();
-  void connectToPrimary(const int msecs, const ConnectionType connectionType);
+  bool connectToPrimary(const int msecs, const ConnectionType connectionType);
   quint16 blockChecksum();
   qint64 primaryPid();
+  QString primaryUser();
   void readInitMessageHeader(QLocalSocket *socket);
   void readInitMessageBody(QLocalSocket *socket);
+  void randomSleep();
 
   SingleCoreApplication *q_ptr;
-  QSharedMemory *memory;
-  QLocalSocket *socket;
-  QLocalServer *server;
-  quint32 instanceNumber;
-  QString blockServerName;
-  SingleCoreApplication::Options options;
-  QMap<QLocalSocket*, ConnectionInfo> connectionMap;
+  QSharedMemory *memory_;
+  QLocalSocket *socket_;
+  QLocalServer *server_;
+  quint32 instanceNumber_;
+  QString blockServerName_;
+  SingleCoreApplication::Options options_;
+  QMap<QLocalSocket*, ConnectionInfo> connectionMap_;
 
  public slots:
   void slotConnectionEstablished();

3rdparty/taglib/CMakeLists.txt

@@ -1,402 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-
-set(TAGLIB_SOVERSION_CURRENT  17)
-set(TAGLIB_SOVERSION_REVISION 0)
-set(TAGLIB_SOVERSION_AGE      16)
-
-math(EXPR TAGLIB_SOVERSION_MAJOR "${TAGLIB_SOVERSION_CURRENT} - ${TAGLIB_SOVERSION_AGE}")
-math(EXPR TAGLIB_SOVERSION_MINOR "${TAGLIB_SOVERSION_AGE}")
-math(EXPR TAGLIB_SOVERSION_PATCH "${TAGLIB_SOVERSION_REVISION}")
-
-include(ConfigureChecks.cmake)
-set(TESTS_DIR "${CMAKE_SOURCE_DIR}/tests/taglib/")
-configure_file(taglib-config.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/taglib-config.h")
-
-add_definitions(-DHAVE_CONFIG_H)
-add_definitions(-DTAGLIB_STATIC)
-
-set(tag_HDRS
-  tag.h
-  fileref.h
-  audioproperties.h
-  taglib_export.h
-  toolkit/taglib.h
-  toolkit/tstring.h
-  toolkit/tlist.h
-  toolkit/tlist.tcc
-  toolkit/tstringlist.h
-  toolkit/tstringhandler.h
-  toolkit/tbytevector.h
-  toolkit/tbytevectorlist.h
-  toolkit/tbytevectorstream.h
-  toolkit/tiostream.h
-  toolkit/tfile.h
-  toolkit/tfilestream.h
-  toolkit/tmap.h
-  toolkit/tmap.tcc
-  toolkit/tpicture.h
-  toolkit/tpicturemap.h
-  toolkit/tpropertymap.h
-  toolkit/trefcounter.h
-  toolkit/tdebuglistener.h
-  mpeg/mpegfile.h
-  mpeg/mpegproperties.h
-  mpeg/mpegheader.h
-  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
-  mpeg/id3v2/id3v2synchdata.h
-  mpeg/id3v2/id3v2footer.h
-  mpeg/id3v2/id3v2framefactory.h
-  mpeg/id3v2/id3v2tag.h
-  mpeg/id3v2/frames/attachedpictureframe.h
-  mpeg/id3v2/frames/commentsframe.h
-  mpeg/id3v2/frames/eventtimingcodesframe.h
-  mpeg/id3v2/frames/generalencapsulatedobjectframe.h
-  mpeg/id3v2/frames/ownershipframe.h
-  mpeg/id3v2/frames/popularimeterframe.h
-  mpeg/id3v2/frames/privateframe.h
-  mpeg/id3v2/frames/relativevolumeframe.h
-  mpeg/id3v2/frames/synchronizedlyricsframe.h
-  mpeg/id3v2/frames/textidentificationframe.h
-  mpeg/id3v2/frames/uniquefileidentifierframe.h
-  mpeg/id3v2/frames/unknownframe.h
-  mpeg/id3v2/frames/unsynchronizedlyricsframe.h
-  mpeg/id3v2/frames/urllinkframe.h
-  mpeg/id3v2/frames/chapterframe.h
-  mpeg/id3v2/frames/tableofcontentsframe.h
-  mpeg/id3v2/frames/podcastframe.h
-  ogg/oggfile.h
-  ogg/oggpage.h
-  ogg/oggpageheader.h
-  ogg/xiphcomment.h
-  ogg/vorbis/vorbisfile.h
-  ogg/vorbis/vorbisproperties.h
-  ogg/flac/oggflacfile.h
-  ogg/speex/speexfile.h
-  ogg/speex/speexproperties.h
-  ogg/opus/opusfile.h
-  ogg/opus/opusproperties.h
-  flac/flacfile.h
-  flac/flacpicture.h
-  flac/flacproperties.h
-  flac/flacmetadatablock.h
-  ape/apefile.h
-  ape/apeproperties.h
-  ape/apetag.h
-  ape/apefooter.h
-  ape/apeitem.h
-  mpc/mpcfile.h
-  mpc/mpcproperties.h
-  wavpack/wavpackfile.h
-  wavpack/wavpackproperties.h
-  trueaudio/trueaudiofile.h
-  trueaudio/trueaudioproperties.h
-  riff/rifffile.h
-  riff/aiff/aifffile.h
-  riff/aiff/aiffproperties.h
-  riff/wav/wavfile.h
-  riff/wav/wavproperties.h
-  riff/wav/infotag.h
-  asf/asffile.h
-  asf/asfproperties.h
-  asf/asftag.h
-  asf/asfattribute.h
-  asf/asfpicture.h
-  mp4/mp4file.h
-  mp4/mp4atom.h
-  mp4/mp4tag.h
-  mp4/mp4item.h
-  mp4/mp4properties.h
-  mp4/mp4coverart.h
-  mod/modfilebase.h
-  mod/modfile.h
-  mod/modtag.h
-  mod/modproperties.h
-  it/itfile.h
-  it/itproperties.h
-  s3m/s3mfile.h
-  s3m/s3mproperties.h
-  xm/xmfile.h
-  xm/xmproperties.h
-  dsf/dsffile.h
-  dsf/dsfproperties.h
-  dsdiff/dsdifffile.h
-  dsdiff/dsdiffproperties.h
-  dsdiff/dsdiffdiintag.h
-)
-
-set(mpeg_SRCS
-  mpeg/mpegfile.cpp
-  mpeg/mpegproperties.cpp
-  mpeg/mpegheader.cpp
-  mpeg/xingheader.cpp
-)
-
-set(id3v1_SRCS
-  mpeg/id3v1/id3v1tag.cpp
-  mpeg/id3v1/id3v1genres.cpp
-)
-
-set(id3v2_SRCS
-  mpeg/id3v2/id3v2framefactory.cpp
-  mpeg/id3v2/id3v2synchdata.cpp
-  mpeg/id3v2/id3v2tag.cpp
-  mpeg/id3v2/id3v2header.cpp
-  mpeg/id3v2/id3v2frame.cpp
-  mpeg/id3v2/id3v2footer.cpp
-  mpeg/id3v2/id3v2extendedheader.cpp
-  )
-
-set(frames_SRCS
-  mpeg/id3v2/frames/attachedpictureframe.cpp
-  mpeg/id3v2/frames/commentsframe.cpp
-  mpeg/id3v2/frames/eventtimingcodesframe.cpp
-  mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp
-  mpeg/id3v2/frames/ownershipframe.cpp
-  mpeg/id3v2/frames/popularimeterframe.cpp
-  mpeg/id3v2/frames/privateframe.cpp
-  mpeg/id3v2/frames/relativevolumeframe.cpp
-  mpeg/id3v2/frames/synchronizedlyricsframe.cpp
-  mpeg/id3v2/frames/textidentificationframe.cpp
-  mpeg/id3v2/frames/uniquefileidentifierframe.cpp
-  mpeg/id3v2/frames/unknownframe.cpp
-  mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp
-  mpeg/id3v2/frames/urllinkframe.cpp
-  mpeg/id3v2/frames/chapterframe.cpp
-  mpeg/id3v2/frames/tableofcontentsframe.cpp
-  mpeg/id3v2/frames/podcastframe.cpp
-)
-
-set(ogg_SRCS
-  ogg/oggfile.cpp
-  ogg/oggpage.cpp
-  ogg/oggpageheader.cpp
-  ogg/xiphcomment.cpp
-)
-
-set(vorbis_SRCS
-  ogg/vorbis/vorbisfile.cpp
-  ogg/vorbis/vorbisproperties.cpp
-)
-
-set(flacs_SRCS
-  flac/flacfile.cpp
-  flac/flacpicture.cpp
-  flac/flacproperties.cpp
-  flac/flacmetadatablock.cpp
-  flac/flacunknownmetadatablock.cpp
-)
-
-set(oggflacs_SRCS
-  ogg/flac/oggflacfile.cpp
-)
-
-set(mpc_SRCS
-  mpc/mpcfile.cpp
-  mpc/mpcproperties.cpp
-)
-
-set(mp4_SRCS
-  mp4/mp4file.cpp
-  mp4/mp4atom.cpp
-  mp4/mp4tag.cpp
-  mp4/mp4item.cpp
-  mp4/mp4properties.cpp
-  mp4/mp4coverart.cpp
-)
-
-set(ape_SRCS
-  ape/apetag.cpp
-  ape/apefooter.cpp
-  ape/apeitem.cpp
-  ape/apefile.cpp
-  ape/apeproperties.cpp
-)
-
-set(wavpack_SRCS
-  wavpack/wavpackfile.cpp
-  wavpack/wavpackproperties.cpp
-)
-
-set(speex_SRCS
-  ogg/speex/speexfile.cpp
-  ogg/speex/speexproperties.cpp
-)
-
-set(opus_SRCS
-  ogg/opus/opusfile.cpp
-  ogg/opus/opusproperties.cpp
-)
-
-set(trueaudio_SRCS
-  trueaudio/trueaudiofile.cpp
-  trueaudio/trueaudioproperties.cpp
-)
-
-set(asf_SRCS
-  asf/asftag.cpp
-  asf/asffile.cpp
-  asf/asfproperties.cpp
-  asf/asfattribute.cpp
-  asf/asfpicture.cpp
-)
-
-set(riff_SRCS
-  riff/rifffile.cpp
-)
-
-set(aiff_SRCS
-  riff/aiff/aifffile.cpp
-  riff/aiff/aiffproperties.cpp
-)
-
-set(wav_SRCS
-  riff/wav/wavfile.cpp
-  riff/wav/wavproperties.cpp
-  riff/wav/infotag.cpp
-)
-
-set(mod_SRCS
-  mod/modfilebase.cpp
-  mod/modfile.cpp
-  mod/modtag.cpp
-  mod/modproperties.cpp
-)
-
-set(s3m_SRCS
-  s3m/s3mfile.cpp
-  s3m/s3mproperties.cpp
-)
-
-set(it_SRCS
-  it/itfile.cpp
-  it/itproperties.cpp
-)
-
-set(xm_SRCS
-  xm/xmfile.cpp
-  xm/xmproperties.cpp
-)
-
-set(dsf_SRCS
-  dsf/dsffile.cpp
-  dsf/dsfproperties.cpp
-)
-
-set(dsdiff_SRCS
-  dsdiff/dsdifffile.cpp
-  dsdiff/dsdiffproperties.cpp
-  dsdiff/dsdiffdiintag.cpp
-)
-
-set(toolkit_SRCS
-  toolkit/taglib.cpp
-  toolkit/tstring.cpp
-  toolkit/tstringlist.cpp
-  toolkit/tstringhandler.cpp
-  toolkit/tbytevector.cpp
-  toolkit/tbytevectorlist.cpp
-  toolkit/tbytevectorstream.cpp
-  toolkit/tiostream.cpp
-  toolkit/tfile.cpp
-  toolkit/tfilestream.cpp
-  toolkit/tdebug.cpp
-  toolkit/tpicture.cpp
-  toolkit/tpicturemap.cpp
-  toolkit/tpropertymap.cpp
-  toolkit/trefcounter.cpp
-  toolkit/tdebuglistener.cpp
-  toolkit/tzlib.cpp
-)
-
-set(tag_LIB_SRCS
-  ${mpeg_SRCS}
-  ${id3v1_SRCS}
-  ${id3v2_SRCS}
-  ${frames_SRCS}
-  ${ogg_SRCS}
-  ${vorbis_SRCS}
-  ${oggflacs_SRCS}
-  ${mpc_SRCS}
-  ${ape_SRCS}
-  ${toolkit_SRCS}
-  ${flacs_SRCS}
-  ${wavpack_SRCS}
-  ${speex_SRCS}
-  ${trueaudio_SRCS}
-  ${riff_SRCS}
-  ${aiff_SRCS} ${wav_SRCS}
-  ${asf_SRCS}
-  ${mp4_SRCS}
-  ${mod_SRCS}
-  ${s3m_SRCS}
-  ${it_SRCS}
-  ${xm_SRCS}
-  ${opus_SRCS}
-  ${dsf_SRCS}
-  ${dsdiff_SRCS}
-  ${zlib_SRCS}
-  tag.cpp
-  tagunion.cpp
-  fileref.cpp
-  audioproperties.cpp
-  tagutils.cpp
-)
-
-add_library(tag STATIC ${tag_LIB_SRCS} ${tag_HDRS})
-
-target_include_directories(tag PRIVATE
-  ${ZLIB_INCLUDE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/toolkit
-  ${CMAKE_CURRENT_SOURCE_DIR}/asf
-  ${CMAKE_CURRENT_SOURCE_DIR}/mpeg
-  ${CMAKE_CURRENT_SOURCE_DIR}/ogg
-  ${CMAKE_CURRENT_SOURCE_DIR}/ogg/flac
-  ${CMAKE_CURRENT_SOURCE_DIR}/flac
-  ${CMAKE_CURRENT_SOURCE_DIR}/mpc
-  ${CMAKE_CURRENT_SOURCE_DIR}/mp4
-  ${CMAKE_CURRENT_SOURCE_DIR}/ogg/vorbis
-  ${CMAKE_CURRENT_SOURCE_DIR}/ogg/speex
-  ${CMAKE_CURRENT_SOURCE_DIR}/ogg/opus
-  ${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v2
-  ${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v2/frames
-  ${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v1
-  ${CMAKE_CURRENT_SOURCE_DIR}/ape
-  ${CMAKE_CURRENT_SOURCE_DIR}/wavpack
-  ${CMAKE_CURRENT_SOURCE_DIR}/trueaudio
-  ${CMAKE_CURRENT_SOURCE_DIR}/riff
-  ${CMAKE_CURRENT_SOURCE_DIR}/riff/aiff
-  ${CMAKE_CURRENT_SOURCE_DIR}/riff/wav
-  ${CMAKE_CURRENT_SOURCE_DIR}/mod
-  ${CMAKE_CURRENT_SOURCE_DIR}/s3m
-  ${CMAKE_CURRENT_SOURCE_DIR}/it
-  ${CMAKE_CURRENT_SOURCE_DIR}/xm
-  ${CMAKE_CURRENT_SOURCE_DIR}/dsf
-  ${CMAKE_CURRENT_SOURCE_DIR}/dsdiff
-  ${CMAKE_SOURCE_DIR}/3rdparty
-)
-
-target_link_libraries(tag PRIVATE ${ZLIB_LIBRARIES})
-
-set_target_properties(tag PROPERTIES
-  VERSION ${TAGLIB_SOVERSION_MAJOR}.${TAGLIB_SOVERSION_MINOR}.${TAGLIB_SOVERSION_PATCH}
-  SOVERSION ${TAGLIB_SOVERSION_MAJOR}
-  DEFINE_SYMBOL MAKE_TAGLIB_LIB
-  LINK_INTERFACE_LIBRARIES ""
-)
-
-foreach(header ${tag_HDRS})
-  get_filename_component(header_name ${header} NAME)
-  configure_file(
-    "${header}"
-    "${CMAKE_CURRENT_BINARY_DIR}/headers/taglib/${header_name}"
-    COPYONLY
-  )
-endforeach()

3rdparty/taglib/COPYING

@@ -1,502 +0,0 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!

3rdparty/taglib/ConfigureChecks.cmake

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

3rdparty/taglib/README.md

@@ -1,26 +0,0 @@
-# TagLib
-
-[![Build Status](https://travis-ci.org/taglib/taglib.svg?branch=master)](https://travis-ci.org/taglib/taglib)
-
-### TagLib Audio Metadata Library
-
-http://taglib.org/
-
-TagLib is a library for reading and editing the metadata of several
-popular audio formats. Currently it supports both ID3v1 and [ID3v2][]
-for MP3 files, [Ogg Vorbis][] comments and ID3 tags 
-in [FLAC][], MPC, Speex, WavPack, TrueAudio, WAV, AIFF, MP4, APE,
-DSF, DFF, and ASF files.
-
-TagLib is distributed under the [GNU Lesser General Public License][]
-(LGPL) and [Mozilla Public License][] (MPL). Essentially that means that
-it may be used in proprietary applications, but if changes are made to
-TagLib they must be contributed back to the project. Please review the
-licenses if you are considering using TagLib in your project.
-
-  [ID3v2]: http://www.id3.org 
-  [Ogg Vorbis]: http://vorbis.com/
-  [FLAC]: https://xiph.org/flac/
-  [GNU Lesser General Public License]: http://www.gnu.org/licenses/lgpl.html
-  [Mozilla Public License]: http://www.mozilla.org/MPL/MPL-1.1.html
-

3rdparty/taglib/ape/ape-tag-format.txt

@@ -1,170 +0,0 @@
-================================================================================
-= APE Tag Specification, Version 2.000
-================================================================================
-
-Original Content     (C) 2004, Frank Klemm <frank.klemm@elster.offl.uni-jena.de>
-Formatting / Editing (C) 2004, Scott Wheeler <wheeler@kde.org>
-
-================================================================================
-= Contents
-================================================================================
-
-1   - APE Tag General Structure
-2   - APE Tag Header / Footer Format
-3   - APE Tag Flags
-4   - APE Tag Item Format
-5   - APE Tag Item Supported Keys
-6   - APE Tag Item Content
-7   - Data Types
-7.1 - Data Types / UTF-8
-7.2 - Data Types / Dates
-7.3 - Data Types / Timestamps
-
-================================================================================
-= 1 - APE Tag General Structure
-================================================================================
-
-Member of Basic Components of SV8 Stream Note:
-
-It is strongly recommended that the data size be stored in the tags.  The size
-should normally be in the roughly one kilobyte, never more than 8 kilobytes.
-
-Larger data should be stored externally using link entries.  Linked data is much
-easier to process by normal programs, so for instance JPEG data should not be
-included inside the audio file.
-
-APE Tag Version 2.000 (with header, recommended):
-
-/================================\
-| APE Tag Header    | 32 bytes   |
-|-------------------|------------|
-| APE Tag Item 1    | > 10 bytes |
-| APE Tag Item 2    | > 10 bytes |
-| APE Tag Item n-1  | > 10 bytes |
-| APE Tag Item n    | > 10 bytes |
-|-------------------|------------|
-| APE Tag Footer    | 32 bytes   |
-\================================/
-
-
-APE tag items should be sorted ascending by size.  When streaming, parts of the
-APE tag may be dropped to reduce the danger of drop outs between tracks.  This
-is not required, but is strongly recommended.  It would be desirable for the i
-tems to be sorted by importance / size, but this is not feasible.  This
-convention should only be broken when adding less important small items and it
-is not desirable to rewrite the entire tag.  An APE tag at the end of a file
-(the recommended location) must have at least a footer; an APE tag at the
-beginning of a file (strongly discouraged) must have at least a header.
-
-APE Tag Version 1.000 (without header, deprecated)
-
-/================================\
-| APE Tag Item 1    | > 10 bytes |
-| APE Tag Item 2    | > 10 bytes |
-| APE Tag Item n-1  | > 10 bytes |
-| APE Tag Item n    | > 10 bytes |
-|-------------------|------------|
-| APE Tag Footer    | 32 bytes   |
-\================================/
-
-================================================================================
-= 2 - APE Tag Header / Footer Format
-================================================================================
-
-Contains number, length and attributes of all tag items
-
-Header and Footer are different in 1 bit in the Tags Flags to distinguish
-between them.
-
-Member of APE Tag 2.0
-
-/===========================================================================\
-| Preamble       | 8 bytes | { 'A', 'P', 'E', 'T', 'A', 'G', 'E', 'X' }     |
-|----------------|---------|------------------------------------------------|
-| Version Number | 4 bytes | 1000 = Version 1.000, 2000 = Version 2.000     |
-|----------------|---------|------------------------------------------------|
-| Tag Size       | 4 bytes | Tag size in bytes including footer and all tag |
-|                |         | items excluding the header (for 1.000          |
-|                |         | compatibility)                                 |
-|----------------|---------|------------------------------------------------|
-| Item Count     | 4 bytes | Number of items in the tag                     |
-|----------------|---------|------------------------------------------------|
-| Tag Flags      | 4 bytes | Global flags                                   |
-|----------------|---------|------------------------------------------------|
-| Reserved       | 8 bytes | Must be zeroed                                 |
-\===========================================================================/
-
-================================================================================
-= 3 - APE Tag Flags
-================================================================================
-
-The general flag structure for either items or headers / footers is the same.
-Bits 31, 30 and 29 are specific to headers / footers, whereas 2 through 0 are
-item specific.
-
-Note: APE Tags from Version 1.0 do not use any of the following.  All flags in
-that version are zeroed and ignored when reading.
-
-/=================================================================\
-| Contains Header | Bit 31      | 1 - has header | 0 - no header  |
-|-----------------|-------------|---------------------------------|
-| Contains Footer | Bit 30      | 1 - has footer | 0 - no footer  |
-|-----------------|-------------|---------------------------------|
-| Is Header       | Bit 29      | 1 - is header  | 0 - is footer  |
-|-----------------|-------------|---------------------------------|
-| Undefined       | Bits 28 - 3 | Undefined, must be zeroed       |
-|-----------------|-------------|---------------------------------|
-| Encoding        | Bits 2 - 1  | 00 - UTF-8                      |
-|                 |             | 01 - Binary Data *              |
-|                 |             | 10 - External Reference **      |
-|                 |             | 11 - Reserved                   |
-|-----------------|-------------|---------------------------------|
-| Read Only       | Bit 0       | 1 - read only  | 0 - read/write |
-\=================================================================/
-
- (*) Should be ignored by tools for editing text values
-(**) Allowed external reference formats:
-     - http://host/directory/filename.ext
-     - ftp://host/directory/filename.ext
-     - filename.ext
-     - /directory/filename.ext
-     - DRIVE:/directory/filename.ext
-
-     Note: External references are also UTF-8 encoded.
-
-================================================================================
-= 4 - APE Tag Item Format
-================================================================================
-
-APE Tag Items are stored as key-value pairs.  APE Tags Item Key are case
-sensitive, however it is illegal to use keys which only differ in case and
-it is recommended that tag reading not be case sensitive.
-
-Every key can only occur (at most) once. It is not possible to repeat a key
-to signify updated contents.
-
-Tags can be partially or completely repeated in the streaming format.  This
-makes it possible to display an artist and / or title if it was missed at the
-beginning of the stream.  It is recommended that the important information like
-artist, album and title should occur approximately every 2 minutes in the
-stream and again 5 to 10 seconds before the end.  However, care should be tak
-en not to replicate this information too often or during passages with high
-bitrate demands to avoid unnecessary drop-outs.
-
-/==============================================================================\
-| Content Size   | 4 bytes       | Length of the value in bytes                |
-|----------------|---------------|---------------------------------------------|
-| Flags          | 4 bytes       | Item flags                                  |
-|----------------|---------------|---------------------------------------------|
-| Key            | 2 - 255 bytes | Item key                                    |
-|----------------|---------------|---------------------------------------------|
-| Key Terminator | 1 byte        | Null byte that indicates the end of the key |
-|----------------|---------------|---------------------------------------------|
-| Value          | variable      | Content (formatted according to the flags)  |
-\==============================================================================/
-
-================================================================================
-
-Sections 5 - 7 haven't yet been converted from:
-
-http://www.personal.uni-jena.de/~pfk/mpp/sv8/apetag.html

3rdparty/taglib/ape/apefile.cpp

@@ -1,291 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2010 by Alex Novichkov
-    email                : novichko@atnet.ru
-
-    copyright            : (C) 2006 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
-                           (original WavPack implementation)
-
-    copyright            : (C) 2004 by Allan Sandfeld Jensen
-    email                : kde@carewolf.org
-                           (original MPC implementation)
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include <memory>
-
-#include "tbytevector.h"
-#include "tstring.h"
-#include "tdebug.h"
-#include "tagunion.h"
-#include "id3v1tag.h"
-#include "id3v2header.h"
-#include "tpropertymap.h"
-#include "tagutils.h"
-
-#include "apefile.h"
-#include "apetag.h"
-#include "apefooter.h"
-
-using namespace Strawberry_TagLib::TagLib;
-
-namespace {
-enum { ApeAPEIndex = 0,
-  ApeID3v1Index = 1 };
-}
-
-class APE::File::FilePrivate {
- public:
-  FilePrivate() : APELocation(-1),
-                  APESize(0),
-                  ID3v1Location(-1),
-                  ID3v2Location(-1),
-                  ID3v2Size(0) {}
-
-  long long APELocation;
-  long long APESize;
-
-  long long ID3v1Location;
-
-  std::unique_ptr<ID3v2::Header> ID3v2Header;
-  long long ID3v2Location;
-  long long ID3v2Size;
-
-  DoubleTagUnion tag;
-
-  std::unique_ptr<AudioProperties> properties;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// static members
-////////////////////////////////////////////////////////////////////////////////
-
-bool APE::File::isSupported(IOStream *stream) {
-  // An APE file has an ID "MAC " somewhere. An ID3v2 tag may precede.
-
-  const ByteVector buffer = Utils::readHeader(stream, bufferSize(), true);
-  return (buffer.find("MAC ") == 0);
-
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-APE::File::File(FileName file, bool readProperties, AudioProperties::ReadStyle) : Strawberry_TagLib::TagLib::File(file), d(new FilePrivate()) {
-
-  if (isOpen())
-    read(readProperties);
-
-}
-
-APE::File::File(IOStream *stream, bool readProperties, AudioProperties::ReadStyle) : Strawberry_TagLib::TagLib::File(stream), d(new FilePrivate()) {
-
-  if (isOpen())
-    read(readProperties);
-
-}
-
-APE::File::~File() {
-  delete d;
-}
-
-Strawberry_TagLib::TagLib::Tag *APE::File::tag() const {
-  return &d->tag;
-}
-
-PropertyMap APE::File::setProperties(const PropertyMap &properties) {
-
-  if (ID3v1Tag())
-    ID3v1Tag()->setProperties(properties);
-
-  return APETag(true)->setProperties(properties);
-
-}
-
-APE::AudioProperties *APE::File::audioProperties() const {
-  return d->properties.get();
-}
-
-bool APE::File::save() {
-
-  if (readOnly()) {
-    debug("APE::File::save() -- File is read only.");
-    return false;
-  }
-
-  // Update ID3v1 tag
-
-  if (ID3v1Tag() && !ID3v1Tag()->isEmpty()) {
-
-    // ID3v1 tag is not empty. Update the old one or create a new one.
-
-    if (d->ID3v1Location >= 0) {
-      seek(d->ID3v1Location);
-    }
-    else {
-      seek(0, End);
-      d->ID3v1Location = tell();
-    }
-
-    writeBlock(ID3v1Tag()->render());
-  }
-  else {
-
-    // ID3v1 tag is empty. Remove the old one.
-
-    if (d->ID3v1Location >= 0) {
-      truncate(d->ID3v1Location);
-      d->ID3v1Location = -1;
-    }
-  }
-
-  // Update APE tag
-
-  if (APETag() && !APETag()->isEmpty()) {
-
-    // APE tag is not empty. Update the old one or create a new one.
-
-    if (d->APELocation < 0) {
-      if (d->ID3v1Location >= 0)
-        d->APELocation = d->ID3v1Location;
-      else
-        d->APELocation = length();
-    }
-
-    const ByteVector data = APETag()->render();
-    insert(data, d->APELocation, d->APESize);
-
-    if (d->ID3v1Location >= 0)
-      d->ID3v1Location += (static_cast<long>(data.size()) - d->APESize);
-
-    d->APESize = data.size();
-  }
-  else {
-
-    // APE tag is empty. Remove the old one.
-
-    if (d->APELocation >= 0) {
-      removeBlock(d->APELocation, d->APESize);
-
-      if (d->ID3v1Location >= 0)
-        d->ID3v1Location -= d->APESize;
-
-      d->APELocation = -1;
-      d->APESize = 0;
-    }
-  }
-
-  return true;
-
-}
-
-ID3v1::Tag *APE::File::ID3v1Tag(bool create) {
-  return d->tag.access<ID3v1::Tag>(ApeID3v1Index, create);
-}
-
-APE::Tag *APE::File::APETag(bool create) {
-  return d->tag.access<APE::Tag>(ApeAPEIndex, create);
-}
-
-void APE::File::strip(int tags) {
-
-  if (tags & ID3v1)
-    d->tag.set(ApeID3v1Index, nullptr);
-
-  if (tags & APE)
-    d->tag.set(ApeAPEIndex, nullptr);
-
-  if (!ID3v1Tag())
-    APETag(true);
-
-}
-
-bool APE::File::hasAPETag() const {
-  return (d->APELocation >= 0);
-}
-
-bool APE::File::hasID3v1Tag() const {
-  return (d->ID3v1Location >= 0);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// private members
-////////////////////////////////////////////////////////////////////////////////
-
-void APE::File::read(bool readProperties) {
-
-  // Look for an ID3v2 tag
-
-  d->ID3v2Location = Utils::findID3v2(this);
-
-  if (d->ID3v2Location >= 0) {
-    seek(d->ID3v2Location);
-    d->ID3v2Header.reset(new ID3v2::Header(readBlock(ID3v2::Header::size())));
-    d->ID3v2Size = d->ID3v2Header->completeTagSize();
-  }
-
-  // Look for an ID3v1 tag
-
-  d->ID3v1Location = Utils::findID3v1(this);
-
-  if (d->ID3v1Location >= 0)
-    d->tag.set(ApeID3v1Index, new ID3v1::Tag(this, d->ID3v1Location));
-
-  // Look for an APE tag
-
-  d->APELocation = Utils::findAPE(this, d->ID3v1Location);
-
-  if (d->APELocation >= 0) {
-    d->tag.set(ApeAPEIndex, new APE::Tag(this, d->APELocation));
-    d->APESize = APETag()->footer()->completeTagSize();
-    d->APELocation = d->APELocation + APE::Footer::size() - d->APESize;
-  }
-
-  if (d->ID3v1Location < 0)
-    APETag(true);
-
-  // Look for APE audio properties
-
-  if (readProperties) {
-
-    long long streamLength;
-
-    if (d->APELocation >= 0)
-      streamLength = d->APELocation;
-    else if (d->ID3v1Location >= 0)
-      streamLength = d->ID3v1Location;
-    else
-      streamLength = length();
-
-    if (d->ID3v2Location >= 0) {
-      seek(d->ID3v2Location + d->ID3v2Size);
-      streamLength -= (d->ID3v2Location + d->ID3v2Size);
-    }
-    else {
-      seek(0);
-    }
-
-    d->properties.reset(new AudioProperties(this, streamLength));
-  }
-
-}

3rdparty/taglib/ape/apefile.h

@@ -1,214 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2010 by Alex Novichkov
-    email                : novichko@atnet.ru
-
-    copyright            : (C) 2006 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
-                           (original WavPack implementation)
-
-    copyright            : (C) 2004 by Allan Sandfeld Jensen
-    email                : kde@carewolf.org
-                           (original MPC implementation)
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_APEFILE_H
-#define TAGLIB_APEFILE_H
-
-#include "tfile.h"
-#include "taglib_export.h"
-#include "apeproperties.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-
-class Tag;
-
-namespace ID3v1 {
-class Tag;
-}
-namespace APE {
-class Tag;
-}
-
-//! An implementation of APE metadata
-
-/*!
- * This is implementation of APE metadata.
- *
- * This supports ID3v1 and APE (v1 and v2) style comments as well as reading stream properties from the file.
- *
- */
-
-namespace APE {
-
-//! An implementation of TagLib::File with APE specific methods
-
-/*!
- * This implements and provides an interface for APE files to the
- * TagLib::Tag and TagLib::AudioProperties interfaces by way of implementing
- * the abstract TagLib::File API as well as providing some additional information specific to APE files.
- *
- */
-
-class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File {
- public:
-  /*!
-   * This set of flags is used for various operations and is suitable for being OR-ed together.
-   */
-  enum TagTypes {
-    //! Empty set.  Matches no tag types.
-    NoTags = 0x0000,
-    //! Matches ID3v1 tags.
-    ID3v1 = 0x0001,
-    //! Matches APE tags.
-    APE = 0x0002,
-    //! Matches all tag types.
-    AllTags = 0xffff
-  };
-
-  /*!
-   * Constructs an APE file from \a file.
-   * If \a readProperties is true the file's audio properties will also be read.
-   *
-   * \note In the current implementation, \a propertiesStyle is ignored.
-   */
-  explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
-
-  /*!
-   * Constructs an APE file from \a stream.
-   * If \a readProperties is true the file's audio properties will also be read.
-   *
-   * \note TagLib will *not* take ownership of the stream, the caller is responsible for deleting it after the File object.
-   *
-   * \note In the current implementation, \a propertiesStyle is ignored.
-   */
-  explicit File(IOStream *stream, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
-
-  /*!
-   * Destroys this instance of the File.
-   */
-  ~File() override;
-
-  /*!
-   * Returns the Tag for this file.  This will be an APE tag, an ID3v1 tag or a combination of the two.
-   */
-  Strawberry_TagLib::TagLib::Tag *tag() const override;
-
-  /*!
-   * Implements the unified property interface -- import function.
-   * Creates an APEv2 tag if necessary.
-   * A potentially existing ID3v1 tag will be updated as well.
-   */
-  PropertyMap setProperties(const PropertyMap&) override;
-
-  /*!
-   * Returns the APE::AudioProperties for this file.
-   * If no audio properties were read then this will return a null pointer.
-   */
-  AudioProperties *audioProperties() const override;
-
-  /*!
-   * Saves the file.
-   *
-   * \note According to the official Monkey's Audio SDK, an APE file
-   * can only have either ID3V1 or APE tags, so a parameter is used here.
-   */
-  bool save() override;
-
-  /*!
-   * Returns a pointer to the ID3v1 tag of the file.
-   *
-   * If \a create is false (the default) this may return a null pointer if there is no valid ID3v1 tag.
-   * If \a create is true it will create an ID3v1 tag if one does not exist and returns a valid pointer.
-   *
-   * \note This may return a valid pointer regardless of whether or not the file on disk has an ID3v1 tag.
-   * Use hasID3v1Tag() to check if the file on disk actually has an ID3v1 tag.
-   *
-   * \note The Tag <b>is still</b> owned by the MPEG::File and should not be deleted by the user.
-   * It will be deleted when the file (object) is destroyed.
-   *
-   * \see hasID3v1Tag()
-   */
-  ID3v1::Tag *ID3v1Tag(bool create = false);
-
-  /*!
-   * Returns a pointer to the APE tag of the file.
-   *
-   * If \a create is false (the default) this may return a null pointer if there is no valid APE tag.
-   * If \a create is true it will create an APE tag if one does not exist and returns a valid pointer.
-   *
-   * \note This may return a valid pointer regardless of whether or not the file on disk has an APE tag.
-   * Use hasAPETag() to check if the file on disk actually has an APE tag.
-   *
-   * \note The Tag <b>is still</b> owned by the MPEG::File and should not be deleted by the user.
-   * It will be deleted when the file (object) is destroyed.
-   *
-   * \see hasAPETag()
-   */
-  APE::Tag *APETag(bool create = false);
-
-  /*!
-   * This will remove the tags that match the OR-ed together TagTypes from the file.
-   * By default it removes all tags.
-   *
-   * \note This will also invalidate pointers to the tags as their memory will be freed.
-   * \note In order to make the removal permanent save() still needs to be called
-   */
-  void strip(int tags = AllTags);
-
-  /*!
-   * Returns whether or not the file on disk actually has an APE tag.
-   *
-   * \see APETag()
-   */
-  bool hasAPETag() const;
-
-  /*!
-   * Returns whether or not the file on disk actually has an ID3v1 tag.
-   *
-   * \see ID3v1Tag()
-   */
-  bool hasID3v1Tag() const;
-
-  /*!
-   * Returns whether or not the given \a stream can be opened as an APE file.
-   *
-   * \note This method is designed to do a quick check.
-   * The result may not necessarily be correct.
-   */
-  static bool isSupported(IOStream *stream);
-
- private:
-  File(const File &);
-  File &operator=(const File &);
-
-  void read(bool readProperties);
-
-  class FilePrivate;
-  FilePrivate *d;
-};
-}  // namespace APE
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/ape/apefooter.cpp

@@ -1,215 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2004 by Allan Sandfeld Jensen
-                           (C) 2002 - 2008 by Scott Wheeler (id3v2header.cpp)
-    email                : kde@carewolf.org
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include <iostream>
-#include <bitset>
-
-#include "tstring.h"
-#include "tdebug.h"
-
-#include "apefooter.h"
-
-using namespace Strawberry_TagLib::TagLib;
-using namespace APE;
-
-class APE::Footer::FooterPrivate {
- public:
-  FooterPrivate() : version(0),
-                    footerPresent(true),
-                    headerPresent(false),
-                    isHeader(false),
-                    itemCount(0),
-                    tagSize(0) {}
-
-  unsigned int version;
-
-  bool footerPresent;
-  bool headerPresent;
-
-  bool isHeader;
-
-  unsigned int itemCount;
-  unsigned int tagSize;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// static members
-////////////////////////////////////////////////////////////////////////////////
-
-unsigned int APE::Footer::size() {
-  return 32;
-}
-
-ByteVector APE::Footer::fileIdentifier() {
-  return ByteVector("APETAGEX");
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-APE::Footer::Footer() : d(new FooterPrivate()) {
-}
-
-APE::Footer::Footer(const ByteVector &data) : d(new FooterPrivate()) {
-  parse(data);
-}
-
-APE::Footer::~Footer() {
-  delete d;
-}
-
-unsigned int APE::Footer::version() const {
-  return d->version;
-}
-
-bool APE::Footer::headerPresent() const {
-  return d->headerPresent;
-}
-
-bool APE::Footer::footerPresent() const {
-  return d->footerPresent;
-}
-
-bool APE::Footer::isHeader() const {
-  return d->isHeader;
-}
-
-void APE::Footer::setHeaderPresent(bool b) const {
-  d->headerPresent = b;
-}
-
-unsigned int APE::Footer::itemCount() const {
-  return d->itemCount;
-}
-
-void APE::Footer::setItemCount(unsigned int s) {
-  d->itemCount = s;
-}
-
-unsigned int APE::Footer::tagSize() const {
-  return d->tagSize;
-}
-
-unsigned int APE::Footer::completeTagSize() const {
-  if (d->headerPresent)
-    return d->tagSize + size();
-  else
-    return d->tagSize;
-}
-
-void APE::Footer::setTagSize(unsigned int s) {
-  d->tagSize = s;
-}
-
-void APE::Footer::setData(const ByteVector &data) {
-  parse(data);
-}
-
-ByteVector APE::Footer::renderFooter() const {
-  return render(false);
-}
-
-ByteVector APE::Footer::renderHeader() const {
-
-  if (!d->headerPresent)
-    return ByteVector();
-  else
-    return render(true);
-
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// protected members
-////////////////////////////////////////////////////////////////////////////////
-
-void APE::Footer::parse(const ByteVector &data) {
-
-  if (data.size() < size())
-    return;
-
-  // The first eight bytes, data[0..7], are the File Identifier, "APETAGEX".
-
-  // Read the version number
-
-  d->version = data.toUInt32LE(8);
-
-  // Read the tag size
-
-  d->tagSize = data.toUInt32LE(12);
-
-  // Read the item count
-
-  d->itemCount = data.toUInt32LE(16);
-
-  // Read the flags
-
-  std::bitset<32> flags(TAGLIB_CONSTRUCT_BITSET(data.toUInt32LE(20)));
-
-  d->headerPresent = flags[31];
-  d->footerPresent = !flags[30];
-  d->isHeader = flags[29];
-
-}
-
-ByteVector APE::Footer::render(bool isHeader) const {
-
-  ByteVector v;
-
-  // add the file identifier -- "APETAGEX"
-
-  v.append(fileIdentifier());
-
-  // add the version number -- we always render a 2.000 tag regardless of what
-  // the tag originally was.
-
-  v.append(ByteVector::fromUInt32LE(2000));
-
-  // add the tag size
-
-  v.append(ByteVector::fromUInt32LE(d->tagSize));
-
-  // add the item count
-
-  v.append(ByteVector::fromUInt32LE(d->itemCount));
-
-  // render and add the flags
-
-  std::bitset<32> flags;
-
-  flags[31] = d->headerPresent;
-  flags[30] = false;  // footer is always present
-  flags[29] = isHeader;
-
-  v.append(ByteVector::fromUInt32LE(flags.to_ulong()));
-
-  // add the reserved 64bit
-
-  v.append(ByteVector::fromUInt64BE(0));
-
-  return v;
-
-}

3rdparty/taglib/ape/apefooter.h

@@ -1,175 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2004 by Allan Sandfeld Jensen
-    email                : kde@carewolf.org
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_APEFOOTER_H
-#define TAGLIB_APEFOOTER_H
-
-#include "tbytevector.h"
-#include "taglib_export.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-
-namespace APE {
-
-//! An implementation of APE footers
-
-/*!
- * This class implements APE footers (and headers).
- * It attempts to follow, both semantically and programmatically,
- * the structure specified in the APE v2.0 standard.
- * The API is based on the properties of APE footer and headers specified there.
- *
- */
-
-class TAGLIB_EXPORT Footer {
- public:
-  /*!
-   * Constructs an empty APE footer.
-   */
-  explicit Footer();
-
-  /*!
-   * Constructs an APE footer based on \a data.  parse() is called immediately.
-   */
-  explicit Footer(const ByteVector &data);
-
-  /*!
-   * Destroys the footer.
-   */
-  virtual ~Footer();
-
-  /*!
-   * Returns the version number.  (Note: This is the 1000 or 2000.)
-   */
-  unsigned int version() const;
-
-  /*!
-   * Returns true if a header is present in the tag.
-   */
-  bool headerPresent() const;
-
-  /*!
-   * Returns true if a footer is present in the tag.
-   */
-  bool footerPresent() const;
-
-  /*!
-   * Returns true this is actually the header.
-   */
-  bool isHeader() const;
-
-  /*!
-   * Sets whether the header should be rendered or not
-   */
-  void setHeaderPresent(bool b) const;
-
-  /*!
-   * Returns the number of items in the tag.
-   */
-  unsigned int itemCount() const;
-
-  /*!
-   * Set the item count to \a s.
-   * \see itemCount()
-   */
-  void setItemCount(unsigned int s);
-
-  /*!
-   * Returns the tag size in bytes.
-   * This is the size of the frame content and footer.
-   * The size of the \e entire tag will be this plus the header size, if present.
-   *
-   * \see completeTagSize()
-   */
-  unsigned int tagSize() const;
-
-  /*!
-   * Returns the tag size, including if present, the header
-   * size.
-   *
-   * \see tagSize()
-   */
-  unsigned int completeTagSize() const;
-
-  /*!
-   * Set the tag size to \a s.
-   * \see tagSize()
-   */
-  void setTagSize(unsigned int s);
-
-  /*!
-   * Returns the size of the footer.  Presently this is always 32 bytes.
-   */
-  static unsigned int size();
-
-  /*!
-   * Returns the string used to identify an APE tag inside of a file.
-   * Presently this is always "APETAGEX".
-   */
-  static ByteVector fileIdentifier();
-
-  /*!
-   * Sets the data that will be used as the footer.  32 bytes,
-   * starting from \a data will be used.
-   */
-  void setData(const ByteVector &data);
-
-  /*!
-   * Renders the footer back to binary format.
-   */
-  ByteVector renderFooter() const;
-
-  /*!
-   * Renders the header corresponding to the footer.
-   * If headerPresent is set to false, it returns an empty ByteVector.
-   */
-  ByteVector renderHeader() const;
-
- protected:
-  /*!
-   * Called by setData() to parse the footer data.
-   * It makes this information available through the public API.
-   */
-  void parse(const ByteVector &data);
-
-  /*!
-   * Called by renderFooter and renderHeader
-   */
-  ByteVector render(bool isHeader) const;
-
- private:
-  Footer(const Footer &);
-  Footer &operator=(const Footer &);
-
-  class FooterPrivate;
-  FooterPrivate *d;
-};
-
-}  // namespace APE
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/ape/apeitem.cpp

@@ -1,271 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2004 by Allan Sandfeld Jensen
-    email                : kde@carewolf.com
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include <memory>
-
-#include "tbytevectorlist.h"
-#include "tdebug.h"
-
-#include "apeitem.h"
-
-using namespace Strawberry_TagLib::TagLib;
-using namespace APE;
-
-struct ItemData {
-  ItemData() : type(Item::Text), readOnly(false) {}
-
-  Item::ItemTypes type;
-  String key;
-  ByteVector value;
-  StringList text;
-  bool readOnly;
-};
-
-class APE::Item::ItemPrivate {
- public:
-  ItemPrivate() : data(new ItemData()) {}
-
-  std::shared_ptr<ItemData> data;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-APE::Item::Item() : d(new ItemPrivate()) {}
-
-APE::Item::Item(const String &key, const String &value) : d(new ItemPrivate()) {
-  d->data->key = key;
-  d->data->text.append(value);
-}
-
-APE::Item::Item(const String &key, const StringList &values) : d(new ItemPrivate()) {
-  d->data->key = key;
-  d->data->text = values;
-}
-
-APE::Item::Item(const String &key, const ByteVector &value, bool binary) : d(new ItemPrivate()) {
-  d->data->key = key;
-  if (binary) {
-    d->data->type = Binary;
-    d->data->value = value;
-  }
-  else {
-    d->data->text.append(value);
-  }
-
-}
-
-APE::Item::Item(const Item &item) : d(new ItemPrivate(*item.d)) {}
-
-APE::Item::~Item() {
-  delete d;
-}
-
-Item &APE::Item::operator=(const Item &item) {
-
-  Item(item).swap(*this);
-  return *this;
-
-}
-
-void APE::Item::swap(Item &item) {
-
-  using std::swap;
-
-  swap(d, item.d);
-
-}
-
-void APE::Item::setReadOnly(bool readOnly) {
-  d->data->readOnly = readOnly;
-}
-
-bool APE::Item::isReadOnly() const {
-  return d->data->readOnly;
-}
-
-void APE::Item::setType(APE::Item::ItemTypes val) {
-  d->data->type = val;
-}
-
-APE::Item::ItemTypes APE::Item::type() const {
-  return d->data->type;
-}
-
-String APE::Item::key() const {
-  return d->data->key;
-}
-
-ByteVector APE::Item::binaryData() const {
-  return d->data->value;
-}
-
-void APE::Item::setBinaryData(const ByteVector &value) {
-  d->data->type = Binary;
-  d->data->value = value;
-  d->data->text.clear();
-}
-
-void APE::Item::setKey(const String &key) {
-  d->data->key = key;
-}
-
-void APE::Item::setValue(const String &value) {
-  d->data->type = Text;
-  d->data->text = value;
-  d->data->value.clear();
-}
-
-void APE::Item::setValues(const StringList &value) {
-  d->data->type = Text;
-  d->data->text = value;
-  d->data->value.clear();
-}
-
-void APE::Item::appendValue(const String &value) {
-  d->data->type = Text;
-  d->data->text.append(value);
-  d->data->value.clear();
-}
-
-void APE::Item::appendValues(const StringList &values) {
-  d->data->type = Text;
-  d->data->text.append(values);
-  d->data->value.clear();
-}
-
-int APE::Item::size() const {
-  size_t result = 8 + d->data->key.size() + 1;
-  switch (d->data->type) {
-    case Text:
-      if (!d->data->text.isEmpty()) {
-        StringList::ConstIterator it = d->data->text.begin();
-
-        result += it->data(String::UTF8).size();
-        it++;
-        for (; it != d->data->text.end(); ++it)
-          result += 1 + it->data(String::UTF8).size();
-      }
-      break;
-
-    case Binary:
-    case Locator:
-      result += d->data->value.size();
-      break;
-  }
-  return result;
-
-}
-
-StringList APE::Item::values() const {
-  return d->data->text;
-}
-
-String APE::Item::toString() const {
-  if (d->data->type == Text && !isEmpty())
-    return d->data->text.front();
-  else
-    return String();
-
-}
-
-bool APE::Item::isEmpty() const {
-  switch (d->data->type) {
-    case Text:
-      if (d->data->text.isEmpty())
-        return true;
-      if (d->data->text.size() == 1 && d->data->text.front().isEmpty())
-        return true;
-      return false;
-    case Binary:
-    case Locator:
-      return d->data->value.isEmpty();
-    default:
-      return false;
-  }
-
-}
-
-void APE::Item::parse(const ByteVector &data) {
-
-  // 11 bytes is the minimum size for an APE item
-
-  if (data.size() < 11) {
-    debug("APE::Item::parse() -- no data in item");
-    return;
-  }
-
-  const unsigned int valueLength = data.toUInt32LE(0);
-  const unsigned int flags = data.toUInt32LE(4);
-
-  // An item key can contain ASCII characters from 0x20 up to 0x7E, not UTF-8.
-  // We assume that the validity of the given key has been checked.
-
-  d->data->key = String(&data[8], String::Latin1);
-
-  const ByteVector value = data.mid(8 + d->data->key.size() + 1, valueLength);
-
-  setReadOnly(flags & 1);
-  setType(ItemTypes((flags >> 1) & 3));
-
-  if (Text == d->data->type)
-    d->data->text = StringList(ByteVectorList::split(value, '\0'), String::UTF8);
-  else
-    d->data->value = value;
-}
-
-ByteVector APE::Item::render() const {
-
-  ByteVector data;
-  unsigned int flags = ((d->data->readOnly) ? 1 : 0) | (d->data->type << 1);
-  ByteVector value;
-
-  if (isEmpty())
-    return data;
-
-  if (d->data->type == Text) {
-    StringList::ConstIterator it = d->data->text.begin();
-
-    value.append(it->data(String::UTF8));
-    it++;
-    for (; it != d->data->text.end(); ++it) {
-      value.append('\0');
-      value.append(it->data(String::UTF8));
-    }
-    d->data->value = value;
-  }
-  else
-    value.append(d->data->value);
-
-  data.append(ByteVector::fromUInt32LE(value.size()));
-  data.append(ByteVector::fromUInt32LE(flags));
-  data.append(d->data->key.data(String::Latin1));
-  data.append(ByteVector('\0'));
-  data.append(value);
-
-  return data;
-
-}

3rdparty/taglib/ape/apeitem.h

@@ -1,207 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2004 by Allan Sandfeld Jensen
-    email                : kde@carewolf.org
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_APEITEM_H
-#define TAGLIB_APEITEM_H
-
-#include "tbytevector.h"
-#include "tstring.h"
-#include "tstringlist.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-namespace APE {
-
-//! An implementation of APE-items
-
-/*!
- * This class provides the features of items in the APEv2 standard.
- */
-class TAGLIB_EXPORT Item {
- public:
-  /*!
-   * Enum of types an Item can have. The value of 3 is reserved.
-   */
-  enum ItemTypes {
-    //! Item contains text information coded in UTF-8
-    Text = 0,
-    //! Item contains binary information
-    Binary = 1,
-    //! Item is a locator of external stored information
-    Locator = 2
-  };
-  /*!
-   * Constructs an empty item.
-   */
-  explicit Item();
-
-  /*!
-   * Constructs a text item with \a key and \a values.
-   */
-  explicit Item(const String &key, const String &values);
-
-  /*!
-   * Constructs a text item with \a key and \a values.
-   */
-  explicit Item(const String &key, const StringList &values);
-
-  /*!
-   * Constructs an item with \a key and \a value.
-   * If \a binary is true a Binary item will be created, otherwise \a value will be interpreted as text
-   */
-  explicit Item(const String &key, const ByteVector &value, bool binary);
-
-  /*!
-   * Construct an item as a copy of \a item.
-   */
-  Item(const Item &item);
-
-  /*!
-   * Destroys the item.
-   */
-  virtual ~Item();
-
-  /*!
-   * Copies the contents of \a item into this item.
-   */
-  Item &operator=(const Item &item);
-
-  /*!
-   * Exchanges the content of this item by the content of \a item.
-   */
-  void swap(Item &item);
-
-  /*!
-   * Returns the key.
-   */
-  String key() const;
-
-  /*!
-   * Returns the binary value.
-   * If the item type is not \a Binary, always returns an empty ByteVector.
-   */
-  ByteVector binaryData() const;
-
-  /*!
-   * Set the binary value to \a value
-   * The item's type will also be set to \a Binary
-   */
-  void setBinaryData(const ByteVector &value);
-
-  /*!
-   * Sets the key for the item to \a key.
-   */
-  void setKey(const String &key);
-
-  /*!
-   * Sets the text value of the item to \a value and clears any previous contents.
-   *
-   * \see toString()
-   */
-  void setValue(const String &value);
-
-  /*!
-   * Sets the text value of the item to the list of values in \a value and clears any previous contents.
-   *
-   * \see toStringList()
-   */
-  void setValues(const StringList &values);
-
-  /*!
-   * Appends \a value to create (or extend) the current list of text values.
-   *
-   * \see toString()
-   */
-  void appendValue(const String &value);
-
-  /*!
-   * Appends \a values to extend the current list of text values.
-   *
-   * \see toStringList()
-   */
-  void appendValues(const StringList &values);
-
-  /*!
-   * Returns the size of the full item.
-   */
-  int size() const;
-
-  /*!
-   * Returns the value as a single string.  In case of multiple strings, the first is returned.
-   * If the data type is not \a Text, always returns an empty String.
-   */
-  String toString() const;
-
-  /*!
-   * Returns the list of text values.  If the data type is not \a Text, always returns an empty StringList.
-   */
-  StringList values() const;
-
-  /*!
-   * Render the item to a ByteVector.
-   */
-  ByteVector render() const;
-
-  /*!
-   * Parse the item from the ByteVector \a data.
-   */
-  void parse(const ByteVector &data);
-
-  /*!
-   * Set the item to read-only.
-   */
-  void setReadOnly(bool readOnly);
-
-  /*!
-   * Return true if the item is read-only.
-   */
-  bool isReadOnly() const;
-
-  /*!
-   * Sets the type of the item to \a type.
-   *
-   * \see ItemTypes
-   */
-  void setType(ItemTypes type);
-
-  /*!
-   * Returns the type of the item.
-   */
-  ItemTypes type() const;
-
-  /*!
-   * Returns if the item has any real content.
-   */
-  bool isEmpty() const;
-
- private:
-  class ItemPrivate;
-  ItemPrivate *d;
-};
-}  // namespace APE
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/ape/apeproperties.cpp

@@ -1,227 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2010 by Alex Novichkov
-    email                : novichko@atnet.ru
-
-    copyright            : (C) 2006 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
-                           (original WavPack implementation)
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include "tstring.h"
-#include "tdebug.h"
-
-#include "id3v2tag.h"
-#include "apeproperties.h"
-#include "apefile.h"
-#include "apetag.h"
-#include "apefooter.h"
-
-using namespace Strawberry_TagLib::TagLib;
-
-class APE::AudioProperties::AudioPropertiesPrivate {
- public:
-  explicit AudioPropertiesPrivate() : length(0),
-                                      bitrate(0),
-                                      sampleRate(0),
-                                      channels(0),
-                                      version(0),
-                                      bitsPerSample(0),
-                                      sampleFrames(0) {}
-
-  int length;
-  int bitrate;
-  int sampleRate;
-  int channels;
-  int version;
-  int bitsPerSample;
-  unsigned int sampleFrames;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-APE::AudioProperties::AudioProperties(File *file, long long streamLength, ReadStyle) : Strawberry_TagLib::TagLib::AudioProperties(), d(new AudioPropertiesPrivate()) {
-  read(file, streamLength);
-}
-
-APE::AudioProperties::~AudioProperties() {
-  delete d;
-}
-
-int APE::AudioProperties::lengthInSeconds() const {
-  return d->length / 1000;
-}
-
-int APE::AudioProperties::lengthInMilliseconds() const {
-  return d->length;
-}
-
-int APE::AudioProperties::bitrate() const {
-  return d->bitrate;
-}
-
-int APE::AudioProperties::sampleRate() const {
-  return d->sampleRate;
-}
-
-int APE::AudioProperties::channels() const {
-  return d->channels;
-}
-
-int APE::AudioProperties::version() const {
-  return d->version;
-}
-
-int APE::AudioProperties::bitsPerSample() const {
-  return d->bitsPerSample;
-}
-
-unsigned int APE::AudioProperties::sampleFrames() const {
-  return d->sampleFrames;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// private members
-////////////////////////////////////////////////////////////////////////////////
-
-namespace {
-int headerVersion(const ByteVector &header) {
-  if (header.size() < 6 || !header.startsWith("MAC "))
-    return -1;
-
-  return header.toUInt16LE(4);
-}
-}  // namespace
-
-void APE::AudioProperties::read(File *file, long long streamLength) {
-
-  // First, we assume that the file pointer is set at the first descriptor.
-  long long offset = file->tell();
-  int version = headerVersion(file->readBlock(6));
-
-  // Next, we look for the descriptor.
-  if (version < 0) {
-    offset = file->find("MAC ", offset);
-    file->seek(offset);
-    version = headerVersion(file->readBlock(6));
-  }
-
-  if (version < 0) {
-    debug("APE::AudioProperties::read() -- APE descriptor not found");
-    return;
-  }
-
-  d->version = version;
-
-  if (d->version >= 3980)
-    analyzeCurrent(file);
-  else
-    analyzeOld(file);
-
-  if (d->sampleFrames > 0 && d->sampleRate > 0) {
-    const double length = d->sampleFrames * 1000.0 / d->sampleRate;
-    d->length = static_cast<int>(length + 0.5);
-    d->bitrate = static_cast<int>(streamLength * 8.0 / length + 0.5);
-  }
-
-}
-
-void APE::AudioProperties::analyzeCurrent(File *file) {
-
-  // Read the descriptor
-  file->seek(2, File::Current);
-  const ByteVector descriptor = file->readBlock(44);
-  if (descriptor.size() < 44) {
-    debug("APE::AudioProperties::analyzeCurrent() -- descriptor is too short.");
-    return;
-  }
-
-  const unsigned int descriptorBytes = descriptor.toUInt32LE(0);
-
-  if ((descriptorBytes - 52) > 0)
-    file->seek(descriptorBytes - 52, File::Current);
-
-  // Read the header
-  const ByteVector header = file->readBlock(24);
-  if (header.size() < 24) {
-    debug("APE::AudioProperties::analyzeCurrent() -- MAC header is too short.");
-    return;
-  }
-
-  // Get the APE info
-  d->channels = header.toUInt16LE(18);
-  d->sampleRate = header.toUInt32LE(20);
-  d->bitsPerSample = header.toUInt16LE(16);
-
-  const unsigned int totalFrames = header.toUInt32LE(12);
-  if (totalFrames == 0)
-    return;
-
-  const unsigned int blocksPerFrame = header.toUInt32LE(4);
-  const unsigned int finalFrameBlocks = header.toUInt32LE(8);
-  d->sampleFrames = (totalFrames - 1) * blocksPerFrame + finalFrameBlocks;
-
-}
-
-void APE::AudioProperties::analyzeOld(File *file) {
-
-  const ByteVector header = file->readBlock(26);
-  if (header.size() < 26) {
-    debug("APE::AudioProperties::analyzeOld() -- MAC header is too short.");
-    return;
-  }
-
-  const unsigned int totalFrames = header.toUInt32LE(18);
-
-  // Fail on 0 length APE files (catches non-finalized APE files)
-  if (totalFrames == 0)
-    return;
-
-  const short compressionLevel = header.toUInt32LE(0);
-  unsigned int blocksPerFrame;
-  if (d->version >= 3950)
-    blocksPerFrame = 73728 * 4;
-  else if (d->version >= 3900 || (d->version >= 3800 && compressionLevel == 4000))
-    blocksPerFrame = 73728;
-  else
-    blocksPerFrame = 9216;
-
-  // Get the APE info
-  d->channels = header.toUInt16LE(4);
-  d->sampleRate = header.toUInt32LE(6);
-
-  const unsigned int finalFrameBlocks = header.toUInt32LE(22);
-  d->sampleFrames = (totalFrames - 1) * blocksPerFrame + finalFrameBlocks;
-
-  // Get the bit depth from the RIFF-fmt chunk.
-  file->seek(16, File::Current);
-  const ByteVector fmt = file->readBlock(28);
-  if (fmt.size() < 28 || !fmt.startsWith("WAVEfmt ")) {
-    debug("APE::AudioProperties::analyzeOld() -- fmt header is too short.");
-    return;
-  }
-
-  d->bitsPerSample = fmt.toUInt16LE(26);
-
-}

3rdparty/taglib/ape/apeproperties.h

@@ -1,118 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2010 by Alex Novichkov
-    email                : novichko@atnet.ru
-
-    copyright            : (C) 2006 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
-                           (original WavPack implementation)
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_APEPROPERTIES_H
-#define TAGLIB_APEPROPERTIES_H
-
-#include "taglib_export.h"
-#include "audioproperties.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-namespace APE {
-
-class File;
-
-//! An implementation of audio property reading for APE
-
-/*!
- * This reads the data from an APE stream found in the AudioProperties API.
- */
-
-class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
- public:
-
-  /*!
-  * Create an instance of APE::AudioProperties with the data read from the APE::File \a file.
-   */
-  explicit AudioProperties(File *file, long long streamLength, ReadStyle style = Average);
-
-  /*!
-   * Destroys this APE::AudioProperties instance.
-   */
-  ~AudioProperties() override;
-
-  /*!
-   * Returns the length of the file in seconds.  The length is rounded down to the nearest whole second.
-   *
-   * \see lengthInMilliseconds()
-   */
-  int lengthInSeconds() const override;
-
-  /*!
-   * Returns the length of the file in milliseconds.
-   *
-   * \see lengthInSeconds()
-   */
-  int lengthInMilliseconds() const override;
-
-  /*!
-   * Returns the average bit rate of the file in kb/s.
-   */
-  int bitrate() const override;
-
-  /*!
-   * Returns the sample rate in Hz.
-   */
-  int sampleRate() const override;
-
-  /*!
-   * Returns the number of audio channels.
-   */
-  int channels() const override;
-
-  /*!
-   * Returns the number of bits per audio sample.
-   */
-  int bitsPerSample() const;
-
-  /*!
-   * Returns the total number of audio samples in file.
-   */
-  unsigned int sampleFrames() const;
-
-  /*!
-   * Returns APE version.
-   */
-  int version() const;
-
- private:
-  void read(File *file, long long streamLength);
-
-  void analyzeCurrent(File *file);
-  void analyzeOld(File *file);
-
-  class AudioPropertiesPrivate;
-  AudioPropertiesPrivate *d;
-};
-}  // namespace APE
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/ape/apetag.cpp

@@ -1,519 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2004 by Allan Sandfeld Jensen
-    email                : kde@carewolf.com
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#if defined(__SUNPRO_CC) && (__SUNPRO_CC < 0x5130)
-// Sun Studio finds multiple specializations of Map because
-// it considers specializations with and without class types
-// to be different; this define forces Map to use only the
-// specialization with the class keyword.
-#  define WANT_CLASS_INSTANTIATION_OF_MAP (1)
-#endif
-
-#include "tfile.h"
-#include "tstring.h"
-#include "tmap.h"
-#include "tpicturemap.h"
-#include "tpropertymap.h"
-#include "tdebug.h"
-#include "tutils.h"
-
-#include "apetag.h"
-#include "apefooter.h"
-#include "apeitem.h"
-
-using namespace Strawberry_TagLib::TagLib;
-using namespace APE;
-
-namespace {
-const unsigned int MinKeyLength = 2;
-const unsigned int MaxKeyLength = 255;
-
-bool isKeyValid(const ByteVector &key) {
-
-  const char *invalidKeys[] = { "ID3", "TAG", "OGGS", "MP+", nullptr };
-
-  // only allow printable ASCII including space (32..126)
-
-  for (ByteVector::ConstIterator it = key.begin(); it != key.end(); ++it) {
-    const int c = static_cast<unsigned char>(*it);
-    if (c < 32 || c > 126)
-      return false;
-  }
-
-  const String upperKey = String(key).upper();
-  for (size_t i = 0; invalidKeys[i] != nullptr; ++i) {
-    if (upperKey == invalidKeys[i])
-      return false;
-  }
-
-  return true;
-}
-}  // namespace
-
-class APE::Tag::TagPrivate {
- public:
-  TagPrivate() : file(nullptr), footerLocation(0) {}
-
-  File *file;
-  long long footerLocation;
-
-  Footer footer;
-  ItemListMap itemListMap;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// public methods
-////////////////////////////////////////////////////////////////////////////////
-
-APE::Tag::Tag() : d(new TagPrivate()) {}
-
-APE::Tag::Tag(Strawberry_TagLib::TagLib::File *file, long long footerLocation) : d(new TagPrivate()) {
-
-  d->file = file;
-  d->footerLocation = footerLocation;
-
-  read();
-}
-
-APE::Tag::~Tag() {
-  delete d;
-}
-
-ByteVector APE::Tag::fileIdentifier() {
-  return ByteVector::fromCString("APETAGEX");
-}
-
-String APE::Tag::title() const {
-
-  if (d->itemListMap["TITLE"].isEmpty())
-    return String();
-  return d->itemListMap["TITLE"].values().toString();
-
-}
-
-String APE::Tag::artist() const {
-
-  if (d->itemListMap["ARTIST"].isEmpty())
-    return String();
-  return d->itemListMap["ARTIST"].values().toString();
-
-}
-
-String APE::Tag::album() const {
-
-  if (d->itemListMap["ALBUM"].isEmpty())
-    return String();
-  return d->itemListMap["ALBUM"].values().toString();
-
-}
-
-String APE::Tag::comment() const {
-
-  if (d->itemListMap["COMMENT"].isEmpty())
-    return String();
-  return d->itemListMap["COMMENT"].values().toString();
-
-}
-
-String APE::Tag::genre() const {
-
-  if (d->itemListMap["GENRE"].isEmpty())
-    return String();
-  return d->itemListMap["GENRE"].values().toString();
-
-}
-
-unsigned int APE::Tag::year() const {
-
-  if (d->itemListMap["YEAR"].isEmpty())
-    return 0;
-  return d->itemListMap["YEAR"].toString().toInt();
-
-}
-
-unsigned int APE::Tag::track() const {
-
-  if (d->itemListMap["TRACK"].isEmpty())
-    return 0;
-  return d->itemListMap["TRACK"].toString().toInt();
-
-}
-
-Strawberry_TagLib::TagLib::PictureMap APE::Tag::pictures() const {
-
-  PictureMap map;
-  if (d->itemListMap.contains(FRONT_COVER)) {
-    Item front = d->itemListMap[FRONT_COVER];
-    if (Item::Binary == front.type()) {
-      ByteVector picture = front.binaryData();
-      const size_t index = picture.find('\0');
-      if (index < picture.size()) {
-        ByteVector desc = picture.mid(0, index + 1);
-        String mime = "image/jpeg";
-        ByteVector data = picture.mid(index + 1);
-        Picture p(data, Picture::FrontCover, mime, desc);
-        map.insert(p);
-      }
-    }
-  }
-
-  if (d->itemListMap.contains(BACK_COVER)) {
-    Item back = d->itemListMap[BACK_COVER];
-    if (Item::Binary == back.type()) {
-      ByteVector picture = back.binaryData();
-      const size_t index = picture.find('\0');
-      if (index < picture.size()) {
-        ByteVector desc = picture.mid(0, index + 1);
-        String mime = "image/jpeg";
-        ByteVector data = picture.mid(index + 1);
-        Picture p(data, Picture::BackCover, mime, desc);
-        map.insert(p);
-      }
-    }
-  }
-
-  return PictureMap(map);
-
-}
-
-void APE::Tag::setTitle(const String &s) {
-  addValue("TITLE", s, true);
-}
-
-void APE::Tag::setArtist(const String &s) {
-  addValue("ARTIST", s, true);
-}
-
-void APE::Tag::setAlbum(const String &s) {
-  addValue("ALBUM", s, true);
-}
-
-void APE::Tag::setComment(const String &s) {
-  addValue("COMMENT", s, true);
-}
-
-void APE::Tag::setGenre(const String &s) {
-  addValue("GENRE", s, true);
-}
-
-void APE::Tag::setYear(unsigned int i) {
-
-  if (i == 0)
-    removeItem("YEAR");
-  else
-    addValue("YEAR", String::number(i), true);
-
-}
-
-void APE::Tag::setTrack(unsigned int i) {
-
-  if (i == 0)
-    removeItem("TRACK");
-  else
-    addValue("TRACK", String::number(i), true);
-
-}
-
-void APE::Tag::setPictures(const PictureMap &l) {
-
-  removeItem(FRONT_COVER);
-  removeItem(BACK_COVER);
-
-  for (PictureMap::ConstIterator pictureMapIt = l.begin(); pictureMapIt != l.end(); ++pictureMapIt) {
-    Picture::Type type = pictureMapIt->first;
-    if (Picture::FrontCover != type && Picture::BackCover != type) {
-      std::cout << "APE: Trying to add a picture with wrong type" << std::endl;
-      continue;
-    }
-
-    const char *id;
-    switch (type) {
-      case Picture::FrontCover:
-        id = FRONT_COVER;
-        break;
-      case Picture::BackCover:
-        id = BACK_COVER;
-        break;
-      default:
-        id = FRONT_COVER;
-        break;
-    }
-
-    PictureList list = pictureMapIt->second;
-    for (PictureList::ConstIterator pictureListIt = list.begin(); pictureListIt != list.end(); ++pictureListIt) {
-      Picture picture = *pictureListIt;
-      if (d->itemListMap.contains(id)) {
-        std::cout << "APE: Already added a picture of type "
-                  << id
-                  << " '"
-                  << picture.description()
-                  << "' "
-                  << "and next are being ignored"
-                  << std::endl;
-        break;
-      }
-
-      ByteVector data = picture.description().data(String::Latin1).append('\0').append(picture.data());
-
-      Item item;
-      item.setKey(id);
-      item.setType(Item::Binary);
-      item.setBinaryData(data);
-      setItem(item.key(), item);
-    }
-  }
-
-}
-
-namespace {
-// conversions of tag keys between what we use in PropertyMap and what's usual
-// for APE tags
-//                                    usual,         APE
-const char *keyConversions[][2] = { { "TRACKNUMBER", "TRACK" },
-  { "DATE", "YEAR" },
-  { "ALBUMARTIST", "ALBUM ARTIST" },
-  { "DISCNUMBER", "DISC" },
-  { "REMIXER", "MIXARTIST" } };
-const size_t keyConversionsSize = sizeof(keyConversions) / sizeof(keyConversions[0]);
-}  // namespace
-
-PropertyMap APE::Tag::properties() const {
-
-  PropertyMap properties;
-  ItemListMap::ConstIterator it = itemListMap().begin();
-  for (; it != itemListMap().end(); ++it) {
-    String tagName = it->first.upper();
-    // if the item is Binary or Locator, or if the key is an invalid string,
-    // add to unsupportedData
-    if (it->second.type() != Item::Text || tagName.isEmpty()) {
-      properties.unsupportedData().append(it->first);
-    }
-    else {
-      // Some tags need to be handled specially
-      for (size_t i = 0; i < keyConversionsSize; ++i) {
-        if (tagName == keyConversions[i][1])
-          tagName = keyConversions[i][0];
-      }
-      properties[tagName].append(it->second.values());
-    }
-  }
-  return properties;
-
-}
-
-void APE::Tag::removeUnsupportedProperties(const StringList &properties) {
-
-  StringList::ConstIterator it = properties.begin();
-  for (; it != properties.end(); ++it)
-    removeItem(*it);
-
-}
-
-PropertyMap APE::Tag::setProperties(const PropertyMap &origProps) {
-
-  PropertyMap properties(origProps);  // make a local copy that can be modified
-
-  // see comment in properties()
-  for (size_t i = 0; i < keyConversionsSize; ++i)
-    if (properties.contains(keyConversions[i][0])) {
-      properties.insert(keyConversions[i][1], properties[keyConversions[i][0]]);
-      properties.erase(keyConversions[i][0]);
-    }
-
-  // first check if tags need to be removed completely
-  StringList toRemove;
-  ItemListMap::ConstIterator remIt = itemListMap().begin();
-  for (; remIt != itemListMap().end(); ++remIt) {
-    String key = remIt->first.upper();
-    // only remove if a) key is valid, b) type is text, c) key not contained in new properties
-    if (!key.isEmpty() && remIt->second.type() == APE::Item::Text && !properties.contains(key))
-      toRemove.append(remIt->first);
-  }
-
-  for (StringList::ConstIterator removeIt = toRemove.begin(); removeIt != toRemove.end(); removeIt++)
-    removeItem(*removeIt);
-
-  // now sync in the "forward direction"
-  PropertyMap::ConstIterator it = properties.begin();
-  PropertyMap invalid;
-  for (; it != properties.end(); ++it) {
-    const String &tagName = it->first;
-    if (!checkKey(tagName))
-      invalid.insert(it->first, it->second);
-    else if (!(itemListMap().contains(tagName)) || !(itemListMap()[tagName].values() == it->second)) {
-      if (it->second.isEmpty())
-        removeItem(tagName);
-      else {
-        StringList::ConstIterator valueIt = it->second.begin();
-        addValue(tagName, *valueIt, true);
-        ++valueIt;
-        for (; valueIt != it->second.end(); ++valueIt)
-          addValue(tagName, *valueIt, false);
-      }
-    }
-  }
-  return invalid;
-}
-
-bool APE::Tag::checkKey(const String &key) {
-
-  if (key.size() < MinKeyLength || key.size() > MaxKeyLength)
-    return false;
-
-  return isKeyValid(key.data(String::UTF8));
-
-}
-
-APE::Footer *APE::Tag::footer() const {
-  return &d->footer;
-}
-
-const APE::ItemListMap &APE::Tag::itemListMap() const {
-  return d->itemListMap;
-}
-
-void APE::Tag::removeItem(const String &key) {
-  d->itemListMap.erase(key.upper());
-}
-
-void APE::Tag::addValue(const String &key, const String &value, bool replace) {
-
-  if (replace)
-    removeItem(key);
-
-  if (value.isEmpty())
-    return;
-
-  // Text items may contain more than one value.
-  // Binary or locator items may have only one value, hence always replaced.
-
-  ItemListMap::Iterator it = d->itemListMap.find(key.upper());
-
-  if (it != d->itemListMap.end() && it->second.type() == Item::Text)
-    it->second.appendValue(value);
-  else
-    setItem(key, Item(key, value));
-
-}
-
-void APE::Tag::setData(const String &key, const ByteVector &value) {
-
-  removeItem(key);
-
-  if (value.isEmpty())
-    return;
-
-  setItem(key, Item(key, value, true));
-
-}
-
-void APE::Tag::setItem(const String &key, const Item &item) {
-
-  if (!checkKey(key)) {
-    debug("APE::Tag::setItem() - Couldn't set an item due to an invalid key.");
-    return;
-  }
-
-  d->itemListMap[key.upper()] = item;
-
-}
-
-bool APE::Tag::isEmpty() const {
-  return d->itemListMap.isEmpty();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// protected methods
-////////////////////////////////////////////////////////////////////////////////
-
-void APE::Tag::read() {
-
-  if (d->file && d->file->isValid()) {
-
-    d->file->seek(d->footerLocation);
-    d->footer.setData(d->file->readBlock(Footer::size()));
-
-    if (d->footer.tagSize() <= Footer::size() ||
-      d->footer.tagSize() > static_cast<unsigned long>(d->file->length()))
-      return;
-
-    d->file->seek(d->footerLocation + Footer::size() - d->footer.tagSize());
-    parse(d->file->readBlock(d->footer.tagSize() - Footer::size()));
-  }
-
-}
-
-ByteVector APE::Tag::render() const {
-
-  ByteVector data;
-  unsigned int itemCount = 0;
-
-  for (ItemListMap::ConstIterator it = d->itemListMap.begin(); it != d->itemListMap.end(); ++it) {
-    data.append(it->second.render());
-    itemCount++;
-  }
-
-  d->footer.setItemCount(itemCount);
-  d->footer.setTagSize(data.size() + Footer::size());
-  d->footer.setHeaderPresent(true);
-
-  return d->footer.renderHeader() + data + d->footer.renderFooter();
-
-}
-
-void APE::Tag::parse(const ByteVector &data) {
-
-  // 11 bytes is the minimum size for an APE item
-
-  if (data.size() < 11)
-    return;
-
-  size_t pos = 0;
-
-  for (unsigned int i = 0; i < d->footer.itemCount() && pos <= data.size() - 11; i++) {
-
-    const size_t nullPos = data.find('\0', pos + 8);
-    if (nullPos == ByteVector::npos()) {
-      debug("APE::Tag::parse() - Couldn't find a key/value separator. Stopped parsing.");
-      return;
-    }
-
-    const size_t keyLength = nullPos - pos - 8;
-    const size_t valLegnth = data.toUInt32LE(pos);
-
-    if (keyLength >= MinKeyLength && keyLength <= MaxKeyLength && isKeyValid(data.mid(pos + 8, keyLength))) {
-      APE::Item item;
-      item.parse(data.mid(pos));
-
-      d->itemListMap.insert(item.key().upper(), item);
-    }
-    else {
-      debug("APE::Tag::parse() - Skipped an item due to an invalid key.");
-    }
-
-    pos += keyLength + valLegnth + 9;
-  }
-
-}

3rdparty/taglib/ape/apetag.h

@@ -1,216 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2004 by Allan Sandfeld Jensen
-    email                : kde@carewolf.org
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_APETAG_H
-#define TAGLIB_APETAG_H
-
-#include "tag.h"
-#include "tbytevector.h"
-#include "tmap.h"
-#include "tstring.h"
-#include "taglib_export.h"
-
-#include "apeitem.h"
-
-#define FRONT_COVER "COVER ART (FRONT)"
-#define BACK_COVER  "COVER ART (BACK)"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-
-class File;
-
-//! An implementation of the APE tagging format
-
-namespace APE {
-
-class Footer;
-
-/*!
- * A mapping between a list of item names, or keys, and the associated item.
- *
- * \see APE::Tag::itemListMap()
- */
-typedef Map<String, Item> ItemListMap;
-
-
-//! An APE tag implementation
-
-class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag {
- public:
-  /*!
-   * Create an APE tag with default values.
-   */
-  explicit Tag();
-
-  /*!
-   * Create an APE tag and parse the data in \a file with APE footer at
-   * \a tagOffset.
-   */
-  explicit Tag(Strawberry_TagLib::TagLib::File *file, long long footerLocation);
-
-  /*!
-   * Destroys this Tag instance.
-   */
-  ~Tag() override;
-
-  /*!
-   * Renders the in memory values to a ByteVector suitable for writing to the file.
-   */
-  ByteVector render() const;
-
-  /*!
-   * Returns the string "APETAGEX" suitable for usage in locating the tag in a file.
-   */
-  static ByteVector fileIdentifier();
-
-  // Reimplementations.
-
-  String title() const override;
-  String artist() const override;
-  String album() const override;
-  String comment() const override;
-  String genre() const override;
-  unsigned int year() const override;
-  unsigned int track() const override;
-
-  /**
-   * @brief pictures
-   * According to :
-   * http://www.hydrogenaud.io/forums/index.php?showtopic=40603&st=50&p=504669&#entry504669
-   * http://git.videolan.org/?p=vlc.git;a=blob;f=modules/meta_engine/taglib.cpp
-   * @return
-   */
-  PictureMap pictures() const override;
-
-  void setTitle(const String &s) override;
-  void setArtist(const String &s) override;
-  void setAlbum(const String &s) override;
-  void setComment(const String &s) override;
-  void setGenre(const String &s) override;
-  void setYear(unsigned int i) override;
-  void setTrack(unsigned int i) override;
-  void setPictures(const PictureMap &l) override;
-
-  /*!
-   * Implements the unified tag dictionary interface -- export function.
-   * APE tags are perfectly compatible with the dictionary interface because they
-   * support both arbitrary tag names and multiple values.
-   * Currently only APE items of type *Text* are handled by the dictionary interface; all *Binary*
-   * and *Locator* items will be put into the unsupportedData list and can be
-   * deleted on request using removeUnsupportedProperties().
-   * The same happens to Text items if their key is invalid for PropertyMap (which should actually never happen).
-   *
-   * The only conversion done by this export function is to rename the APE tags
-   * TRACK to TRACKNUMBER, YEAR to DATE, and ALBUM ARTIST to ALBUMARTIST,
-   * respectively, in order to be compliant with the names used in other formats.
-   */
-  PropertyMap properties() const override;
-
-  void removeUnsupportedProperties(const StringList &properties) override;
-
-  /*!
-   * Implements the unified tag dictionary interface -- import function.
-   * The same comments as for the export function apply; additionally note that the APE tag
-   * specification requires keys to have between 2 and 16 printable ASCII characters
-   * with the exception of the fixed strings "ID3", "TAG", "OGGS", and "MP+".
-   */
-  PropertyMap setProperties(const PropertyMap &) override;
-
-  /*!
-   * Check if the given String is a valid APE tag key.
-   */
-  static bool checkKey(const String &);
-
-  /*!
-   * Returns a pointer to the tag's footer.
-   */
-  Footer *footer() const;
-
-  /*!
-   * Returns a reference to the item list map.
-   * This is an ItemListMap of all of the items in the tag.
-   *
-   * This is the most powerful structure for accessing the items of the tag.
-   *
-   * APE tags are case-insensitive, all keys in this map have been converted
-   * to upper case.
-   *
-   * \warning You should not modify this data structure directly, instead
-   * use setItem() and removeItem().
-   */
-  const ItemListMap &itemListMap() const;
-
-  /*!
-   * Removes the \a key item from the tag
-   */
-  void removeItem(const String &key);
-
-  /*!
-   * Adds to the text item specified by \a key the data \a value.
-   * If \a replace is true, then all of the other values on the same key will be removed first.
-   * If a binary item exists for \a key it will be removed first.
-   */
-  void addValue(const String &key, const String &value, bool replace = true);
-
-  /*!
-  * Set the binary data for the key specified by \a item to \a value
-  * This will convert the item to type \a Binary if it isn't already and all of the other values on the same key will be removed.
-  */
-  void setData(const String &key, const ByteVector &value);
-
-  /*!
-   * Sets the \a key item to the value of \a item. If an item with the \a key is already present, it will be replaced.
-   */
-  void setItem(const String &key, const Item &item);
-
-  /*!
-   * Returns true if the tag does not contain any data.
-   */
-  bool isEmpty() const override;
-
- protected:
-  /*!
-   * Reads from the file specified in the constructor.
-   */
-  void read();
-
-  /*!
-   * Parses the body of the tag in \a data.
-   */
-  void parse(const ByteVector &data);
-
- private:
-  Tag(const Tag &);
-  Tag &operator=(const Tag &);
-
-  class TagPrivate;
-  TagPrivate *d;
-};
-}  // namespace APE
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/asf/asfattribute.cpp

@@ -1,328 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2005-2007 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include <memory>
-
-#include "taglib.h"
-#include "tdebug.h"
-
-#include "asfattribute.h"
-#include "asffile.h"
-#include "asfutils.h"
-
-using namespace Strawberry_TagLib::TagLib;
-
-namespace {
-struct AttributeData {
-  explicit AttributeData() : numericValue(0), stream(0), language(0) {}
-
-  ASF::Attribute::AttributeTypes type;
-  String stringValue;
-  ByteVector byteVectorValue;
-  ASF::Picture pictureValue;
-  unsigned long long numericValue;
-  int stream;
-  int language;
-};
-}  // namespace
-
-class ASF::Attribute::AttributePrivate {
- public:
-  AttributePrivate() : data(new AttributeData()) {
-    data->pictureValue = ASF::Picture::fromInvalid();
-  }
-
-  std::shared_ptr<AttributeData> data;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-ASF::Attribute::Attribute() : d(new AttributePrivate()) {
-  d->data->type = UnicodeType;
-}
-
-ASF::Attribute::Attribute(const ASF::Attribute &other) : d(new AttributePrivate(*other.d)) {}
-
-ASF::Attribute::Attribute(const String &value) : d(new AttributePrivate()) {
-  d->data->type = UnicodeType;
-  d->data->stringValue = value;
-}
-
-ASF::Attribute::Attribute(const ByteVector &value) : d(new AttributePrivate()) {
-  d->data->type = BytesType;
-  d->data->byteVectorValue = value;
-}
-
-ASF::Attribute::Attribute(const ASF::Picture &value) : d(new AttributePrivate()) {
-  d->data->type = BytesType;
-  d->data->pictureValue = value;
-}
-
-ASF::Attribute::Attribute(unsigned int value) : d(new AttributePrivate()) {
-  d->data->type = DWordType;
-  d->data->numericValue = value;
-}
-
-ASF::Attribute::Attribute(unsigned long long value) : d(new AttributePrivate()) {
-  d->data->type = QWordType;
-  d->data->numericValue = value;
-}
-
-ASF::Attribute::Attribute(unsigned short value) : d(new AttributePrivate()) {
-  d->data->type = WordType;
-  d->data->numericValue = value;
-}
-
-ASF::Attribute::Attribute(bool value) : d(new AttributePrivate()) {
-  d->data->type = BoolType;
-  d->data->numericValue = value;
-}
-
-ASF::Attribute &ASF::Attribute::operator=(const ASF::Attribute &other) {
-  Attribute(other).swap(*this);
-  return *this;
-}
-
-void ASF::Attribute::swap(Attribute &other) {
-  using std::swap;
-
-  swap(d, other.d);
-}
-
-ASF::Attribute::~Attribute() {
-  delete d;
-}
-
-ASF::Attribute::AttributeTypes ASF::Attribute::type() const {
-  return d->data->type;
-}
-
-String ASF::Attribute::toString() const {
-  return d->data->stringValue;
-}
-
-ByteVector ASF::Attribute::toByteVector() const {
-  if (d->data->pictureValue.isValid())
-    return d->data->pictureValue.render();
-
-  return d->data->byteVectorValue;
-}
-
-unsigned short ASF::Attribute::toBool() const {
-  return d->data->numericValue ? 1 : 0;
-}
-
-unsigned short ASF::Attribute::toUShort() const {
-  return static_cast<unsigned short>(d->data->numericValue);
-}
-
-unsigned int ASF::Attribute::toUInt() const {
-  return static_cast<unsigned int>(d->data->numericValue);
-}
-
-unsigned long long ASF::Attribute::toULongLong() const {
-  return static_cast<unsigned long long>(d->data->numericValue);
-}
-
-ASF::Picture ASF::Attribute::toPicture() const {
-  return d->data->pictureValue;
-}
-
-String ASF::Attribute::parse(ASF::File &f, int kind) {
-
-  unsigned int size, nameLength;
-  String name;
-  d->data->pictureValue = Picture::fromInvalid();
-  // extended content descriptor
-  if (kind == 0) {
-    nameLength = readWORD(&f);
-    name = readString(&f, nameLength);
-    d->data->type = ASF::Attribute::AttributeTypes(readWORD(&f));
-    size = readWORD(&f);
-  }
-  // metadata & metadata library
-  else {
-    int temp = readWORD(&f);
-    // metadata library
-    if (kind == 2) {
-      d->data->language = temp;
-    }
-    d->data->stream = readWORD(&f);
-    nameLength = readWORD(&f);
-    d->data->type = ASF::Attribute::AttributeTypes(readWORD(&f));
-    size = readDWORD(&f);
-    name = readString(&f, nameLength);
-  }
-
-  if (kind != 2 && size > 65535) {
-    debug("ASF::Attribute::parse() -- Value larger than 64kB");
-  }
-
-  switch (d->data->type) {
-    case WordType:
-      d->data->numericValue = readWORD(&f);
-      break;
-
-    case BoolType:
-      if (kind == 0) {
-        d->data->numericValue = (readDWORD(&f) != 0);
-      }
-      else {
-        d->data->numericValue = (readWORD(&f) != 0);
-      }
-      break;
-
-    case DWordType:
-      d->data->numericValue = readDWORD(&f);
-      break;
-
-    case QWordType:
-      d->data->numericValue = readQWORD(&f);
-      break;
-
-    case UnicodeType:
-      d->data->stringValue = readString(&f, size);
-      break;
-
-    case BytesType:
-    case GuidType:
-      d->data->byteVectorValue = f.readBlock(size);
-      break;
-  }
-
-  if (d->data->type == BytesType && name == "WM/Picture") {
-    d->data->pictureValue.parse(d->data->byteVectorValue);
-    if (d->data->pictureValue.isValid()) {
-      d->data->byteVectorValue.clear();
-    }
-  }
-
-  return name;
-
-}
-
-int ASF::Attribute::dataSize() const {
-
-  switch (d->data->type) {
-    case WordType:
-      return 2;
-    case BoolType:
-      return 4;
-    case DWordType:
-      return 4;
-    case QWordType:
-      return 5;
-    case UnicodeType:
-      return static_cast<int>(d->data->stringValue.size() * 2 + 2);
-    case BytesType:
-      if (d->data->pictureValue.isValid())
-        return d->data->pictureValue.dataSize();
-      break;
-    case GuidType:
-      return static_cast<int>(d->data->byteVectorValue.size());
-  }
-  return 0;
-
-}
-
-ByteVector ASF::Attribute::render(const String &name, int kind) const {
-
-  ByteVector data;
-
-  switch (d->data->type) {
-    case WordType:
-      data.append(ByteVector::fromUInt16LE(toUShort()));
-      break;
-
-    case BoolType:
-      if (kind == 0) {
-        data.append(ByteVector::fromUInt32LE(toBool()));
-      }
-      else {
-        data.append(ByteVector::fromUInt16LE(toBool()));
-      }
-      break;
-
-    case DWordType:
-      data.append(ByteVector::fromUInt32LE(toUInt()));
-      break;
-
-    case QWordType:
-      data.append(ByteVector::fromUInt64LE(toULongLong()));
-      break;
-
-    case UnicodeType:
-      data.append(renderString(d->data->stringValue));
-      break;
-
-    case BytesType:
-      if (d->data->pictureValue.isValid()) {
-        data.append(d->data->pictureValue.render());
-        break;
-      }
-      break;
-    case GuidType:
-      data.append(d->data->byteVectorValue);
-      break;
-  }
-
-  if (kind == 0) {
-    data = renderString(name, true) +
-      ByteVector::fromUInt16LE((int)d->data->type) +
-      ByteVector::fromUInt16LE(data.size()) +
-      data;
-  }
-  else {
-    ByteVector nameData = renderString(name);
-    data = ByteVector::fromUInt16LE(kind == 2 ? d->data->language : 0) +
-      ByteVector::fromUInt16LE(d->data->stream) +
-      ByteVector::fromUInt16LE(nameData.size()) +
-      ByteVector::fromUInt16LE(static_cast<int>(d->data->type)) +
-      ByteVector::fromUInt32LE(data.size()) +
-      nameData +
-      data;
-  }
-
-  return data;
-
-}
-
-int ASF::Attribute::language() const {
-  return d->data->language;
-}
-
-void ASF::Attribute::setLanguage(int value) {
-  d->data->language = value;
-}
-
-int ASF::Attribute::stream() const {
-  return d->data->stream;
-}
-
-void ASF::Attribute::setStream(int value) {
-  d->data->stream = value;
-}

3rdparty/taglib/asf/asfattribute.h

@@ -1,200 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2005-2007 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_ASFATTRIBUTE_H
-#define TAGLIB_ASFATTRIBUTE_H
-
-#include "tstring.h"
-#include "tbytevector.h"
-#include "taglib_export.h"
-#include "asfpicture.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-namespace ASF {
-
-class File;
-class Picture;
-
-class TAGLIB_EXPORT Attribute {
- public:
-  /*!
-   * Enum of types an Attribute can have.
-   */
-  enum AttributeTypes {
-    UnicodeType = 0,
-    BytesType = 1,
-    BoolType = 2,
-    DWordType = 3,
-    QWordType = 4,
-    WordType = 5,
-    GuidType = 6
-  };
-
-  /*!
-   * Constructs an empty attribute.
-   */
-  Attribute();
-
-  /*!
-   * Constructs an attribute with \a key and a UnicodeType \a value.
-   */
-  Attribute(const String &value);
-
-  /*!
-   * Constructs an attribute with \a key and a BytesType \a value.
-   */
-  Attribute(const ByteVector &value);
-
-  /*!
-   * Constructs an attribute with \a key and a Picture \a value.
-   *
-   * This attribute is compatible with the ID3 frame, APIC. The ID3 specification for the APIC frame stipulates that,
-   * while there may be any number of APIC frames associated with a file,
-   * only one may be of type 1 and only one may be of type 2.
-   *
-   * The specification also states that the description of the picture can be no longer than 64 characters, but can be empty.
-   * WM/Picture attributes added with TagLib::ASF are not automatically validated to conform to ID3 specifications.
-   * You must add code in your application to perform validations if you want to maintain complete compatibility with ID3.
-   */
-  Attribute(const Picture &value);
-
-  /*!
-   * Constructs an attribute with \a key and a DWordType \a value.
-   */
-  Attribute(unsigned int value);
-
-  /*!
-   * Constructs an attribute with \a key and a QWordType \a value.
-   */
-  Attribute(unsigned long long value);
-
-  /*!
-   * Constructs an attribute with \a key and a WordType \a value.
-   */
-  Attribute(unsigned short value);
-
-  /*!
-   * Constructs an attribute with \a key and a BoolType \a value.
-   */
-  Attribute(bool value);
-
-  /*!
-   * Construct an attribute as a copy of \a other.
-   */
-  Attribute(const Attribute &other);
-
-  /*!
-   * Copies the contents of \a other into this item.
-   */
-  Attribute &operator=(const Attribute &other);
-
-  /*!
-   * Exchanges the content of the Attribute by the content of \a other.
-   */
-  void swap(Attribute &other);
-
-  /*!
-   * Destroys the attribute.
-   */
-  virtual ~Attribute();
-
-  /*!
-   * Returns type of the value.
-   */
-  AttributeTypes type() const;
-
-  /*!
-   * Returns the BoolType \a value.
-   */
-  unsigned short toBool() const;
-
-  /*!
-   * Returns the WordType \a value.
-   */
-  unsigned short toUShort() const;
-
-  /*!
-   * Returns the DWordType \a value.
-   */
-  unsigned int toUInt() const;
-
-  /*!
-   * Returns the QWordType \a value.
-   */
-  unsigned long long toULongLong() const;
-
-  /*!
-   * Returns the UnicodeType \a value.
-   */
-  String toString() const;
-
-  /*!
-   * Returns the BytesType \a value.
-   */
-  ByteVector toByteVector() const;
-
-  /*!
-   * Returns the Picture \a value.
-   */
-  Picture toPicture() const;
-
-  /*!
-   * Returns the language number, or 0 is no stream number was set.
-   */
-  int language() const;
-
-  /*!
-   * Sets the language number.
-   */
-  void setLanguage(int value);
-
-  /*!
-   * Returns the stream number, or 0 is no stream number was set.
-   */
-  int stream() const;
-
-  /*!
-   * Sets the stream number.
-   */
-  void setStream(int value);
-
-  //! Returns the size of the stored data
-  int dataSize() const;
-
- private:
-  friend class File;
-
-  String parse(ASF::File &file, int kind = 0);
-  ByteVector render(const String &name, int kind = 0) const;
-
-  class AttributePrivate;
-  AttributePrivate *d;
-};
-}  // namespace ASF
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/asf/asffile.cpp

@@ -1,661 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2005-2007 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include <memory>
-
-#include "tdebug.h"
-#include "tbytevectorlist.h"
-#include "tpropertymap.h"
-#include "tstring.h"
-#include "tagutils.h"
-
-#include "asffile.h"
-#include "asftag.h"
-#include "asfproperties.h"
-#include "asfutils.h"
-
-using namespace Strawberry_TagLib::TagLib;
-
-class ASF::File::FilePrivate {
- public:
-  class BaseObject;
-  class UnknownObject;
-  class FilePropertiesObject;
-  class StreamPropertiesObject;
-  class ContentDescriptionObject;
-  class ExtendedContentDescriptionObject;
-  class HeaderExtensionObject;
-  class CodecListObject;
-  class MetadataObject;
-  class MetadataLibraryObject;
-
-  typedef List<std::shared_ptr<BaseObject>> ObjectList;
-  typedef ObjectList::ConstIterator ObjectConstIterator;
-
-  FilePrivate() : headerSize(0) {}
-
-  unsigned long long headerSize;
-
-  std::unique_ptr<ASF::Tag> tag;
-  std::unique_ptr<ASF::AudioProperties> properties;
-
-  ObjectList objects;
-
-  std::shared_ptr<ContentDescriptionObject> contentDescriptionObject;
-  std::shared_ptr<ExtendedContentDescriptionObject> extendedContentDescriptionObject;
-  std::shared_ptr<HeaderExtensionObject> headerExtensionObject;
-  std::shared_ptr<MetadataObject> metadataObject;
-  std::shared_ptr<MetadataLibraryObject> metadataLibraryObject;
-};
-
-namespace {
-const ByteVector headerGuid("\x30\x26\xB2\x75\x8E\x66\xCF\x11\xA6\xD9\x00\xAA\x00\x62\xCE\x6C", 16);
-const ByteVector filePropertiesGuid("\xA1\xDC\xAB\x8C\x47\xA9\xCF\x11\x8E\xE4\x00\xC0\x0C\x20\x53\x65", 16);
-const ByteVector streamPropertiesGuid("\x91\x07\xDC\xB7\xB7\xA9\xCF\x11\x8E\xE6\x00\xC0\x0C\x20\x53\x65", 16);
-const ByteVector contentDescriptionGuid("\x33\x26\xB2\x75\x8E\x66\xCF\x11\xA6\xD9\x00\xAA\x00\x62\xCE\x6C", 16);
-const ByteVector extendedContentDescriptionGuid("\x40\xA4\xD0\xD2\x07\xE3\xD2\x11\x97\xF0\x00\xA0\xC9\x5E\xA8\x50", 16);
-const ByteVector headerExtensionGuid("\xb5\x03\xbf_.\xa9\xcf\x11\x8e\xe3\x00\xc0\x0c Se", 16);
-const ByteVector metadataGuid("\xEA\xCB\xF8\xC5\xAF[wH\204g\xAA\214D\xFAL\xCA", 16);
-const ByteVector metadataLibraryGuid("\224\034#D\230\224\321I\241A\x1d\x13NEpT", 16);
-const ByteVector codecListGuid("\x40\x52\xd1\x86\x1d\x31\xd0\x11\xa3\xa4\x00\xa0\xc9\x03\x48\xf6", 16);
-const ByteVector contentEncryptionGuid("\xFB\xB3\x11\x22\x23\xBD\xD2\x11\xB4\xB7\x00\xA0\xC9\x55\xFC\x6E", 16);
-const ByteVector extendedContentEncryptionGuid("\x14\xE6\x8A\x29\x22\x26 \x17\x4C\xB9\x35\xDA\xE0\x7E\xE9\x28\x9C", 16);
-const ByteVector advancedContentEncryptionGuid("\xB6\x9B\x07\x7A\xA4\xDA\x12\x4E\xA5\xCA\x91\xD3\x8D\xC1\x1A\x8D", 16);
-}  // namespace
-
-class ASF::File::FilePrivate::BaseObject {
- public:
-  ByteVector data;
-  virtual ~BaseObject() {}
-  virtual ByteVector guid() const = 0;
-  virtual void parse(ASF::File *file, unsigned int size);
-  virtual ByteVector render(ASF::File *file);
-};
-
-class ASF::File::FilePrivate::UnknownObject : public ASF::File::FilePrivate::BaseObject {
-  ByteVector myGuid;
-
- public:
-  explicit UnknownObject(const ByteVector &guid);
-  ByteVector guid() const override;
-};
-
-class ASF::File::FilePrivate::FilePropertiesObject : public ASF::File::FilePrivate::BaseObject {
- public:
-  ByteVector guid() const override;
-  void parse(ASF::File *file, unsigned int size) override;
-};
-
-class ASF::File::FilePrivate::StreamPropertiesObject : public ASF::File::FilePrivate::BaseObject {
- public:
-  ByteVector guid() const override;
-  void parse(ASF::File *file, unsigned int size) override;
-};
-
-class ASF::File::FilePrivate::ContentDescriptionObject : public ASF::File::FilePrivate::BaseObject {
- public:
-  ByteVector guid() const override;
-  void parse(ASF::File *file, unsigned int size) override;
-  ByteVector render(ASF::File *file) override;
-};
-
-class ASF::File::FilePrivate::ExtendedContentDescriptionObject : public ASF::File::FilePrivate::BaseObject {
- public:
-  ByteVectorList attributeData;
-  ByteVector guid() const override;
-  void parse(ASF::File *file, unsigned int size) override;
-  ByteVector render(ASF::File *file) override;
-};
-
-class ASF::File::FilePrivate::MetadataObject : public ASF::File::FilePrivate::BaseObject {
- public:
-  ByteVectorList attributeData;
-  ByteVector guid() const override;
-  void parse(ASF::File *file, unsigned int size) override;
-  ByteVector render(ASF::File *file) override;
-};
-
-class ASF::File::FilePrivate::MetadataLibraryObject : public ASF::File::FilePrivate::BaseObject {
- public:
-  ByteVectorList attributeData;
-  ByteVector guid() const override;
-  void parse(ASF::File *file, unsigned int size) override;
-  ByteVector render(ASF::File *file) override;
-};
-
-class ASF::File::FilePrivate::HeaderExtensionObject : public ASF::File::FilePrivate::BaseObject {
- public:
-  ObjectList objects;
-  HeaderExtensionObject();
-  ByteVector guid() const override;
-  void parse(ASF::File *file, unsigned int size) override;
-  ByteVector render(ASF::File *file) override;
-};
-
-class ASF::File::FilePrivate::CodecListObject : public ASF::File::FilePrivate::BaseObject {
- public:
-  ByteVector guid() const override;
-  void parse(ASF::File *file, unsigned int size) override;
-
- private:
-  enum CodecType {
-    Video = 0x0001,
-    Audio = 0x0002,
-    Unknown = 0xFFFF
-  };
-};
-
-void ASF::File::FilePrivate::BaseObject::parse(ASF::File *file, unsigned int size) {
-
-  data.clear();
-  if (size > 24 && static_cast<long long>(size) <= file->length())
-    data = file->readBlock(size - 24);
-  else
-    data = ByteVector();
-
-}
-
-ByteVector ASF::File::FilePrivate::BaseObject::render(ASF::File * /*file*/) {
-  return guid() + ByteVector::fromUInt64LE(data.size() + 24) + data;
-}
-
-ASF::File::FilePrivate::UnknownObject::UnknownObject(const ByteVector &guid) : myGuid(guid) {}
-
-ByteVector ASF::File::FilePrivate::UnknownObject::guid() const {
-  return myGuid;
-}
-
-ByteVector ASF::File::FilePrivate::FilePropertiesObject::guid() const {
-  return filePropertiesGuid;
-}
-
-void ASF::File::FilePrivate::FilePropertiesObject::parse(ASF::File *file, unsigned int size) {
-
-  BaseObject::parse(file, size);
-  if (data.size() < 64) {
-    debug("ASF::File::FilePrivate::FilePropertiesObject::parse() -- data is too short.");
-    return;
-  }
-
-  const long long duration = data.toInt64LE(40);
-  const long long preroll = data.toInt64LE(56);
-  file->d->properties->setLengthInMilliseconds(static_cast<int>(duration / 10000.0 - preroll + 0.5));
-
-}
-
-ByteVector ASF::File::FilePrivate::StreamPropertiesObject::guid() const {
-  return streamPropertiesGuid;
-}
-
-void ASF::File::FilePrivate::StreamPropertiesObject::parse(ASF::File *file, unsigned int size) {
-
-  BaseObject::parse(file, size);
-  if (data.size() < 70) {
-    debug("ASF::File::FilePrivate::StreamPropertiesObject::parse() -- data is too short.");
-    return;
-  }
-
-  file->d->properties->setCodec(data.toUInt16LE(54));
-  file->d->properties->setChannels(data.toUInt16LE(56));
-  file->d->properties->setSampleRate(data.toUInt32LE(58));
-  file->d->properties->setBitrate(static_cast<int>(data.toUInt32LE(62) * 8.0 / 1000.0 + 0.5));
-  file->d->properties->setBitsPerSample(data.toUInt16LE(68));
-
-}
-
-ByteVector ASF::File::FilePrivate::ContentDescriptionObject::guid() const {
-  return contentDescriptionGuid;
-}
-
-void ASF::File::FilePrivate::ContentDescriptionObject::parse(ASF::File *file, unsigned int /*size*/) {
-
-  const int titleLength = readWORD(file);
-  const int artistLength = readWORD(file);
-  const int copyrightLength = readWORD(file);
-  const int commentLength = readWORD(file);
-  const int ratingLength = readWORD(file);
-  file->d->tag->setTitle(readString(file, titleLength));
-  file->d->tag->setArtist(readString(file, artistLength));
-  file->d->tag->setCopyright(readString(file, copyrightLength));
-  file->d->tag->setComment(readString(file, commentLength));
-  file->d->tag->setRating(readString(file, ratingLength));
-
-}
-
-ByteVector ASF::File::FilePrivate::ContentDescriptionObject::render(ASF::File *file) {
-
-  const ByteVector v1 = renderString(file->d->tag->title());
-  const ByteVector v2 = renderString(file->d->tag->artist());
-  const ByteVector v3 = renderString(file->d->tag->copyright());
-  const ByteVector v4 = renderString(file->d->tag->comment());
-  const ByteVector v5 = renderString(file->d->tag->rating());
-  data.clear();
-  data.append(ByteVector::fromUInt16LE(v1.size()));
-  data.append(ByteVector::fromUInt16LE(v2.size()));
-  data.append(ByteVector::fromUInt16LE(v3.size()));
-  data.append(ByteVector::fromUInt16LE(v4.size()));
-  data.append(ByteVector::fromUInt16LE(v5.size()));
-  data.append(v1);
-  data.append(v2);
-  data.append(v3);
-  data.append(v4);
-  data.append(v5);
-  return BaseObject::render(file);
-
-}
-
-ByteVector ASF::File::FilePrivate::ExtendedContentDescriptionObject::guid() const {
-  return extendedContentDescriptionGuid;
-}
-
-void ASF::File::FilePrivate::ExtendedContentDescriptionObject::parse(ASF::File *file, unsigned int /*size*/) {
-
-  int count = readWORD(file);
-  while (count--) {
-    ASF::Attribute attribute;
-    String name = attribute.parse(*file);
-    file->d->tag->addAttribute(name, attribute);
-  }
-
-}
-
-ByteVector ASF::File::FilePrivate::ExtendedContentDescriptionObject::render(ASF::File *file) {
-
-  data.clear();
-  data.append(ByteVector::fromUInt16LE(attributeData.size()));
-  data.append(attributeData.toByteVector(""));
-  return BaseObject::render(file);
-
-}
-
-ByteVector ASF::File::FilePrivate::MetadataObject::guid() const {
-  return metadataGuid;
-}
-
-void ASF::File::FilePrivate::MetadataObject::parse(ASF::File *file, unsigned int /*size*/) {
-
-  int count = readWORD(file);
-  while (count--) {
-    ASF::Attribute attribute;
-    String name = attribute.parse(*file, 1);
-    file->d->tag->addAttribute(name, attribute);
-  }
-
-}
-
-ByteVector ASF::File::FilePrivate::MetadataObject::render(ASF::File *file) {
-
-  data.clear();
-  data.append(ByteVector::fromUInt16LE(attributeData.size()));
-  data.append(attributeData.toByteVector(""));
-  return BaseObject::render(file);
-
-}
-
-ByteVector ASF::File::FilePrivate::MetadataLibraryObject::guid() const {
-  return metadataLibraryGuid;
-}
-
-void ASF::File::FilePrivate::MetadataLibraryObject::parse(ASF::File *file, unsigned int /*size*/) {
-
-  int count = readWORD(file);
-  while (count--) {
-    ASF::Attribute attribute;
-    String name = attribute.parse(*file, 2);
-    file->d->tag->addAttribute(name, attribute);
-  }
-
-}
-
-ByteVector ASF::File::FilePrivate::MetadataLibraryObject::render(ASF::File *file) {
-
-  data.clear();
-  data.append(ByteVector::fromUInt16LE(attributeData.size()));
-  data.append(attributeData.toByteVector(""));
-  return BaseObject::render(file);
-
-}
-
-ASF::File::FilePrivate::HeaderExtensionObject::HeaderExtensionObject() {
-  objects.setAutoDelete(true);
-}
-
-ByteVector ASF::File::FilePrivate::HeaderExtensionObject::guid() const {
-  return headerExtensionGuid;
-}
-
-void ASF::File::FilePrivate::HeaderExtensionObject::parse(ASF::File *file, unsigned int /*size*/) {
-
-  file->seek(18, File::Current);
-  long long dataSize = readDWORD(file);
-  long long dataPos = 0;
-  while (dataPos < dataSize) {
-    ByteVector guid = file->readBlock(16);
-    if (guid.size() != 16) {
-      file->setValid(false);
-      break;
-    }
-    bool ok;
-    long long size = readQWORD(file, &ok);
-    if (!ok) {
-      file->setValid(false);
-      break;
-    }
-    std::shared_ptr<BaseObject> obj;
-    if (guid == metadataGuid) {
-      file->d->metadataObject.reset(new MetadataObject());
-      obj = file->d->metadataObject;
-    }
-    else if (guid == metadataLibraryGuid) {
-      file->d->metadataLibraryObject.reset(new MetadataLibraryObject());
-      obj = file->d->metadataLibraryObject;
-    }
-    else {
-      obj.reset(new UnknownObject(guid));
-    }
-    obj->parse(file, static_cast<unsigned int>(size));
-    objects.append(obj);
-    dataPos += size;
-  }
-
-}
-
-ByteVector ASF::File::FilePrivate::HeaderExtensionObject::render(ASF::File *file) {
-
-  data.clear();
-  for (ObjectConstIterator it = objects.begin(); it != objects.end(); ++it) {
-    data.append((*it)->render(file));
-  }
-  data = ByteVector("\x11\xD2\xD3\xAB\xBA\xA9\xcf\x11\x8E\xE6\x00\xC0\x0C\x20\x53\x65\x06\x00", 18) + ByteVector::fromUInt32LE(data.size()) + data;
-  return BaseObject::render(file);
-
-}
-
-ByteVector ASF::File::FilePrivate::CodecListObject::guid() const {
-  return codecListGuid;
-}
-
-void ASF::File::FilePrivate::CodecListObject::parse(ASF::File *file, unsigned int size) {
-
-  BaseObject::parse(file, size);
-  if (data.size() <= 20) {
-    debug("ASF::File::FilePrivate::CodecListObject::parse() -- data is too short.");
-    return;
-  }
-
-  unsigned int pos = 16;
-
-  const int count = data.toUInt32LE(pos);
-  pos += 4;
-
-  for (int i = 0; i < count; ++i) {
-
-    if (pos >= data.size())
-      break;
-
-    const CodecType type = static_cast<CodecType>(data.toUInt16LE(pos));
-    pos += 2;
-
-    int nameLength = data.toUInt16LE(pos);
-    pos += 2;
-
-    const unsigned int namePos = pos;
-    pos += nameLength * 2;
-
-    const int descLength = data.toUInt16LE(pos);
-    pos += 2;
-
-    const unsigned int descPos = pos;
-    pos += descLength * 2;
-
-    const int infoLength = data.toUInt16LE(pos);
-    pos += 2 + infoLength * 2;
-
-    if (type == CodecListObject::Audio) {
-      // First audio codec found.
-
-      const String name(data.mid(namePos, nameLength * 2), String::UTF16LE);
-      file->d->properties->setCodecName(name.stripWhiteSpace());
-
-      const String desc(data.mid(descPos, descLength * 2), String::UTF16LE);
-      file->d->properties->setCodecDescription(desc.stripWhiteSpace());
-
-      break;
-    }
-  }
-
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// static members
-////////////////////////////////////////////////////////////////////////////////
-
-bool ASF::File::isSupported(IOStream *stream) {
-
-  // An ASF file has to start with the designated GUID.
-
-  const ByteVector id = Utils::readHeader(stream, 16, false);
-  return (id == headerGuid);
-
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-ASF::File::File(FileName file, bool, AudioProperties::ReadStyle) : Strawberry_TagLib::TagLib::File(file), d(new FilePrivate()) {
-  if (isOpen())
-    read();
-}
-
-ASF::File::File(IOStream *stream, bool, AudioProperties::ReadStyle) : Strawberry_TagLib::TagLib::File(stream), d(new FilePrivate()) {
-  if (isOpen())
-    read();
-}
-
-ASF::File::~File() {
-  delete d;
-}
-
-ASF::Tag *ASF::File::tag() const {
-  return d->tag.get();
-}
-
-ASF::AudioProperties *ASF::File::audioProperties() const {
-  return d->properties.get();
-}
-
-bool ASF::File::save() {
-
-  if (readOnly()) {
-    debug("ASF::File::save() -- File is read only.");
-    return false;
-  }
-
-  if (!isValid()) {
-    debug("ASF::File::save() -- Trying to save invalid file.");
-    return false;
-  }
-
-  if (!d->contentDescriptionObject) {
-    d->contentDescriptionObject.reset(new FilePrivate::ContentDescriptionObject());
-    d->objects.append(d->contentDescriptionObject);
-  }
-  if (!d->extendedContentDescriptionObject) {
-    d->extendedContentDescriptionObject.reset(new FilePrivate::ExtendedContentDescriptionObject());
-    d->objects.append(d->extendedContentDescriptionObject);
-  }
-  if (!d->headerExtensionObject) {
-    d->headerExtensionObject.reset(new FilePrivate::HeaderExtensionObject());
-    d->objects.append(d->headerExtensionObject);
-  }
-  if (!d->metadataObject) {
-    d->metadataObject.reset(new FilePrivate::MetadataObject());
-    d->headerExtensionObject->objects.append(d->metadataObject);
-  }
-  if (!d->metadataLibraryObject) {
-    d->metadataLibraryObject.reset(new FilePrivate::MetadataLibraryObject());
-    d->headerExtensionObject->objects.append(d->metadataLibraryObject);
-  }
-
-  d->extendedContentDescriptionObject->attributeData.clear();
-  d->metadataObject->attributeData.clear();
-  d->metadataLibraryObject->attributeData.clear();
-
-  const AttributeListMap allAttributes = d->tag->attributeListMap();
-
-  for (AttributeListMap::ConstIterator it = allAttributes.begin(); it != allAttributes.end(); ++it) {
-
-    const String &name = it->first;
-    const AttributeList &attributes = it->second;
-
-    bool inExtendedContentDescriptionObject = false;
-    bool inMetadataObject = false;
-
-    for (AttributeList::ConstIterator jt = attributes.begin(); jt != attributes.end(); ++jt) {
-
-      const Attribute &attribute = *jt;
-      const bool largeValue = (attribute.dataSize() > 65535);
-      const bool guid = (attribute.type() == Attribute::GuidType);
-
-      if (!inExtendedContentDescriptionObject && !guid && !largeValue && attribute.language() == 0 && attribute.stream() == 0) {
-        d->extendedContentDescriptionObject->attributeData.append(attribute.render(name));
-        inExtendedContentDescriptionObject = true;
-      }
-      else if (!inMetadataObject && !guid && !largeValue && attribute.language() == 0 && attribute.stream() != 0) {
-        d->metadataObject->attributeData.append(attribute.render(name, 1));
-        inMetadataObject = true;
-      }
-      else {
-        d->metadataLibraryObject->attributeData.append(attribute.render(name, 2));
-      }
-    }
-  }
-
-  ByteVector data;
-  for (FilePrivate::ObjectConstIterator it = d->objects.begin(); it != d->objects.end(); ++it) {
-    data.append((*it)->render(this));
-  }
-
-  seek(16);
-  writeBlock(ByteVector::fromUInt64LE(data.size() + 30));
-  writeBlock(ByteVector::fromUInt32LE(d->objects.size()));
-  writeBlock(ByteVector("\x01\x02", 2));
-
-  insert(data, 30, static_cast<size_t>(d->headerSize - 30));
-
-  d->headerSize = data.size() + 30;
-
-  return true;
-
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// private members
-////////////////////////////////////////////////////////////////////////////////
-
-void ASF::File::read() {
-
-  if (!isValid())
-    return;
-
-  if (readBlock(16) != headerGuid) {
-    debug("ASF::File::read(): Not an ASF file.");
-    setValid(false);
-    return;
-  }
-
-  d->tag.reset(new ASF::Tag());
-  d->properties.reset(new ASF::AudioProperties());
-
-  bool ok;
-  d->headerSize = readQWORD(this, &ok);
-  if (!ok) {
-    setValid(false);
-    return;
-  }
-  int numObjects = readDWORD(this, &ok);
-  if (!ok) {
-    setValid(false);
-    return;
-  }
-  seek(2, Current);
-
-  std::shared_ptr<FilePrivate::FilePropertiesObject> filePropertiesObject;
-  std::shared_ptr<FilePrivate::StreamPropertiesObject> streamPropertiesObject;
-  for (int i = 0; i < numObjects; i++) {
-    const ByteVector guid = readBlock(16);
-    if (guid.size() != 16) {
-      setValid(false);
-      break;
-    }
-    long size = static_cast<long>(readQWORD(this, &ok));
-    if (!ok) {
-      setValid(false);
-      break;
-    }
-    std::shared_ptr<FilePrivate::BaseObject> obj;
-    if (guid == filePropertiesGuid) {
-      filePropertiesObject.reset(new FilePrivate::FilePropertiesObject());
-      obj = filePropertiesObject;
-    }
-    else if (guid == streamPropertiesGuid) {
-      streamPropertiesObject.reset(new FilePrivate::StreamPropertiesObject());
-      obj = streamPropertiesObject;
-    }
-    else if (guid == contentDescriptionGuid) {
-      d->contentDescriptionObject.reset(new FilePrivate::ContentDescriptionObject());
-      obj = d->contentDescriptionObject;
-    }
-    else if (guid == extendedContentDescriptionGuid) {
-      d->extendedContentDescriptionObject.reset(new FilePrivate::ExtendedContentDescriptionObject());
-      obj = d->extendedContentDescriptionObject;
-    }
-    else if (guid == headerExtensionGuid) {
-      d->headerExtensionObject.reset(new FilePrivate::HeaderExtensionObject());
-      obj = d->headerExtensionObject;
-    }
-    else if (guid == codecListGuid) {
-      obj.reset(new FilePrivate::CodecListObject());
-    }
-    else {
-      if (guid == contentEncryptionGuid ||
-        guid == extendedContentEncryptionGuid ||
-        guid == advancedContentEncryptionGuid) {
-        d->properties->setEncrypted(true);
-      }
-      obj.reset(new FilePrivate::UnknownObject(guid));
-    }
-    obj->parse(this, size);
-    d->objects.append(obj);
-  }
-
-  if (!filePropertiesObject || !streamPropertiesObject) {
-    debug("ASF::File::read(): Missing mandatory header objects.");
-    setValid(false);
-    return;
-  }
-
-}

3rdparty/taglib/asf/asffile.h

@@ -1,118 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2005-2007 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_ASFFILE_H
-#define TAGLIB_ASFFILE_H
-
-#include "tag.h"
-#include "tfile.h"
-#include "taglib_export.h"
-#include "asfproperties.h"
-#include "asftag.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-
-//! An implementation of ASF (WMA) metadata
-namespace ASF {
-
-/*!
- * This implements and provides an interface for ASF files to the
- * TagLib::Tag and TagLib::AudioProperties interfaces by way of implementing
- * the abstract TagLib::File API as well as providing some additional
- * information specific to ASF files.
- */
-class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File {
- public:
-  /*!
-   * Constructs an ASF file from \a file.
-   *
-   * \note In the current implementation, both \a readProperties and
-   * \a propertiesStyle are ignored.  The audio properties are always
-   * read.
-   */
-  explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
-
-  /*!
-   * Constructs an ASF file from \a stream.
-   *
-   * \note In the current implementation, both \a readProperties and
-   * \a propertiesStyle are ignored.  The audio properties are always
-   * read.
-   *
-   * \note TagLib will *not* take ownership of the stream, the caller is
-   * responsible for deleting it after the File object.
-   */
-  explicit File(IOStream *stream, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
-
-  /*!
-   * Destroys this instance of the File.
-   */
-  ~File() override;
-
-  /*!
-   * Returns a pointer to the ASF tag of the file.
-   *
-   * ASF::Tag implements the tag interface, so this serves as the
-   * reimplementation of TagLib::File::tag().
-   *
-   * \note The Tag <b>is still</b> owned by the ASF::File and should not be
-   * deleted by the user.  It will be deleted when the file (object) is
-   * destroyed.
-   */
-  Tag *tag() const override;
-
-  /*!
-   * Returns the ASF audio properties for this file.
-   */
-  AudioProperties *audioProperties() const override;
-
-  /*!
-   * Save the file.
-   *
-   * This returns true if the save was successful.
-   */
-  bool save() override;
-
-  /*!
-   * Returns whether or not the given \a stream can be opened as an ASF file.
-   *
-   * \note This method is designed to do a quick check.  The result may not necessarily be correct.
-   */
-  static bool isSupported(IOStream *stream);
-
- private:
-  void read();
-
-  class FilePrivate;
-  FilePrivate *d;
-};
-
-}  // namespace ASF
-
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/asf/asfpicture.cpp

@@ -1,168 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2010 by Anton Sergunov
-    email                : setosha@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include <memory>
-
-#include "taglib.h"
-#include "tdebug.h"
-
-#include "asfattribute.h"
-#include "asffile.h"
-#include "asfpicture.h"
-#include "asfutils.h"
-
-using namespace Strawberry_TagLib::TagLib;
-
-namespace {
-struct PictureData {
-  bool valid;
-  ASF::Picture::Type type;
-  String mimeType;
-  String description;
-  ByteVector picture;
-};
-}  // namespace
-
-class ASF::Picture::PicturePrivate {
- public:
-  explicit PicturePrivate() : data(new PictureData()) {}
-
-  std::shared_ptr<PictureData> data;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// Picture class members
-////////////////////////////////////////////////////////////////////////////////
-
-ASF::Picture::Picture() : d(new PicturePrivate()) {
-  d->data->valid = true;
-}
-
-ASF::Picture::Picture(const Picture& other) : d(new PicturePrivate(*other.d)) {}
-
-ASF::Picture::~Picture() {
-  delete d;
-}
-
-bool ASF::Picture::isValid() const {
-  return d->data->valid;
-}
-
-String ASF::Picture::mimeType() const {
-  return d->data->mimeType;
-}
-
-void ASF::Picture::setMimeType(const String& value) {
-  d->data->mimeType = value;
-}
-
-ASF::Picture::Type ASF::Picture::type() const {
-  return d->data->type;
-}
-
-void ASF::Picture::setType(const ASF::Picture::Type &t) {
-  d->data->type = t;
-}
-
-String ASF::Picture::description() const {
-  return d->data->description;
-}
-
-void ASF::Picture::setDescription(const String& desc) {
-  d->data->description = desc;
-}
-
-ByteVector ASF::Picture::picture() const {
-  return d->data->picture;
-}
-
-void ASF::Picture::setPicture(const ByteVector &p) {
-  d->data->picture = p;
-}
-
-int ASF::Picture::dataSize() const {
-  return 9 + (d->data->mimeType.length() + d->data->description.length()) * 2 + d->data->picture.size();
-}
-
-ASF::Picture& ASF::Picture::operator=(const ASF::Picture& other) {
-  Picture(other).swap(*this);
-  return *this;
-}
-
-void ASF::Picture::swap(Picture& other) {
-  using std::swap;
-
-  swap(d, other.d);
-}
-
-ByteVector ASF::Picture::render() const {
-
-  if (!isValid())
-    return ByteVector();
-
-  return ByteVector(static_cast<char>(d->data->type)) + ByteVector::fromUInt32LE(d->data->picture.size()) + renderString(d->data->mimeType) + renderString(d->data->description) + d->data->picture;
-
-}
-
-void ASF::Picture::parse(const ByteVector &bytes) {
-
-  d->data->valid = false;
-  if (bytes.size() < 9)
-    return;
-  size_t pos = 0;
-  d->data->type = static_cast<Type>(bytes[0]);
-  ++pos;
-  const unsigned int dataLen = bytes.toUInt32LE(pos);
-  pos += 4;
-
-  const ByteVector nullStringTerminator(2, 0);
-
-  size_t endPos = bytes.find(nullStringTerminator, pos, 2);
-  if (endPos == ByteVector::npos())
-    return;
-  d->data->mimeType = String(bytes.mid(pos, endPos - pos), String::UTF16LE);
-  pos = endPos + 2;
-
-  endPos = bytes.find(nullStringTerminator, pos, 2);
-  if (endPos == ByteVector::npos())
-    return;
-  d->data->description = String(bytes.mid(pos, endPos - pos), String::UTF16LE);
-  pos = endPos + 2;
-
-  if (dataLen + pos != bytes.size())
-    return;
-
-  d->data->picture = bytes.mid(pos, dataLen);
-  d->data->valid = true;
-
-}
-
-ASF::Picture ASF::Picture::fromInvalid() {
-
-  Picture ret;
-  ret.d->data->valid = false;
-  return ret;
-
-}

3rdparty/taglib/asf/asfpicture.h

@@ -1,218 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2010 by Anton Sergunov
-    email                : setosha@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef ASFPICTURE_H
-#define ASFPICTURE_H
-
-#include "tstring.h"
-#include "tbytevector.h"
-#include "taglib_export.h"
-#include "attachedpictureframe.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-namespace ASF {
-class Attribute;
-
-//! An ASF attached picture interface implementation
-
-/*!
- * This is an implementation of ASF attached pictures interface.
- * Pictures may be included in attributes, one per WM/Picture attribute (but there may be multiple WM/Picture attribute in a single tag).
- * These pictures are usually in either JPEG or PNG format.
- * \see Attribute::toPicture()
- * \see Attribute::Attribute(const Picture& picture)
- */
-class TAGLIB_EXPORT Picture {
- public:
-  /*!
-   * This describes the function or content of the picture.
-   */
-  enum Type {
-    //! A type not enumerated below
-    Other = 0x00,
-    //! 32x32 PNG image that should be used as the file icon
-    FileIcon = 0x01,
-    //! File icon of a different size or format
-    OtherFileIcon = 0x02,
-    //! Front cover image of the album
-    FrontCover = 0x03,
-    //! Back cover image of the album
-    BackCover = 0x04,
-    //! Inside leaflet page of the album
-    LeafletPage = 0x05,
-    //! Image from the album itself
-    Media = 0x06,
-    //! Picture of the lead artist or soloist
-    LeadArtist = 0x07,
-    //! Picture of the artist or performer
-    Artist = 0x08,
-    //! Picture of the conductor
-    Conductor = 0x09,
-    //! Picture of the band or orchestra
-    Band = 0x0A,
-    //! Picture of the composer
-    Composer = 0x0B,
-    //! Picture of the lyricist or text writer
-    Lyricist = 0x0C,
-    //! Picture of the recording location or studio
-    RecordingLocation = 0x0D,
-    //! Picture of the artists during recording
-    DuringRecording = 0x0E,
-    //! Picture of the artists during performance
-    DuringPerformance = 0x0F,
-    //! Picture from a movie or video related to the track
-    MovieScreenCapture = 0x10,
-    //! Picture of a large, coloured fish
-    ColouredFish = 0x11,
-    //! Illustration related to the track
-    Illustration = 0x12,
-    //! Logo of the band or performer
-    BandLogo = 0x13,
-    //! Logo of the publisher (record company)
-    PublisherLogo = 0x14
-  };
-
-  /*!
-   * Constructs an empty picture.
-   */
-  explicit Picture();
-
-  /*!
-   * Construct an picture as a copy of \a other.
-   */
-  Picture(const Picture& other);
-
-  /*!
-   * Destroys the picture.
-   */
-  virtual ~Picture();
-
-  /*!
-   * Copies the contents of \a other into this picture.
-   */
-  Picture& operator=(const Picture& other);
-
-  /*!
-   * Exchanges the content of the Picture by the content of \a other.
-   */
-  void swap(Picture& other);
-
-  /*!
-   * Returns true if Picture stores valid picture
-   */
-  bool isValid() const;
-
-  /*!
-   * Returns the mime type of the image. This should in most cases be "image/png" or "image/jpeg".
-   * \see setMimeType(const String &)
-   * \see picture()
-   * \see setPicture(const ByteArray&)
-   */
-  String mimeType() const;
-
-  /*!
-   * Sets the mime type of the image.  This should in most cases be "image/png" or "image/jpeg".
-   * \see setMimeType(const String &)
-   * \see picture()
-   * \see setPicture(const ByteArray&)
-   */
-  void setMimeType(const String& value);
-
-  /*!
-   * Returns the type of the image.
-   *
-   * \see Type
-   * \see setType()
-   */
-  Type type() const;
-
-  /*!
-   * Sets the type for the image.
-   *
-   * \see Type
-   * \see type()
-   */
-  void setType(const ASF::Picture::Type& t);
-
-  /*!
-   * Returns a text description of the image.
-   *
-   * \see setDescription()
-   */
-  String description() const;
-
-  /*!
-   * Sets a textual description of the image to \a desc.
-   *
-   * \see description()
-   */
-  void setDescription(const String& desc);
-
-  /*!
-   * Returns the image data as a ByteVector.
-   *
-   * \note ByteVector has a data() method that returns a const char * which should make it easy to export this data to external programs.
-   *
-   * \see setPicture()
-   * \see mimeType()
-   */
-  ByteVector picture() const;
-
-  /*!
-   * Sets the image data to \a p.
-   * \a p should be of the type specified in this frame's mime-type specification.
-   *
-   * \see picture()
-   * \see mimeType()
-   * \see setMimeType()
-   */
-  void setPicture(const ByteVector& p);
-
-  /*!
-   * Returns picture as binary raw data \a value
-   */
-  ByteVector render() const;
-
-  /*!
-   * Returns picture as binary raw data \a value
-   */
-  int dataSize() const;
-
- private:
-  friend class Attribute;
-
-  void parse(const ByteVector&);
-  static Picture fromInvalid();
-
- private:
-  class PicturePrivate;
-  PicturePrivate* d;
-};
-}  // namespace ASF
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif  // ASFPICTURE_H

3rdparty/taglib/asf/asfproperties.cpp

@@ -1,160 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2005-2007 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include "tdebug.h"
-#include "tstring.h"
-#include "asfproperties.h"
-
-using namespace Strawberry_TagLib::TagLib;
-
-class ASF::AudioProperties::AudioPropertiesPrivate {
- public:
-  explicit AudioPropertiesPrivate() : length(0),
-                                       bitrate(0),
-                                       sampleRate(0),
-                                       channels(0),
-                                       bitsPerSample(0),
-                                       codec(ASF::AudioProperties::Unknown),
-                                       encrypted(false) {}
-
-  int length;
-  int bitrate;
-  int sampleRate;
-  int channels;
-  int bitsPerSample;
-  ASF::AudioProperties::Codec codec;
-  String codecName;
-  String codecDescription;
-  bool encrypted;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-ASF::AudioProperties::AudioProperties() : Strawberry_TagLib::TagLib::AudioProperties(), d(new AudioPropertiesPrivate()) {
-}
-
-ASF::AudioProperties::~AudioProperties() {
-  delete d;
-}
-
-int ASF::AudioProperties::lengthInSeconds() const {
-  return d->length / 1000;
-}
-
-int ASF::AudioProperties::lengthInMilliseconds() const {
-  return d->length;
-}
-
-int ASF::AudioProperties::bitrate() const {
-  return d->bitrate;
-}
-
-int ASF::AudioProperties::sampleRate() const {
-  return d->sampleRate;
-}
-
-int ASF::AudioProperties::channels() const {
-  return d->channels;
-}
-
-int ASF::AudioProperties::bitsPerSample() const {
-  return d->bitsPerSample;
-}
-
-ASF::AudioProperties::Codec ASF::AudioProperties::codec() const {
-  return d->codec;
-}
-
-String ASF::AudioProperties::codecName() const {
-  return d->codecName;
-}
-
-String ASF::AudioProperties::codecDescription() const {
-  return d->codecDescription;
-}
-
-bool ASF::AudioProperties::isEncrypted() const {
-  return d->encrypted;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// private members
-////////////////////////////////////////////////////////////////////////////////
-
-void ASF::AudioProperties::setLengthInMilliseconds(int value) {
-  d->length = value;
-}
-
-void ASF::AudioProperties::setBitrate(int value) {
-  d->bitrate = value;
-}
-
-void ASF::AudioProperties::setSampleRate(int value) {
-  d->sampleRate = value;
-}
-
-void ASF::AudioProperties::setChannels(int value) {
-  d->channels = value;
-}
-
-void ASF::AudioProperties::setBitsPerSample(int value) {
-  d->bitsPerSample = value;
-}
-
-void ASF::AudioProperties::setCodec(int value) {
-
-  switch (value) {
-    case 0x0160:
-      d->codec = WMA1;
-      break;
-    case 0x0161:
-      d->codec = WMA2;
-      break;
-    case 0x0162:
-      d->codec = WMA9Pro;
-      break;
-    case 0x0163:
-      d->codec = WMA9Lossless;
-      break;
-    default:
-      d->codec = Unknown;
-      break;
-  }
-
-}
-
-void ASF::AudioProperties::setCodecName(const String &value) {
-  d->codecName = value;
-}
-
-void ASF::AudioProperties::setCodecDescription(const String &value) {
-  d->codecDescription = value;
-}
-
-void ASF::AudioProperties::setEncrypted(bool value) {
-  d->encrypted = value;
-}

3rdparty/taglib/asf/asfproperties.h

@@ -1,168 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2005-2007 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_ASFPROPERTIES_H
-#define TAGLIB_ASFPROPERTIES_H
-
-#include "audioproperties.h"
-#include "tstring.h"
-#include "taglib_export.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-namespace ASF {
-
-//! An implementation of ASF audio properties
-class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
-  friend class File;
-
- public:
-  /*!
-   * Audio codec types can be used in ASF file.
-   */
-  enum Codec {
-    /*!
-     * Couldn't detect the codec.
-     */
-    Unknown = 0,
-
-    /*!
-     * Windows Media Audio 1
-     */
-    WMA1,
-
-    /*!
-     * Windows Media Audio 2 or above
-     */
-    WMA2,
-
-    /*!
-     * Windows Media Audio 9 Professional
-     */
-    WMA9Pro,
-
-    /*!
-     * Windows Media Audio 9 Lossless
-     */
-    WMA9Lossless,
-  };
-
-  /*!
-   * Creates an instance of ASF::Properties.
-   */
-  explicit AudioProperties();
-
-  /*!
-   * Destroys this ASF::AudioProperties instance.
-   */
-  ~AudioProperties() override;
-
-  /*!
-   * Returns the length of the file in seconds.  The length is rounded down to
-   * the nearest whole second.
-   *
-   * \see lengthInMilliseconds()
-   */
-  int lengthInSeconds() const override;
-
-  /*!
-   * Returns the length of the file in milliseconds.
-   *
-   * \see lengthInSeconds()
-   */
-  int lengthInMilliseconds() const override;
-
-  /*!
-   * Returns the average bit rate of the file in kb/s.
-   */
-  int bitrate() const override;
-
-  /*!
-   * Returns the sample rate in Hz.
-   */
-  int sampleRate() const override;
-
-  /*!
-   * Returns the number of audio channels.
-   */
-  int channels() const override;
-
-  /*!
-   * Returns the number of bits per audio sample.
-   */
-  int bitsPerSample() const;
-
-  /*!
-   * Returns the codec used in the file.
-   *
-   * \see codecName()
-   * \see codecDescription()
-   */
-  Codec codec() const;
-
-  /*!
-   * Returns the concrete codec name, for example "Windows Media Audio 9.1" used in the file if available, otherwise an empty string.
-   *
-   * \see codec()
-   * \see codecDescription()
-   */
-  String codecName() const;
-
-  /*!
-   * Returns the codec description, typically contains the encoder settings,
-   * for example "VBR Quality 50, 44kHz, stereo 1-pass VBR" if available, otherwise an empty string.
-   *
-   * \see codec()
-   * \see codecName()
-   */
-  String codecDescription() const;
-
-  /*!
-   * Returns whether or not the file is encrypted.
-   */
-  bool isEncrypted() const;
-
- private:
-  void setLengthInMilliseconds(int value);
-  void setBitrate(int value);
-  void setSampleRate(int value);
-  void setChannels(int value);
-  void setBitsPerSample(int value);
-  void setCodec(int value);
-  void setCodecName(const String &value);
-  void setCodecDescription(const String &value);
-  void setEncrypted(bool value);
-
- private:
-  class AudioPropertiesPrivate;
-  AudioPropertiesPrivate *d;
-};
-
-}  // namespace ASF
-
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/asf/asftag.cpp

@@ -1,522 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2005-2007 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include "tpicturemap.h"
-#include "tpropertymap.h"
-#include "asftag.h"
-
-using namespace Strawberry_TagLib::TagLib;
-
-class ASF::Tag::TagPrivate {
- public:
-  String title;
-  String artist;
-  String copyright;
-  String comment;
-  String rating;
-  AttributeListMap attributeListMap;
-};
-
-ASF::Tag::Tag() : d(new TagPrivate()) {}
-
-ASF::Tag::~Tag() {
-  delete d;
-}
-
-String ASF::Tag::title() const {
-  return d->title;
-}
-
-String ASF::Tag::artist() const {
-  return d->artist;
-}
-
-String ASF::Tag::album() const {
-
-  if (d->attributeListMap.contains("WM/AlbumTitle"))
-    return d->attributeListMap["WM/AlbumTitle"][0].toString();
-  return String();
-
-}
-
-String ASF::Tag::copyright() const {
-  return d->copyright;
-}
-
-String ASF::Tag::comment() const {
-  return d->comment;
-}
-
-String ASF::Tag::rating() const {
-  return d->rating;
-}
-
-unsigned int ASF::Tag::year() const {
-
-  if (d->attributeListMap.contains("WM/Year"))
-    return d->attributeListMap["WM/Year"][0].toString().toInt();
-  return 0;
-
-}
-
-unsigned int ASF::Tag::track() const {
-
-  if (d->attributeListMap.contains("WM/TrackNumber")) {
-    const ASF::Attribute attr = d->attributeListMap["WM/TrackNumber"][0];
-    if (attr.type() == ASF::Attribute::DWordType)
-      return attr.toUInt();
-    else
-      return attr.toString().toInt();
-  }
-  if (d->attributeListMap.contains("WM/Track"))
-    return d->attributeListMap["WM/Track"][0].toUInt();
-  return 0;
-
-}
-
-String ASF::Tag::genre() const {
-
-  if (d->attributeListMap.contains("WM/Genre"))
-    return d->attributeListMap["WM/Genre"][0].toString();
-  return String();
-
-}
-
-PictureMap ASF::Tag::pictures() const {
-
-  PictureMap map;
-  if (d->attributeListMap.contains("WM/Picture")) {
-    AttributeList list = d->attributeListMap["WM/Picture"];
-    for (AttributeList::ConstIterator it = list.begin(); it != list.end(); ++it) {
-      ASF::Picture asfPicture = (*it).toPicture();
-      TagLib::Picture::Type type;
-      switch (asfPicture.type()) {
-        case ASF::Picture::FileIcon:
-          type = TagLib::Picture::FileIcon;
-          break;
-        case ASF::Picture::OtherFileIcon:
-          type = TagLib::Picture::OtherFileIcon;
-          break;
-        case ASF::Picture::FrontCover:
-          type = TagLib::Picture::FrontCover;
-          break;
-        case ASF::Picture::BackCover:
-          type = TagLib::Picture::BackCover;
-          break;
-        case ASF::Picture::LeafletPage:
-          type = TagLib::Picture::LeafletPage;
-          break;
-        case ASF::Picture::Media:
-          type = TagLib::Picture::Media;
-          break;
-        case ASF::Picture::LeadArtist:
-          type = TagLib::Picture::LeadArtist;
-          break;
-        case ASF::Picture::Artist:
-          type = TagLib::Picture::Artist;
-          break;
-        case ASF::Picture::Conductor:
-          type = TagLib::Picture::Conductor;
-          break;
-        case ASF::Picture::Band:
-          type = TagLib::Picture::Band;
-          break;
-        case ASF::Picture::Composer:
-          type = TagLib::Picture::Composer;
-          break;
-        case ASF::Picture::Lyricist:
-          type = TagLib::Picture::Lyricist;
-          break;
-        case ASF::Picture::RecordingLocation:
-          type = TagLib::Picture::RecordingLocation;
-          break;
-        case ASF::Picture::DuringRecording:
-          type = TagLib::Picture::DuringRecording;
-          break;
-        case ASF::Picture::DuringPerformance:
-          type = TagLib::Picture::DuringPerformance;
-          break;
-        case ASF::Picture::MovieScreenCapture:
-          type = TagLib::Picture::MovieScreenCapture;
-          break;
-        case ASF::Picture::ColouredFish:
-          type = TagLib::Picture::ColouredFish;
-          break;
-        case ASF::Picture::Illustration:
-          type = TagLib::Picture::Illustration;
-          break;
-        case ASF::Picture::BandLogo:
-          type = TagLib::Picture::BandLogo;
-          break;
-        case ASF::Picture::PublisherLogo:
-          type = TagLib::Picture::PublisherLogo;
-          break;
-        default:
-          type = TagLib::Picture::Other;
-          break;
-      }
-      TagLib::Picture picture(asfPicture.picture(), type, asfPicture.mimeType(), asfPicture.description());
-      map.insert(picture);
-    }
-  }
-  return PictureMap(map);
-
-}
-
-void ASF::Tag::setTitle(const String &value) {
-  d->title = value;
-}
-
-void ASF::Tag::setArtist(const String &value) {
-  d->artist = value;
-}
-
-void ASF::Tag::setCopyright(const String &value) {
-  d->copyright = value;
-}
-
-void ASF::Tag::setComment(const String &value) {
-  d->comment = value;
-}
-
-void ASF::Tag::setRating(const String &value) {
-  d->rating = value;
-}
-
-void ASF::Tag::setAlbum(const String &value) {
-  setAttribute("WM/AlbumTitle", value);
-}
-
-void ASF::Tag::setGenre(const String &value) {
-  setAttribute("WM/Genre", value);
-}
-
-void ASF::Tag::setYear(unsigned int value) {
-  setAttribute("WM/Year", String::number(value));
-}
-
-void ASF::Tag::setTrack(unsigned int value) {
-  setAttribute("WM/TrackNumber", String::number(value));
-}
-
-void ASF::Tag::setPictures(const PictureMap &l) {
-
-  removeItem("WM/Picture");
-  for (PictureMap::ConstIterator pictureMapIt = l.begin(); pictureMapIt != l.end(); ++pictureMapIt) {
-    PictureList list = pictureMapIt->second;
-    for (PictureList::ConstIterator pictureListIt = list.begin(); pictureListIt != list.end(); ++pictureListIt) {
-      const TagLib::Picture picture = (*pictureListIt);
-      ASF::Picture asfPicture;
-      asfPicture.setPicture(picture.data());
-      asfPicture.setMimeType(picture.mime());
-      asfPicture.setDescription(picture.description());
-      switch (picture.type()) {
-        case TagLib::Picture::Other:
-          asfPicture.setType(ASF::Picture::Other);
-          break;
-        case TagLib::Picture::FileIcon:
-          asfPicture.setType(ASF::Picture::FileIcon);
-          break;
-        case TagLib::Picture::OtherFileIcon:
-          asfPicture.setType(ASF::Picture::OtherFileIcon);
-          break;
-        case TagLib::Picture::FrontCover:
-          asfPicture.setType(ASF::Picture::FrontCover);
-          break;
-        case TagLib::Picture::BackCover:
-          asfPicture.setType(ASF::Picture::BackCover);
-          break;
-        case TagLib::Picture::LeafletPage:
-          asfPicture.setType(ASF::Picture::LeafletPage);
-          break;
-        case TagLib::Picture::Media:
-          asfPicture.setType(ASF::Picture::Media);
-          break;
-        case TagLib::Picture::LeadArtist:
-          asfPicture.setType(ASF::Picture::LeadArtist);
-          break;
-        case TagLib::Picture::Artist:
-          asfPicture.setType(ASF::Picture::Artist);
-          break;
-        case TagLib::Picture::Conductor:
-          asfPicture.setType(ASF::Picture::Conductor);
-          break;
-        case TagLib::Picture::Band:
-          asfPicture.setType(ASF::Picture::Band);
-          break;
-        case TagLib::Picture::Composer:
-          asfPicture.setType(ASF::Picture::Composer);
-          break;
-        case TagLib::Picture::Lyricist:
-          asfPicture.setType(ASF::Picture::Lyricist);
-          break;
-        case TagLib::Picture::RecordingLocation:
-          asfPicture.setType(ASF::Picture::RecordingLocation);
-          break;
-        case TagLib::Picture::DuringRecording:
-          asfPicture.setType(ASF::Picture::DuringRecording);
-          break;
-        case TagLib::Picture::DuringPerformance:
-          asfPicture.setType(ASF::Picture::DuringPerformance);
-          break;
-        case TagLib::Picture::MovieScreenCapture:
-          asfPicture.setType(ASF::Picture::MovieScreenCapture);
-          break;
-        case TagLib::Picture::ColouredFish:
-          asfPicture.setType(ASF::Picture::ColouredFish);
-          break;
-        case TagLib::Picture::Illustration:
-          asfPicture.setType(ASF::Picture::Illustration);
-          break;
-        case TagLib::Picture::BandLogo:
-          asfPicture.setType(ASF::Picture::BandLogo);
-          break;
-        case TagLib::Picture::PublisherLogo:
-          asfPicture.setType(ASF::Picture::PublisherLogo);
-          break;
-      }
-      addAttribute("WM/Picture", Attribute(asfPicture));
-    }
-  }
-
-}
-
-const ASF::AttributeListMap &ASF::Tag::attributeListMap() const {
-  return d->attributeListMap;
-}
-
-bool ASF::Tag::contains(const String &key) const {
-  return d->attributeListMap.contains(key);
-}
-
-void ASF::Tag::removeItem(const String &key) {
-  d->attributeListMap.erase(key);
-}
-
-ASF::AttributeList ASF::Tag::attribute(const String &name) const {
-  return d->attributeListMap[name];
-}
-
-void ASF::Tag::setAttribute(const String &name, const Attribute &attribute) {
-
-  AttributeList value;
-  value.append(attribute);
-  d->attributeListMap.insert(name, value);
-
-}
-
-void ASF::Tag::setAttribute(const String &name, const AttributeList &values) {
-  d->attributeListMap.insert(name, values);
-}
-
-void ASF::Tag::addAttribute(const String &name, const Attribute &attribute) {
-
-  if (d->attributeListMap.contains(name)) {
-    d->attributeListMap[name].append(attribute);
-  }
-  else {
-    setAttribute(name, attribute);
-  }
-
-}
-
-bool ASF::Tag::isEmpty() const {
-
-  return Strawberry_TagLib::TagLib::Tag::isEmpty() &&
-    copyright().isEmpty() &&
-    rating().isEmpty() &&
-    d->attributeListMap.isEmpty();
-
-}
-
-namespace {
-const char *keyTranslation[][2] = {
-  { "WM/AlbumTitle", "ALBUM" },
-  { "WM/AlbumArtist", "ALBUMARTIST" },
-  { "WM/Composer", "COMPOSER" },
-  { "WM/Writer", "WRITER" },
-  { "WM/Conductor", "CONDUCTOR" },
-  { "WM/ModifiedBy", "REMIXER" },
-  { "WM/Year", "DATE" },
-  { "WM/OriginalReleaseYear", "ORIGINALDATE" },
-  { "WM/Producer", "PRODUCER" },
-  { "WM/ContentGroupDescription", "GROUPING" },
-  { "WM/SubTitle", "SUBTITLE" },
-  { "WM/SetSubTitle", "DISCSUBTITLE" },
-  { "WM/TrackNumber", "TRACKNUMBER" },
-  { "WM/PartOfSet", "DISCNUMBER" },
-  { "WM/Genre", "GENRE" },
-  { "WM/BeatsPerMinute", "BPM" },
-  { "WM/Mood", "MOOD" },
-  { "WM/ISRC", "ISRC" },
-  { "WM/Lyrics", "LYRICS" },
-  { "WM/Media", "MEDIA" },
-  { "WM/Publisher", "LABEL" },
-  { "WM/CatalogNo", "CATALOGNUMBER" },
-  { "WM/Barcode", "BARCODE" },
-  { "WM/EncodedBy", "ENCODEDBY" },
-  { "WM/AlbumSortOrder", "ALBUMSORT" },
-  { "WM/AlbumArtistSortOrder", "ALBUMARTISTSORT" },
-  { "WM/ArtistSortOrder", "ARTISTSORT" },
-  { "WM/TitleSortOrder", "TITLESORT" },
-  { "WM/Script", "SCRIPT" },
-  { "WM/Language", "LANGUAGE" },
-  { "MusicBrainz/Track Id", "MUSICBRAINZ_TRACKID" },
-  { "MusicBrainz/Artist Id", "MUSICBRAINZ_ARTISTID" },
-  { "MusicBrainz/Album Id", "MUSICBRAINZ_ALBUMID" },
-  { "MusicBrainz/Album Artist Id", "MUSICBRAINZ_ALBUMARTISTID" },
-  { "MusicBrainz/Release Group Id", "MUSICBRAINZ_RELEASEGROUPID" },
-  { "MusicBrainz/Work Id", "MUSICBRAINZ_WORKID" },
-  { "MusicIP/PUID", "MUSICIP_PUID" },
-  { "Acoustid/Id", "ACOUSTID_ID" },
-  { "Acoustid/Fingerprint", "ACOUSTID_FINGERPRINT" },
-};
-const size_t keyTranslationSize = sizeof(keyTranslation) / sizeof(keyTranslation[0]);
-
-String translateKey(const String &key) {
-
-  for (size_t i = 0; i < keyTranslationSize; ++i) {
-    if (key == keyTranslation[i][0])
-      return keyTranslation[i][1];
-  }
-
-  return String();
-
-}
-}  // namespace
-
-PropertyMap ASF::Tag::properties() const {
-
-  PropertyMap props;
-
-  if (!d->title.isEmpty()) {
-    props["TITLE"] = d->title;
-  }
-  if (!d->artist.isEmpty()) {
-    props["ARTIST"] = d->artist;
-  }
-  if (!d->copyright.isEmpty()) {
-    props["COPYRIGHT"] = d->copyright;
-  }
-  if (!d->comment.isEmpty()) {
-    props["COMMENT"] = d->comment;
-  }
-
-  ASF::AttributeListMap::ConstIterator it = d->attributeListMap.begin();
-  for (; it != d->attributeListMap.end(); ++it) {
-    const String key = translateKey(it->first);
-    if (!key.isEmpty()) {
-      AttributeList::ConstIterator it2 = it->second.begin();
-      for (; it2 != it->second.end(); ++it2) {
-        if (key == "TRACKNUMBER") {
-          if (it2->type() == ASF::Attribute::DWordType)
-            props.insert(key, String::number(it2->toUInt()));
-          else
-            props.insert(key, it2->toString());
-        }
-        else {
-          props.insert(key, it2->toString());
-        }
-      }
-    }
-    else {
-      props.unsupportedData().append(it->first);
-    }
-  }
-  return props;
-
-}
-
-void ASF::Tag::removeUnsupportedProperties(const StringList &props) {
-
-  StringList::ConstIterator it = props.begin();
-  for (; it != props.end(); ++it)
-    d->attributeListMap.erase(*it);
-
-}
-
-PropertyMap ASF::Tag::setProperties(const PropertyMap &props) {
-
-  static Map<String, String> reverseKeyMap;
-  if (reverseKeyMap.isEmpty()) {
-    int numKeys = sizeof(keyTranslation) / sizeof(keyTranslation[0]);
-    for (int i = 0; i < numKeys; i++) {
-      reverseKeyMap[keyTranslation[i][1]] = keyTranslation[i][0];
-    }
-  }
-
-  PropertyMap origProps = properties();
-  PropertyMap::ConstIterator it = origProps.begin();
-  for (; it != origProps.end(); ++it) {
-    if (!props.contains(it->first) || props[it->first].isEmpty()) {
-      if (it->first == "TITLE") {
-        d->title.clear();
-      }
-      else if (it->first == "ARTIST") {
-        d->artist.clear();
-      }
-      else if (it->first == "COMMENT") {
-        d->comment.clear();
-      }
-      else if (it->first == "COPYRIGHT") {
-        d->copyright.clear();
-      }
-      else {
-        d->attributeListMap.erase(reverseKeyMap[it->first]);
-      }
-    }
-  }
-
-  PropertyMap ignoredProps;
-  it = props.begin();
-  for (; it != props.end(); ++it) {
-    if (reverseKeyMap.contains(it->first)) {
-      String name = reverseKeyMap[it->first];
-      removeItem(name);
-      StringList::ConstIterator it2 = it->second.begin();
-      for (; it2 != it->second.end(); ++it2) {
-        addAttribute(name, *it2);
-      }
-    }
-    else if (it->first == "TITLE") {
-      d->title = it->second.toString();
-    }
-    else if (it->first == "ARTIST") {
-      d->artist = it->second.toString();
-    }
-    else if (it->first == "COMMENT") {
-      d->comment = it->second.toString();
-    }
-    else if (it->first == "COPYRIGHT") {
-      d->copyright = it->second.toString();
-    }
-    else {
-      ignoredProps.insert(it->first, it->second);
-    }
-  }
-
-  return ignoredProps;
-
-}

3rdparty/taglib/asf/asftag.h

@@ -1,201 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2005-2007 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_ASFTAG_H
-#define TAGLIB_ASFTAG_H
-
-#include "tag.h"
-#include "tlist.h"
-#include "tmap.h"
-#include "taglib_export.h"
-#include "asfattribute.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-
-namespace ASF {
-
-typedef List<Attribute> AttributeList;
-typedef Map<String, AttributeList> AttributeListMap;
-
-class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag {
-
-  friend class File;
-
- public:
-  explicit Tag();
-
-  ~Tag() override;
-
-  /*!
-   * Returns the track name.
-   */
-  String title() const override;
-
-  /*!
-   * Returns the artist name.
-   */
-  String artist() const override;
-
-  /*!
-   * Returns the album name; if no album name is present in the tag String::null will be returned.
-   */
-  String album() const override;
-
-  /*!
-   * Returns the track comment.
-   */
-  String comment() const override;
-
-  /*!
-   * Returns the genre name; if no genre is present in the tag String::null will be returned.
-   */
-  String genre() const override;
-
-  /*!
-   * Returns the rating.
-   */
-  virtual String rating() const;
-
-  /*!
-   * Returns the genre name; if no genre is present in the tag String::null will be returned.
-   */
-  virtual String copyright() const;
-
-  /*!
-   * Returns the year; if there is no year set, this will return 0.
-   */
-  unsigned int year() const override;
-
-  /*!
-   * Returns the track number; if there is no track number set, this will return 0.
-   */
-  unsigned int track() const override;
-
-  PictureMap pictures() const override;
-
-  /*!
-   * Sets the title to \a s.
-   */
-  void setTitle(const String &value) override;
-
-  /*!
-   * Sets the artist to \a s.
-   */
-  void setArtist(const String &value) override;
-
-  /*!
-   * Sets the album to \a s.  If \a s is String::null then this value will be cleared.
-   */
-  void setAlbum(const String &value) override;
-
-  /*!
-   * Sets the comment to \a s.
-   */
-  void setComment(const String &value) override;
-
-  /*!
-   * Sets the rating to \a s.
-   */
-  virtual void setRating(const String &value);
-
-  /*!
-   * Sets the copyright to \a s.
-   */
-  virtual void setCopyright(const String &value);
-
-  /*!
-   * Sets the genre to \a s.
-   */
-  void setGenre(const String &value) override;
-
-  /*!
-   * Sets the year to \a i.  If \a s is 0 then this value will be cleared.
-   */
-  void setYear(unsigned int value) override;
-
-  /*!
-   * Sets the track to \a i.  If \a s is 0 then this value will be cleared.
-   */
-  void setTrack(unsigned int value) override;
-
-  void setPictures(const PictureMap&) override;
-
-  /*!
-   * Returns true if the tag does not contain any data.
-   * This should be reimplemented in subclasses that provide more than the basic tagging abilities in this class.
-   */
-  bool isEmpty() const override;
-
-  /*!
-   * Returns a reference to the item list map.  This is an AttributeListMap of all of the items in the tag.
-   */
-  const AttributeListMap &attributeListMap() const;
-
-  /*!
-   * \return True if a value for \a attribute is currently set.
-   */
-  bool contains(const String &key) const;
-
-  /*!
-   * Removes the \a key attribute from the tag
-   */
-  void removeItem(const String &key);
-
-  /*!
-   * \return The list of values for the key \a name, or an empty list if no values have been set.
-   */
-  AttributeList attribute(const String &name) const;
-
-  /*!
-   * Sets the \a key attribute to the value of \a attribute. If an attribute with the \a key is already present, it will be replaced.
-   */
-  void setAttribute(const String &name, const Attribute &attribute);
-
-  /*!
-   * Sets multiple \a values to the key \a name.
-   */
-  void setAttribute(const String &name, const AttributeList &values);
-
-  /*!
-   * Sets the \a key attribute to the value of \a attribute. If an attribute
-   * with the \a key is already present, it will be added to the list.
-   */
-  void addAttribute(const String &name, const Attribute &attribute);
-
-  PropertyMap properties() const override;
-  void removeUnsupportedProperties(const StringList &props) override;
-  PropertyMap setProperties(const PropertyMap &props) override;
-
- private:
-  class TagPrivate;
-  TagPrivate *d;
-};
-
-}  // namespace ASF
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/asf/asfutils.h

@@ -1,100 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2015 by Tsuda Kageyu
-    email                : tsuda.kageyu@gmail.com
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_ASFUTILS_H
-#define TAGLIB_ASFUTILS_H
-
-// THIS FILE IS NOT A PART OF THE TAGLIB API
-
-#ifndef DO_NOT_DOCUMENT  // tell Doxygen not to document this header
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-namespace ASF {
-namespace {
-
-inline unsigned short readWORD(File *file, bool *ok = nullptr) {
-  const ByteVector v = file->readBlock(2);
-  if (v.size() != 2) {
-    if (ok) *ok = false;
-    return 0;
-  }
-  if (ok) *ok = true;
-  return v.toUInt16LE(0);
-}
-
-inline unsigned int readDWORD(File *file, bool *ok = nullptr) {
-  const ByteVector v = file->readBlock(4);
-  if (v.size() != 4) {
-    if (ok) *ok = false;
-    return 0;
-  }
-  if (ok) *ok = true;
-  return v.toUInt32LE(0);
-}
-
-inline long long readQWORD(File *file, bool *ok = nullptr) {
-  const ByteVector v = file->readBlock(8);
-  if (v.size() != 8) {
-    if (ok) *ok = false;
-    return 0;
-  }
-  if (ok) *ok = true;
-  return v.toInt64LE(0);
-}
-
-inline String readString(File *file, int length) {
-
-  ByteVector data = file->readBlock(length);
-  size_t size = data.size();
-  while (size >= 2) {
-    if (data[size - 1] != '\0' || data[size - 2] != '\0') {
-      break;
-    }
-    size -= 2;
-  }
-  if (size != data.size()) {
-    data.resize(size);
-  }
-  return String(data, String::UTF16LE);
-
-}
-
-inline ByteVector renderString(const String &str, bool includeLength = false) {
-  ByteVector data = str.data(String::UTF16LE) + ByteVector::fromUInt16LE(0);
-  if (includeLength) {
-    data = ByteVector::fromUInt16LE(data.size()) + data;
-  }
-  return data;
-}
-
-}  // namespace
-}  // namespace ASF
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif
-
-#endif

3rdparty/taglib/audioproperties.cpp

@@ -1,53 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2002 - 2008 by Scott Wheeler
-    email                : wheeler@kde.org
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include "tstringlist.h"
-
-#include "audioproperties.h"
-
-using namespace Strawberry_TagLib::TagLib;
-
-////////////////////////////////////////////////////////////////////////////////
-// public methods
-////////////////////////////////////////////////////////////////////////////////
-
-AudioProperties::~AudioProperties() {}
-
-
-String AudioProperties::toString() const {
-
-  StringList desc;
-  desc.append("Audio");
-  desc.append(String::number(lengthInSeconds()) + " seconds");
-  desc.append(String::number(bitrate()) + " kbps");
-  return desc.toString(", ");
-
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// protected methods
-////////////////////////////////////////////////////////////////////////////////
-
-AudioProperties::AudioProperties() : d(nullptr) {}

3rdparty/taglib/audioproperties.h

@@ -1,120 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2002 - 2008 by Scott Wheeler
-    email                : wheeler@kde.org
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_AUDIOPROPERTIES_H
-#define TAGLIB_AUDIOPROPERTIES_H
-
-#include "taglib_export.h"
-#include "tstring.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-
-//! A simple, abstract interface to common audio properties
-
-/*!
-   * The values here are common to most audio formats.
-   * For more specific, codec dependent values, please see see the subclasses APIs.
-   * This is meant to compliment the TagLib::File and TagLib::Tag APIs in providing a simple
-   * interface that is sufficient for most applications.
-   */
-
-class TAGLIB_EXPORT AudioProperties {
- public:
-  /*!
-   * Reading audio properties from a file can sometimes be very time consuming
-   * and for the most accurate results can often involve reading the entire file.
-   * Because in many situations speed is critical or the accuracy of the values
-   * is not particularly important this allows the level of desired accuracy to be set.
-   */
-  enum ReadStyle {
-    //! Read as little of the file as possible
-    Fast,
-    //! Read more of the file and make better values guesses
-    Average,
-    //! Read as much of the file as needed to report accurate values
-    Accurate
-  };
-
-  /*!
-   * Destroys this AudioProperties instance.
-   */
-  virtual ~AudioProperties();
-
-  /*!
-   * Returns the length of the file in seconds.  The length is rounded down to the nearest whole second.
-   *
-   * \see lengthInMilliseconds()
-   */
-  virtual int lengthInSeconds() const = 0;
-
-  /*!
-   * Returns the length of the file in milliseconds.
-   *
-   * \see lengthInSeconds()
-   */
-  virtual int lengthInMilliseconds() const = 0;
-
-  /*!
-   * Returns the most appropriate bit rate for the file in kb/s.  For constant bitrate formats this is simply the bitrate of the file.
-   * For variable bitrate formats this is either the average or nominal bitrate.
-   */
-  virtual int bitrate() const = 0;
-
-  /*!
-   * Returns the sample rate in Hz.
-   */
-  virtual int sampleRate() const = 0;
-
-  /*!
-   * Returns the number of audio channels.
-   */
-  virtual int channels() const = 0;
-
-  /*!
-   * Returns description of the audio file.
-   */
-  virtual String toString() const;
-
- protected:
-  /*!
-   * Construct an audio properties instance.
-   * This is protected as this class should not be instantiated directly,
-   * but should be instantiated via its subclasses and can be fetched from the FileRef or File APIs.
-   */
-  explicit AudioProperties();
-
- private:
-  AudioProperties(const AudioProperties&);
-  AudioProperties &operator=(const AudioProperties&);
-
-  class AudioPropertiesPrivate;
-  AudioPropertiesPrivate *d;
-};
-
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/dsdiff/dsdiffdiintag.cpp

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

3rdparty/taglib/dsdiff/dsdiffdiintag.h

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

3rdparty/taglib/dsdiff/dsdifffile.cpp

@@ -1,919 +0,0 @@
-/***************************************************************************
- copyright            : (C) 2016 by Damien Plisson, Audirvana
- email                : damien78@audirvana.com
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include <memory>
-#include <array>
-
-#include "tstring.h"
-#include "tbytevector.h"
-#include "tdebug.h"
-#include "id3v2tag.h"
-#include "tstringlist.h"
-#include "tpropertymap.h"
-#include "tagutils.h"
-
-#include "tagunion.h"
-#include "dsdifffile.h"
-
-using namespace 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
-};
-enum {
-  PROPChunk = 0,
-  DIINChunk = 1
-};
-}  // namespace
-
-class DSDIFF::File::FilePrivate {
- public:
-  FilePrivate() : endianness(BigEndian),
-                  size(0),
-                  isID3InPropChunk(false),
-                  duplicateID3V2chunkIndex(-1),
-                  id3v2TagChunkID("ID3 "),
-                  hasID3v2(false),
-                  hasDiin(false) {
-    childChunkIndex[ID3v2Index] = -1;
-    childChunkIndex[DIINIndex] = -1;
-  }
-
-  Endianness endianness;
-  ByteVector type;
-  unsigned long long size;
-  ByteVector format;
-  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;
-
-  std::unique_ptr<AudioProperties> properties;
-
-  DoubleTagUnion tag;
-
-  ByteVector id3v2TagChunkID;
-
-  bool hasID3v2;
-  bool hasDiin;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// static members
-////////////////////////////////////////////////////////////////////////////////
-
-bool DSDIFF::File::isSupported(IOStream *stream) {
-
-  // A DSDIFF file has to start with "FRM8????????DSD ".
-
-  const ByteVector id = Utils::readHeader(stream, 16, false);
-  return (id.startsWith("FRM8") && id.containsAt("DSD ", 12));
-
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-DSDIFF::File::File(FileName file, bool readProperties, AudioProperties::ReadStyle propertiesStyle) : Strawberry_TagLib::TagLib::File(file) {
-
-  d = new FilePrivate;
-  d->endianness = BigEndian;
-  if (isOpen())
-    read(readProperties, propertiesStyle);
-
-}
-
-DSDIFF::File::File(IOStream *stream, bool readProperties, AudioProperties::ReadStyle propertiesStyle) : Strawberry_TagLib::TagLib::File(stream) {
-
-  d = new FilePrivate;
-  d->endianness = BigEndian;
-  if (isOpen())
-    read(readProperties, propertiesStyle);
-
-}
-
-DSDIFF::File::~File() {
-  delete d;
-}
-
-Strawberry_TagLib::TagLib::Tag *DSDIFF::File::tag() const {
-  return &d->tag;
-}
-
-ID3v2::Tag *DSDIFF::File::ID3v2Tag(bool create) const {
-  return d->tag.access<ID3v2::Tag>(ID3v2Index, create);
-}
-
-bool DSDIFF::File::hasID3v2Tag() const {
-  return d->hasID3v2;
-}
-
-DSDIFF::DIIN::Tag *DSDIFF::File::DIINTag(bool create) const {
-  return d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, create);
-}
-
-bool DSDIFF::File::hasDIINTag() const {
-  return d->hasDiin;
-}
-
-PropertyMap DSDIFF::File::properties() const {
-
-  if (d->hasID3v2)
-    return d->tag.access<ID3v2::Tag>(ID3v2Index, false)->properties();
-
-  return PropertyMap();
-
-}
-
-void DSDIFF::File::removeUnsupportedProperties(const StringList &properties) {
-
-  if (d->hasID3v2)
-    d->tag.access<ID3v2::Tag>(ID3v2Index, false)->removeUnsupportedProperties(properties);
-
-  if (d->hasDiin)
-    d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, false)->removeUnsupportedProperties(properties);
-
-}
-
-PropertyMap DSDIFF::File::setProperties(const PropertyMap &properties) {
-  return d->tag.access<ID3v2::Tag>(ID3v2Index, true)->setProperties(properties);
-}
-
-DSDIFF::AudioProperties *DSDIFF::File::audioProperties() const {
-  return d->properties.get();
-}
-
-bool DSDIFF::File::save() {
-  return save(AllTags);
-}
-
-bool DSDIFF::File::save(TagTypes tags, StripTags, ID3v2::Version version) {
-
-  if (readOnly()) {
-    debug("DSDIFF::File::save() -- File is read only.");
-    return false;
-  }
-
-  if (!isValid()) {
-    debug("DSDIFF::File::save() -- Trying to save invalid file.");
-    return false;
-  }
-
-  //if(strip == StripOthers || strip == StripAll)
-  //File::strip(static_cast<TagTypes>(AllTags & ~tags));
-
-  // First: save ID3V2 chunk
-
-  ID3v2::Tag *id3v2Tag = d->tag.access<ID3v2::Tag>(ID3v2Index, false);
-
-  if (tags & ID3v2 && id3v2Tag) {
-    if (d->isID3InPropChunk) {
-      if (id3v2Tag && !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 {
-      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
-
-  DSDIFF::DIIN::Tag *diinTag = d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, false);
-
-  if (tags & DIIN && diinTag) {
-    if (!diinTag->title().isEmpty()) {
-      ByteVector diinTitle;
-      if (d->endianness == BigEndian)
-        diinTitle.append(ByteVector::fromUInt32BE(diinTag->title().size()));
-      else
-        diinTitle.append(ByteVector::fromUInt32LE(diinTag->title().size()));
-      diinTitle.append(ByteVector::fromCString(diinTag->title().toCString()));
-      setChildChunkData("DITI", diinTitle, DIINChunk);
-    }
-    else
-      setChildChunkData("DITI", ByteVector(), DIINChunk);
-
-    if (!diinTag->artist().isEmpty()) {
-      ByteVector diinArtist;
-      if (d->endianness == BigEndian)
-        diinArtist.append(ByteVector::fromUInt32BE(diinTag->artist().size()));
-      else
-        diinArtist.append(ByteVector::fromUInt32LE(diinTag->artist().size()));
-      diinArtist.append(ByteVector::fromCString(diinTag->artist().toCString()));
-      setChildChunkData("DIAR", diinArtist, DIINChunk);
-    }
-    else
-      setChildChunkData("DIAR", ByteVector(), DIINChunk);
-  }
-
-  // Third: remove the duplicate ID3V2 chunk (inside PROP chunk) if any
-  if (d->duplicateID3V2chunkIndex >= 0) {
-    setChildChunkData(d->duplicateID3V2chunkIndex, ByteVector(), PROPChunk);
-    d->duplicateID3V2chunkIndex = -1;
-  }
-
-  return true;
-
-}
-
-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::removeRootChunk(unsigned int i) {
-
-  unsigned long long chunkSize = d->chunks[i].size + d->chunks[i].padding + 12;
-
-  d->size -= chunkSize;
-  if (d->endianness == BigEndian)
-    insert(ByteVector::fromUInt64BE(d->size), 4, 8);
-  else
-    insert(ByteVector::fromUInt64LE(d->size), 4, 8);
-
-  removeBlock(d->chunks[i].offset - 12, chunkSize);
-
-  // Update the internal offsets
-
-  for (unsigned long r = i + 1; r < d->chunks.size(); r++)
-    d->chunks[r].offset = d->chunks[r - 1].offset + 12 + d->chunks[r - 1].size + d->chunks[r - 1].padding;
-
-  d->chunks.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;
-  }
-
-  // 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);
-  if (d->endianness == BigEndian)
-    insert(ByteVector::fromUInt64BE(d->size), 4, 8);
-  else
-    insert(ByteVector::fromUInt64LE(d->size), 4, 8);
-
-  // Now update the specific chunk
-
-  writeChunk(d->chunks[i].name, data, d->chunks[i].offset - 12, d->chunks[i].size + d->chunks[i].padding + 12);
-
-  d->chunks[i].size = data.size();
-  d->chunks[i].padding = (data.size() & 0x01) ? 1 : 0;
-
-  // Finally update the internal offsets
-
-  updateRootChunksStructure(i + 1);
-
-}
-
-void DSDIFF::File::setRootChunkData(const ByteVector &name, const ByteVector &data) {
-
-  if (d->chunks.size() == 0) {
-    debug("DSDIFF::File::setPropChunkData - No valid chunks found.");
-    return;
-  }
-
-  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.
-  i = d->chunks.size() - 1;
-  unsigned long offset = d->chunks[i].offset + d->chunks[i].size + d->chunks[i].padding;
-
-  // First we update the global size
-  d->size += (offset & 1) + ((data.size() + 1) & ~1) + 12;
-  if (d->endianness == BigEndian)
-    insert(ByteVector::fromUInt64BE(d->size), 4, 8);
-  else
-    insert(ByteVector::fromUInt64LE(d->size), 4, 8);
-
-  // Now add the chunk to the file
-  writeChunk(name,
-    data,
-    offset,
-    std::max<unsigned long long>(0, length() - offset),
-    (offset & 1) ? 1 : 0);
-
-  Chunk64 chunk;
-  chunk.name = name;
-  chunk.size = data.size();
-  chunk.offset = offset + 12;
-  chunk.padding = (data.size() & 0x01) ? 1 : 0;
-
-  d->chunks.push_back(chunk);
-
-}
-
-void DSDIFF::File::removeChildChunk(unsigned int i, unsigned int childChunkNum) {
-
-  ChunkList &childChunks = d->childChunks[childChunkNum];
-
-  // Update global size
-
-  unsigned long long removedChunkTotalSize = childChunks[i].size + childChunks[i].padding + 12;
-  d->size -= removedChunkTotalSize;
-  if (d->endianness == BigEndian)
-    insert(ByteVector::fromUInt64BE(d->size), 4, 8);
-  else
-    insert(ByteVector::fromUInt64LE(d->size), 4, 8);  
-
-  // Update child chunk size
-
-  d->chunks[d->childChunkIndex[childChunkNum]].size -= removedChunkTotalSize;
-  if (d->endianness == BigEndian)
-    insert(ByteVector::fromUInt64BE(d->chunks[d->childChunkIndex[childChunkNum]].size), d->chunks[d->childChunkIndex[childChunkNum]].offset - 8, 8);
-  else
-    insert(ByteVector::fromUInt64LE(d->chunks[d->childChunkIndex[childChunkNum]].size), d->chunks[d->childChunkIndex[childChunkNum]].offset - 8, 8);
-  // Remove the chunk
-
-  removeBlock(childChunks[i].offset - 12, removedChunkTotalSize);
-
-  // Update the internal offsets
-  // For child chunks
-
-  if ((i + 1) < childChunks.size()) {
-    childChunks[i + 1].offset = childChunks[i].offset;
-    i++;
-    for (i++; i < childChunks.size(); i++)
-      childChunks[i].offset = childChunks[i - 1].offset + 12 + childChunks[i - 1].size + childChunks[i - 1].padding;
-  }
-
-  // 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;
-  }
-
-  // Non null data: update chunk
-  // First we update the global size
-
-  d->size += ((data.size() + 1) & ~1) - (childChunks[i].size + childChunks[i].padding);
-
-  if (d->endianness == BigEndian)
-    insert(ByteVector::fromUInt64BE(d->size), 4, 8);
-  else
-    insert(ByteVector::fromUInt64LE(d->size), 4, 8);
-
-  // And the PROP chunk size
-
-  d->chunks[d->childChunkIndex[childChunkNum]].size += ((data.size() + 1) & ~1) - (childChunks[i].size + childChunks[i].padding);
-  
-  if (d->endianness == BigEndian)
-    insert(ByteVector::fromUInt64BE(d->chunks[d->childChunkIndex[childChunkNum]].size), d->chunks[d->childChunkIndex[childChunkNum]].offset - 8, 8);
-  else
-    insert(ByteVector::fromUInt64LE(d->chunks[d->childChunkIndex[childChunkNum]].size), d->chunks[d->childChunkIndex[childChunkNum]].offset - 8, 8);
-
-  // Now update the specific chunk
-
-  writeChunk(childChunks[i].name, data, childChunks[i].offset - 12, childChunks[i].size + childChunks[i].padding + 12);
-
-  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) {
-
-  ChunkList &childChunks = d->childChunks[childChunkNum];
-
-  if (childChunks.size() == 0) {
-    debug("DSDIFF::File::setPropChunkData - No valid chunks found.");
-    return;
-  }
-
-  for (unsigned int i = 0; i < childChunks.size(); i++) {
-    if (childChunks[i].name == name) {
-      setChildChunkData(i, data, childChunkNum);
-      return;
-    }
-  }
-
-  // Do not attempt to remove a non existing chunk
-
-  if (data.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;
-  if (d->endianness == BigEndian)
-    insert(ByteVector::fromUInt64BE(d->size), 4, 8);
-  else
-    insert(ByteVector::fromUInt64LE(d->size), 4, 8);
-
-  // And the child chunk size
-
-  d->chunks[d->childChunkIndex[childChunkNum]].size += (offset & 1) + ((data.size() + 1) & ~1) + 12;
-  if (d->endianness == BigEndian)
-    insert(ByteVector::fromUInt64BE(d->chunks[d->childChunkIndex[childChunkNum]].size), d->chunks[d->childChunkIndex[childChunkNum]].offset - 8, 8);
-  else
-    insert(ByteVector::fromUInt64LE(d->chunks[d->childChunkIndex[childChunkNum]].size), d->chunks[d->childChunkIndex[childChunkNum]].offset - 8, 8);
-
-  // Now add the chunk to the file
-
-  unsigned long long nextRootChunkIdx = length();
-  if ((d->childChunkIndex[childChunkNum] + 1) < static_cast<int>(d->chunks.size()))
-    nextRootChunkIdx = d->chunks[d->childChunkIndex[childChunkNum] + 1].offset - 12;
-
-  writeChunk(name, data, offset,
-    std::max<unsigned long long>(0, nextRootChunkIdx - offset),
-    (offset & 1) ? 1 : 0);
-
-  // For root chunks
-
-  updateRootChunksStructure(d->childChunkIndex[childChunkNum] + 1);
-
-  Chunk64 chunk;
-  chunk.name = name;
-  chunk.size = data.size();
-  chunk.offset = offset + 12;
-  chunk.padding = (data.size() & 0x01) ? 1 : 0;
-
-  childChunks.push_back(chunk);
-
-}
-
-void DSDIFF::File::updateRootChunksStructure(unsigned int startingChunk) {
-
-  for (unsigned int i = startingChunk; i < d->chunks.size(); i++)
-    d->chunks[i].offset = d->chunks[i - 1].offset + 12 + d->chunks[i - 1].size + d->chunks[i - 1].padding;
-
-  // Update childchunks structure as well
-
-  if (d->childChunkIndex[PROPChunk] >= static_cast<int>(startingChunk)) {
-    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)) {
-    ChunkList &childChunksToUpdate = d->childChunks[DIINChunk];
-    if (childChunksToUpdate.size() > 0) {
-      childChunksToUpdate[0].offset = d->chunks[d->childChunkIndex[DIINChunk]].offset + 12;
-      for (unsigned int i = 1; i < childChunksToUpdate.size(); i++)
-        childChunksToUpdate[i].offset = childChunksToUpdate[i - 1].offset + 12 + childChunksToUpdate[i - 1].size + childChunksToUpdate[i - 1].padding;
-    }
-  }
-
-}
-
-void DSDIFF::File::read(bool readProperties, AudioProperties::ReadStyle propertiesStyle) {
-
-  bool bigEndian = (d->endianness == BigEndian);
-
-  d->type = readBlock(4);
-  d->size = bigEndian ? readBlock(8).toInt64BE(0) : readBlock(8).toInt64LE(0);
-  d->format = readBlock(4);
-
-  // + 12: chunk header at least, fix for additional junk bytes
-
-  while (tell() + 12 <= length()) {
-    ByteVector chunkName = readBlock(4);
-    unsigned long long chunkSize = bigEndian ? readBlock(8).toInt64BE(0) : readBlock(8).toInt64LE(0);
-
-    if (!isValidChunkID(chunkName)) {
-      debug("DSDIFF::File::read() -- Chunk '" + chunkName + "' has invalid ID");
-      setValid(false);
-      break;
-    }
-
-    if (static_cast<unsigned long long>(tell()) + chunkSize >
-      static_cast<unsigned long long>(length())) {
-      debug("DSDIFF::File::read() -- Chunk '" + chunkName + "' has invalid size (larger than the file size)");
-      setValid(false);
-      break;
-    }
-
-    Chunk64 chunk;
-    chunk.name = chunkName;
-    chunk.size = chunkSize;
-    chunk.offset = tell();
-
-    seek(chunk.size, Current);
-
-    // Check padding
-
-    chunk.padding = 0;
-    long uPosNotPadded = tell();
-    if ((uPosNotPadded & 0x01) != 0) {
-      ByteVector iByte = readBlock(1);
-      if ((iByte.size() != 1) || (iByte[0] != 0))
-        // Not well formed, re-seek
-        seek(uPosNotPadded, Beginning);
-      else
-        chunk.padding = 1;
-    }
-    d->chunks.push_back(chunk);
-  }
-
-  // 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 ") {
-      lengthDSDSamplesTimeChannels = d->chunks[i].size * 8;
-      audioDataSizeinBytes = d->chunks[i].size;
-    }
-    else if (d->chunks[i].name == "DST ") {
-      // Now decode the chunks inside the DST chunk to read the DST Frame Information one
-      long long dstChunkEnd = d->chunks[i].offset + d->chunks[i].size;
-      seek(d->chunks[i].offset);
-
-      audioDataSizeinBytes = d->chunks[i].size;
-
-      while (tell() + 12 <= dstChunkEnd) {
-        ByteVector dstChunkName = readBlock(4);
-        long long dstChunkSize = bigEndian ? readBlock(8).toInt64BE(0) : readBlock(8).toInt64LE(0);
-
-        if (!isValidChunkID(dstChunkName)) {
-          debug("DSDIFF::File::read() -- DST Chunk '" + dstChunkName + "' has invalid ID");
-          setValid(false);
-          break;
-        }
-
-        if (static_cast<long long>(tell()) + dstChunkSize > dstChunkEnd) {
-          debug("DSDIFF::File::read() -- DST Chunk '" + dstChunkName + "' has invalid size (larger than the DST chunk)");
-          setValid(false);
-          break;
-        }
-
-        if (dstChunkName == "FRTE") {
-          // Found the DST frame information chunk
-          dstNumFrames = bigEndian ? readBlock(4).toUInt32BE(0) : readBlock(4).toUInt32LE(0);
-          dstFrameRate = bigEndian ? readBlock(2).toUInt16BE(0) : readBlock(2).toUInt16LE(0);
-          // Found the wanted one, no need to look at the others
-          break;
-        }
-
-        seek(dstChunkSize, Current);
-
-        // Check padding
-        long uPosNotPadded = tell();
-        if ((uPosNotPadded & 0x01) != 0) {
-          ByteVector iByte = readBlock(1);
-          if ((iByte.size() != 1) || (iByte[0] != 0))
-            // Not well formed, re-seek
-            seek(uPosNotPadded, Beginning);
-        }
-      }
-    }
-    else if (d->chunks[i].name == "PROP") {
-      d->childChunkIndex[PROPChunk] = i;
-      // Now decodes the chunks inside the PROP chunk
-      long long propChunkEnd = d->chunks[i].offset + d->chunks[i].size;
-      // +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 = bigEndian ? readBlock(8).toInt64BE(0) : readBlock(8).toInt64LE(0);
-
-        if (!isValidChunkID(propChunkName)) {
-          debug("DSDIFF::File::read() -- PROP Chunk '" + propChunkName + "' has invalid ID");
-          setValid(false);
-          break;
-        }
-
-        if (static_cast<long long>(tell()) + propChunkSize > propChunkEnd) {
-          debug("DSDIFF::File::read() -- PROP Chunk '" + propChunkName + "' has invalid size (larger than the PROP chunk)");
-          setValid(false);
-          break;
-        }
-
-        Chunk64 chunk;
-        chunk.name = propChunkName;
-        chunk.size = propChunkSize;
-        chunk.offset = tell();
-
-        seek(chunk.size, Current);
-
-        // Check padding
-        chunk.padding = 0;
-        long uPosNotPadded = tell();
-        if ((uPosNotPadded & 0x01) != 0) {
-          ByteVector iByte = readBlock(1);
-          if ((iByte.size() != 1) || (iByte[0] != 0))
-            // Not well formed, re-seek
-            seek(uPosNotPadded, Beginning);
-          else
-            chunk.padding = 1;
-        }
-        d->childChunks[PROPChunk].push_back(chunk);
-      }
-    }
-    else if (d->chunks[i].name == "DIIN") {
-      d->childChunkIndex[DIINChunk] = i;
-      d->hasDiin = true;
-
-      // Now decode the chunks inside the DIIN chunk
-
-      long long diinChunkEnd = d->chunks[i].offset + d->chunks[i].size;
-      seek(d->chunks[i].offset);
-
-      while (tell() + 12 <= diinChunkEnd) {
-        ByteVector diinChunkName = readBlock(4);
-        long long diinChunkSize = bigEndian ? readBlock(8).toInt64BE(0) : readBlock(8).toInt64LE(0);
-
-        if (!isValidChunkID(diinChunkName)) {
-          debug("DSDIFF::File::read() -- DIIN Chunk '" + diinChunkName + "' has invalid ID");
-          setValid(false);
-          break;
-        }
-
-        if (static_cast<long long>(tell()) + diinChunkSize > diinChunkEnd) {
-          debug("DSDIFF::File::read() -- DIIN Chunk '" + diinChunkName + "' has invalid size (larger than the DIIN chunk)");
-          setValid(false);
-          break;
-        }
-
-        Chunk64 chunk;
-        chunk.name = diinChunkName;
-        chunk.size = diinChunkSize;
-        chunk.offset = tell();
-
-        seek(chunk.size, Current);
-
-        // Check padding
-
-        chunk.padding = 0;
-        long uPosNotPadded = tell();
-
-        if ((uPosNotPadded & 0x01) != 0) {
-          ByteVector iByte = readBlock(1);
-          if ((iByte.size() != 1) || (iByte[0] != 0))
-            // Not well formed, re-seek
-            seek(uPosNotPadded, Beginning);
-          else
-            chunk.padding = 1;
-        }
-        d->childChunks[DIINChunk].push_back(chunk);
-      }
-    }
-    else if (d->chunks[i].name == "ID3 " || d->chunks[i].name == "id3 ") {
-      d->id3v2TagChunkID = d->chunks[i].name;
-      d->tag.set(ID3v2Index, new ID3v2::Tag(this, d->chunks[i].offset));
-      d->isID3InPropChunk = false;
-      d->hasID3v2 = true;
-    }
-  }
-
-  if (!isValid())
-    return;
-
-  if (d->childChunkIndex[PROPChunk] < 0) {
-    debug("DSDIFF::File::read() -- no PROP chunk found");
-    setValid(false);
-    return;
-  }
-
-  // Read properties
-
-  unsigned int sampleRate = 0;
-  unsigned short channels = 0;
-
-  for (unsigned int i = 0; i < d->childChunks[PROPChunk].size(); i++) {
-    if (d->childChunks[PROPChunk][i].name == "ID3 " || d->childChunks[PROPChunk][i].name == "id3 ") {
-      if (d->hasID3v2) {
-        d->duplicateID3V2chunkIndex = i;
-        // 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));
-      d->isID3InPropChunk = true;
-      d->hasID3v2 = true;
-    }
-    else if (d->childChunks[PROPChunk][i].name == "FS  ") {
-      // Sample rate
-      seek(d->childChunks[PROPChunk][i].offset);
-      sampleRate = bigEndian ? readBlock(4).toUInt32BE(0) : readBlock(4).toUInt32LE(0);
-    }
-    else if (d->childChunks[PROPChunk][i].name == "CHNL") {
-      // Channels
-      seek(d->childChunks[PROPChunk][i].offset);
-      channels = bigEndian ? readBlock(2).toInt16BE(0) : readBlock(2).toInt16LE(0);
-    }
-  }
-
-  // Read title & artist from DIIN chunk
-
-  d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, true);
-
-  if (d->hasDiin) {
-    for (unsigned int i = 0; i < d->childChunks[DIINChunk].size(); i++) {
-      if (d->childChunks[DIINChunk][i].name == "DITI") {
-        seek(d->childChunks[DIINChunk][i].offset);
-        unsigned int titleStrLength = bigEndian ? readBlock(4).toUInt32BE(0) : readBlock(4).toUInt32LE(0);
-        if (titleStrLength <= d->childChunks[DIINChunk][i].size) {
-          ByteVector titleStr = readBlock(titleStrLength);
-          d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, false)->setTitle(titleStr);
-        }
-      }
-      else if (d->childChunks[DIINChunk][i].name == "DIAR") {
-        seek(d->childChunks[DIINChunk][i].offset);
-        unsigned int artistStrLength = bigEndian ? readBlock(4).toUInt32BE(0) : readBlock(4).toUInt32LE(0);
-        if (artistStrLength <= d->childChunks[DIINChunk][i].size) {
-          ByteVector artistStr = readBlock(artistStrLength);
-          d->tag.access<DSDIFF::DIIN::Tag>(DIINIndex, false)->setArtist(artistStr);
-        }
-      }
-    }
-  }
-
-  if (readProperties) {
-    if (lengthDSDSamplesTimeChannels == 0) {
-      // DST compressed signal : need to compute length of DSD uncompressed frames
-      if (dstFrameRate > 0)
-        lengthDSDSamplesTimeChannels = static_cast<unsigned long long>(dstNumFrames) * static_cast<unsigned long long>(sampleRate) / static_cast<unsigned long long>(dstFrameRate);
-      else
-        lengthDSDSamplesTimeChannels = 0;
-    }
-    else {
-      // In DSD uncompressed files, the read number of samples is the total for each channel
-      if (channels > 0)
-        lengthDSDSamplesTimeChannels /= channels;
-    }
-    int bitrate = 0;
-    if (lengthDSDSamplesTimeChannels > 0)
-      bitrate = (audioDataSizeinBytes * 8 * sampleRate) / lengthDSDSamplesTimeChannels / 1000;
-
-    d->properties.reset(new AudioProperties(sampleRate, channels, lengthDSDSamplesTimeChannels, bitrate, propertiesStyle));
-  }
-
-  if (!ID3v2Tag()) {
-    d->tag.access<ID3v2::Tag>(ID3v2Index, true);
-    // By default, ID3 chunk is at root level
-    d->isID3InPropChunk = false;
-    d->hasID3v2 = false;
-  }
-
-}
-
-void DSDIFF::File::writeChunk(const ByteVector &name, const ByteVector &data, unsigned long long offset, unsigned long replace, unsigned int leadingPadding) {
-
-  ByteVector combined;
-  if (leadingPadding)
-    combined.append(ByteVector(leadingPadding, '\x00'));
-
-  combined.append(name);
-  if (d->endianness == BigEndian)
-    combined.append(ByteVector::fromUInt64BE(data.size()));
-  else
-    combined.append(ByteVector::fromUInt64LE(data.size()));
-  combined.append(data);
-  if ((data.size() & 0x01) != 0)
-    combined.append('\x00');
-
-  insert(combined, offset, replace);
-
-}

3rdparty/taglib/dsdiff/dsdifffile.h

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

3rdparty/taglib/dsdiff/dsdiffproperties.cpp

@@ -1,96 +0,0 @@
-/***************************************************************************
- copyright            : (C) 2016 by Damien Plisson, Audirvana
- email                : damien78@audirvana.com
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include "tstring.h"
-#include "tdebug.h"
-
-#include "dsdiffproperties.h"
-
-using namespace Strawberry_TagLib::TagLib;
-
-class DSDIFF::AudioProperties::AudioPropertiesPrivate {
- public:
-  explicit AudioPropertiesPrivate() : length(0),
-                                      bitrate(0),
-                                      sampleRate(0),
-                                      channels(0),
-                                      sampleWidth(0),
-                                      sampleCount(0) {
-  }
-
-  int length;
-  int bitrate;
-  int sampleRate;
-  int channels;
-  int sampleWidth;
-  unsigned long long sampleCount;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-DSDIFF::AudioProperties::AudioProperties(const unsigned int sampleRate, const unsigned short channels, const unsigned long long samplesCount, const int bitrate, ReadStyle) : Strawberry_TagLib::TagLib::AudioProperties(), d(new AudioPropertiesPrivate) {
-
-  d->channels = channels;
-  d->sampleCount = samplesCount;
-  d->sampleWidth = 1;
-  d->sampleRate = sampleRate;
-  d->bitrate = bitrate;
-  d->length = d->sampleRate > 0 ? static_cast<int>((d->sampleCount * 1000.0) / d->sampleRate + 0.5) : 0;
-
-}
-
-DSDIFF::AudioProperties::~AudioProperties() {
-  delete d;
-}
-
-int DSDIFF::AudioProperties::lengthInSeconds() const {
-  return d->length / 1000;
-}
-
-int DSDIFF::AudioProperties::lengthInMilliseconds() const {
-  return d->length;
-}
-
-int DSDIFF::AudioProperties::bitrate() const {
-  return d->bitrate;
-}
-
-int DSDIFF::AudioProperties::sampleRate() const {
-  return d->sampleRate;
-}
-
-int DSDIFF::AudioProperties::channels() const {
-  return d->channels;
-}
-
-int DSDIFF::AudioProperties::bitsPerSample() const {
-  return d->sampleWidth;
-}
-
-long long DSDIFF::AudioProperties::sampleCount() const {
-  return d->sampleCount;
-}

3rdparty/taglib/dsdiff/dsdiffproperties.h

@@ -1,78 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2016 by Damien Plisson, Audirvana
-    email                : damien78@audirvana.com
-***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_DSDIFFPROPERTIES_H
-#define TAGLIB_DSDIFFPROPERTIES_H
-
-#include "audioproperties.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-namespace DSDIFF {
-
-class File;
-
-//! An implementation of audio property reading for DSDIFF
-
-/*!
- * This reads the data from an DSDIFF stream found in the AudioProperties API.
- */
-
-class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
- public:
-  /*!
-   * Create an instance of DSDIFF::AudioProperties with the data read from the ByteVector \a data.
-   */
-  explicit AudioProperties(const unsigned int sampleRate, const unsigned short channels, const unsigned long long samplesCount, const int bitrate, ReadStyle);
-
-  /*!
-   * Destroys this DSDIFF::AudioProperties instance.
-   */
-  ~AudioProperties() override;
-
-  // Reimplementations.
-
-  int lengthInSeconds() const override;
-  int lengthInMilliseconds() const override;
-  int bitrate() const override;
-  int sampleRate() const override;
-  int channels() const override;
-
-  int bitsPerSample() const;
-  long long sampleCount() const;
-
- private:
-  AudioProperties(const AudioProperties &);
-  AudioProperties &operator=(const AudioProperties &);
-
-  class AudioPropertiesPrivate;
-  AudioPropertiesPrivate *d;
-};
-
-}  // namespace DSDIFF
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/dsf/dsffile.cpp

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

3rdparty/taglib/dsf/dsffile.h

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

3rdparty/taglib/dsf/dsfproperties.cpp

@@ -1,135 +0,0 @@
-/***************************************************************************
- copyright            : (C) 2013 by Stephen F. Booth
- email                : me@sbooth.org
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include "tstring.h"
-#include "tdebug.h"
-
-#include "dsfproperties.h"
-
-using namespace Strawberry_TagLib::TagLib;
-
-class DSF::AudioProperties::AudioPropertiesPrivate {
- public:
-  explicit AudioPropertiesPrivate() : formatVersion(0),
-                                      formatID(0),
-                                      channelType(0),
-                                      channelNum(0),
-                                      samplingFrequency(0),
-                                      bitsPerSample(0),
-                                      sampleCount(0),
-                                      blockSizePerChannel(0),
-                                      bitrate(0),
-                                      length(0) {
-  }
-
-  // Nomenclature is from DSF file format specification
-  unsigned int formatVersion;
-  unsigned int formatID;
-  unsigned int channelType;
-  unsigned int channelNum;
-  unsigned int samplingFrequency;
-  unsigned int bitsPerSample;
-  long long sampleCount;
-  unsigned int blockSizePerChannel;
-
-  // Computed
-  int bitrate;
-  int length;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-DSF::AudioProperties::AudioProperties(const ByteVector &data, ReadStyle) : Strawberry_TagLib::TagLib::AudioProperties(), d(new AudioPropertiesPrivate()) {
-  read(data);
-}
-
-DSF::AudioProperties::~AudioProperties() {
-  delete d;
-}
-
-int DSF::AudioProperties::lengthInSeconds() const {
-  return d->length / 1000;
-}
-
-int DSF::AudioProperties::lengthInMilliseconds() const {
-  return d->length;
-}
-
-int DSF::AudioProperties::bitrate() const {
-  return d->bitrate;
-}
-
-int DSF::AudioProperties::sampleRate() const {
-  return d->samplingFrequency;
-}
-
-int DSF::AudioProperties::channels() const {
-  return d->channelNum;
-}
-
-// DSF specific
-int DSF::AudioProperties::formatVersion() const {
-  return d->formatVersion;
-}
-
-int DSF::AudioProperties::formatID() const {
-  return d->formatID;
-}
-
-int DSF::AudioProperties::channelType() const {
-  return d->channelType;
-}
-
-int DSF::AudioProperties::bitsPerSample() const {
-  return d->bitsPerSample;
-}
-
-long long DSF::AudioProperties::sampleCount() const {
-  return d->sampleCount;
-}
-
-int DSF::AudioProperties::blockSizePerChannel() const {
-  return d->blockSizePerChannel;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// private members
-////////////////////////////////////////////////////////////////////////////////
-
-void DSF::AudioProperties::read(const ByteVector &data) {
-  d->formatVersion = data.toUInt32LE(0);
-  d->formatID = data.toUInt32LE(4);
-  d->channelType = data.toUInt32LE(8);
-  d->channelNum = data.toUInt32LE(12);
-  d->samplingFrequency = data.toUInt32LE(16);
-  d->bitsPerSample = data.toUInt32LE(20);
-  d->sampleCount = data.toInt64LE(24);
-  d->blockSizePerChannel = data.toUInt32LE(32);
-
-  d->bitrate = static_cast<int>((d->samplingFrequency * d->bitsPerSample * d->channelNum) / 1000.0 + 0.5);
-  d->length = d->samplingFrequency > 0 ? static_cast<int>(d->sampleCount * 1000.0 / d->samplingFrequency + 0.5) : 0;
-}

3rdparty/taglib/dsf/dsfproperties.h

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

3rdparty/taglib/fileref.cpp

@@ -1,424 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2002 - 2008 by Scott Wheeler
-    email                : wheeler@kde.org
-
-    copyright            : (C) 2010 by Alex Novichkov
-    email                : novichko@atnet.ru
-                           (added APE file support)
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include <memory>
-
-#include "tfile.h"
-#include "tfilestream.h"
-#include "tstring.h"
-#include "tdebug.h"
-
-#include "fileref.h"
-#include "asffile.h"
-#include "mpegfile.h"
-#include "vorbisfile.h"
-#include "flacfile.h"
-#include "oggflacfile.h"
-#include "mpcfile.h"
-#include "mp4file.h"
-#include "wavpackfile.h"
-#include "speexfile.h"
-#include "opusfile.h"
-#include "trueaudiofile.h"
-#include "aifffile.h"
-#include "wavfile.h"
-#include "apefile.h"
-#include "modfile.h"
-#include "s3mfile.h"
-#include "itfile.h"
-#include "xmfile.h"
-#include "dsffile.h"
-#include "dsdifffile.h"
-
-using namespace Strawberry_TagLib::TagLib;
-
-namespace {
-typedef List<const FileRef::FileTypeResolver*> ResolverList;
-ResolverList fileTypeResolvers;
-
-// Detect the file type by user-defined resolvers.
-
-File *detectByResolvers(FileName fileName, bool readAudioProperties, AudioProperties::ReadStyle audioPropertiesStyle) {
-
-  ResolverList::ConstIterator it = fileTypeResolvers.begin();
-  for (; it != fileTypeResolvers.end(); ++it) {
-    File *file = (*it)->createFile(fileName, readAudioProperties, audioPropertiesStyle);
-    if (file)
-      return file;
-  }
-
-  return nullptr;
-
-}
-
-// Detect the file type based on the file extension.
-
-File *detectByExtension(IOStream *stream, bool readAudioProperties, AudioProperties::ReadStyle audioPropertiesStyle) {
-
-#ifdef _WIN32
-  const String s(stream->name().wstr());
-#else
-  const String s(stream->name());
-#endif
-
-  String ext;
-  const size_t pos = s.rfind(".");
-  if (pos != String::npos())
-    ext = s.substr(pos + 1).upper();
-
-  // If this list is updated, the method defaultFileExtensions() should also be
-  // updated.  However at some point that list should be created at the same time
-  // that a default file type resolver is created.
-
-  if (ext.isEmpty())
-    return nullptr;
-
-  // .oga can be any audio in the Ogg container. So leave it to content-based detection.
-
-  if (ext == "MP3")
-    return new MPEG::File(stream, ID3v2::FrameFactory::instance(), readAudioProperties, audioPropertiesStyle);
-  if (ext == "OGG")
-    return new Ogg::Vorbis::File(stream, readAudioProperties, audioPropertiesStyle);
-  if (ext == "FLAC")
-    return new FLAC::File(stream, readAudioProperties, audioPropertiesStyle);
-  if (ext == "MPC")
-    return new MPC::File(stream, readAudioProperties, audioPropertiesStyle);
-  if (ext == "WV")
-    return new WavPack::File(stream, readAudioProperties, audioPropertiesStyle);
-  if (ext == "SPX")
-    return new Ogg::Speex::File(stream, readAudioProperties, audioPropertiesStyle);
-  if (ext == "OPUS")
-    return new Ogg::Opus::File(stream, readAudioProperties, audioPropertiesStyle);
-  if (ext == "TTA")
-    return new TrueAudio::File(stream, readAudioProperties, audioPropertiesStyle);
-  if (ext == "M4A" || ext == "M4R" || ext == "M4B" || ext == "M4P" || ext == "MP4" || ext == "3G2" || ext == "M4V")
-    return new MP4::File(stream, readAudioProperties, audioPropertiesStyle);
-  if (ext == "WMA" || ext == "ASF")
-    return new ASF::File(stream, readAudioProperties, audioPropertiesStyle);
-  if (ext == "AIF" || ext == "AIFF" || ext == "AFC" || ext == "AIFC")
-    return new RIFF::AIFF::File(stream, readAudioProperties, audioPropertiesStyle);
-  if (ext == "WAV")
-    return new RIFF::WAV::File(stream, readAudioProperties, audioPropertiesStyle);
-  if (ext == "APE")
-    return new APE::File(stream, readAudioProperties, audioPropertiesStyle);
-  // module, nst and wow are possible but uncommon extensions
-  if (ext == "MOD" || ext == "MODULE" || ext == "NST" || ext == "WOW")
-    return new Mod::File(stream, readAudioProperties, audioPropertiesStyle);
-  if (ext == "S3M")
-    return new S3M::File(stream, readAudioProperties, audioPropertiesStyle);
-  if (ext == "IT")
-    return new IT::File(stream, readAudioProperties, audioPropertiesStyle);
-  if (ext == "XM")
-    return new XM::File(stream, readAudioProperties, audioPropertiesStyle);
-  if (ext == "DFF" || ext == "DSDIFF")
-    return new DSDIFF::File(stream, readAudioProperties, audioPropertiesStyle);
-  if (ext == "DSF")
-    return new DSF::File(stream, readAudioProperties, audioPropertiesStyle);
-
-  return nullptr;
-
-}
-
-// Detect the file type based on the actual content of the stream.
-
-File *detectByContent(IOStream *stream, bool readAudioProperties, AudioProperties::ReadStyle audioPropertiesStyle) {
-
-  File *file = nullptr;
-
-  if (MPEG::File::isSupported(stream))
-    file = new MPEG::File(stream, ID3v2::FrameFactory::instance(), readAudioProperties, audioPropertiesStyle);
-  else if (Ogg::Vorbis::File::isSupported(stream))
-    file = new Ogg::Vorbis::File(stream, readAudioProperties, audioPropertiesStyle);
-  else if (Ogg::FLAC::File::isSupported(stream))
-    file = new Ogg::FLAC::File(stream, readAudioProperties, audioPropertiesStyle);
-  else if (FLAC::File::isSupported(stream))
-    file = new FLAC::File(stream, readAudioProperties, audioPropertiesStyle);
-  else if (MPC::File::isSupported(stream))
-    file = new MPC::File(stream, readAudioProperties, audioPropertiesStyle);
-  else if (WavPack::File::isSupported(stream))
-    file = new WavPack::File(stream, readAudioProperties, audioPropertiesStyle);
-  else if (Ogg::Speex::File::isSupported(stream))
-    file = new Ogg::Speex::File(stream, readAudioProperties, audioPropertiesStyle);
-  else if (Ogg::Opus::File::isSupported(stream))
-    file = new Ogg::Opus::File(stream, readAudioProperties, audioPropertiesStyle);
-  else if (TrueAudio::File::isSupported(stream))
-    file = new TrueAudio::File(stream, readAudioProperties, audioPropertiesStyle);
-  else if (MP4::File::isSupported(stream))
-    file = new MP4::File(stream, readAudioProperties, audioPropertiesStyle);
-  else if (ASF::File::isSupported(stream))
-    file = new ASF::File(stream, readAudioProperties, audioPropertiesStyle);
-  else if (RIFF::AIFF::File::isSupported(stream))
-    file = new RIFF::AIFF::File(stream, readAudioProperties, audioPropertiesStyle);
-  else if (RIFF::WAV::File::isSupported(stream))
-    file = new RIFF::WAV::File(stream, readAudioProperties, audioPropertiesStyle);
-  else if (APE::File::isSupported(stream))
-    file = new APE::File(stream, readAudioProperties, audioPropertiesStyle);
-  else if (DSDIFF::File::isSupported(stream))
-    file = new DSDIFF::File(stream, readAudioProperties, audioPropertiesStyle);
-  else if (DSF::File::isSupported(stream))
-    file = new DSF::File(stream, readAudioProperties, audioPropertiesStyle);
-
-  // isSupported() only does a quick check, so double check the file here.
-
-  if (file) {
-    if (file->isValid())
-      return file;
-    else
-      delete file;
-  }
-
-  return nullptr;
-
-}
-
-struct FileRefData {
-  FileRefData() : file(nullptr), stream(nullptr) {}
-
-  ~FileRefData() {
-    delete file;
-    delete stream;
-  }
-
-  File *file;
-  IOStream *stream;
-};
-
-}  // namespace
-
-class FileRef::FileRefPrivate {
- public:
-  FileRefPrivate() : data(new FileRefData()) {}
-
-  std::shared_ptr<FileRefData> data;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-FileRef::FileRef() : d(new FileRefPrivate()) {}
-
-FileRef::FileRef(FileName fileName, bool readAudioProperties, AudioProperties::ReadStyle audioPropertiesStyle) : d(new FileRefPrivate()) {
-  parse(fileName, readAudioProperties, audioPropertiesStyle);
-}
-
-FileRef::FileRef(IOStream *stream, bool readAudioProperties, AudioProperties::ReadStyle audioPropertiesStyle) : d(new FileRefPrivate()) {
-  parse(stream, readAudioProperties, audioPropertiesStyle);
-}
-
-FileRef::FileRef(File *file) : d(new FileRefPrivate()) {
-  d->data->file = file;
-}
-
-FileRef::FileRef(const FileRef &ref) : d(new FileRefPrivate(*ref.d)) {}
-
-FileRef::~FileRef() {
-  delete d;
-}
-
-Tag *FileRef::tag() const {
-
-  if (isNull()) {
-    debug("FileRef::tag() - Called without a valid file.");
-    return nullptr;
-  }
-  return d->data->file->tag();
-
-}
-
-PropertyMap FileRef::properties() const {
-  if (isNull()) {
-    debug("FileRef::properties() - Called without a valid file.");
-    return PropertyMap();
-  }
-
-  return d->data->file->properties();
-}
-
-void FileRef::removeUnsupportedProperties(const StringList &properties) {
-  if (isNull()) {
-    debug("FileRef::removeUnsupportedProperties() - Called without a valid file.");
-    return;
-  }
-
-  d->data->file->removeUnsupportedProperties(properties);
-}
-
-
-PropertyMap FileRef::setProperties(const PropertyMap &properties) {
-  if (isNull()) {
-    debug("FileRef::setProperties() - Called without a valid file.");
-    return PropertyMap();
-  }
-
-  return d->data->file->setProperties(properties);
-}
-
-AudioProperties *FileRef::audioProperties() const {
-
-  if (isNull()) {
-    debug("FileRef::audioProperties() - Called without a valid file.");
-    return nullptr;
-  }
-  return d->data->file->audioProperties();
-
-}
-
-File *FileRef::file() const {
-  return d->data->file;
-}
-
-bool FileRef::save() {
-
-  if (isNull()) {
-    debug("FileRef::save() - Called without a valid file.");
-    return false;
-  }
-  return d->data->file->save();
-
-}
-
-const FileRef::FileTypeResolver *FileRef::addFileTypeResolver(const FileRef::FileTypeResolver *resolver) {  // static
-  fileTypeResolvers.prepend(resolver);
-  return resolver;
-}
-
-StringList FileRef::defaultFileExtensions() {
-
-  StringList l;
-
-  l.append("ogg");
-  l.append("flac");
-  l.append("oga");
-  l.append("mp3");
-  l.append("mpc");
-  l.append("wv");
-  l.append("spx");
-  l.append("tta");
-  l.append("m4a");
-  l.append("m4r");
-  l.append("m4b");
-  l.append("m4p");
-  l.append("3g2");
-  l.append("mp4");
-  l.append("m4v");
-  l.append("wma");
-  l.append("asf");
-  l.append("aif");
-  l.append("aiff");
-  l.append("wav");
-  l.append("ape");
-  l.append("mod");
-  l.append("module");  // alias for "mod"
-  l.append("nst");     // alias for "mod"
-  l.append("wow");     // alias for "mod"
-  l.append("s3m");
-  l.append("it");
-  l.append("xm");
-  l.append("dsf");
-  l.append("dff");
-  l.append("dsdiff");  // alias for "dff"
-
-  return l;
-
-}
-
-bool FileRef::isValid() const {
-  return (d->data->file && d->data->file->isValid());
-}
-
-bool FileRef::isNull() const {
-  return (!d->data->file || !d->data->file->isValid());
-}
-
-FileRef &FileRef::operator=(const FileRef &ref) {
-  FileRef(ref).swap(*this);
-  return *this;
-}
-
-void FileRef::swap(FileRef &ref) {
-  using std::swap;
-
-  swap(d, ref.d);
-}
-
-bool FileRef::operator==(const FileRef &ref) const {
-  return (ref.d->data == d->data);
-}
-
-bool FileRef::operator!=(const FileRef &ref) const {
-  return (ref.d->data != d->data);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// private members
-////////////////////////////////////////////////////////////////////////////////
-
-void FileRef::parse(FileName fileName, bool readAudioProperties, AudioProperties::ReadStyle audioPropertiesStyle) {
-
-  // Try user-defined resolvers.
-
-  d->data->file = detectByResolvers(fileName, readAudioProperties, audioPropertiesStyle);
-  if (d->data->file)
-    return;
-
-  // Try to resolve file types based on the file extension.
-
-  d->data->stream = new FileStream(fileName);
-  d->data->file = detectByExtension(d->data->stream, readAudioProperties, audioPropertiesStyle);
-  if (d->data->file)
-    return;
-
-  // At last, try to resolve file types based on the actual content.
-
-  d->data->file = detectByContent(d->data->stream, readAudioProperties, audioPropertiesStyle);
-  if (d->data->file)
-    return;
-
-  // Stream have to be closed here if failed to resolve file types.
-
-  delete d->data->stream;
-  d->data->stream = nullptr;
-}
-
-void FileRef::parse(IOStream *stream, bool readAudioProperties, AudioProperties::ReadStyle audioPropertiesStyle) {
-
-  // User-defined resolvers won't work with a stream.
-
-  // Try to resolve file types based on the file extension.
-
-  d->data->file = detectByExtension(stream, readAudioProperties, audioPropertiesStyle);
-  if (d->data->file)
-    return;
-
-  // At last, try to resolve file types based on the actual content of the file.
-
-  d->data->file = detectByContent(stream, readAudioProperties, audioPropertiesStyle);
-
-}

3rdparty/taglib/fileref.h

@@ -1,283 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2002 - 2008 by Scott Wheeler
-    email                : wheeler@kde.org
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_FILEREF_H
-#define TAGLIB_FILEREF_H
-
-#include "tfile.h"
-#include "tstringlist.h"
-
-#include "taglib_export.h"
-#include "tpropertymap.h"
-#include "audioproperties.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-
-class Tag;
-
-//! This class provides a simple abstraction for creating and handling files
-
-/*!
-   * FileRef exists to provide a minimal, generic and value-based wrapper around a File.
-   * It is lightweight and implicitly shared, and as such suitable for pass-by-value use.
-   * This hides some of the uglier details of TagLib::File and the non-generic portions of the concrete file implementations.
-   *
-   * This class is useful in a "simple usage" situation where it is desirable
-   * to be able to get and set some of the tag information that is similar across file types.
-   *
-   * Also note that it is probably a good idea to plug this into your mime
-   * type system rather than using the constructor that accepts a file name using the FileTypeResolver.
-   *
-   * \see FileTypeResolver
-   * \see addFileTypeResolver()
-   */
-
-class TAGLIB_EXPORT FileRef {
- public:
-  //! A class for pluggable file type resolution.
-
-  /*!
-   * This class is used to add extend TagLib's very basic file name based file type resolution.
-   *
-   * This can be accomplished with:
-   *
-   * \code
-   *
-   * class MyFileTypeResolver : FileTypeResolver
-   * {
-   *   Strawberry_TagLib::TagLib::File *createFile(Strawberry_TagLib::TagLib::FileName *fileName, bool, AudioProperties::ReadStyle) const
-   *   {
-   *     if(someCheckForAnMP3File(fileName))
-   *       return new Strawberry_TagLib::TagLib::MPEG::File(fileName);
-   *     return 0;
-   *   }
-   * }
-   *
-   * FileRef::addFileTypeResolver(new MyFileTypeResolver);
-   *
-   * \endcode
-   *
-   * Naturally a less contrived example would be slightly more complex.
-   * This can be used to plug in mime-type detection systems or to add new file types to TagLib.
-   */
-
-  class TAGLIB_EXPORT FileTypeResolver {
-   public:
-    virtual ~FileTypeResolver() {}
-    /*!
-     * This method must be overridden to provide an additional file type resolver.
-     * If the resolver is able to determine the file type it should return a valid File object; if not it should return 0.
-     *
-     * \note The created file is then owned by the FileRef and should not be deleted.
-     * Deletion will happen automatically when the FileRef passes out of scope.
-     */
-    virtual File *createFile(FileName fileName, bool readAudioProperties = true, AudioProperties::ReadStyle audioPropertiesStyle = AudioProperties::Average) const = 0;
-  };
-
-  /*!
-   * Creates a null FileRef.
-   */
-  explicit FileRef();
-
-  /*!
-   * Create a FileRef from \a fileName.
-   * If \a readAudioProperties is true then the audio properties will be read using \a audioPropertiesStyle.
-   * If \a readAudioProperties is false then \a audioPropertiesStyle will be ignored.
-   *
-   * Also see the note in the class documentation about why you may not want to
-   * use this method in your application.
-   */
-  explicit FileRef(FileName fileName, bool readAudioProperties = true, AudioProperties::ReadStyle audioPropertiesStyle = AudioProperties::Average);
-
-  /*!
-   * Construct a FileRef from an opened \a IOStream.
-   * If \a readAudioProperties is true then the audio properties will be read using \a audioPropertiesStyle.
-   * If \a readAudioProperties is false then \a audioPropertiesStyle will be ignored.
-   *
-   * Also see the note in the class documentation about why you may not want to use this method in your application.
-   *
-   * \note TagLib will *not* take ownership of the stream, the caller is responsible for deleting it after the File object.
-   */
-  explicit FileRef(IOStream *stream, bool readAudioProperties = true, AudioProperties::ReadStyle audioPropertiesStyle = AudioProperties::Average);
-
-  /*!
-   * Construct a FileRef using \a file.
-   * The FileRef now takes ownership of the pointer and will delete the File when it passes out of scope.
-   */
-  explicit FileRef(File *file);
-
-  /*!
-   * Make a copy of \a ref.
-   */
-  FileRef(const FileRef &ref);
-
-  /*!
-   * Destroys this FileRef instance.
-   */
-  virtual ~FileRef();
-
-  /*!
-   * Returns a pointer to represented file's tag.
-   *
-   * \warning This pointer will become invalid when this FileRef and all
-   * copies pass out of scope.
-   *
-   * \warning Do not cast it to any subclasses of \class Tag.
-   * Use tag returning methods of appropriate subclasses of \class File instead.
-   *
-   * \see File::tag()
-   */
-  Tag *tag() const;
-
-  /*!
-   * Exports the tags of the file as dictionary mapping (human readable) tag names (uppercase Strings) to StringLists of tag values.
-   * Calls the according specialization in the File subclasses.
-   * For each metadata object of the file that could not be parsed into the PropertyMap format,
-   * the returend map's unsupportedData() list will contain one entry identifying that object (e.g. the frame type for ID3v2 tags).
-   * Use removeUnsupportedProperties() to remove (a subset of) them.
-   * For files that contain more than one tag (e.g. an MP3 with both an ID3v1 and an ID3v2 tag) only the most "modern" one will be exported (ID3v2 in this case).
-   */
-  PropertyMap properties() const;
-
-  /*!
-   * Removes unsupported properties, or a subset of them, from the file's metadata.
-   * The parameter \a properties must contain only entries from properties().unsupportedData().
-   */
-  void removeUnsupportedProperties(const StringList &properties);
-
-  /*!
-   * Sets the tags of this File to those specified in \a properties.
-   * Calls the according specialization method in the subclasses of File to do the translation into the format-specific details.
-   * If some value(s) could not be written imported to the specific metadata format,
-   * the returned PropertyMap will contain those value(s). Otherwise it will be empty, indicating that no problems occured.
-   * With file types that support several tag formats (for instance, MP3 files can have ID3v1, ID3v2, and APEv2 tags),
-   * this function will create the most appropriate one (ID3v2 for MP3 files). Older formats will be updated as well,
-   * if they exist, but won't be taken into account for the return value of this function.
-   * See the documentation of the subclass implementations for detailed descriptions.
-   */
-  PropertyMap setProperties(const PropertyMap &properties);
-
-  /*!
-   * Returns the audio properties for this FileRef.
-   * If no audio properties were read then this will returns a null pointer.
-   */
-  AudioProperties *audioProperties() const;
-
-  /*!
-   * Returns a pointer to the file represented by this handler class.
-   *
-   * As a general rule this call should be avoided since if you need to work
-   * with file objects directly, you are probably better served instantiating
-   * the File subclasses (i.e. MPEG::File) manually and working with their APIs.
-   *
-   * This <i>handle</i> exists to provide a minimal, generic and value-based
-   * wrapper around a File.  Accessing the file directly generally indicates
-   * a moving away from this simplicity (and into things beyond the scope of
-   * FileRef).
-   *
-   * \warning This pointer will become invalid when this FileRef and all
-   * copies pass out of scope.
-   */
-  File *file() const;
-
-  /*!
-   * Saves the file.  Returns true on success.
-   */
-  bool save();
-
-  /*!
-   * Adds a FileTypeResolver to the list of those used by TagLib.
-   * Each additional FileTypeResolver is added to the front of a list of resolvers that are tried.
-   * If the FileTypeResolver returns zero the next resolver is tried.
-   *
-   * Returns a pointer to the added resolver (the same one that's passed in --
-   * this is mostly so that static initializers have something to use for assignment).
-   *
-   * \see FileTypeResolver
-   */
-  static const FileTypeResolver *addFileTypeResolver(const FileTypeResolver *resolver);
-
-  /*!
-   * As is mentioned elsewhere in this class's documentation, the default file
-   * type resolution code provided by TagLib only works by comparing file extensions.
-   *
-   * This method returns the list of file extensions that are used by default.
-   *
-   * The extensions are all returned in lowercase, though the comparison used
-   * by TagLib for resolution is case-insensitive.
-   *
-   * \note This does not account for any additional file type resolvers that
-   * are plugged in.  Also note that this is not intended to replace a proper
-   * mime-type resolution system, but is just here for reference.
-   *
-   * \see FileTypeResolver
-   */
-  static StringList defaultFileExtensions();
-
-  /*!
-   * Returns true if the file is open and readable.
-   *
-   * \note Just a negative of isNull().
-   */
-  bool isValid() const;
-
-  /*!
-   * Returns true if the file (and as such other pointers) are null.
-   */
-  bool isNull() const;
-
-  /*!
-   * Assign the file pointed to by \a ref to this FileRef.
-   */
-  FileRef &operator=(const FileRef &ref);
-
-  /*!
-   * Exchanges the content of the FileRef by the content of \a ref.
-   */
-  void swap(FileRef &ref);
-
-  /*!
-   * Returns true if this FileRef and \a ref point to the same File object.
-   */
-  bool operator==(const FileRef &ref) const;
-
-  /*!
-   * Returns true if this FileRef and \a ref do not point to the same File object.
-   */
-  bool operator!=(const FileRef &ref) const;
-
- private:
-  void parse(FileName fileName, bool readAudioProperties, AudioProperties::ReadStyle audioPropertiesStyle);
-  void parse(IOStream *stream, bool readAudioProperties, AudioProperties::ReadStyle audioPropertiesStyle);
-
-  class FileRefPrivate;
-  FileRefPrivate *d;
-};
-
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif  // TAGLIB_FILEREF_H

3rdparty/taglib/flac/flacfile.cpp

@@ -1,535 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2003-2004 by Allan Sandfeld Jensen
-    email                : kde@carewolf.org
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include <memory>
-
-#include "tbytevector.h"
-#include "tstring.h"
-#include "tlist.h"
-#include "tdebug.h"
-#include "tagunion.h"
-#include "tpropertymap.h"
-#include "tagutils.h"
-
-#include "id3v2header.h"
-#include "id3v2tag.h"
-#include "id3v1tag.h"
-#include "xiphcomment.h"
-
-#include "flacpicture.h"
-#include "flacfile.h"
-#include "flacmetadatablock.h"
-#include "flacunknownmetadatablock.h"
-
-using namespace Strawberry_TagLib::TagLib;
-
-namespace {
-typedef List<std::shared_ptr<FLAC::MetadataBlock>> BlockList;
-typedef BlockList::Iterator BlockIterator;
-typedef BlockList::Iterator BlockConstIterator;
-
-enum { FlacXiphIndex = 0,
-  FlacID3v2Index = 1,
-  FlacID3v1Index = 2 };
-
-const long long MinPaddingLength = 4096;
-const long long MaxPaddingLegnth = 1024 * 1024;
-
-const char LastBlockFlag = '\x80';
-}  // namespace
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-namespace FLAC {
-// Enables BlockList::find() to take raw pointers.
-
-bool operator==(std::shared_ptr<MetadataBlock> lhs, MetadataBlock *rhs);
-bool operator==(std::shared_ptr<MetadataBlock> lhs, MetadataBlock *rhs) {
-  return lhs.get() == rhs;
-}
-}  // namespace FLAC
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-class FLAC::File::FilePrivate {
- public:
-  explicit FilePrivate(const ID3v2::FrameFactory *frameFactory) : ID3v2FrameFactory(ID3v2::FrameFactory::instance()),
-                                                                  ID3v2Location(-1),
-                                                                  ID3v2OriginalSize(0),
-                                                                  ID3v1Location(-1),
-                                                                  flacStart(0),
-                                                                  streamStart(0),
-                                                                  scanned(false) {
-
-    if (frameFactory)
-      ID3v2FrameFactory = frameFactory;
-
-  }
-
-  const ID3v2::FrameFactory *ID3v2FrameFactory;
-  long long ID3v2Location;
-  long long ID3v2OriginalSize;
-
-  long long ID3v1Location;
-
-  TripleTagUnion tag;
-
-  std::unique_ptr<AudioProperties> properties;
-  ByteVector xiphCommentData;
-  BlockList blocks;
-
-  long long flacStart;
-  long long streamStart;
-  bool scanned;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// static members
-////////////////////////////////////////////////////////////////////////////////
-
-bool FLAC::File::isSupported(IOStream *stream) {
-
-  // A FLAC file has an ID "fLaC" somewhere. An ID3v2 tag may precede.
-
-  const ByteVector buffer = Utils::readHeader(stream, bufferSize(), true);
-  return (buffer.find("fLaC") != ByteVector::npos());
-
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-FLAC::File::File(FileName file, bool readProperties, AudioProperties::ReadStyle, ID3v2::FrameFactory *frameFactory) : Strawberry_TagLib::TagLib::File(file), d(new FilePrivate(frameFactory)) {
-
-  if (isOpen())
-    read(readProperties);
-
-}
-
-FLAC::File::File(IOStream *stream, bool readProperties, AudioProperties::ReadStyle, ID3v2::FrameFactory *frameFactory) : Strawberry_TagLib::TagLib::File(stream), d(new FilePrivate(frameFactory)) {
-
-  if (isOpen())
-    read(readProperties);
-
-}
-
-FLAC::File::~File() {
-  delete d;
-}
-
-Strawberry_TagLib::TagLib::Tag *FLAC::File::tag() const {
-  return &d->tag;
-}
-
-PropertyMap FLAC::File::setProperties(const PropertyMap &properties) {
-  return xiphComment(true)->setProperties(properties);
-}
-
-FLAC::AudioProperties *FLAC::File::audioProperties() const {
-  return d->properties.get();
-}
-
-bool FLAC::File::save() {
-
-  if (readOnly()) {
-    debug("FLAC::File::save() - Cannot save to a read only file.");
-    return false;
-  }
-
-  if (!isValid()) {
-    debug("FLAC::File::save() -- Trying to save invalid file.");
-    return false;
-  }
-
-  // Create new vorbis comments
-  if (!hasXiphComment())
-    Tag::duplicate(&d->tag, xiphComment(true), false);
-
-  d->xiphCommentData = xiphComment()->render(false);
-
-  // Replace metadata blocks
-
-  for (BlockIterator it = d->blocks.begin(); it != d->blocks.end(); ++it) {
-    if ((*it)->code() == MetadataBlock::VorbisComment) {
-      // Set the new Vorbis Comment block
-      d->blocks.erase(it);
-      break;
-    }
-  }
-
-  d->blocks.append(std::shared_ptr<MetadataBlock>(new UnknownMetadataBlock(MetadataBlock::VorbisComment, d->xiphCommentData)));
-
-  // Render data for the metadata blocks
-
-  ByteVector data;
-  for (BlockConstIterator it = d->blocks.begin(); it != d->blocks.end(); ++it) {
-    ByteVector blockData = (*it)->render();
-    ByteVector blockHeader = ByteVector::fromUInt32BE(blockData.size());
-    blockHeader[0] = (*it)->code();
-    data.append(blockHeader);
-    data.append(blockData);
-  }
-
-  // Compute the amount of padding, and append that to data.
-
-  long long originalLength = d->streamStart - d->flacStart;
-  long long paddingLength = originalLength - data.size() - 4;
-
-  if (paddingLength <= 0) {
-    paddingLength = MinPaddingLength;
-  }
-  else {
-    // Padding won't increase beyond 1% of the file size or 1MB.
-
-    long long threshold = length() / 100;
-    threshold = std::max(threshold, MinPaddingLength);
-    threshold = std::min(threshold, MaxPaddingLegnth);
-
-    if (paddingLength > threshold)
-      paddingLength = MinPaddingLength;
-  }
-
-  ByteVector paddingHeader = ByteVector::fromUInt32BE(paddingLength);
-  paddingHeader[0] = static_cast<char>(MetadataBlock::Padding | LastBlockFlag);
-  data.append(paddingHeader);
-  data.resize(static_cast<size_t>(data.size() + paddingLength));
-
-  // Write the data to the file
-
-  insert(data, d->flacStart, originalLength);
-
-  d->streamStart += (static_cast<long>(data.size()) - originalLength);
-
-  if (d->ID3v1Location >= 0)
-    d->ID3v1Location += (static_cast<long>(data.size()) - originalLength);
-
-  // Update ID3 tags
-
-  if (ID3v2Tag() && !ID3v2Tag()->isEmpty()) {
-
-    // ID3v2 tag is not empty. Update the old one or create a new one.
-
-    if (d->ID3v2Location < 0)
-      d->ID3v2Location = 0;
-
-    data = ID3v2Tag()->render();
-    insert(data, d->ID3v2Location, d->ID3v2OriginalSize);
-
-    d->flacStart += (static_cast<long>(data.size()) - d->ID3v2OriginalSize);
-    d->streamStart += (static_cast<long>(data.size()) - d->ID3v2OriginalSize);
-
-    if (d->ID3v1Location >= 0)
-      d->ID3v1Location += (static_cast<long>(data.size()) - d->ID3v2OriginalSize);
-
-    d->ID3v2OriginalSize = data.size();
-  }
-  else {
-
-    // ID3v2 tag is empty. Remove the old one.
-
-    if (d->ID3v2Location >= 0) {
-      removeBlock(d->ID3v2Location, d->ID3v2OriginalSize);
-
-      d->flacStart -= d->ID3v2OriginalSize;
-      d->streamStart -= d->ID3v2OriginalSize;
-
-      if (d->ID3v1Location >= 0)
-        d->ID3v1Location -= d->ID3v2OriginalSize;
-
-      d->ID3v2Location = -1;
-      d->ID3v2OriginalSize = 0;
-    }
-  }
-
-  if (ID3v1Tag() && !ID3v1Tag()->isEmpty()) {
-
-    // ID3v1 tag is not empty. Update the old one or create a new one.
-
-    if (d->ID3v1Location >= 0) {
-      seek(d->ID3v1Location);
-    }
-    else {
-      seek(0, End);
-      d->ID3v1Location = tell();
-    }
-
-    writeBlock(ID3v1Tag()->render());
-  }
-  else {
-
-    // ID3v1 tag is empty. Remove the old one.
-
-    if (d->ID3v1Location >= 0) {
-      truncate(d->ID3v1Location);
-      d->ID3v1Location = -1;
-    }
-  }
-
-  return true;
-
-}
-
-ID3v2::Tag *FLAC::File::ID3v2Tag(bool create) {
-  return d->tag.access<ID3v2::Tag>(FlacID3v2Index, create);
-}
-
-ID3v1::Tag *FLAC::File::ID3v1Tag(bool create) {
-  return d->tag.access<ID3v1::Tag>(FlacID3v1Index, create);
-}
-
-Ogg::XiphComment *FLAC::File::xiphComment(bool create) {
-  return d->tag.access<Ogg::XiphComment>(FlacXiphIndex, create);
-}
-
-List<FLAC::Picture *> FLAC::File::pictureList() {
-
-  List<Picture *> pictures;
-  for (BlockConstIterator it = d->blocks.begin(); it != d->blocks.end(); ++it) {
-    Picture *picture = dynamic_cast<Picture *>(it->get());
-    if (picture) {
-      pictures.append(picture);
-    }
-  }
-  return pictures;
-
-}
-
-void FLAC::File::addPicture(Picture *picture) {
-  d->blocks.append(std::shared_ptr<Picture>(picture));
-}
-
-void FLAC::File::removePicture(Picture *picture) {
-
-  BlockIterator it = d->blocks.find(picture);
-  if (it != d->blocks.end())
-    d->blocks.erase(it);
-
-}
-
-void FLAC::File::removePictures() {
-
-  for (BlockIterator it = d->blocks.begin(); it != d->blocks.end();) {
-    if (dynamic_cast<Picture *>(it->get())) {
-      it = d->blocks.erase(it);
-    }
-    else {
-      ++it;
-    }
-  }
-
-}
-
-void FLAC::File::strip(int tags) {
-
-  if (tags & ID3v1)
-    d->tag.set(FlacID3v1Index, nullptr);
-
-  if (tags & ID3v2)
-    d->tag.set(FlacID3v2Index, nullptr);
-
-  if (tags & XiphComment) {
-    xiphComment()->removeAllFields();
-    xiphComment()->removeAllPictures();
-  }
-
-}
-
-bool FLAC::File::hasXiphComment() const {
-  return !d->xiphCommentData.isEmpty();
-}
-
-bool FLAC::File::hasID3v1Tag() const {
-  return (d->ID3v1Location >= 0);
-}
-
-bool FLAC::File::hasID3v2Tag() const {
-  return (d->ID3v2Location >= 0);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// private members
-////////////////////////////////////////////////////////////////////////////////
-
-void FLAC::File::read(bool readProperties) {
-
-  // Look for an ID3v2 tag
-
-  d->ID3v2Location = Utils::findID3v2(this);
-
-  if (d->ID3v2Location >= 0) {
-    d->tag.set(FlacID3v2Index, new ID3v2::Tag(this, d->ID3v2Location, d->ID3v2FrameFactory));
-    d->ID3v2OriginalSize = ID3v2Tag()->header()->completeTagSize();
-  }
-
-  // Look for an ID3v1 tag
-
-  d->ID3v1Location = Utils::findID3v1(this);
-
-  if (d->ID3v1Location >= 0)
-    d->tag.set(FlacID3v1Index, new ID3v1::Tag(this, d->ID3v1Location));
-
-  // Look for FLAC metadata, including vorbis comments
-
-  scan();
-
-  if (!isValid())
-    return;
-
-  if (!d->xiphCommentData.isEmpty())
-    d->tag.set(FlacXiphIndex, new Ogg::XiphComment(d->xiphCommentData));
-  else
-    d->tag.set(FlacXiphIndex, new Ogg::XiphComment());
-
-  if (readProperties) {
-
-    // First block should be the stream_info metadata
-
-    const ByteVector infoData = d->blocks.front()->render();
-
-    long long streamLength;
-
-    if (d->ID3v1Location >= 0)
-      streamLength = d->ID3v1Location - d->streamStart;
-    else
-      streamLength = length() - d->streamStart;
-
-    d->properties.reset(new AudioProperties(infoData, streamLength));
-  }
-
-}
-
-void FLAC::File::scan() {
-
-  // Scan the metadata pages
-
-  if (d->scanned)
-    return;
-
-  if (!isValid())
-    return;
-
-  long long nextBlockOffset;
-
-  if (d->ID3v2Location >= 0)
-    nextBlockOffset = find("fLaC", d->ID3v2Location + d->ID3v2OriginalSize);
-  else
-    nextBlockOffset = find("fLaC");
-
-  if (nextBlockOffset < 0) {
-    debug("FLAC::File::scan() -- FLAC stream not found");
-    setValid(false);
-    return;
-  }
-
-  nextBlockOffset += 4;
-  d->flacStart = nextBlockOffset;
-
-  while (true) {
-
-    seek(nextBlockOffset);
-    const ByteVector header = readBlock(4);
-
-    // Header format (from spec):
-    // <1> Last-metadata-block flag
-    // <7> BLOCK_TYPE
-    //    0 : STREAMINFO
-    //    1 : PADDING
-    //    ..
-    //    4 : VORBIS_COMMENT
-    //    ..
-    //    6 : PICTURE
-    //    ..
-    // <24> Length of metadata to follow
-
-    const char blockType = header[0] & ~LastBlockFlag;
-    const bool isLastBlock = (header[0] & LastBlockFlag) != 0;
-    const size_t blockLength = header.toUInt24BE(1);
-
-    // First block should be the stream_info metadata
-
-    if (d->blocks.isEmpty() && blockType != MetadataBlock::StreamInfo) {
-      debug("FLAC::File::scan() -- First block should be the stream_info metadata");
-      setValid(false);
-      return;
-    }
-
-    if (blockLength == 0 && blockType != MetadataBlock::Padding && blockType != MetadataBlock::SeekTable) {
-      debug("FLAC::File::scan() -- Zero-sized metadata block found");
-      setValid(false);
-      return;
-    }
-
-    const ByteVector data = readBlock(blockLength);
-    if (data.size() != blockLength) {
-      debug("FLAC::File::scan() -- Failed to read a metadata block");
-      setValid(false);
-      return;
-    }
-
-    std::shared_ptr<MetadataBlock> block;
-
-    // Found the vorbis-comment
-    if (blockType == MetadataBlock::VorbisComment) {
-      if (d->xiphCommentData.isEmpty()) {
-        d->xiphCommentData = data;
-        block.reset(new UnknownMetadataBlock(MetadataBlock::VorbisComment, data));
-      }
-      else {
-        debug("FLAC::File::scan() -- multiple Vorbis Comment blocks found, discarding");
-      }
-    }
-    else if (blockType == MetadataBlock::Picture) {
-      std::shared_ptr<FLAC::Picture> picture(new FLAC::Picture());
-      if (picture->parse(data)) {
-        block = picture;
-      }
-      else {
-        debug("FLAC::File::scan() -- invalid picture found, discarding");
-      }
-    }
-    else if (blockType == MetadataBlock::Padding) {
-      // Skip all padding blocks.
-    }
-    else {
-      block.reset(new UnknownMetadataBlock(blockType, data));
-    }
-
-    if (block)
-      d->blocks.append(block);
-
-    nextBlockOffset += blockLength + 4;
-
-    if (isLastBlock)
-      break;
-  }
-
-  // End of metadata, now comes the datastream
-
-  d->streamStart = nextBlockOffset;
-
-  d->scanned = true;
-
-}

3rdparty/taglib/flac/flacfile.h

@@ -1,278 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2003 by Allan Sandfeld Jensen
-    email                : kde@carewolf.org
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_FLACFILE_H
-#define TAGLIB_FLACFILE_H
-
-#include <memory>
-
-#include "taglib_export.h"
-#include "tfile.h"
-#include "tlist.h"
-#include "tag.h"
-
-#include "flacpicture.h"
-#include "flacproperties.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-
-class Tag;
-namespace ID3v2 {
-class FrameFactory;
-class Tag;
-}  // namespace ID3v2
-namespace ID3v1 {
-class Tag;
-}
-namespace Ogg {
-class XiphComment;
-}
-
-//! An implementation of FLAC metadata
-
-/*!
- * This is implementation of FLAC metadata for non-Ogg FLAC files.  At some
- * point when Ogg / FLAC is more common there will be a similar implementation
- * under the Ogg hierarchy.
- *
- * This supports ID3v1, ID3v2 and Xiph style comments as well as reading stream
- * properties from the file.
- */
-
-namespace FLAC {
-
-//! An implementation of TagLib::File with FLAC specific methods
-
-/*!
- * This implements and provides an interface for FLAC files to the TagLib::Tag and TagLib::AudioProperties interfaces
- * by way of implementing the abstract TagLib::File API as well as providing some additional information specific to FLAC files.
- *
- */
-
-class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File {
- public:
-  /*!
-   * This set of flags is used for various operations and is suitable for
-   * being OR-ed together.
-   */
-  enum TagTypes {
-    //! Empty set.  Matches no tag types.
-    NoTags = 0x0000,
-    //! Matches Vorbis comments.
-    XiphComment = 0x0001,
-    //! Matches ID3v1 tags.
-    ID3v1 = 0x0002,
-    //! Matches ID3v2 tags.
-    ID3v2 = 0x0004,
-    //! Matches all tag types.
-    AllTags = 0xffff
-  };
-
-  /*!
-   * Constructs an FLAC file from \a file.
-   * If \a readProperties is true the file's audio properties will also be read.
-   *
-   * If this file contains and ID3v2 tag the frames will be created using \a frameFactory.
-   *
-   * \note In the current implementation, \a propertiesStyle is ignored.
-   */
-  explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average, ID3v2::FrameFactory *frameFactory = nullptr);
-
-  /*!
-   * Constructs a FLAC file from \a stream.  If \a readProperties is true the file's audio properties will also be read.
-   *
-   * \note TagLib will *not* take ownership of the stream, the caller is responsible for deleting it after the File object.
-   *
-   * If this file contains and ID3v2 tag the frames will be created using \a frameFactory.
-   *
-   * \note In the current implementation, \a propertiesStyle is ignored.
-   */
-  // BIC: merge with the above constructor
-  explicit File(IOStream *stream, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average, ID3v2::FrameFactory *frameFactory = nullptr);
-
-  /*!
-   * Destroys this instance of the File.
-   */
-  ~File() override;
-
-  /*!
-   * Returns the Tag for this file.  This will be a union of XiphComment, ID3v1 and ID3v2 tags.
-   *
-   * \see ID3v2Tag()
-   * \see ID3v1Tag()
-   * \see XiphComment()
-   */
-  Strawberry_TagLib::TagLib::Tag *tag() const override;
-
-  /*!
-   * Implements the unified property interface -- import function.
-   * This always creates a Xiph comment, if none exists. The return value relates to the Xiph comment only.
-   * Ignores any changes to ID3v1 or ID3v2 comments since they are not allowed in the FLAC specification.
-   */
-  PropertyMap setProperties(const PropertyMap &) override;
-
-  /*!
-   * Returns the FLAC::AudioProperties for this file.  If no audio properties were read then this will return a null pointer.
-   */
-  AudioProperties *audioProperties() const override;
-
-  /*!
-   * Save the file.  This will primarily save the XiphComment, but will also keep any old ID3-tags up to date.
-   * If the file has no XiphComment, one will be constructed from the ID3-tags.
-   *
-   * This returns true if the save was successful.
-   */
-  bool save() override;
-
-  /*!
-   * Returns a pointer to the ID3v2 tag of the file.
-   *
-   * If \a create is false (the default) this returns a null pointer
-   * if there is no valid ID3v2 tag.
-   * If \a create is true it will create an ID3v2 tag if one does not exist and returns a valid pointer.
-   *
-   * \note This may return a valid pointer regardless of whether or not the file on disk has an ID3v2 tag.
-   * Use hasID3v2Tag() to check if the file on disk actually has an ID3v2 tag.
-   *
-   * \note The Tag <b>is still</b> owned by the MPEG::File and should not be
-   * deleted by the user.  It will be deleted when the file (object) is destroyed.
-   *
-   * \see hasID3v2Tag()
-   */
-  ID3v2::Tag *ID3v2Tag(bool create = false);
-
-  /*!
-   * Returns a pointer to the ID3v1 tag of the file.
-   *
-   * If \a create is false (the default) this returns a null pointer if there is no valid APE tag.
-   * If \a create is true it will create an APE tag if one does not exist and returns a valid pointer.
-   *
-   * \note This may return a valid pointer regardless of whether or not the file on disk has an ID3v1 tag.
-   * Use hasID3v1Tag() to check if the file on disk actually has an ID3v1 tag.
-   *
-   * \note The Tag <b>is still</b> owned by the MPEG::File and should not be deleted by the user.
-   * It will be deleted when the file (object) is destroyed.
-   *
-   * \see hasID3v1Tag()
-   */
-  ID3v1::Tag *ID3v1Tag(bool create = false);
-
-  /*!
-   * Returns a pointer to the XiphComment for the file.
-   *
-   * If \a create is false (the default) this returns a null pointer if there is no valid XiphComment.
-   * If \a create is true it will create a XiphComment if one does not exist and returns a valid pointer.
-   *
-   * \note This may return a valid pointer regardless of whether or not the file on disk has a XiphComment.
-   * Use hasXiphComment() to check if the file on disk actually has a XiphComment.
-   *
-   * \note The Tag <b>is still</b> owned by the FLAC::File and should not be deleted by the user.
-   * It will be deleted when the file (object) is destroyed.
-   *
-   * \see hasXiphComment()
-   */
-  Ogg::XiphComment *xiphComment(bool create = false);
-
-  /*!
-   * Returns a list of pictures attached to the FLAC file.
-   */
-  List<Picture *> pictureList();
-
-  /*!
-   * Removes an attached picture. The picture's memory will be freed.
-   */
-  void removePicture(Picture *picture);
-
-  /*!
-   * Remove all attached images.
-   */
-  void removePictures();
-
-  /*!
-   * Add a new picture to the file.
-   * The file takes ownership of the picture and will handle freeing its memory.
-   *
-   * \note The file will be saved only after calling save().
-   */
-  void addPicture(Picture *picture);
-
-  /*!
-   * This will remove the tags that match the OR-ed together TagTypes from the file.
-   * By default it removes all tags.
-   *
-   * \warning This will also invalidate pointers to the tags as their memory will be freed.
-   *
-   * \note In order to make the removal permanent save() still needs to be called.
-   *
-   * \note This won't remove the Vorbis comment block completely.
-   * The vendor ID will be preserved.
-   */
-  void strip(int tags = AllTags);
-
-  /*!
-   * Returns whether or not the file on disk actually has a XiphComment.
-   *
-   * \see xiphComment()
-   */
-  bool hasXiphComment() const;
-
-  /*!
-   * Returns whether or not the file on disk actually has an ID3v1 tag.
-   *
-   * \see ID3v1Tag()
-   */
-  bool hasID3v1Tag() const;
-
-  /*!
-   * Returns whether or not the file on disk actually has an ID3v2 tag.
-   *
-   * \see ID3v2Tag()
-   */
-  bool hasID3v2Tag() const;
-
-  /*!
-   * Returns whether or not the given \a stream can be opened as a FLAC file.
-   *
-   * \note This method is designed to do a quick check.
-   * The result may not necessarily be correct.
-   */
-  static bool isSupported(IOStream *stream);
-
- private:
-  File(const File&);
-  File &operator=(const File&);
-
-  void read(bool readProperties);
-  void scan();
-
-  class FilePrivate;
-  FilePrivate *d;
-};
-}  // namespace FLAC
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/flac/flacmetadatablock.cpp

@@ -1,39 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2010 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include "taglib.h"
-#include "tdebug.h"
-#include "flacmetadatablock.h"
-
-using namespace Strawberry_TagLib::TagLib;
-
-class FLAC::MetadataBlock::MetadataBlockPrivate {
- public:
-  MetadataBlockPrivate() {}
-};
-
-FLAC::MetadataBlock::MetadataBlock() : d(nullptr) {}
-
-FLAC::MetadataBlock::~MetadataBlock() {}

3rdparty/taglib/flac/flacmetadatablock.h

@@ -1,74 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2010 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_FLACMETADATABLOCK_H
-#define TAGLIB_FLACMETADATABLOCK_H
-
-#include "tlist.h"
-#include "tbytevector.h"
-#include "taglib_export.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-namespace FLAC {
-
-class TAGLIB_EXPORT MetadataBlock {
- public:
-  explicit MetadataBlock();
-  virtual ~MetadataBlock();
-
-  enum BlockType {
-    StreamInfo = 0,
-    Padding,
-    Application,
-    SeekTable,
-    VorbisComment,
-    CueSheet,
-    Picture
-  };
-
-  /*!
-   * Returns the FLAC metadata block type.
-   */
-  virtual int code() const = 0;
-
-  /*!
-   * Render the content of the block.
-   */
-  virtual ByteVector render() const = 0;
-
- private:
-  MetadataBlock(const MetadataBlock &item);
-  MetadataBlock &operator=(const MetadataBlock &item);
-
-  class MetadataBlockPrivate;
-  MetadataBlockPrivate *d;
-};
-
-}  // namespace FLAC
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/flac/flacpicture.cpp

@@ -1,194 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2010 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include "taglib.h"
-#include "tdebug.h"
-#include "flacpicture.h"
-
-using namespace Strawberry_TagLib::TagLib;
-
-class FLAC::Picture::PicturePrivate {
- public:
-  explicit PicturePrivate() : type(FLAC::Picture::Other),
-                              width(0),
-                              height(0),
-                              colorDepth(0),
-                              numColors(0) {
-  }
-
-  Type type;
-  String mimeType;
-  String description;
-  int width;
-  int height;
-  int colorDepth;
-  int numColors;
-  ByteVector data;
-};
-
-FLAC::Picture::Picture() : d(new PicturePrivate()) {
-}
-
-FLAC::Picture::Picture(const ByteVector &data) : d(new PicturePrivate()) {
-  parse(data);
-}
-
-FLAC::Picture::~Picture() {
-  delete d;
-}
-
-int FLAC::Picture::code() const {
-  return FLAC::MetadataBlock::Picture;
-}
-
-bool FLAC::Picture::parse(const ByteVector &data) {
-
-  if (data.size() < 32) {
-    debug("A picture block must contain at least 5 bytes.");
-    return false;
-  }
-
-  size_t pos = 0;
-  d->type = FLAC::Picture::Type(data.toUInt32BE(pos));
-  pos += 4;
-  const unsigned int mimeTypeLength = data.toUInt32BE(pos);
-  pos += 4;
-  if (pos + mimeTypeLength + 24 > data.size()) {
-    debug("Invalid picture block.");
-    return false;
-  }
-  d->mimeType = String(data.mid(pos, mimeTypeLength), String::UTF8);
-  pos += mimeTypeLength;
-  const unsigned int descriptionLength = data.toUInt32BE(pos);
-  pos += 4;
-  if (pos + descriptionLength + 20 > data.size()) {
-    debug("Invalid picture block.");
-    return false;
-  }
-  d->description = String(data.mid(pos, descriptionLength), String::UTF8);
-  pos += descriptionLength;
-  d->width = data.toUInt32BE(pos);
-  pos += 4;
-  d->height = data.toUInt32BE(pos);
-  pos += 4;
-  d->colorDepth = data.toUInt32BE(pos);
-  pos += 4;
-  d->numColors = data.toUInt32BE(pos);
-  pos += 4;
-  const unsigned int dataLength = data.toUInt32BE(pos);
-  pos += 4;
-  if (pos + dataLength > data.size()) {
-    debug("Invalid picture block.");
-    return false;
-  }
-  d->data = data.mid(pos, dataLength);
-
-  return true;
-
-}
-
-ByteVector FLAC::Picture::render() const {
-
-  ByteVector result;
-  result.append(ByteVector::fromUInt32BE(d->type));
-  ByteVector mimeTypeData = d->mimeType.data(String::UTF8);
-  result.append(ByteVector::fromUInt32BE(mimeTypeData.size()));
-  result.append(mimeTypeData);
-  ByteVector descriptionData = d->description.data(String::UTF8);
-  result.append(ByteVector::fromUInt32BE(descriptionData.size()));
-  result.append(descriptionData);
-  result.append(ByteVector::fromUInt32BE(d->width));
-  result.append(ByteVector::fromUInt32BE(d->height));
-  result.append(ByteVector::fromUInt32BE(d->colorDepth));
-  result.append(ByteVector::fromUInt32BE(d->numColors));
-  result.append(ByteVector::fromUInt32BE(d->data.size()));
-  result.append(d->data);
-  return result;
-
-}
-
-FLAC::Picture::Type FLAC::Picture::type() const {
-  return d->type;
-}
-
-void FLAC::Picture::setType(FLAC::Picture::Type type) {
-  d->type = type;
-}
-
-String FLAC::Picture::mimeType() const {
-  return d->mimeType;
-}
-
-void FLAC::Picture::setMimeType(const String &mimeType) {
-  d->mimeType = mimeType;
-}
-
-String FLAC::Picture::description() const {
-  return d->description;
-}
-
-void FLAC::Picture::setDescription(const String &description) {
-  d->description = description;
-}
-
-int FLAC::Picture::width() const {
-  return d->width;
-}
-
-void FLAC::Picture::setWidth(int width) {
-  d->width = width;
-}
-
-int FLAC::Picture::height() const {
-  return d->height;
-}
-
-void FLAC::Picture::setHeight(int height) {
-  d->height = height;
-}
-
-int FLAC::Picture::colorDepth() const {
-  return d->colorDepth;
-}
-
-void FLAC::Picture::setColorDepth(int colorDepth) {
-  d->colorDepth = colorDepth;
-}
-
-int FLAC::Picture::numColors() const {
-  return d->numColors;
-}
-
-void FLAC::Picture::setNumColors(int numColors) {
-  d->numColors = numColors;
-}
-
-ByteVector FLAC::Picture::data() const {
-  return d->data;
-}
-
-void FLAC::Picture::setData(const ByteVector &data) {
-  d->data = data;
-}

3rdparty/taglib/flac/flacpicture.h

@@ -1,203 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2010 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_FLACPICTURE_H
-#define TAGLIB_FLACPICTURE_H
-
-#include "tlist.h"
-#include "tstring.h"
-#include "tbytevector.h"
-#include "taglib_export.h"
-#include "flacmetadatablock.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-
-namespace FLAC {
-
-class TAGLIB_EXPORT Picture : public MetadataBlock {
- public:
-  /*!
-   * This describes the function or content of the picture.
-   */
-  enum Type {
-    //! A type not enumerated below
-    Other = 0x00,
-    //! 32x32 PNG image that should be used as the file icon
-    FileIcon = 0x01,
-    //! File icon of a different size or format
-    OtherFileIcon = 0x02,
-    //! Front cover image of the album
-    FrontCover = 0x03,
-    //! Back cover image of the album
-    BackCover = 0x04,
-    //! Inside leaflet page of the album
-    LeafletPage = 0x05,
-    //! Image from the album itself
-    Media = 0x06,
-    //! Picture of the lead artist or soloist
-    LeadArtist = 0x07,
-    //! Picture of the artist or performer
-    Artist = 0x08,
-    //! Picture of the conductor
-    Conductor = 0x09,
-    //! Picture of the band or orchestra
-    Band = 0x0A,
-    //! Picture of the composer
-    Composer = 0x0B,
-    //! Picture of the lyricist or text writer
-    Lyricist = 0x0C,
-    //! Picture of the recording location or studio
-    RecordingLocation = 0x0D,
-    //! Picture of the artists during recording
-    DuringRecording = 0x0E,
-    //! Picture of the artists during performance
-    DuringPerformance = 0x0F,
-    //! Picture from a movie or video related to the track
-    MovieScreenCapture = 0x10,
-    //! Picture of a large, coloured fish
-    ColouredFish = 0x11,
-    //! Illustration related to the track
-    Illustration = 0x12,
-    //! Logo of the band or performer
-    BandLogo = 0x13,
-    //! Logo of the publisher (record company)
-    PublisherLogo = 0x14
-  };
-
-  explicit Picture();
-  explicit Picture(const ByteVector &data);
-  ~Picture() override;
-
-  /*!
-   * Returns the type of the image.
-   */
-  Type type() const;
-
-  /*!
-   * Sets the type of the image.
-   */
-  void setType(Type type);
-
-  /*!
-   * Returns the mime type of the image.  This should in most cases be "image/png" or "image/jpeg".
-   */
-  String mimeType() const;
-
-  /*!
-   * Sets the mime type of the image.  This should in most cases be "image/png" or "image/jpeg".
-   */
-  void setMimeType(const String &m);
-
-  /*!
-   * Returns a text description of the image.
-   */
-
-  String description() const;
-
-  /*!
-   * Sets a textual description of the image to \a desc.
-   */
-
-  void setDescription(const String &desc);
-
-  /*!
-   * Returns the width of the image.
-   */
-  int width() const;
-
-  /*!
-   * Sets the width of the image.
-   */
-  void setWidth(int w);
-
-  /*!
-   * Returns the height of the image.
-   */
-  int height() const;
-
-  /*!
-   * Sets the height of the image.
-   */
-  void setHeight(int h);
-
-  /*!
-   * Returns the color depth (in bits-per-pixel) of the image.
-   */
-  int colorDepth() const;
-
-  /*!
-   * Sets the color depth (in bits-per-pixel) of the image.
-   */
-  void setColorDepth(int depth);
-
-  /*!
-   * Returns the number of colors used on the image..
-   */
-  int numColors() const;
-
-  /*!
-   * Sets the number of colors used on the image (for indexed images).
-   */
-  void setNumColors(int numColors);
-
-  /*!
-   * Returns the image data.
-   */
-  ByteVector data() const;
-
-  /*!
-   * Sets the image data.
-   */
-  void setData(const ByteVector &data);
-
-  /*!
-   * Returns the FLAC metadata block type.
-   */
-  int code() const override;
-
-  /*!
-   * Render the content to the FLAC picture block format.
-   */
-  ByteVector render() const override;
-
-  /*!
-   * Parse the picture data in the FLAC picture block format.
-   */
-  bool parse(const ByteVector &rawData);
-
- private:
-  Picture(const Picture &item);
-  Picture &operator=(const Picture &item);
-
-  class PicturePrivate;
-  PicturePrivate *d;
-};
-
-}  // namespace FLAC
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/flac/flacproperties.cpp

@@ -1,146 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2003 by Allan Sandfeld Jensen
-    email                : kde@carewolf.org
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include "tstring.h"
-#include "tdebug.h"
-
-#include "flacproperties.h"
-#include "flacfile.h"
-
-using namespace Strawberry_TagLib::TagLib;
-
-class FLAC::AudioProperties::AudioPropertiesPrivate {
- public:
-  explicit AudioPropertiesPrivate() : length(0),
-                                      bitrate(0),
-                                      sampleRate(0),
-                                      bitsPerSample(0),
-                                      channels(0),
-                                      sampleFrames(0) {}
-
-  int length;
-  int bitrate;
-  int sampleRate;
-  int bitsPerSample;
-  int channels;
-  unsigned long long sampleFrames;
-  ByteVector signature;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-FLAC::AudioProperties::AudioProperties(const ByteVector &data, long long streamLength, ReadStyle) : Strawberry_TagLib::TagLib::AudioProperties(), d(new AudioPropertiesPrivate()) {
-  read(data, streamLength);
-}
-
-FLAC::AudioProperties::~AudioProperties() {
-  delete d;
-}
-
-int FLAC::AudioProperties::lengthInSeconds() const {
-  return d->length / 1000;
-}
-
-int FLAC::AudioProperties::lengthInMilliseconds() const {
-  return d->length;
-}
-
-int FLAC::AudioProperties::bitrate() const {
-  return d->bitrate;
-}
-
-int FLAC::AudioProperties::sampleRate() const {
-  return d->sampleRate;
-}
-
-int FLAC::AudioProperties::bitsPerSample() const {
-  return d->bitsPerSample;
-}
-
-int FLAC::AudioProperties::channels() const {
-  return d->channels;
-}
-
-unsigned long long FLAC::AudioProperties::sampleFrames() const {
-  return d->sampleFrames;
-}
-
-ByteVector FLAC::AudioProperties::signature() const {
-  return d->signature;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// private members
-////////////////////////////////////////////////////////////////////////////////
-
-void FLAC::AudioProperties::read(const ByteVector &data, long long streamLength) {
-
-  if (data.size() < 18) {
-    debug("FLAC::AudioProperties::read() - FLAC properties must contain at least 18 bytes.");
-    return;
-  }
-
-  size_t pos = 0;
-
-  // Minimum block size (in samples)
-  pos += 2;
-
-  // Maximum block size (in samples)
-  pos += 2;
-
-  // Minimum frame size (in bytes)
-  pos += 3;
-
-  // Maximum frame size (in bytes)
-  pos += 3;
-
-  const unsigned int flags = data.toUInt32BE(pos);
-  pos += 4;
-
-  d->sampleRate = flags >> 12;
-  d->channels = ((flags >> 9) & 7) + 1;
-  d->bitsPerSample = ((flags >> 4) & 31) + 1;
-
-  // The last 4 bits are the most significant 4 bits for the 36 bit
-  // stream length in samples. (Audio files measured in days)
-
-  const unsigned long long hi = flags & 0xf;
-  const unsigned long long lo = data.toUInt32BE(pos);
-  pos += 4;
-
-  d->sampleFrames = (hi << 32) | lo;
-
-  if (d->sampleFrames > 0 && d->sampleRate > 0) {
-    const double length = d->sampleFrames * 1000.0 / d->sampleRate;
-    d->length = static_cast<int>(length + 0.5);
-    d->bitrate = static_cast<int>(streamLength * 8.0 / length + 0.5);
-  }
-
-  if (data.size() >= pos + 16)
-    d->signature = data.mid(pos, 16);
-
-}

3rdparty/taglib/flac/flacproperties.h

@@ -1,111 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2003 by Allan Sandfeld Jensen
-    email                : kde@carewolf.org
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_FLACPROPERTIES_H
-#define TAGLIB_FLACPROPERTIES_H
-
-#include "taglib_export.h"
-#include "audioproperties.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-
-namespace FLAC {
-
-class File;
-
-//! An implementation of audio property reading for FLAC
-
-/*!
- * This reads the data from an FLAC stream found in the AudioProperties API.
- */
-
-class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
- public:
-  /*!
-   * Create an instance of FLAC::AudioProperties with the data read from the ByteVector \a data.
-   */
-  explicit AudioProperties(const ByteVector &data, long long streamLength, ReadStyle style = Average);
-
-  /*!
-   * Destroys this FLAC::AudioProperties instance.
-   */
-  ~AudioProperties() override;
-
-  /*!
-   * Returns the length of the file in seconds.  The length is rounded down to the nearest whole second.
-   *
-   * \see lengthInMilliseconds()
-   */
-  int lengthInSeconds() const override;
-
-  /*!
-   * Returns the length of the file in milliseconds.
-   *
-   * \see lengthInSeconds()
-   */
-  int lengthInMilliseconds() const override;
-
-  /*!
-   * Returns the average bit rate of the file in kb/s.
-   */
-  int bitrate() const override;
-
-  /*!
-   * Returns the sample rate in Hz.
-   */
-  int sampleRate() const override;
-
-  /*!
-   * Returns the number of audio channels.
-   */
-  int channels() const override;
-
-  /*!
-   * Returns the number of bits per audio sample as read from the FLAC identification header.
-   */
-  int bitsPerSample() const;
-
-  /*!
-   * Return the number of sample frames.
-   */
-  unsigned long long sampleFrames() const;
-
-  /*!
-   * Returns the MD5 signature of the uncompressed audio stream as read from the stream info header.
-   */
-  ByteVector signature() const;
-
- private:
-  void read(const ByteVector &data, long long streamLength);
-
-  class AudioPropertiesPrivate;
-  AudioPropertiesPrivate *d;
-};
-}  // namespace FLAC
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/flac/flacunknownmetadatablock.cpp

@@ -1,68 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2010 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include "taglib.h"
-#include "tdebug.h"
-#include "tstring.h"
-#include "flacunknownmetadatablock.h"
-
-using namespace Strawberry_TagLib::TagLib;
-
-class FLAC::UnknownMetadataBlock::UnknownMetadataBlockPrivate {
- public:
-  explicit UnknownMetadataBlockPrivate() : code(0) {}
-
-  int code;
-  ByteVector data;
-};
-
-FLAC::UnknownMetadataBlock::UnknownMetadataBlock(int code, const ByteVector &data) : d(new UnknownMetadataBlockPrivate()) {
-  d->code = code;
-  d->data = data;
-}
-
-FLAC::UnknownMetadataBlock::~UnknownMetadataBlock() {
-  delete d;
-}
-
-int FLAC::UnknownMetadataBlock::code() const {
-  return d->code;
-}
-
-void FLAC::UnknownMetadataBlock::setCode(int code) {
-  d->code = code;
-}
-
-ByteVector FLAC::UnknownMetadataBlock::data() const {
-  return d->data;
-}
-
-void FLAC::UnknownMetadataBlock::setData(const ByteVector &data) {
-  d->data = data;
-}
-
-ByteVector FLAC::UnknownMetadataBlock::render() const {
-  return d->data;
-}

3rdparty/taglib/flac/flacunknownmetadatablock.h

@@ -1,80 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2010 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_FLACUNKNOWNMETADATABLOCK_H
-#define TAGLIB_FLACUNKNOWNMETADATABLOCK_H
-
-#include "tlist.h"
-#include "tbytevector.h"
-#include "taglib_export.h"
-#include "flacmetadatablock.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-namespace FLAC {
-
-class TAGLIB_EXPORT UnknownMetadataBlock : public MetadataBlock {
- public:
-  explicit UnknownMetadataBlock(int code, const ByteVector &data);
-  ~UnknownMetadataBlock() override;
-
-  /*!
-   * Returns the FLAC metadata block type.
-   */
-  int code() const override;
-
-  /*!
-   * Sets the FLAC metadata block type.
-   */
-  void setCode(int code);
-
-  /*!
-   * Returns the FLAC metadata block type.
-   */
-  ByteVector data() const;
-
-  /*!
-   * Sets the FLAC metadata block type.
-   */
-  void setData(const ByteVector &data);
-
-  /*!
-   * Render the content of the block.
-   */
-  ByteVector render() const override;
-
- private:
-  explicit UnknownMetadataBlock(const MetadataBlock &item);
-  UnknownMetadataBlock &operator=(const MetadataBlock &item);
-
-  class UnknownMetadataBlockPrivate;
-  UnknownMetadataBlockPrivate *d;
-};
-
-}  // namespace FLAC
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/it/itfile.cpp

@@ -1,312 +0,0 @@
-/***************************************************************************
-    copyright           : (C) 2011 by Mathias Panzenböck
-    email               : grosser.meister.morti@gmx.net
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-
-#include "tstringlist.h"
-#include "itfile.h"
-#include "tdebug.h"
-#include "modfileprivate.h"
-#include "tpropertymap.h"
-
-using namespace Strawberry_TagLib::TagLib;
-using namespace IT;
-
-class IT::File::FilePrivate {
- public:
-  explicit FilePrivate(AudioProperties::ReadStyle propertiesStyle) : properties(propertiesStyle) {}
-
-  Mod::Tag tag;
-  IT::AudioProperties properties;
-};
-
-IT::File::File(FileName file, bool readProperties, AudioProperties::ReadStyle propertiesStyle) : Mod::FileBase(file), d(new FilePrivate(propertiesStyle)) {
-
-  if (isOpen())
-    read(readProperties);
-
-}
-
-IT::File::File(IOStream *stream, bool readProperties, AudioProperties::ReadStyle propertiesStyle) : Mod::FileBase(stream), d(new FilePrivate(propertiesStyle)) {
-
-  if (isOpen())
-    read(readProperties);
-
-}
-
-IT::File::~File() {
-  delete d;
-}
-
-Mod::Tag *IT::File::tag() const {
-  return &d->tag;
-}
-
-IT::AudioProperties *IT::File::audioProperties() const {
-  return &d->properties;
-}
-
-bool IT::File::save() {
-
-  if (readOnly()) {
-    debug("IT::File::save() - Cannot save to a read only file.");
-    return false;
-  }
-  seek(4);
-  writeString(d->tag.title(), 25);
-  writeByte(0);
-
-  seek(2, Current);
-
-  unsigned short length = 0;
-  unsigned short instrumentCount = 0;
-  unsigned short sampleCount = 0;
-
-  if (!readU16L(length) || !readU16L(instrumentCount) || !readU16L(sampleCount))
-    return false;
-
-  seek(15, Current);
-
-  // write comment as instrument and sample names:
-  StringList lines = d->tag.comment().split("\n");
-  for (unsigned short i = 0; i < instrumentCount; ++i) {
-    seek(192L + length + (static_cast<long>(i) << 2));
-    unsigned int instrumentOffset = 0;
-    if (!readU32L(instrumentOffset))
-      return false;
-
-    seek(instrumentOffset + 32);
-
-    if (i < lines.size())
-      writeString(lines[i], 25);
-    else
-      writeString(String(), 25);
-    writeByte(0);
-  }
-
-  for (unsigned short i = 0; i < sampleCount; ++i) {
-    seek(192L + length + (static_cast<long>(instrumentCount) << 2) + (static_cast<long>(i) << 2));
-    unsigned int sampleOffset = 0;
-    if (!readU32L(sampleOffset))
-      return false;
-
-    seek(sampleOffset + 20);
-
-    if (static_cast<unsigned int>(i + instrumentCount) < lines.size())
-      writeString(lines[i + instrumentCount], 25);
-    else
-      writeString(String(), 25);
-    writeByte(0);
-  }
-
-  // write rest as message:
-  StringList messageLines;
-  for (unsigned int i = instrumentCount + sampleCount; i < lines.size(); ++i)
-    messageLines.append(lines[i]);
-  ByteVector message = messageLines.toString("\r").data(String::Latin1);
-
-  // it's actually not really stated if the message needs a
-  // terminating NUL but it does not hurt to add one:
-  if (message.size() > 7999)
-    message.resize(7999);
-  message.append(static_cast<char>(0));
-
-  unsigned short special = 0;
-  unsigned short messageLength = 0;
-  unsigned int messageOffset = 0;
-
-  seek(46);
-  if (!readU16L(special))
-    return false;
-
-  unsigned int fileSize = File::length();
-  if (special & AudioProperties::MessageAttached) {
-    seek(54);
-    if (!readU16L(messageLength) || !readU32L(messageOffset))
-      return false;
-
-    if (messageLength == 0)
-      messageOffset = fileSize;
-  }
-  else {
-    messageOffset = fileSize;
-    seek(46);
-    writeU16L(special | 0x1);
-  }
-
-  if (messageOffset + messageLength >= fileSize) {
-    // append new message
-    seek(54);
-    writeU16L(message.size());
-    writeU32L(messageOffset);
-    seek(messageOffset);
-    writeBlock(message);
-    truncate(messageOffset + message.size());
-  }
-  else {
-    // Only overwrite existing message.
-    // I'd need to parse (understand!) the whole file for more.
-    // Although I could just move the message to the end of file
-    // and let the existing one be, but that would waste space.
-    message.resize(messageLength, 0);
-    seek(messageOffset);
-    writeBlock(message);
-  }
-  return true;
-}
-
-void IT::File::read(bool) {
-  if (!isOpen())
-    return;
-
-  seek(0);
-  READ_ASSERT(readBlock(4) == "IMPM");
-  READ_STRING(d->tag.setTitle, 26);
-
-  seek(2, Current);
-
-  READ_U16L_AS(length);
-  READ_U16L_AS(instrumentCount);
-  READ_U16L_AS(sampleCount);
-
-  d->properties.setInstrumentCount(instrumentCount);
-  d->properties.setSampleCount(sampleCount);
-  READ_U16L(d->properties.setPatternCount);
-  READ_U16L(d->properties.setVersion);
-  READ_U16L(d->properties.setCompatibleVersion);
-  READ_U16L(d->properties.setFlags);
-  READ_U16L_AS(special);
-  d->properties.setSpecial(special);
-  READ_BYTE(d->properties.setGlobalVolume);
-  READ_BYTE(d->properties.setMixVolume);
-  READ_BYTE(d->properties.setBpmSpeed);
-  READ_BYTE(d->properties.setTempo);
-  READ_BYTE(d->properties.setPanningSeparation);
-  READ_BYTE(d->properties.setPitchWheelDepth);
-
-  // IT supports some kind of comment tag. Still, the
-  // sample/instrument names are abused as comments so
-  // I just add all together.
-  String message;
-  if (special & AudioProperties::MessageAttached) {
-    READ_U16L_AS(messageLength);
-    READ_U32L_AS(messageOffset);
-    seek(messageOffset);
-    ByteVector messageBytes = readBlock(messageLength);
-    READ_ASSERT(messageBytes.size() == messageLength);
-    const size_t index = messageBytes.find(static_cast<char>(0));
-    if (index != ByteVector::npos())
-      messageBytes.resize(index, 0);
-    messageBytes.replace('\r', '\n');
-    message = messageBytes;
-  }
-
-  seek(64);
-
-  ByteVector pannings = readBlock(64);
-  ByteVector volumes = readBlock(64);
-  READ_ASSERT(pannings.size() == 64 && volumes.size() == 64);
-  int channels = 0;
-  for (int i = 0; i < 64; ++i) {
-    // Strictly speaking an IT file has always 64 channels, but
-    // I don't count disabled and muted channels.
-    // But this always gives 64 channels for all my files anyway.
-    // Strangely VLC does report other values. I wonder how VLC
-    // gets it's values.
-    if (static_cast<unsigned char>(pannings[i]) < 128 && volumes[i] > 0)
-      ++channels;
-  }
-  d->properties.setChannels(channels);
-
-  // real length might be shorter because of skips and terminator
-  unsigned short realLength = 0;
-  for (unsigned short i = 0; i < length; ++i) {
-    READ_BYTE_AS(order);
-    if (order == 255) break;
-    if (order != 254) ++realLength;
-  }
-  d->properties.setLengthInPatterns(realLength);
-
-  StringList comment;
-  // Note: I found files that have nil characters somewhere
-  //       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 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 + (static_cast<long>(i) << 2));
-    READ_U32L_AS(instrumentOffset);
-    seek(instrumentOffset);
-
-    ByteVector instrumentMagic = readBlock(4);
-    READ_ASSERT(instrumentMagic == "IMPI");
-
-    READ_STRING_AS(dosFileName, 13);
-
-    seek(15, Current);
-
-    READ_STRING_AS(instrumentName, 26);
-    comment.append(instrumentName);
-  }
-
-  for (unsigned short i = 0; i < sampleCount; ++i) {
-    seek(192L + length + (static_cast<long>(instrumentCount) << 2) + (static_cast<long>(i) << 2));
-    READ_U32L_AS(sampleOffset);
-
-    seek(sampleOffset);
-
-    ByteVector sampleMagic = readBlock(4);
-    READ_ASSERT(sampleMagic == "IMPS");
-
-    READ_STRING_AS(dosFileName, 13);
-    READ_BYTE_AS(globalVolume);
-    READ_BYTE_AS(sampleFlags);
-    READ_BYTE_AS(sampleVolume);
-    READ_STRING_AS(sampleName, 26);
-    /*
-    READ_BYTE_AS(sampleCvt);
-    READ_BYTE_AS(samplePanning);
-    READ_U32L_AS(sampleLength);
-    READ_U32L_AS(loopStart);
-    READ_U32L_AS(loopStop);
-    READ_U32L_AS(c5speed);
-    READ_U32L_AS(sustainLoopStart);
-    READ_U32L_AS(sustainLoopEnd);
-    READ_U32L_AS(sampleDataOffset);
-    READ_BYTE_AS(vibratoSpeed);
-    READ_BYTE_AS(vibratoDepth);
-    READ_BYTE_AS(vibratoRate);
-    READ_BYTE_AS(vibratoType);
-    */
-
-    comment.append(sampleName);
-  }
-
-  if (message.size() > 0)
-    comment.append(message);
-  d->tag.setComment(comment.toString("\n"));
-  d->tag.setTrackerName("Impulse Tracker");
-
-}

3rdparty/taglib/it/itfile.h

@@ -1,91 +0,0 @@
-/***************************************************************************
-    copyright           : (C) 2011 by Mathias Panzenböck
-    email               : grosser.meister.morti@gmx.net
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it  under the terms of the GNU Lesser General Public License version  *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,            *
- *   MA  02110-1301  USA                                                   *
- ***************************************************************************/
-
-#ifndef TAGLIB_ITFILE_H
-#define TAGLIB_ITFILE_H
-
-#include "tfile.h"
-#include "audioproperties.h"
-#include "taglib_export.h"
-#include "modfilebase.h"
-#include "modtag.h"
-#include "itproperties.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-namespace IT {
-
-class TAGLIB_EXPORT File : public Mod::FileBase {
- public:
-  /*!
-   * Constructs a Impulse Tracker file from \a file.
-   *
-   * \note In the current implementation, both \a readProperties and \a propertiesStyle are ignored.
-   * The audio properties are always read.
-   */
-  explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
-
-  /*!
-   * Constructs a Impulse Tracker file from \a stream.
-   *
-   * \note In the current implementation, both \a readProperties and \a propertiesStyle are ignored.
-   * The audio properties are always read.
-   *
-   * \note TagLib will *not* take ownership of the stream, the caller is responsible for deleting it after the File object.
-   */
-  explicit File(IOStream *stream, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
-
-  /*!
-   * Destroys this instance of the File.
-   */
-  ~File() override;
-
-  Mod::Tag *tag() const override;
-
-  /*!
-   * Returns the IT::AudioProperties for this file. If no audio properties
-   * were read then this will return a null pointer.
-   */
-  IT::AudioProperties *audioProperties() const override;
-
-  /*!
-   * Save the file.
-   * This is the same as calling save(AllTags);
-   *
-   * \note Saving Impulse Tracker tags is not supported.
-   */
-  bool save() override;
-
- private:
-  File(const File&);
-  File &operator=(const File&);
-
-  void read(bool readProperties);
-
-  class FilePrivate;
-  FilePrivate *d;
-};
-
-}  // namespace IT
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/it/itproperties.cpp

@@ -1,216 +0,0 @@
-/***************************************************************************
-    copyright           :(C) 2011 by Mathias Panzenböck
-    email               : grosser.meister.morti@gmx.net
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-
-#include "itproperties.h"
-
-using namespace Strawberry_TagLib::TagLib;
-using namespace IT;
-
-class IT::AudioProperties::AudioPropertiesPrivate {
- public:
-  explicit AudioPropertiesPrivate() : channels(0),
-                                      lengthInPatterns(0),
-                                      instrumentCount(0),
-                                      sampleCount(0),
-                                      patternCount(0),
-                                      version(0),
-                                      compatibleVersion(0),
-                                      flags(0),
-                                      special(0),
-                                      globalVolume(0),
-                                      mixVolume(0),
-                                      tempo(0),
-                                      bpmSpeed(0),
-                                      panningSeparation(0),
-                                      pitchWheelDepth(0) {
-  }
-
-  int channels;
-  unsigned short lengthInPatterns;
-  unsigned short instrumentCount;
-  unsigned short sampleCount;
-  unsigned short patternCount;
-  unsigned short version;
-  unsigned short compatibleVersion;
-  unsigned short flags;
-  unsigned short special;
-  unsigned char globalVolume;
-  unsigned char mixVolume;
-  unsigned char tempo;
-  unsigned char bpmSpeed;
-  unsigned char panningSeparation;
-  unsigned char pitchWheelDepth;
-};
-
-IT::AudioProperties::AudioProperties(AudioProperties::ReadStyle) : Strawberry_TagLib::TagLib::AudioProperties(), d(new AudioPropertiesPrivate()) {}
-
-IT::AudioProperties::~AudioProperties() {
-  delete d;
-}
-
-int IT::AudioProperties::lengthInSeconds() const {
-  return 0;
-}
-
-int IT::AudioProperties::lengthInMilliseconds() const {
-  return 0;
-}
-
-int IT::AudioProperties::bitrate() const {
-  return 0;
-}
-
-int IT::AudioProperties::sampleRate() const {
-  return 0;
-}
-
-int IT::AudioProperties::channels() const {
-  return d->channels;
-}
-
-unsigned short IT::AudioProperties::lengthInPatterns() const {
-  return d->lengthInPatterns;
-}
-
-bool IT::AudioProperties::stereo() const {
-  return d->flags & Stereo;
-}
-
-unsigned short IT::AudioProperties::instrumentCount() const {
-  return d->instrumentCount;
-}
-
-unsigned short IT::AudioProperties::sampleCount() const {
-  return d->sampleCount;
-}
-
-unsigned short IT::AudioProperties::patternCount() const {
-  return d->patternCount;
-}
-
-unsigned short IT::AudioProperties::version() const {
-  return d->version;
-}
-
-unsigned short IT::AudioProperties::compatibleVersion() const {
-  return d->compatibleVersion;
-}
-
-unsigned short IT::AudioProperties::flags() const {
-  return d->flags;
-}
-
-unsigned short IT::AudioProperties::special() const {
-  return d->special;
-}
-
-unsigned char IT::AudioProperties::globalVolume() const {
-  return d->globalVolume;
-}
-
-unsigned char IT::AudioProperties::mixVolume() const {
-  return d->mixVolume;
-}
-
-unsigned char IT::AudioProperties::tempo() const {
-  return d->tempo;
-}
-
-unsigned char IT::AudioProperties::bpmSpeed() const {
-  return d->bpmSpeed;
-}
-
-unsigned char IT::AudioProperties::panningSeparation() const {
-  return d->panningSeparation;
-}
-
-unsigned char IT::AudioProperties::pitchWheelDepth() const {
-  return d->pitchWheelDepth;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// private members
-////////////////////////////////////////////////////////////////////////////////
-
-void IT::AudioProperties::setChannels(int channels) {
-  d->channels = channels;
-}
-
-void IT::AudioProperties::setLengthInPatterns(unsigned short lengthInPatterns) {
-  d->lengthInPatterns = lengthInPatterns;
-}
-
-void IT::AudioProperties::setInstrumentCount(unsigned short instrumentCount) {
-  d->instrumentCount = instrumentCount;
-}
-
-void IT::AudioProperties::setSampleCount(unsigned short sampleCount) {
-  d->sampleCount = sampleCount;
-}
-
-void IT::AudioProperties::setPatternCount(unsigned short patternCount) {
-  d->patternCount = patternCount;
-}
-
-void IT::AudioProperties::setFlags(unsigned short flags) {
-  d->flags = flags;
-}
-
-void IT::AudioProperties::setSpecial(unsigned short special) {
-  d->special = special;
-}
-
-void IT::AudioProperties::setCompatibleVersion(unsigned short compatibleVersion) {
-  d->compatibleVersion = compatibleVersion;
-}
-
-void IT::AudioProperties::setVersion(unsigned short version) {
-  d->version = version;
-}
-
-void IT::AudioProperties::setGlobalVolume(unsigned char globalVolume) {
-  d->globalVolume = globalVolume;
-}
-
-void IT::AudioProperties::setMixVolume(unsigned char mixVolume) {
-  d->mixVolume = mixVolume;
-}
-
-void IT::AudioProperties::setTempo(unsigned char tempo) {
-  d->tempo = tempo;
-}
-
-void IT::AudioProperties::setBpmSpeed(unsigned char bpmSpeed) {
-  d->bpmSpeed = bpmSpeed;
-}
-
-void IT::AudioProperties::setPanningSeparation(unsigned char panningSeparation) {
-  d->panningSeparation = panningSeparation;
-}
-
-void IT::AudioProperties::setPitchWheelDepth(unsigned char pitchWheelDepth) {
-  d->pitchWheelDepth = pitchWheelDepth;
-}

3rdparty/taglib/it/itproperties.h

@@ -1,107 +0,0 @@
-/***************************************************************************
-    copyright           : (C) 2011 by Mathias Panzenböck
-    email               : grosser.meister.morti@gmx.net
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_ITPROPERTIES_H
-#define TAGLIB_ITPROPERTIES_H
-
-#include "taglib.h"
-#include "audioproperties.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-namespace IT {
-class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
-  friend class File;
-
- public:
-  /*! Flag bits. */
-  enum {
-    Stereo = 1,
-    Vol0MixOptimizations = 2,
-    UseInstruments = 4,
-    LinearSlides = 8,
-    OldEffects = 16,
-    LinkEffects = 32,
-    UseMidiPitchController = 64,
-    RequestEmbeddedMidiConf = 128
-  };
-
-  /*! Special bits. */
-  enum {
-    MessageAttached = 1,
-    MidiConfEmbedded = 8
-  };
-
-  explicit AudioProperties(AudioProperties::ReadStyle);
-  ~AudioProperties() override;
-
-  int lengthInSeconds() const override;
-  int lengthInMilliseconds() const override;
-  int bitrate() const override;
-  int sampleRate() const override;
-  int channels() const override;
-
-  unsigned short lengthInPatterns() const;
-  bool stereo() const;
-  unsigned short instrumentCount() const;
-  unsigned short sampleCount() const;
-  unsigned short patternCount() const;
-  unsigned short version() const;
-  unsigned short compatibleVersion() const;
-  unsigned short flags() const;
-  unsigned short special() const;
-  unsigned char globalVolume() const;
-  unsigned char mixVolume() const;
-  unsigned char tempo() const;
-  unsigned char bpmSpeed() const;
-  unsigned char panningSeparation() const;
-  unsigned char pitchWheelDepth() const;
-
- private:
-  void setChannels(int channels);
-  void setLengthInPatterns(unsigned short lengthInPatterns);
-  void setInstrumentCount(unsigned short instrumentCount);
-  void setSampleCount(unsigned short sampleCount);
-  void setPatternCount(unsigned short patternCount);
-  void setVersion(unsigned short version);
-  void setCompatibleVersion(unsigned short compatibleVersion);
-  void setFlags(unsigned short flags);
-  void setSpecial(unsigned short special);
-  void setGlobalVolume(unsigned char globalVolume);
-  void setMixVolume(unsigned char mixVolume);
-  void setTempo(unsigned char tempo);
-  void setBpmSpeed(unsigned char bpmSpeed);
-  void setPanningSeparation(unsigned char panningSeparation);
-  void setPitchWheelDepth(unsigned char pitchWheelDepth);
-
- private:
-  class AudioPropertiesPrivate;
-  AudioPropertiesPrivate *d;
-};
-}  // namespace IT
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/mod/modfile.cpp

@@ -1,173 +0,0 @@
-/***************************************************************************
-    copyright           : (C) 2011 by Mathias Panzenböck
-    email               : grosser.meister.morti@gmx.net
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-
-#include "modfile.h"
-#include "tstringlist.h"
-#include "tdebug.h"
-#include "modfileprivate.h"
-#include "tpropertymap.h"
-
-using namespace Strawberry_TagLib::TagLib;
-using namespace Mod;
-
-class Mod::File::FilePrivate {
- public:
-  explicit FilePrivate(AudioProperties::ReadStyle propertiesStyle) : properties(propertiesStyle) {}
-
-  Mod::Tag tag;
-  Mod::AudioProperties properties;
-};
-
-Mod::File::File(FileName file, bool readProperties, AudioProperties::ReadStyle propertiesStyle) : Mod::FileBase(file), d(new FilePrivate(propertiesStyle)) {
-
-  if (isOpen())
-    read(readProperties);
-
-}
-
-Mod::File::File(IOStream *stream, bool readProperties, AudioProperties::ReadStyle propertiesStyle) : Mod::FileBase(stream), d(new FilePrivate(propertiesStyle)) {
-
-  if (isOpen())
-    read(readProperties);
-
-}
-
-Mod::File::~File() {
-  delete d;
-}
-
-Mod::Tag *Mod::File::tag() const {
-  return &d->tag;
-}
-
-Mod::AudioProperties *Mod::File::audioProperties() const {
-  return &d->properties;
-}
-
-bool Mod::File::save() {
-
-  if (readOnly()) {
-    debug("Mod::File::save() - Cannot save to a read only file.");
-    return false;
-  }
-  seek(0);
-  writeString(d->tag.title(), 20);
-  StringList lines = d->tag.comment().split("\n");
-  size_t n = std::min<size_t>(lines.size(), d->properties.instrumentCount());
-  for (size_t i = 0; i < n; ++i) {
-    writeString(lines[i], 22);
-    seek(8, Current);
-  }
-
-  for (size_t i = n; i < d->properties.instrumentCount(); ++i) {
-    writeString(String(), 22);
-    seek(8, Current);
-  }
-  return true;
-
-}
-
-void Mod::File::read(bool) {
-
-  if (!isOpen())
-    return;
-
-  seek(1080);
-  ByteVector modId = readBlock(4);
-  READ_ASSERT(modId.size() == 4);
-
-  int channels = 4;
-  unsigned int instruments = 31;
-  if (modId == "M.K." || modId == "M!K!" || modId == "M&K!" || modId == "N.T.") {
-    d->tag.setTrackerName("ProTracker");
-    channels = 4;
-  }
-  else if (modId.startsWith("FLT") || modId.startsWith("TDZ")) {
-    d->tag.setTrackerName("StarTrekker");
-    char digit = modId[3];
-    READ_ASSERT(digit >= '0' && digit <= '9');
-    channels = digit - '0';
-  }
-  else if (modId.endsWith("CHN")) {
-    d->tag.setTrackerName("StarTrekker");
-    char digit = modId[0];
-    READ_ASSERT(digit >= '0' && digit <= '9');
-    channels = digit - '0';
-  }
-  else if (modId == "CD81" || modId == "OKTA") {
-    d->tag.setTrackerName("Atari Oktalyzer");
-    channels = 8;
-  }
-  else if (modId.endsWith("CH") || modId.endsWith("CN")) {
-    d->tag.setTrackerName("TakeTracker");
-    char digit = modId[0];
-    READ_ASSERT(digit >= '0' && digit <= '9');
-    channels = (digit - '0') * 10;
-    digit = modId[1];
-    READ_ASSERT(digit >= '0' && digit <= '9');
-    channels += digit - '0';
-  }
-  else {
-    // Not sure if this is correct. I'd need a file
-    // created with NoiseTracker to check this.
-    d->tag.setTrackerName("NoiseTracker");  // probably
-    channels = 4;
-    instruments = 15;
-  }
-  d->properties.setChannels(channels);
-  d->properties.setInstrumentCount(instruments);
-
-  seek(0);
-  READ_STRING(d->tag.setTitle, 20);
-
-  StringList comment;
-  for (unsigned int i = 0; i < instruments; ++i) {
-    READ_STRING_AS(instrumentName, 22);
-    // value in words, * 2 (<< 1) for bytes:
-    READ_U16B_AS(sampleLength);
-
-    READ_BYTE_AS(fineTuneByte);
-    int fineTune = fineTuneByte & 0xF;
-    // > 7 means negative value
-    if (fineTune > 7) fineTune -= 16;
-
-    READ_BYTE_AS(volume);
-    if (volume > 64) volume = 64;
-    // volume in decibels: 20 * log10(volume / 64)
-
-    // value in words, * 2 (<< 1) for bytes:
-    READ_U16B_AS(repeatStart);
-    // value in words, * 2 (<< 1) for bytes:
-    READ_U16B_AS(repatLength);
-
-    comment.append(instrumentName);
-  }
-
-  READ_BYTE(d->properties.setLengthInPatterns);
-
-  d->tag.setComment(comment.toString("\n"));
-
-}

3rdparty/taglib/mod/modfile.h

@@ -1,95 +0,0 @@
-/***************************************************************************
-    copyright           : (C) 2011 by Mathias Panzenböck
-    email               : grosser.meister.morti@gmx.net
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_MODFILE_H
-#define TAGLIB_MODFILE_H
-
-#include "tfile.h"
-#include "audioproperties.h"
-#include "taglib_export.h"
-#include "modfilebase.h"
-#include "modtag.h"
-#include "modproperties.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-namespace Mod {
-
-class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::Mod::FileBase {
- public:
-  /*!
-   * Constructs a Protracker file from \a file.
-   *
-   * \note In the current implementation, both \a readProperties and \a propertiesStyle are ignored.
-   * The audio properties are always read.
-   */
-  explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
-
-  /*!
-   * Constructs a Protracker file from \a stream.
-   *
-   * \note In the current implementation, both \a readProperties and \a propertiesStyle are ignored.
-   * The audio properties are always read.
-   *
-   * \note TagLib will *not* take ownership of the stream, the caller is
-   * responsible for deleting it after the File object.
-   */
-  explicit File(IOStream *stream, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
-
-  /*!
-   * Destroys this instance of the File.
-   */
-  ~File() override;
-
-  Mod::Tag *tag() const override;
-
-  /*!
-   * Returns the Mod::AudioProperties for this file. If no audio properties were read then this will return a null pointer.
-   */
-  Mod::AudioProperties *audioProperties() const override;
-
-  /*!
-   * Save the file.
-   * This is the same as calling save(AllTags);
-   *
-   * \note Saving Protracker tags is not supported.
-   */
-  bool save() override;
-
- private:
-  File(const File &);
-  File &operator=(const File &);
-
-  void read(bool readProperties);
-
-  class FilePrivate;
-  FilePrivate *d;
-};
-
-}  // namespace Mod
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/mod/modfilebase.cpp

@@ -1,122 +0,0 @@
-/***************************************************************************
-    copyright           : (C) 2011 by Mathias Panzenböck
-    email               : grosser.meister.morti@gmx.net
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-
-#include "tdebug.h"
-#include "modfilebase.h"
-
-using namespace Strawberry_TagLib::TagLib;
-using namespace Mod;
-
-Mod::FileBase::FileBase(FileName file) : Strawberry_TagLib::TagLib::File(file) {}
-
-Mod::FileBase::FileBase(IOStream *stream) : Strawberry_TagLib::TagLib::File(stream) {}
-
-void Mod::FileBase::writeString(const String &s, unsigned int size, char padding) {
-  ByteVector data(s.data(String::Latin1));
-  data.resize(size, padding);
-  writeBlock(data);
-}
-
-bool Mod::FileBase::readString(String &s, unsigned int size) {
-
-  ByteVector data(readBlock(size));
-  if (data.size() < size) return false;
-  const size_t index = data.find(static_cast<char>(0));
-  if (index != ByteVector::npos()) {
-    data.resize(index);
-  }
-  data.replace('\xff', ' ');
-
-  s = data;
-  return true;
-
-}
-
-void Mod::FileBase::writeByte(unsigned char _byte) {
-  ByteVector data(1, _byte);
-  writeBlock(data);
-}
-
-void Mod::FileBase::writeU16L(unsigned short number) {
-  writeBlock(ByteVector::fromUInt16LE(number));
-}
-
-void Mod::FileBase::writeU32L(unsigned int number) {
-  writeBlock(ByteVector::fromUInt32LE(number));
-}
-
-void Mod::FileBase::writeU16B(unsigned short number) {
-  writeBlock(ByteVector::fromUInt16BE(number));
-}
-
-void Mod::FileBase::writeU32B(unsigned int number) {
-  writeBlock(ByteVector::fromUInt32BE(number));
-}
-
-bool Mod::FileBase::readByte(unsigned char &_byte) {
-
-  ByteVector data(readBlock(1));
-  if (data.size() < 1) return false;
-  _byte = data[0];
-  return true;
-
-}
-
-bool Mod::FileBase::readU16L(unsigned short &number) {
-
-  ByteVector data(readBlock(2));
-  if (data.size() < 2) return false;
-  number = data.toUInt16LE(0);
-  return true;
-
-}
-
-bool Mod::FileBase::readU32L(unsigned int &number) {
-
-  ByteVector data(readBlock(4));
-  if (data.size() < 4) return false;
-  number = data.toUInt32LE(0);
-  return true;
-
-}
-
-bool Mod::FileBase::readU16B(unsigned short &number) {
-
-  ByteVector data(readBlock(2));
-  if (data.size() < 2) return false;
-  number = data.toUInt16BE(0);
-  return true;
-
-}
-
-bool Mod::FileBase::readU32B(unsigned int &number) {
-
-  ByteVector data(readBlock(4));
-  if (data.size() < 4) return false;
-  number = data.toUInt32BE(0);
-  return true;
-
-}

3rdparty/taglib/mod/modfilebase.h

@@ -1,65 +0,0 @@
-/***************************************************************************
-    copyright           : (C) 2011 by Mathias Panzenböck
-    email               : grosser.meister.morti@gmx.net
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_MODFILEBASE_H
-#define TAGLIB_MODFILEBASE_H
-
-#include "taglib.h"
-#include "tfile.h"
-#include "tstring.h"
-#include "tlist.h"
-#include "taglib_export.h"
-
-#include <algorithm>
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-namespace Mod {
-
-class TAGLIB_EXPORT FileBase : public Strawberry_TagLib::TagLib::File {
- protected:
-  explicit FileBase(FileName file);
-  explicit FileBase(IOStream *stream);
-
-  void writeString(const String &s, unsigned int size, char padding = 0);
-  void writeByte(unsigned char byte);
-  void writeU16L(unsigned short number);
-  void writeU32L(unsigned int number);
-  void writeU16B(unsigned short number);
-  void writeU32B(unsigned int number);
-
-  bool readString(String &s, unsigned int size);
-  bool readByte(unsigned char &_byte);
-  bool readU16L(unsigned short &number);
-  bool readU32L(unsigned int &number);
-  bool readU16B(unsigned short &number);
-  bool readU32B(unsigned int &number);
-};
-
-}  // namespace Mod
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/mod/modfileprivate.h

@@ -1,66 +0,0 @@
-/***************************************************************************
-    copyright           : (C) 2011 by Mathias Panzenböck
-    email               : grosser.meister.morti@gmx.net
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it  under the terms of the GNU Lesser General Public License version  *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,            *
- *   MA  02110-1301  USA                                                   *
- ***************************************************************************/
-
-#ifndef TAGLIB_MODFILEPRIVATE_H
-#define TAGLIB_MODFILEPRIVATE_H
-
-// some helper-macros only used internally by (s3m|it|xm)file.cpp
-#define READ_ASSERT(cond) \
-  if (!(cond)) {          \
-    setValid(false);      \
-    return;               \
-  }
-
-#define READ(setter, type, read) \
-  {                              \
-    type number;                 \
-    READ_ASSERT(read(number));   \
-    setter(number);              \
-  }
-
-#define READ_BYTE(setter) READ(setter, unsigned char, readByte)
-#define READ_U16L(setter) READ(setter, unsigned short, readU16L)
-#define READ_U32L(setter) READ(setter, unsigned int, readU32L)
-#define READ_U16B(setter) READ(setter, unsigned short, readU16B)
-#define READ_U32B(setter) READ(setter, unsigned int, readU32B)
-
-#define READ_STRING(setter, size)     \
-  {                                   \
-    String s;                         \
-    READ_ASSERT(readString(s, size)); \
-    setter(s);                        \
-  }
-
-#define READ_AS(type, name, read) \
-  type name = 0;                  \
-  READ_ASSERT(read(name));
-
-#define READ_BYTE_AS(name) READ_AS(unsigned char, name, readByte)
-#define READ_U16L_AS(name) READ_AS(unsigned short, name, readU16L)
-#define READ_U32L_AS(name) READ_AS(unsigned int, name, readU32L)
-#define READ_U16B_AS(name) READ_AS(unsigned short, name, readU16B)
-#define READ_U32B_AS(name) READ_AS(unsigned int, name, readU32B)
-
-#define READ_STRING_AS(name, size) \
-  String name;                     \
-  READ_ASSERT(readString(name, size));
-
-#endif

3rdparty/taglib/mod/modproperties.cpp

@@ -1,94 +0,0 @@
-/***************************************************************************
-    copyright           : (C) 2011 by Mathias Panzenböck
-    email               : grosser.meister.morti@gmx.net
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-
-#include "modproperties.h"
-
-using namespace Strawberry_TagLib::TagLib;
-using namespace Mod;
-
-class Mod::AudioProperties::AudioPropertiesPrivate {
- public:
-  explicit AudioPropertiesPrivate() : channels(0), instrumentCount(0), lengthInPatterns(0) {}
-
-  int channels;
-  unsigned int instrumentCount;
-  unsigned char lengthInPatterns;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-Mod::AudioProperties::AudioProperties(AudioProperties::ReadStyle) : Strawberry_TagLib::TagLib::AudioProperties(), d(new AudioPropertiesPrivate()) {
-}
-
-Mod::AudioProperties::~AudioProperties() {
-  delete d;
-}
-
-int Mod::AudioProperties::lengthInSeconds() const {
-  return 0;
-}
-
-int Mod::AudioProperties::lengthInMilliseconds() const {
-  return 0;
-}
-
-int Mod::AudioProperties::bitrate() const {
-  return 0;
-}
-
-int Mod::AudioProperties::sampleRate() const {
-  return 0;
-}
-
-int Mod::AudioProperties::channels() const {
-  return d->channels;
-}
-
-unsigned int Mod::AudioProperties::instrumentCount() const {
-  return d->instrumentCount;
-}
-
-unsigned char Mod::AudioProperties::lengthInPatterns() const {
-  return d->lengthInPatterns;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// private members
-////////////////////////////////////////////////////////////////////////////////
-
-void Mod::AudioProperties::setChannels(int channels) {
-  d->channels = channels;
-}
-
-void Mod::AudioProperties::setInstrumentCount(unsigned int instrumentCount) {
-  d->instrumentCount = instrumentCount;
-}
-
-void Mod::AudioProperties::setLengthInPatterns(unsigned char lengthInPatterns) {
-  d->lengthInPatterns = lengthInPatterns;
-}

3rdparty/taglib/mod/modproperties.h

@@ -1,66 +0,0 @@
-/***************************************************************************
-    copyright           : (C) 2011 by Mathias Panzenböck
-    email               : grosser.meister.morti@gmx.net
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_MODPROPERTIES_H
-#define TAGLIB_MODPROPERTIES_H
-
-#include "taglib.h"
-#include "audioproperties.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-namespace Mod {
-
-class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
-  friend class File;
-
- public:
-  explicit AudioProperties(AudioProperties::ReadStyle propertiesStyle);
-  ~AudioProperties() override;
-
-  int lengthInSeconds() const override;
-  int lengthInMilliseconds() const override;
-  int bitrate() const override;
-  int sampleRate() const override;
-  int channels() const override;
-
-  unsigned int instrumentCount() const;
-  unsigned char lengthInPatterns() const;
-
- private:
-  void setChannels(int channels);
-
-  void setInstrumentCount(unsigned int instrumentCount);
-  void setLengthInPatterns(unsigned char lengthInPatterns);
-
-  class AudioPropertiesPrivate;
-  AudioPropertiesPrivate *d;
-};
-
-}  // namespace Mod
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/mod/modtag.cpp

@@ -1,162 +0,0 @@
-/***************************************************************************
-    copyright           : (C) 2011 by Mathias Panzenböck
-    email               : grosser.meister.morti@gmx.net
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-
-#include "modtag.h"
-#include "tstringlist.h"
-#include "tpropertymap.h"
-#include "tpicturemap.h"
-
-using namespace Strawberry_TagLib::TagLib;
-using namespace Mod;
-
-class Mod::Tag::TagPrivate {
- public:
-  explicit TagPrivate() {}
-
-  String title;
-  String comment;
-  String trackerName;
-};
-
-Mod::Tag::Tag() : d(new TagPrivate()) {}
-
-Mod::Tag::~Tag() {
-  delete d;
-}
-
-String Mod::Tag::title() const {
-  return d->title;
-}
-
-String Mod::Tag::artist() const {
-  return String();
-}
-
-String Mod::Tag::album() const {
-  return String();
-}
-
-String Mod::Tag::comment() const {
-  return d->comment;
-}
-
-String Mod::Tag::genre() const {
-  return String();
-}
-
-unsigned int Mod::Tag::year() const {
-  return 0;
-}
-
-unsigned int Mod::Tag::track() const {
-  return 0;
-}
-
-Strawberry_TagLib::TagLib::PictureMap Mod::Tag::pictures() const {
-  return PictureMap();
-}
-
-String Mod::Tag::trackerName() const {
-  return d->trackerName;
-}
-
-void Mod::Tag::setTitle(const String &title) {
-  d->title = title;
-}
-
-void Mod::Tag::setArtist(const String &) {
-}
-
-void Mod::Tag::setAlbum(const String &) {
-}
-
-void Mod::Tag::setComment(const String &comment) {
-  d->comment = comment;
-}
-
-void Mod::Tag::setGenre(const String &) {
-}
-
-void Mod::Tag::setYear(unsigned int) {
-}
-
-void Mod::Tag::setTrack(unsigned int) {
-}
-
-void Mod::Tag::setPictures(const PictureMap&) {}
-
-void Mod::Tag::setTrackerName(const String &trackerName) {
-  d->trackerName = trackerName;
-}
-
-PropertyMap Mod::Tag::properties() const {
-
-  PropertyMap properties;
-  properties["TITLE"] = d->title;
-  properties["COMMENT"] = d->comment;
-  if (!(d->trackerName.isEmpty()))
-    properties["TRACKERNAME"] = d->trackerName;
-  return properties;
-
-}
-
-PropertyMap Mod::Tag::setProperties(const PropertyMap &origProps) {
-
-  PropertyMap properties(origProps);
-  properties.removeEmpty();
-  StringList oneValueSet;
-  if (properties.contains("TITLE")) {
-    d->title = properties["TITLE"].front();
-    oneValueSet.append("TITLE");
-  }
-  else
-    d->title.clear();
-
-  if (properties.contains("COMMENT")) {
-    d->comment = properties["COMMENT"].front();
-    oneValueSet.append("COMMENT");
-  }
-  else
-    d->comment.clear();
-
-  if (properties.contains("TRACKERNAME")) {
-    d->trackerName = properties["TRACKERNAME"].front();
-    oneValueSet.append("TRACKERNAME");
-  }
-  else
-    d->trackerName.clear();
-
-  // for each tag that has been set above, remove the first entry in the corresponding
-  // value list. The others will be returned as unsupported by this format.
-  for (StringList::ConstIterator it = oneValueSet.begin(); it != oneValueSet.end(); ++it) {
-    if (properties[*it].size() == 1)
-      properties.erase(*it);
-    else
-      properties[*it].erase(properties[*it].begin());
-  }
-  return properties;
-
-}

3rdparty/taglib/mod/modtag.h

@@ -1,186 +0,0 @@
-/***************************************************************************
-    copyright           : (C) 2011 by Mathias Panzenböck
-    email               : grosser.meister.morti@gmx.net
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_MODTAG_H
-#define TAGLIB_MODTAG_H
-
-#include "tag.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-namespace Mod {
-
-/*!
- * Tags for module files (Mod, S3M, IT, XM).
- *
- * Note that only the \a title is supported as such by most module file formats.
- * Except for XM files the \a trackerName is derived from the file format or the flavour of the file format.
- * For XM files it is stored in the file.
- *
- * The \a comment tag is not strictly supported by module files,
- * but it is common practice to abuse instrument/sample/pattern names as multiline comments.
- * TagLib does so as well.
- *
- */
-class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag {
- public:
-  explicit Tag();
-  ~Tag() override;
-
-  /*!
-   * Returns the track name; if no track name is present in the tag String::null will be returned.
-   */
-  String title() const override;
-
-  /*!
-   * Not supported by module files.  Therefore always returns String::null.
-   */
-  String artist() const override;
-
-  /*!
-   * Not supported by module files.  Therefore always returns String::null.
-   */
-  String album() const override;
-
-  /*!
-   * Returns the track comment derived from the instrument/sample/pattern
-   * names; if no comment is present in the tag String::null will be returned.
-   */
-  String comment() const override;
-
-  /*!
-   * Not supported by module files.  Therefore always returns String::null.
-   */
-  String genre() const override;
-
-  /*!
-   * Not supported by module files.  Therefore always returns 0.
-   */
-  unsigned int year() const override;
-
-  /*!
-   * Not supported by module files.  Therefore always returns 0.
-   */
-  unsigned int track() const override;
-
-  PictureMap pictures() const override;
-
-  /*!
-   * Returns the name of the tracker used to create/edit the module file.
-   * Only XM files store this tag to the file as such, for other formats
-   * (Mod, S3M, IT) this is derived from the file type or the flavour of the file type.
-   * Therefore only XM files might have an empty (String::null) tracker name.
-   */
-  String trackerName() const;
-
-  /*!
-   * Sets the title to \a title.
-   * If \a title is String::null then this value will be cleared.
-   *
-   * The length limits per file type are (1 character = 1 byte):
-   * Mod 20 characters, S3M 27 characters, IT 25 characters and XM 20 characters.
-   */
-  void setTitle(const String &title) override;
-
-  /*!
-   * Not supported by module files and therefore ignored.
-   */
-  void setArtist(const String &artist) override;
-
-  /*!
-   * Not supported by module files and therefore ignored.
-   */
-  void setAlbum(const String &album) override;
-
-  /*!
-   * Sets the comment to \a comment.
-   * If \a comment is String::null then this value will be cleared.
-   *
-   * Note that module file formats don't actually support a comment tag.
-   * Instead the names of instruments/patterns/samples are abused as a multiline comment.
-   * Because of this the number of lines in a module file is fixed to the number of instruments/patterns/samples.
-   *
-   * Also note that the instrument/pattern/sample name length is limited an thus the line length in comments are limited.
-   * Too big comments will be truncated.
-   *
-   * The line length limits per file type are (1 character = 1 byte):
-   * Mod 22 characters, S3M 27 characters, IT 25 characters and XM 22 characters.
-   */
-  void setComment(const String &comment) override;
-
-  /*!
-   * Not supported by module files and therefore ignored.
-   */
-  void setGenre(const String &genre) override;
-
-  /*!
-   * Not supported by module files and therefore ignored.
-   */
-  void setYear(unsigned int year) override;
-
-  /*!
-   * Not supported by module files and therefore ignored.
-   */
-  void setTrack(unsigned int track) override;
-
-  void setPictures(const PictureMap &l) override;
-
-  /*!
-   * Sets the tracker name to \a trackerName.
-   * If \a trackerName is String::null then this value will be cleared.
-   *
-   * Note that only XM files support this tag.
-   * Setting the tracker name for other module file formats will be ignored.
-   *
-   * The length of this tag is limited to 20 characters (1 character = 1 byte).
-   */
-  void setTrackerName(const String &trackerName);
-
-  /*!
-   * Implements the unified property interface -- export function.
-   * Since the module tag is very limited, the exported map is as well.
-   */
-  PropertyMap properties() const override;
-
-  /*!
-   * Implements the unified property interface -- import function.
-   * Because of the limitations of the module file tag, any tags besides COMMENT, TITLE and, if it is an XM file, TRACKERNAME, will be returned.
-   * Additionally, if the map contains tags with multiple values, all but the first will be contained in the returned map of unsupported properties.
-   */
-  PropertyMap setProperties(const PropertyMap &) override;
-
- private:
-  Tag(const Tag&);
-  Tag &operator=(const Tag&);
-
-  class TagPrivate;
-  TagPrivate *d;
-};
-
-}  // namespace Mod
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/mp4/mp4atom.cpp

@@ -1,181 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2007 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include <climits>
-
-#include "tdebug.h"
-#include "tstring.h"
-#include "mp4atom.h"
-
-using namespace Strawberry_TagLib::TagLib;
-
-const char *MP4::Atom::containers[11] = { "moov", "udta", "mdia", "meta", "ilst", "stbl", "minf", "moof", "traf", "trak", "stsd" };
-
-MP4::Atom::Atom(File *file) {
-
-  children.setAutoDelete(true);
-
-  offset = file->tell();
-  ByteVector header = file->readBlock(8);
-  if (header.size() != 8) {
-    // The atom header must be 8 bytes long, otherwise there is either
-    // trailing garbage or the file is truncated
-    debug("MP4: Couldn't read 8 bytes of data for atom header");
-    length = 0;
-    file->seek(0, File::End);
-    return;
-  }
-
-  length = header.toUInt32BE(0);
-
-  if (length == 0) {
-    // The last atom which extends to the end of the file.
-    length = file->length() - offset;
-  }
-  else if (length == 1) {
-    // The atom has a 64-bit length.
-    length = file->readBlock(8).toInt64BE(0);
-  }
-
-  if (length < 8) {
-    debug("MP4: Invalid atom size");
-    length = 0;
-    file->seek(0, File::End);
-    return;
-  }
-
-  name = header.mid(4, 4);
-
-  for (int i = 0; i < numContainers; i++) {
-    if (name == containers[i]) {
-      if (name == "meta") {
-        file->seek(4, File::Current);
-      }
-      else if (name == "stsd") {
-        file->seek(8, File::Current);
-      }
-      while (file->tell() < offset + length) {
-        MP4::Atom *child = new MP4::Atom(file);
-        children.append(child);
-        if (child->length == 0)
-          return;
-      }
-      return;
-    }
-  }
-
-  file->seek(offset + length);
-
-}
-
-MP4::Atom::~Atom() {}
-
-MP4::Atom *MP4::Atom::find(const char *name1, const char *name2, const char *name3, const char *name4) {
-
-  if (!name1) {
-    return this;
-  }
-  for (AtomList::ConstIterator it = children.begin(); it != children.end(); ++it) {
-    if ((*it)->name == name1) {
-      return (*it)->find(name2, name3, name4);
-    }
-  }
-  return nullptr;
-
-}
-
-MP4::AtomList MP4::Atom::findall(const char *_name, bool recursive) {
-
-  MP4::AtomList result;
-  for (AtomList::ConstIterator it = children.begin(); it != children.end(); ++it) {
-    if ((*it)->name == _name) {
-      result.append(*it);
-    }
-    if (recursive) {
-      result.append((*it)->findall(_name, recursive));
-    }
-  }
-  return result;
-
-}
-
-bool MP4::Atom::path(MP4::AtomList &path, const char *name1, const char *name2, const char *name3) {
-
-  path.append(this);
-  if (!name1) {
-    return true;
-  }
-  for (AtomList::ConstIterator it = children.begin(); it != children.end(); ++it) {
-    if ((*it)->name == name1) {
-      return (*it)->path(path, name2, name3);
-    }
-  }
-  return false;
-
-}
-
-MP4::Atoms::Atoms(File *file) {
-
-  atoms.setAutoDelete(true);
-
-  file->seek(0, File::End);
-  long long end = file->tell();
-  file->seek(0);
-  while (file->tell() + 8 <= end) {
-    MP4::Atom *atom = new MP4::Atom(file);
-    atoms.append(atom);
-    if (atom->length == 0)
-      break;
-  }
-
-}
-
-MP4::Atoms::~Atoms() {}
-
-MP4::Atom *MP4::Atoms::find(const char *name1, const char *name2, const char *name3, const char *name4) {
-
-  for (AtomList::ConstIterator it = atoms.begin(); it != atoms.end(); ++it) {
-    if ((*it)->name == name1) {
-      return (*it)->find(name2, name3, name4);
-    }
-  }
-  return nullptr;
-
-}
-
-MP4::AtomList MP4::Atoms::path(const char *name1, const char *name2, const char *name3, const char *name4) {
-
-  MP4::AtomList path;
-  for (AtomList::ConstIterator it = atoms.begin(); it != atoms.end(); ++it) {
-    if ((*it)->name == name1) {
-      if (!(*it)->path(path, name2, name3, name4)) {
-        path.clear();
-      }
-      return path;
-    }
-  }
-  return path;
-
-}

3rdparty/taglib/mp4/mp4atom.h

@@ -1,111 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2007,2011 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-// This file is not part of the public API!
-
-#ifndef DO_NOT_DOCUMENT
-
-#  ifndef TAGLIB_MP4ATOM_H
-#    define TAGLIB_MP4ATOM_H
-
-#    include "tfile.h"
-#    include "tlist.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-namespace MP4 {
-
-class Atom;
-typedef Strawberry_TagLib::TagLib::List<Atom *> AtomList;
-
-enum AtomDataType {
-  TypeImplicit = 0,    // for use with tags for which no type needs to be indicated because only one type is allowed
-  TypeUTF8 = 1,        // without any count or null terminator
-  TypeUTF16 = 2,       // also known as UTF-16BE
-  TypeSJIS = 3,        // deprecated unless it is needed for special Japanese characters
-  TypeHTML = 6,        // the HTML file header specifies which HTML version
-  TypeXML = 7,         // the XML header must identify the DTD or schemas
-  TypeUUID = 8,        // also known as GUID; stored as 16 bytes in binary (valid as an ID)
-  TypeISRC = 9,        // stored as UTF-8 text (valid as an ID)
-  TypeMI3P = 10,       // stored as UTF-8 text (valid as an ID)
-  TypeGIF = 12,        // (deprecated) a GIF image
-  TypeJPEG = 13,       // a JPEG image
-  TypePNG = 14,        // a PNG image
-  TypeURL = 15,        // absolute, in UTF-8 characters
-  TypeDuration = 16,   // in milliseconds, 32-bit integer
-  TypeDateTime = 17,   // in UTC, counting seconds since midnight, January 1, 1904; 32 or 64-bits
-  TypeGenred = 18,     // a list of enumerated values
-  TypeInteger = 21,    // a signed big-endian integer with length one of { 1,2,3,4,8 } bytes
-  TypeRIAAPA = 24,     // RIAA parental advisory; { -1=no, 1=yes, 0=unspecified }, 8-bit integer
-  TypeUPC = 25,        // Universal Product Code, in text UTF-8 format (valid as an ID)
-  TypeBMP = 27,        // Windows bitmap image
-  TypeUndefined = 255  // undefined
-};
-
-struct AtomData {
-  explicit AtomData(AtomDataType _type, ByteVector _data) : type(_type), locale(0), data(_data) {}
-  AtomDataType type;
-  int locale;
-  ByteVector data;
-};
-
-typedef Strawberry_TagLib::TagLib::List<AtomData> AtomDataList;
-
-class Atom {
- public:
-  explicit Atom(File *file);
-  ~Atom();
-
-  Atom *find(const char *name1, const char *name2 = nullptr, const char *name3 = nullptr, const char *name4 = nullptr);
-  bool path(AtomList &path, const char *name1, const char *name2 = nullptr, const char *name3 = nullptr);
-  AtomList findall(const char *name, bool recursive = false);
-  long long offset;
-  long long length;
-  Strawberry_TagLib::TagLib::ByteVector name;
-  AtomList children;
-
- private:
-  static const int numContainers = 11;
-  static const char *containers[11];
-};
-
-//! Root-level atoms
-class Atoms {
- public:
-  explicit Atoms(File *file);
-  ~Atoms();
-
-  Atom *find(const char *name1, const char *name2 = nullptr, const char *name3 = nullptr, const char *name4 = nullptr);
-  AtomList path(const char *name1, const char *name2 = nullptr, const char *name3 = nullptr, const char *name4 = nullptr);
-  AtomList atoms;
-};
-
-}  // namespace MP4
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#  endif
-
-#endif

3rdparty/taglib/mp4/mp4coverart.cpp

@@ -1,85 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2009 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include <memory>
-
-#include "taglib.h"
-#include "tdebug.h"
-#include "mp4coverart.h"
-
-using namespace Strawberry_TagLib::TagLib;
-
-namespace {
-
-struct CoverArtData {
-  MP4::CoverArt::Format format;
-  ByteVector data;
-};
-
-}  // namespace
-
-class MP4::CoverArt::CoverArtPrivate {
- public:
-  explicit CoverArtPrivate(Format f, const ByteVector &v) : data(new CoverArtData()) {
-    data->format = f;
-    data->data = v;
-  }
-
-  std::shared_ptr<CoverArtData> data;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-MP4::CoverArt::CoverArt(Format format, const ByteVector &data) : d(new CoverArtPrivate(format, data)) {}
-
-MP4::CoverArt::CoverArt(const CoverArt &item) : d(new CoverArtPrivate(*item.d)) {}
-
-MP4::CoverArt &
-MP4::CoverArt::operator=(const CoverArt &item) {
-  CoverArt(item).swap(*this);
-  return *this;
-}
-
-void MP4::CoverArt::swap(CoverArt &item) {
-  using std::swap;
-
-  swap(d, item.d);
-}
-
-MP4::CoverArt::~CoverArt() {
-  delete d;
-}
-
-MP4::CoverArt::Format
-MP4::CoverArt::format() const {
-  return d->data->format;
-}
-
-ByteVector
-MP4::CoverArt::data() const {
-  return d->data->data;
-}

3rdparty/taglib/mp4/mp4coverart.h

@@ -1,83 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2009 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_MP4COVERART_H
-#define TAGLIB_MP4COVERART_H
-
-#include "tlist.h"
-#include "tbytevector.h"
-#include "taglib_export.h"
-#include "mp4atom.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-namespace MP4 {
-
-class TAGLIB_EXPORT CoverArt {
- public:
-  /*!
-   * This describes the image type.
-   */
-  enum Format {
-    JPEG = TypeJPEG,
-    PNG = TypePNG,
-    BMP = TypeBMP,
-    GIF = TypeGIF,
-    Unknown = TypeImplicit,
-  };
-
-  explicit CoverArt(Format format, const ByteVector &data);
-  ~CoverArt();
-
-  CoverArt(const CoverArt &item);
-
-  /*!
-   * Copies the contents of \a item into this CoverArt.
-   */
-  CoverArt &operator=(const CoverArt &item);
-
-  /*!
-   * Exchanges the content of the CoverArt by the content of \a item.
-   */
-  void swap(CoverArt &item);
-
-  //! Format of the image
-  Format format() const;
-
-  //! The image data
-  ByteVector data() const;
-
- private:
-  class CoverArtPrivate;
-  CoverArtPrivate *d;
-};
-
-typedef List<CoverArt> CoverArtList;
-
-}  // namespace MP4
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/mp4/mp4file.cpp

@@ -1,156 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2007 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include "tdebug.h"
-#include "tstring.h"
-#include "tpropertymap.h"
-#include "tagutils.h"
-
-#include "mp4atom.h"
-#include "mp4tag.h"
-#include "mp4file.h"
-
-using namespace Strawberry_TagLib::TagLib;
-
-namespace {
-bool checkValid(const MP4::AtomList &list) {
-
-  for (MP4::AtomList::ConstIterator it = list.begin(); it != list.end(); ++it) {
-
-    if ((*it)->length == 0)
-      return false;
-
-    if (!checkValid((*it)->children))
-      return false;
-  }
-
-  return true;
-
-}
-}  // namespace
-
-class MP4::File::FilePrivate {
- public:
-  explicit FilePrivate() : tag(nullptr), atoms(nullptr), properties(nullptr) {}
-
-  ~FilePrivate() {
-    delete atoms;
-    delete tag;
-    delete properties;
-  }
-
-  MP4::Tag *tag;
-  MP4::Atoms *atoms;
-  MP4::AudioProperties *properties;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// static members
-////////////////////////////////////////////////////////////////////////////////
-
-bool MP4::File::isSupported(IOStream *stream) {
-
-  // An MP4 file has to have an "ftyp" box first.
-
-  const ByteVector id = Utils::readHeader(stream, 8, false);
-  return id.containsAt("ftyp", 4);
-
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-MP4::File::File(FileName file, bool readProperties, AudioProperties::ReadStyle) : Strawberry_TagLib::TagLib::File(file), d(new FilePrivate()) {
-
-  if (isOpen())
-    read(readProperties);
-
-}
-
-MP4::File::File(IOStream *stream, bool readProperties, AudioProperties::ReadStyle) : Strawberry_TagLib::TagLib::File(stream), d(new FilePrivate()) {
-
-  if (isOpen())
-    read(readProperties);
-
-}
-
-MP4::File::~File() {
-  delete d;
-}
-
-MP4::Tag *
-MP4::File::tag() const {
-  return d->tag;
-}
-
-MP4::AudioProperties *
-MP4::File::audioProperties() const {
-  return d->properties;
-}
-
-void MP4::File::read(bool readProperties) {
-
-  if (!isValid())
-    return;
-
-  d->atoms = new Atoms(this);
-  if (!checkValid(d->atoms->atoms)) {
-    setValid(false);
-    return;
-  }
-
-  // must have a moov atom, otherwise consider it invalid
-  if (!d->atoms->find("moov")) {
-    setValid(false);
-    return;
-  }
-
-  d->tag = new Tag(this, d->atoms);
-  if (readProperties) {
-    d->properties = new AudioProperties(this, d->atoms);
-  }
-
-}
-
-bool MP4::File::save() {
-
-  if (readOnly()) {
-    debug("MP4::File::save() -- File is read only.");
-    return false;
-  }
-
-  if (!isValid()) {
-    debug("MP4::File::save() -- Trying to save invalid file.");
-    return false;
-  }
-
-  return d->tag->save();
-
-}
-
-bool MP4::File::hasMP4Tag() const {
-  return (d->atoms->find("moov", "udta", "meta", "ilst") != nullptr);
-}

3rdparty/taglib/mp4/mp4file.h

@@ -1,120 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2007 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_MP4FILE_H
-#define TAGLIB_MP4FILE_H
-
-#include "tag.h"
-#include "tfile.h"
-#include "taglib_export.h"
-#include "mp4properties.h"
-#include "mp4tag.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-
-//! An implementation of MP4 (AAC, ALAC, ...) metadata
-namespace MP4 {
-
-class Atoms;
-
-/*!
- * This implements and provides an interface for MP4 files to the
- * TagLib::Tag and TagLib::AudioProperties interfaces by way of implementing
- * the abstract TagLib::File API as well as providing some additional
- * information specific to MP4 files.
- */
-class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File {
- public:
-  /*!
-   * Constructs an MP4 file from \a file.
-   * If \a readProperties is true the file's audio properties will also be read.
-   *
-   * \note In the current implementation, \a propertiesStyle is ignored.
-   */
-  explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle audioPropertiesStyle = AudioProperties::Average);
-
-  /*!
-   * Constructs an MP4 file from \a stream.
-   * If \a readProperties is true the file's audio properties will also be read.
-   *
-   * \note TagLib will *not* take ownership of the stream, the caller is
-   * responsible for deleting it after the File object.
-   *
-   * \note In the current implementation, \a propertiesStyle is ignored.
-   */
-  explicit File(IOStream *stream, bool readProperties = true, AudioProperties::ReadStyle audioPropertiesStyle = AudioProperties::Average);
-
-  /*!
-   * Destroys this instance of the File.
-   */
-  ~File() override;
-
-  /*!
-   * Returns a pointer to the MP4 tag of the file.
-   *
-   * MP4::Tag implements the tag interface, so this serves as the reimplementation of TagLib::File::tag().
-   *
-   * \note The Tag <b>is still</b> owned by the MP4::File and should not be deleted by the user.
-   * It will be deleted when the file (object) is destroyed.
-   */
-  Tag *tag() const override;
-
-  /*!
-   * Returns the MP4 audio properties for this file.
-   */
-  AudioProperties *audioProperties() const override;
-
-  /*!
-   * Save the file.
-   *
-   * This returns true if the save was successful.
-   */
-  bool save() override;
-
-  /*!
-   * Returns whether or not the file on disk actually has an MP4 tag, or the file has a Metadata Item List (ilst) atom.
-   */
-  bool hasMP4Tag() const;
-
-  /*!
-   * Returns whether or not the given \a stream can be opened as an ASF file.
-   *
-   * \note This method is designed to do a quick check.  The result may not necessarily be correct.
-   */
-  static bool isSupported(IOStream *stream);
-
- private:
-  void read(bool readProperties);
-
-  class FilePrivate;
-  FilePrivate *d;
-};
-
-}  // namespace MP4
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/mp4/mp4item.cpp

@@ -1,215 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2007 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include <memory>
-
-#include "taglib.h"
-#include "tdebug.h"
-#include "mp4item.h"
-#include "tutils.h"
-
-using namespace Strawberry_TagLib::TagLib;
-
-namespace {
-struct ItemData {
-
-  bool valid;
-  MP4::AtomDataType atomDataType;
-  MP4::Item::ItemType type;
-  union {
-    bool m_bool;
-    int m_int;
-    MP4::Item::IntPair m_intPair;
-    unsigned char m_byte;
-    unsigned int m_uint;
-    long long m_longlong;
-  };
-  StringList m_stringList;
-  ByteVectorList m_byteVectorList;
-  MP4::CoverArtList m_coverArtList;
-};
-}  // namespace
-
-class MP4::Item::ItemPrivate {
- public:
-  explicit ItemPrivate() : data(new ItemData()) {
-    data->valid = true;
-    data->atomDataType = MP4::TypeUndefined;
-    data->type = MP4::Item::TypeUndefined_;
-  }
-
-  std::shared_ptr<ItemData> data;
-};
-
-MP4::Item::Item() : d(new ItemPrivate()) {
-  d->data->valid = false;
-}
-
-MP4::Item::Item(const Item &item) : d(new ItemPrivate(*item.d)) {}
-
-MP4::Item &MP4::Item::operator=(const Item &item) {
-  Item(item).swap(*this);
-  return *this;
-}
-
-void MP4::Item::swap(Item &item) {
-  using std::swap;
-
-  swap(d, item.d);
-}
-
-MP4::Item::~Item() {
-  delete d;
-}
-
-MP4::Item::Item(bool value) : d(new ItemPrivate()) {
-  d->data->m_bool = value;
-  d->data->type = TypeBool;
-}
-
-MP4::Item::Item(int value) : d(new ItemPrivate()) {
-  d->data->m_int = value;
-  d->data->type = TypeInt;
-}
-
-MP4::Item::Item(unsigned char value) : d(new ItemPrivate()) {
-  d->data->m_byte = value;
-  d->data->type = TypeByte;
-}
-
-MP4::Item::Item(unsigned int value) : d(new ItemPrivate()) {
-  d->data->m_uint = value;
-  d->data->type = TypeUInt;
-}
-
-MP4::Item::Item(long long value) : d(new ItemPrivate()) {
-  d->data->m_longlong = value;
-  d->data->type = TypeLongLong;
-}
-
-MP4::Item::Item(int value1, int value2) : d(new ItemPrivate()) {
-  d->data->m_intPair.first = value1;
-  d->data->m_intPair.second = value2;
-  d->data->type = TypeIntPair;
-}
-
-MP4::Item::Item(const ByteVectorList &value) : d(new ItemPrivate()) {
-  d->data->m_byteVectorList = value;
-  d->data->type = TypeByteVectorList;
-}
-
-MP4::Item::Item(const StringList &value) : d(new ItemPrivate()) {
-  d->data->m_stringList = value;
-  d->data->type = TypeStringList;
-}
-
-MP4::Item::Item(const MP4::CoverArtList &value) : d(new ItemPrivate()) {
-  d->data->m_coverArtList = value;
-  d->data->type = TypeCoverArtList;
-}
-
-void MP4::Item::setAtomDataType(MP4::AtomDataType type) {
-  d->data->atomDataType = type;
-}
-
-MP4::AtomDataType MP4::Item::atomDataType() const {
-  return d->data->atomDataType;
-}
-
-bool MP4::Item::toBool() const {
-  return d->data->m_bool;
-}
-
-int MP4::Item::toInt() const {
-  return d->data->m_int;
-}
-
-unsigned char MP4::Item::toByte() const {
-  return d->data->m_byte;
-}
-
-unsigned int MP4::Item::toUInt() const {
-  return d->data->m_uint;
-}
-
-long long MP4::Item::toLongLong() const {
-  return d->data->m_longlong;
-}
-
-MP4::Item::IntPair MP4::Item::toIntPair() const {
-  return d->data->m_intPair;
-}
-
-StringList MP4::Item::toStringList() const {
-  return d->data->m_stringList;
-}
-
-ByteVectorList MP4::Item::toByteVectorList() const {
-  return d->data->m_byteVectorList;
-}
-
-MP4::CoverArtList MP4::Item::toCoverArtList() const {
-  return d->data->m_coverArtList;
-}
-
-bool MP4::Item::isValid() const {
-  return d->data->valid;
-}
-
-String MP4::Item::toString() const {
-
-  StringList desc;
-  switch (d->data->type) {
-    case TypeBool:
-      return d->data->m_bool ? "true" : "false";
-    case TypeInt:
-      return Utils::formatString("%d", d->data->m_int);
-    case TypeIntPair:
-      return Utils::formatString("%d/%d", d->data->m_intPair.first, d->data->m_intPair.second);
-    case TypeByte:
-      return Utils::formatString("%d", d->data->m_byte);
-    case TypeUInt:
-      return Utils::formatString("%u", d->data->m_uint);
-    case TypeLongLong:
-      return Utils::formatString("%lld", d->data->m_longlong);
-    case TypeStringList:
-      return d->data->m_stringList.toString(" / ");
-    case TypeByteVectorList:
-      for (size_t i = 0; i < d->data->m_byteVectorList.size(); i++) {
-        desc.append(Utils::formatString(
-          "[%d bytes of data]", static_cast<int>(d->data->m_byteVectorList[i].size())));
-      }
-      return desc.toString(", ");
-    case TypeCoverArtList:
-      for (size_t i = 0; i < d->data->m_coverArtList.size(); i++) {
-        desc.append(Utils::formatString("[%d bytes of data]", static_cast<int>(d->data->m_coverArtList[i].data().size())));
-      }
-      return desc.toString(", ");
-    case TypeUndefined_:
-      return "[unknown]";
-  }
-  return String();
-
-}

3rdparty/taglib/mp4/mp4item.h

@@ -1,109 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2007 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_MP4ITEM_H
-#define TAGLIB_MP4ITEM_H
-
-#include "tstringlist.h"
-#include "mp4coverart.h"
-#include "taglib_export.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-namespace MP4 {
-
-class TAGLIB_EXPORT Item {
- public:
-  struct IntPair {
-    int first, second;
-  };
-
-  enum ItemType {
-    TypeUndefined_ = 0,
-    TypeBool,
-    TypeInt,
-    TypeIntPair,
-    TypeByte,
-    TypeUInt,
-    TypeLongLong,
-    TypeStringList,
-    TypeByteVectorList,
-    TypeCoverArtList,
-  };
-
-  explicit Item();
-  Item(const Item &item);
-
-  /*!
-   * Copies the contents of \a item into this Item.
-   */
-  Item &operator=(const Item &item);
-
-  /*!
-   * Exchanges the content of the Item by the content of \a item.
-   */
-  void swap(Item &item);
-
-  ~Item();
-
-  Item(int value);
-  Item(unsigned char value);
-  Item(unsigned int value);
-  Item(long long value);
-  Item(bool value);
-  Item(int first, int second);
-  Item(const StringList &value);
-  Item(const ByteVectorList &value);
-  Item(const CoverArtList &value);
-
-  void setAtomDataType(AtomDataType type);
-  AtomDataType atomDataType() const;
-
-  int toInt() const;
-  unsigned char toByte() const;
-  unsigned int toUInt() const;
-  long long toLongLong() const;
-  bool toBool() const;
-  IntPair toIntPair() const;
-  StringList toStringList() const;
-  ByteVectorList toByteVectorList() const;
-  CoverArtList toCoverArtList() const;
-
-  ItemType type() const;
-
-  bool isValid() const;
-
-  String toString() const;
-
- private:
-  class ItemPrivate;
-  ItemPrivate *d;
-};
-
-}  // namespace MP4
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/mp4/mp4properties.cpp

@@ -1,227 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2007 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include "tdebug.h"
-#include "tstring.h"
-#include "mp4file.h"
-#include "mp4atom.h"
-#include "mp4properties.h"
-
-using namespace Strawberry_TagLib::TagLib;
-
-class MP4::AudioProperties::AudioPropertiesPrivate {
- public:
-  explicit AudioPropertiesPrivate() : length(0),
-                                      bitrate(0),
-                                      sampleRate(0),
-                                      channels(0),
-                                      bitsPerSample(0),
-                                      encrypted(false),
-                                      codec(MP4::AudioProperties::Unknown) {}
-
-  int length;
-  int bitrate;
-  int sampleRate;
-  int channels;
-  int bitsPerSample;
-  bool encrypted;
-  Codec codec;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-MP4::AudioProperties::AudioProperties(File *file, MP4::Atoms *atoms, ReadStyle) : Strawberry_TagLib::TagLib::AudioProperties(), d(new AudioPropertiesPrivate()) {
-  read(file, atoms);
-}
-
-MP4::AudioProperties::~AudioProperties() {
-  delete d;
-}
-
-int MP4::AudioProperties::channels() const {
-  return d->channels;
-}
-
-int MP4::AudioProperties::sampleRate() const {
-  return d->sampleRate;
-}
-
-int MP4::AudioProperties::lengthInSeconds() const {
-  return d->length / 1000;
-}
-
-int MP4::AudioProperties::lengthInMilliseconds() const {
-  return d->length;
-}
-
-int MP4::AudioProperties::bitrate() const {
-  return d->bitrate;
-}
-
-int MP4::AudioProperties::bitsPerSample() const {
-  return d->bitsPerSample;
-}
-
-bool MP4::AudioProperties::isEncrypted() const {
-  return d->encrypted;
-}
-
-MP4::AudioProperties::Codec
-MP4::AudioProperties::codec() const {
-  return d->codec;
-}
-
-String MP4::AudioProperties::toString() const {
-
-  String format;
-  if (d->codec == AAC) {
-    format = "AAC";
-  }
-  else if (d->codec == ALAC) {
-    format = "ALAC";
-  }
-  else {
-    format = "Unknown";
-  }
-  StringList desc;
-  desc.append("MPEG-4 audio (" + format + ")");
-  desc.append(String::number(lengthInSeconds()) + " seconds");
-  desc.append(String::number(bitrate()) + " kbps");
-  return desc.toString(", ");
-
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// private members
-////////////////////////////////////////////////////////////////////////////////
-
-void MP4::AudioProperties::read(File *file, Atoms *atoms) {
-
-  MP4::Atom *moov = atoms->find("moov");
-  if (!moov) {
-    debug("MP4: Atom 'moov' not found");
-    return;
-  }
-
-  MP4::Atom *trak = nullptr;
-  ByteVector data;
-
-  const MP4::AtomList trakList = moov->findall("trak");
-  for (MP4::AtomList::ConstIterator it = trakList.begin(); it != trakList.end(); ++it) {
-    trak = *it;
-    MP4::Atom *hdlr = trak->find("mdia", "hdlr");
-    if (!hdlr) {
-      debug("MP4: Atom 'trak.mdia.hdlr' not found");
-      return;
-    }
-    file->seek(hdlr->offset);
-    data = file->readBlock(hdlr->length);
-    if (data.containsAt("soun", 16)) {
-      break;
-    }
-    trak = nullptr;
-  }
-  if (!trak) {
-    debug("MP4: No audio tracks");
-    return;
-  }
-
-  MP4::Atom *mdhd = trak->find("mdia", "mdhd");
-  if (!mdhd) {
-    debug("MP4: Atom 'trak.mdia.mdhd' not found");
-    return;
-  }
-
-  file->seek(mdhd->offset);
-  data = file->readBlock(mdhd->length);
-
-  const unsigned int version = data[8];
-  long long unit;
-  long long length;
-  if (version == 1) {
-    if (data.size() < 36 + 8) {
-      debug("MP4: Atom 'trak.mdia.mdhd' is smaller than expected");
-      return;
-    }
-    unit = data.toUInt32BE(28);
-    length = data.toInt64BE(32);
-  }
-  else {
-    if (data.size() < 24 + 8) {
-      debug("MP4: Atom 'trak.mdia.mdhd' is smaller than expected");
-      return;
-    }
-    unit = data.toUInt32BE(20);
-    length = data.toUInt32BE(24);
-  }
-  if (unit > 0 && length > 0)
-    d->length = static_cast<int>(length * 1000.0 / unit + 0.5);
-
-  MP4::Atom *atom = trak->find("mdia", "minf", "stbl", "stsd");
-  if (!atom) {
-    return;
-  }
-
-  file->seek(atom->offset);
-  data = file->readBlock(atom->length);
-  if (data.containsAt("mp4a", 20)) {
-    d->codec = AAC;
-    d->channels = data.toUInt16BE(40);
-    d->bitsPerSample = data.toUInt16BE(42);
-    d->sampleRate = data.toUInt32BE(46);
-    if (data.containsAt("esds", 56) && data[64] == 0x03) {
-      unsigned int pos = 65;
-      if (data.containsAt("\x80\x80\x80", pos)) {
-        pos += 3;
-      }
-      pos += 4;
-      if (data[pos] == 0x04) {
-        pos += 1;
-        if (data.containsAt("\x80\x80\x80", pos)) {
-          pos += 3;
-        }
-        pos += 10;
-        d->bitrate = static_cast<int>((data.toUInt32BE(pos) + 500) / 1000.0 + 0.5);
-      }
-    }
-  }
-  else if (data.containsAt("alac", 20)) {
-    if (atom->length == 88 && data.containsAt("alac", 56)) {
-      d->codec = ALAC;
-      d->bitsPerSample = data.at(69);
-      d->channels = data.at(73);
-      d->bitrate = static_cast<int>(data.toUInt32BE(80) / 1000.0 + 0.5);
-      d->sampleRate = data.toUInt32BE(84);
-    }
-  }
-
-  MP4::Atom *drms = atom->find("drms");
-  if (drms) {
-    d->encrypted = true;
-  }
-
-}

3rdparty/taglib/mp4/mp4properties.h

@@ -1,108 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2007 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_MP4PROPERTIES_H
-#define TAGLIB_MP4PROPERTIES_H
-
-#include "taglib_export.h"
-#include "audioproperties.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-namespace MP4 {
-
-class Atoms;
-class File;
-
-//! An implementation of MP4 audio properties
-class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
- public:
-  enum Codec {
-    Unknown = 0,
-    AAC,
-    ALAC
-  };
-
-  explicit AudioProperties(File *file, Atoms *atoms, ReadStyle style = Average);
-  ~AudioProperties() override;
-
-  /*!
-   * Returns the length of the file in seconds.  The length is rounded down to the nearest whole second.
-   *
-   * \see lengthInMilliseconds()
-   */
-  int lengthInSeconds() const override;
-
-  /*!
-   * Returns the length of the file in milliseconds.
-   *
-   * \see lengthInSeconds()
-   */
-  int lengthInMilliseconds() const override;
-
-  /*!
-   * Returns the average bit rate of the file in kb/s.
-   */
-  int bitrate() const override;
-
-  /*!
-   * Returns the sample rate in Hz.
-   */
-  int sampleRate() const override;
-
-  /*!
-   * Returns the number of audio channels.
-   */
-  int channels() const override;
-
-  /*!
-   * Returns the number of bits per audio sample.
-   */
-  virtual int bitsPerSample() const;
-
-  /*!
-   * Returns whether or not the file is encrypted.
-   */
-  bool isEncrypted() const;
-
-  /*!
-   * Returns the codec used in the file.
-   */
-  Codec codec() const;
-
-  String toString() const override;
-
- private:
-  void read(File *file, Atoms *atoms);
-
-  class AudioPropertiesPrivate;
-  AudioPropertiesPrivate *d;
-};
-
-}  // namespace MP4
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/mp4/mp4tag.h

@@ -1,146 +0,0 @@
-/**************************************************************************
-    copyright            : (C) 2007,2011 by Lukáš Lalinský
-    email                : lalinsky@gmail.com
- **************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_MP4TAG_H
-#define TAGLIB_MP4TAG_H
-
-#include "tag.h"
-#include "tbytevectorlist.h"
-#include "tfile.h"
-#include "tmap.h"
-#include "tstringlist.h"
-#include "taglib_export.h"
-#include "mp4atom.h"
-#include "mp4item.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-namespace MP4 {
-
-typedef Strawberry_TagLib::TagLib::Map<String, Item> ItemMap;
-typedef Strawberry_TagLib::TagLib::Map<String, Item> ItemListMap;
-
-class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag {
- public:
-  explicit Tag();
-  explicit Tag(Strawberry_TagLib::TagLib::File *file, Atoms *atoms);
-  ~Tag() override;
-  bool save();
-
-  String title() const override;
-  String artist() const override;
-  String album() const override;
-  String comment() const override;
-  String genre() const override;
-  unsigned int year() const override;
-  unsigned int track() const override;
-  PictureMap pictures() const override;
-
-  void setTitle(const String &value) override;
-  void setArtist(const String &value) override;
-  void setAlbum(const String &value) override;
-  void setComment(const String &value) override;
-  void setGenre(const String &value) override;
-  void setYear(unsigned int value) override;
-  void setTrack(unsigned int value) override;
-  void setPictures(const PictureMap &l) override;
-
-  bool isEmpty() const override;
-  /*!
-   * Returns a string-keyed map of the MP4::Items for this tag.
-   */
-  const ItemMap &itemMap() const;
-
-  /*!
-   * \return The item, if any, corresponding to \a key.
-   */
-  Item item(const String &key) const;
-
-  /*!
-   * Sets the value of \a key to \a value, overwriting any previous value.
-   */
-  void setItem(const String &key, const Item &value);
-
-  /*!
-   * Removes the entry with \a key from the tag, or does nothing if it does not exist.
-   */
-  void removeItem(const String &key);
-
-  /*!
-   * \return True if the tag contains an entry for \a key.
-   */
-  bool contains(const String &key) const;
-
-  String toString() const override;
-
-  PropertyMap properties() const override;
-  void removeUnsupportedProperties(const StringList &props) override;
-  PropertyMap setProperties(const PropertyMap &props) override;
-
- private:
-  AtomDataList parseData2(const Atom *atom, int expectedFlags = -1, bool freeForm = false);
-  ByteVectorList parseData(const Atom *atom, int expectedFlags = -1, bool freeForm = false);
-  void parseText(const Atom *atom, int expectedFlags = 1);
-  void parseFreeForm(const Atom *atom);
-  void parseInt(const Atom *atom);
-  void parseByte(const Atom *atom);
-  void parseUInt(const Atom *atom);
-  void parseLongLong(const Atom *atom);
-  void parseGnre(const Atom *atom);
-  void parseIntPair(const Atom *atom);
-  void parseBool(const Atom *atom);
-  void parseCovr(const Atom *atom);
-
-  ByteVector padIlst(const ByteVector &data, int length = -1) const;
-  ByteVector renderAtom(const ByteVector &name, const ByteVector &data) const;
-  ByteVector renderData(const ByteVector &name, int flags, const ByteVectorList &data) const;
-  ByteVector renderText(const ByteVector &name, const Item &item, int flags = TypeUTF8) const;
-  ByteVector renderFreeForm(const String &name, const Item &item) const;
-  ByteVector renderBool(const ByteVector &name, const Item &item) const;
-  ByteVector renderInt(const ByteVector &name, const Item &item) const;
-  ByteVector renderByte(const ByteVector &name, const Item &item) const;
-  ByteVector renderUInt(const ByteVector &name, const Item &item) const;
-  ByteVector renderLongLong(const ByteVector &name, const Item &item) const;
-  ByteVector renderIntPair(const ByteVector &name, const Item &item) const;
-  ByteVector renderIntPairNoTrailing(const ByteVector &name, const Item &item) const;
-  ByteVector renderCovr(const ByteVector &name, const Item &item) const;
-
-  void updateParents(const AtomList &path, long delta, int ignore = 0);
-  void updateOffsets(long delta, long long offset);
-
-  void saveNew(ByteVector data);
-  void saveExisting(ByteVector data, const AtomList &path);
-
-  void addItem(const String &name, const Item &value);
-
-  class TagPrivate;
-  TagPrivate *d;
-};
-
-}  // namespace MP4
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/mpc/mpcfile.cpp

@@ -1,300 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2004 by Allan Sandfeld Jensen
-    email                : kde@carewolf.org
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include <memory>
-
-#include "tbytevector.h"
-#include "tstring.h"
-#include "tagunion.h"
-#include "tdebug.h"
-#include "tpropertymap.h"
-#include "tagutils.h"
-
-#include "mpcfile.h"
-#include "id3v1tag.h"
-#include "id3v2header.h"
-#include "apetag.h"
-#include "apefooter.h"
-
-using namespace Strawberry_TagLib::TagLib;
-
-namespace {
-enum { MPCAPEIndex = 0,
-  MPCID3v1Index = 1 };
-}
-
-class MPC::File::FilePrivate {
- public:
-  explicit FilePrivate() : APELocation(-1),
-                           APESize(0),
-                           ID3v1Location(-1),
-                           ID3v2Location(-1),
-                           ID3v2Size(0) {}
-
-  long long APELocation;
-  long long APESize;
-
-  long long ID3v1Location;
-
-  std::unique_ptr<ID3v2::Header> ID3v2Header;
-  long long ID3v2Location;
-  long long ID3v2Size;
-
-  DoubleTagUnion tag;
-
-  std::unique_ptr<AudioProperties> properties;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// static members
-////////////////////////////////////////////////////////////////////////////////
-
-bool MPC::File::isSupported(IOStream *stream) {
-
-  // A newer MPC file has to start with "MPCK" or "MP+", but older files don't
-  // have keys to do a quick check.
-
-  const ByteVector id = Utils::readHeader(stream, 4, false);
-  return (id == "MPCK" || id.startsWith("MP+"));
-
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-MPC::File::File(FileName file, bool readProperties, AudioProperties::ReadStyle) : Strawberry_TagLib::TagLib::File(file), d(new FilePrivate()) {
-
-  if (isOpen())
-    read(readProperties);
-
-}
-
-MPC::File::File(IOStream *stream, bool readProperties, AudioProperties::ReadStyle) : Strawberry_TagLib::TagLib::File(stream), d(new FilePrivate()) {
-
-  if (isOpen())
-    read(readProperties);
-
-}
-
-MPC::File::~File() {
-  delete d;
-}
-
-Strawberry_TagLib::TagLib::Tag *MPC::File::tag() const {
-  return &d->tag;
-}
-
-PropertyMap MPC::File::setProperties(const PropertyMap &properties) {
-  if (ID3v1Tag())
-    ID3v1Tag()->setProperties(properties);
-
-  return APETag(true)->setProperties(properties);
-}
-
-MPC::AudioProperties *MPC::File::audioProperties() const {
-  return d->properties.get();
-}
-
-bool MPC::File::save() {
-
-  if (readOnly()) {
-    debug("MPC::File::save() -- File is read only.");
-    return false;
-  }
-
-  // Possibly strip ID3v2 tag
-
-  if (!d->ID3v2Header && d->ID3v2Location >= 0) {
-    removeBlock(d->ID3v2Location, d->ID3v2Size);
-
-    if (d->APELocation >= 0)
-      d->APELocation -= d->ID3v2Size;
-
-    if (d->ID3v1Location >= 0)
-      d->ID3v1Location -= d->ID3v2Size;
-
-    d->ID3v2Location = -1;
-    d->ID3v2Size = 0;
-  }
-
-  // Update ID3v1 tag
-
-  if (ID3v1Tag() && !ID3v1Tag()->isEmpty()) {
-
-    // ID3v1 tag is not empty. Update the old one or create a new one.
-
-    if (d->ID3v1Location >= 0) {
-      seek(d->ID3v1Location);
-    }
-    else {
-      seek(0, End);
-      d->ID3v1Location = tell();
-    }
-
-    writeBlock(ID3v1Tag()->render());
-  }
-  else {
-
-    // ID3v1 tag is empty. Remove the old one.
-
-    if (d->ID3v1Location >= 0) {
-      truncate(d->ID3v1Location);
-      d->ID3v1Location = -1;
-    }
-  }
-
-  // Update APE tag
-
-  if (APETag() && !APETag()->isEmpty()) {
-
-    // APE tag is not empty. Update the old one or create a new one.
-
-    if (d->APELocation < 0) {
-      if (d->ID3v1Location >= 0)
-        d->APELocation = d->ID3v1Location;
-      else
-        d->APELocation = length();
-    }
-
-    const ByteVector data = APETag()->render();
-    insert(data, d->APELocation, d->APESize);
-
-    if (d->ID3v1Location >= 0)
-      d->ID3v1Location += (static_cast<long>(data.size()) - d->APESize);
-
-    d->APESize = data.size();
-  }
-  else {
-
-    // APE tag is empty. Remove the old one.
-
-    if (d->APELocation >= 0) {
-      removeBlock(d->APELocation, d->APESize);
-
-      if (d->ID3v1Location >= 0)
-        d->ID3v1Location -= d->APESize;
-
-      d->APELocation = -1;
-      d->APESize = 0;
-    }
-  }
-
-  return true;
-
-}
-
-ID3v1::Tag *MPC::File::ID3v1Tag(bool create) {
-  return d->tag.access<ID3v1::Tag>(MPCID3v1Index, create);
-}
-
-APE::Tag *MPC::File::APETag(bool create) {
-  return d->tag.access<APE::Tag>(MPCAPEIndex, create);
-}
-
-void MPC::File::strip(int tags) {
-
-  if (tags & ID3v1)
-    d->tag.set(MPCID3v1Index, nullptr);
-
-  if (tags & APE)
-    d->tag.set(MPCAPEIndex, nullptr);
-
-  if (!ID3v1Tag())
-    APETag(true);
-
-  if (tags & ID3v2)
-    d->ID3v2Header.reset();
-}
-
-bool MPC::File::hasID3v1Tag() const {
-  return (d->ID3v1Location >= 0);
-}
-
-bool MPC::File::hasAPETag() const {
-  return (d->APELocation >= 0);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// private members
-////////////////////////////////////////////////////////////////////////////////
-
-void MPC::File::read(bool readProperties) {
-
-  // Look for an ID3v2 tag
-
-  d->ID3v2Location = Utils::findID3v2(this);
-
-  if (d->ID3v2Location >= 0) {
-    seek(d->ID3v2Location);
-    d->ID3v2Header.reset(new ID3v2::Header(readBlock(ID3v2::Header::size())));
-    d->ID3v2Size = d->ID3v2Header->completeTagSize();
-  }
-
-  // Look for an ID3v1 tag
-
-  d->ID3v1Location = Utils::findID3v1(this);
-
-  if (d->ID3v1Location >= 0)
-    d->tag.set(MPCID3v1Index, new ID3v1::Tag(this, d->ID3v1Location));
-
-  // Look for an APE tag
-
-  d->APELocation = Utils::findAPE(this, d->ID3v1Location);
-
-  if (d->APELocation >= 0) {
-    d->tag.set(MPCAPEIndex, new APE::Tag(this, d->APELocation));
-    d->APESize = APETag()->footer()->completeTagSize();
-    d->APELocation = d->APELocation + APE::Footer::size() - d->APESize;
-  }
-
-  if (d->ID3v1Location < 0)
-    APETag(true);
-
-  // Look for MPC metadata
-
-  if (readProperties) {
-
-    long long streamLength;
-
-    if (d->APELocation >= 0)
-      streamLength = d->APELocation;
-    else if (d->ID3v1Location >= 0)
-      streamLength = d->ID3v1Location;
-    else
-      streamLength = length();
-
-    if (d->ID3v2Location >= 0) {
-      seek(d->ID3v2Location + d->ID3v2Size);
-      streamLength -= (d->ID3v2Location + d->ID3v2Size);
-    }
-    else {
-      seek(0);
-    }
-
-    d->properties.reset(new AudioProperties(this, streamLength));
-  }
-
-}

3rdparty/taglib/mpc/mpcfile.h

@@ -1,212 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2004 by Allan Sandfeld Jensen
-    email                : kde@carewolf.org
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_MPCFILE_H
-#define TAGLIB_MPCFILE_H
-
-#include "taglib_export.h"
-#include "tfile.h"
-#include "tag.h"
-
-#include "mpcproperties.h"
-
-#include "tlist.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-
-class Tag;
-
-namespace ID3v1 {
-class Tag;
-}
-namespace APE {
-class Tag;
-}
-
-//! An implementation of MPC metadata
-
-/*!
- * This is implementation of MPC metadata.
- *
- * This supports ID3v1 and APE (v1 and v2) style comments as well as reading stream properties from the file.
- * ID3v2 tags are invalid in MPC-files, but will be skipped and ignored.
- *
- */
-
-namespace MPC {
-
-//! An implementation of TagLib::File with MPC specific methods
-
-/*!
- * This implements and provides an interface for MPC files to the TagLib::Tag and TagLib::AudioProperties interfaces by way of implementing the abstract TagLib::File API as well as providing some additional information specific to MPC files.
- * The only invalid tag combination supported is an ID3v1 tag after an APE tag.
- */
-
-class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File {
- public:
-  /*!
-   * This set of flags is used for various operations and is suitable for being OR-ed together.
-   */
-  enum TagTypes {
-    //! Empty set.  Matches no tag types.
-    NoTags = 0x0000,
-    //! Matches ID3v1 tags.
-    ID3v1 = 0x0001,
-    //! Matches ID3v2 tags.
-    ID3v2 = 0x0002,
-    //! Matches APE tags.
-    APE = 0x0004,
-    //! Matches all tag types.
-    AllTags = 0xffff
-  };
-
-  /*!
-   * Constructs an MPC file from \a file.
-   * If \a readProperties is true the file's audio properties will also be read.
-   *
-   * \note In the current implementation, \a propertiesStyle is ignored.
-   */
-  explicit File(FileName file, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
-
-  /*!
-   * Constructs an MPC file from \a stream.
-   * If \a readProperties is true the file's audio properties will also be read.
-   *
-   * \note TagLib will *not* take ownership of the stream, the caller is responsible for deleting it after the File object.
-   *
-   * \note In the current implementation, \a propertiesStyle is ignored.
-   */
-  explicit File(IOStream *stream, bool readProperties = true, AudioProperties::ReadStyle propertiesStyle = AudioProperties::Average);
-
-  /*!
-   * Destroys this instance of the File.
-   */
-  ~File() override;
-
-  /*!
-   * Returns the Tag for this file.
-   * This will be an APE tag, an ID3v1 tag or a combination of the two.
-   */
-  Strawberry_TagLib::TagLib::Tag *tag() const override;
-
-  /*!
-   * Implements the unified property interface -- import function.
-   * Affects only the APEv2 tag which will be created if necessary.
-   * If an ID3v1 tag exists, it will be updated as well.
-   */
-  PropertyMap setProperties(const PropertyMap &) override;
-
-  /*!
-   * Returns the MPC::AudioProperties for this file.
-   * If no audio properties were read then this will return a null pointer.
-   */
-  AudioProperties *audioProperties() const override;
-
-  /*!
-   * Saves the file.
-   *
-   * This returns true if the save was successful.
-   */
-  bool save() override;
-
-  /*!
-   * Returns a pointer to the ID3v1 tag of the file.
-   *
-   * If \a create is false (the default) this returns a null pointer if there is no valid APE tag.
-   * If \a create is true it will create an APE tag if one does not exist and returns a valid pointer.
-   *
-   * \note This may return a valid pointer regardless of whether or not the file on disk has an ID3v1 tag.
-   * Use hasID3v1Tag() to check if the file on disk actually has an ID3v1 tag.
-   *
-   * \note The Tag <b>is still</b> owned by the MPEG::File and should not be deleted by the user.
-   * It will be deleted when the file (object) is destroyed.
-   *
-   * \see hasID3v1Tag()
-   */
-  ID3v1::Tag *ID3v1Tag(bool create = false);
-
-  /*!
-   * Returns a pointer to the APE tag of the file.
-   *
-   * If \a create is false (the default) this may return a null pointer
-   * if there is no valid APE tag.
-   * If \a create is true it will create an APE tag if one does not exist and returns a valid pointer.
-   * If there already be an ID3v1 tag, the new APE tag will be placed before it.
-   *
-   * \note This may return a valid pointer regardless of whether or not the file on disk has an APE tag.
-   * Use hasAPETag() to check if the file on disk actually has an APE tag.
-   *
-   * \note The Tag <b>is still</b> owned by the MPEG::File and should not be deleted by the user.
-   * It will be deleted when the file (object) is destroyed.
-   *
-   * \see hasAPETag()
-   */
-  APE::Tag *APETag(bool create = false);
-
-  /*!
-   * This will remove the tags that match the OR-ed together TagTypes from the file.  By default it removes all tags.
-   *
-   * \warning This will also invalidate pointers to the tags as their memory will be freed.
-   *
-   * \note In order to make the removal permanent save() still needs to be called.
-   */
-  void strip(int tags = AllTags);
-
-  /*!
-   * Returns whether or not the file on disk actually has an ID3v1 tag.
-   *
-   * \see ID3v1Tag()
-   */
-  bool hasID3v1Tag() const;
-
-  /*!
-   * Returns whether or not the file on disk actually has an APE tag.
-   *
-   * \see APETag()
-   */
-  bool hasAPETag() const;
-
-  /*!
-   * Returns whether or not the given \a stream can be opened as an MPC file.
-   *
-   * \note This method is designed to do a quick check.  The result may not necessarily be correct.
-   */
-  static bool isSupported(IOStream *stream);
-
- private:
-  File(const File&);
-  File &operator=(const File&);
-
-  void read(bool readProperties);
-
-  class FilePrivate;
-  FilePrivate *d;
-};
-}  // namespace MPC
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif

3rdparty/taglib/mpc/mpcproperties.cpp

@@ -1,353 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2004 by Allan Sandfeld Jensen
-    email                : kde@carewolf.org
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-
-#include <bitset>
-#include <cmath>
-
-#include "tstring.h"
-#include "tdebug.h"
-
-#include "mpcproperties.h"
-#include "mpcfile.h"
-
-using namespace Strawberry_TagLib::TagLib;
-
-namespace {
-const unsigned int HeaderSize = 56;
-}
-
-class MPC::AudioProperties::AudioPropertiesPrivate {
- public:
-  explicit AudioPropertiesPrivate() : version(0),
-                                      length(0),
-                                      bitrate(0),
-                                      sampleRate(0),
-                                      channels(0),
-                                      totalFrames(0),
-                                      sampleFrames(0),
-                                      trackGain(0),
-                                      trackPeak(0),
-                                      albumGain(0),
-                                      albumPeak(0) {}
-
-  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;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-MPC::AudioProperties::AudioProperties(File *file, long long streamLength, ReadStyle) : Strawberry_TagLib::TagLib::AudioProperties(), d(new AudioPropertiesPrivate()) {
-
-  ByteVector magic = file->readBlock(4);
-  if (magic == "MPCK") {
-    // Musepack version 8
-    readSV8(file, streamLength);
-  }
-  else {
-    // Musepack version 7 or older, fixed size header
-    readSV7(magic + file->readBlock(HeaderSize - 4), streamLength);
-  }
-
-}
-
-MPC::AudioProperties::~AudioProperties() {
-  delete d;
-}
-
-int MPC::AudioProperties::lengthInSeconds() const {
-  return d->length / 1000;
-}
-
-int MPC::AudioProperties::lengthInMilliseconds() const {
-  return d->length;
-}
-
-int MPC::AudioProperties::bitrate() const {
-  return d->bitrate;
-}
-
-int MPC::AudioProperties::sampleRate() const {
-  return d->sampleRate;
-}
-
-int MPC::AudioProperties::channels() const {
-  return d->channels;
-}
-
-int MPC::AudioProperties::mpcVersion() const {
-  return d->version;
-}
-
-unsigned int MPC::AudioProperties::totalFrames() const {
-  return d->totalFrames;
-}
-
-unsigned int MPC::AudioProperties::sampleFrames() const {
-  return d->sampleFrames;
-}
-
-int MPC::AudioProperties::trackGain() const {
-  return d->trackGain;
-}
-
-int MPC::AudioProperties::trackPeak() const {
-  return d->trackPeak;
-}
-
-int MPC::AudioProperties::albumGain() const {
-  return d->albumGain;
-}
-
-int MPC::AudioProperties::albumPeak() const {
-  return d->albumPeak;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// private members
-////////////////////////////////////////////////////////////////////////////////
-
-namespace {
-unsigned long readSize(File *file, size_t &sizeLength, bool &eof) {
-
-  sizeLength = 0;
-  eof = false;
-
-  unsigned char tmp;
-  unsigned long size = 0;
-
-  do {
-    const ByteVector b = file->readBlock(1);
-    if (b.isEmpty()) {
-      eof = true;
-      break;
-    }
-
-    tmp = b[0];
-    size = (size << 7) | (tmp & 0x7F);
-    sizeLength++;
-  }
-  while ((tmp & 0x80));
-
-  return size;
-
-}
-
-unsigned long readSize(const ByteVector &data, size_t &pos) {
-
-  unsigned char tmp;
-  unsigned long size = 0;
-
-  do {
-    tmp = data[pos++];
-    size = (size << 7) | (tmp & 0x7F);
-  }
-  while ((tmp & 0x80) && (pos < data.size()));
-
-  return size;
-
-}
-
-// This array looks weird, but the same as original MusePack code found at:
-// https://www.musepack.net/index.php?pg=src
-const unsigned short sftable[8] = { 44100, 48000, 37800, 32000, 0, 0, 0, 0 };
-}  // namespace
-
-void MPC::AudioProperties::readSV8(File *file, long long streamLength) {
-
-  bool readSH = false, readRG = false;
-
-  while (!readSH && !readRG) {
-    const ByteVector packetType = file->readBlock(2);
-
-    size_t packetSizeLength;
-    bool eof;
-    const size_t packetSize = readSize(file, packetSizeLength, eof);
-    if (eof) {
-      debug("MPC::AudioProperties::readSV8() - Reached to EOF.");
-      break;
-    }
-
-    const size_t dataSize = packetSize - 2 - packetSizeLength;
-
-    const ByteVector data = file->readBlock(dataSize);
-    if (data.size() != dataSize) {
-      debug("MPC::AudioProperties::readSV8() - dataSize doesn't match the actual data size.");
-      break;
-    }
-
-    if (packetType == "SH") {
-      // Stream Header
-      // http://trac.musepack.net/wiki/SV8Specification#StreamHeaderPacket
-
-      if (dataSize <= 5) {
-        debug("MPC::AudioProperties::readSV8() - \"SH\" packet is too short to parse.");
-        break;
-      }
-
-      readSH = true;
-
-      size_t pos = 4;
-      d->version = data[pos];
-      pos += 1;
-      d->sampleFrames = readSize(data, pos);
-      if (pos > dataSize - 3) {
-        debug("MPC::AudioProperties::readSV8() - \"SH\" packet is corrupt.");
-        break;
-      }
-
-      const unsigned long begSilence = readSize(data, pos);
-      if (pos > dataSize - 2) {
-        debug("MPC::AudioProperties::readSV8() - \"SH\" packet is corrupt.");
-        break;
-      }
-
-      const unsigned short flags = data.toUInt16BE(pos);
-      pos += 2;
-
-      d->sampleRate = sftable[(flags >> 13) & 0x07];
-      d->channels = ((flags >> 4) & 0x0F) + 1;
-
-      const unsigned int frameCount = d->sampleFrames - begSilence;
-      if (frameCount > 0 && d->sampleRate > 0) {
-        const double length = frameCount * 1000.0 / d->sampleRate;
-        d->length = static_cast<int>(length + 0.5);
-        d->bitrate = static_cast<int>(streamLength * 8.0 / length + 0.5);
-      }
-    }
-    else if (packetType == "RG") {
-      // Replay Gain
-      // http://trac.musepack.net/wiki/SV8Specification#ReplaygainPacket
-
-      if (dataSize <= 9) {
-        debug("MPC::AudioProperties::readSV8() - \"RG\" packet is too short to parse.");
-        break;
-      }
-
-      readRG = true;
-
-      const int replayGainVersion = data[0];
-      if (replayGainVersion == 1) {
-        d->trackGain = data.toUInt16BE(1);
-        d->trackPeak = data.toUInt16BE(3);
-        d->albumGain = data.toUInt16BE(5);
-        d->albumPeak = data.toUInt16BE(7);
-      }
-    }
-
-    else if (packetType == "SE") {
-      break;
-    }
-
-    else {
-      file->seek(dataSize, File::Current);
-    }
-  }
-
-}
-
-void MPC::AudioProperties::readSV7(const ByteVector &data, long long streamLength) {
-
-  if (data.startsWith("MP+")) {
-    d->version = data[3] & 15;
-    if (d->version < 7)
-      return;
-
-    d->totalFrames = data.toUInt32LE(4);
-
-    const unsigned int flags = data.toUInt32LE(8);
-    d->sampleRate = sftable[(flags >> 16) & 0x03];
-    d->channels = 2;
-
-    const unsigned int gapless = data.toUInt32LE(5);
-
-    d->trackGain = data.toUInt16LE(14);
-    d->trackPeak = data.toUInt16LE(12);
-    d->albumGain = data.toUInt16LE(18);
-    d->albumPeak = data.toUInt16LE(16);
-
-    // convert gain info
-    if (d->trackGain != 0) {
-      int tmp = static_cast<int>((64.82 - static_cast<short>(d->trackGain) / 100.) * 256. + .5);
-      if (tmp >= (1 << 16) || tmp < 0) tmp = 0;
-      d->trackGain = tmp;
-    }
-
-    if (d->albumGain != 0) {
-      int tmp = static_cast<int>((64.82 - d->albumGain / 100.) * 256. + .5);
-      if (tmp >= (1 << 16) || tmp < 0) tmp = 0;
-      d->albumGain = tmp;
-    }
-
-    if (d->trackPeak != 0)
-      d->trackPeak = static_cast<int>(log10(static_cast<double>(d->trackPeak)) * 20 * 256 + .5);
-
-    if (d->albumPeak != 0)
-      d->albumPeak = static_cast<int>(log10(static_cast<double>(d->albumPeak)) * 20 * 256 + .5);
-
-    bool trueGapless = (gapless >> 31) & 0x0001;
-    if (trueGapless) {
-      unsigned int lastFrameSamples = (gapless >> 20) & 0x07FF;
-      d->sampleFrames = d->totalFrames * 1152 - lastFrameSamples;
-    }
-    else
-      d->sampleFrames = d->totalFrames * 1152 - 576;
-  }
-  else {
-    const unsigned int headerData = data.toUInt32LE(0);
-
-    d->bitrate = (headerData >> 23) & 0x01ff;
-    d->version = (headerData >> 11) & 0x03ff;
-    d->sampleRate = 44100;
-    d->channels = 2;
-
-    if (d->version >= 5)
-      d->totalFrames = data.toUInt32LE(4);
-    else
-      d->totalFrames = data.toUInt16LE(6);
-
-    d->sampleFrames = d->totalFrames * 1152 - 576;
-  }
-
-  if (d->sampleFrames > 0 && d->sampleRate > 0) {
-    const double length = d->sampleFrames * 1000.0 / d->sampleRate;
-    d->length = static_cast<int>(length + 0.5);
-
-    if (d->bitrate == 0)
-      d->bitrate = static_cast<int>(streamLength * 8.0 / length + 0.5);
-  }
-
-}

3rdparty/taglib/mpc/mpcproperties.h

@@ -1,132 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2004 by Allan Sandfeld Jensen
-    email                : kde@carewolf.org
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_MPCPROPERTIES_H
-#define TAGLIB_MPCPROPERTIES_H
-
-#include "taglib_export.h"
-#include "audioproperties.h"
-
-namespace Strawberry_TagLib {
-namespace TagLib {
-
-namespace MPC {
-
-class File;
-
-//! An implementation of audio property reading for MPC
-
-/*!
- * This reads the data from an MPC stream found in the AudioProperties API.
- */
-
-class TAGLIB_EXPORT AudioProperties : public Strawberry_TagLib::TagLib::AudioProperties {
- public:
-  /*!
-   * Create an instance of MPC::AudioProperties with the data read directly from a MPC::File.
-   */
-  explicit AudioProperties(File *file, long long streamLength, ReadStyle style = Average);
-
-  /*!
-   * Destroys this MPC::AudioProperties instance.
-   */
-  ~AudioProperties() override;
-
-  /*!
-   * Returns the length of the file in seconds.
-   * The length is rounded down to the nearest whole second.
-   *
-   * \see lengthInMilliseconds()
-   */
-  int lengthInSeconds() const override;
-
-  /*!
-   * Returns the length of the file in milliseconds.
-   *
-   * \see lengthInSeconds()
-   */
-  int lengthInMilliseconds() const override;
-
-  /*!
-   * Returns the average bit rate of the file in kb/s.
-   */
-  int bitrate() const override;
-
-  /*!
-   * Returns the sample rate in Hz.
-   */
-  int sampleRate() const override;
-
-  /*!
-   * Returns the number of audio channels.
-   */
-  int channels() const override;
-
-  /*!
-   * Returns the version of the bitstream (SV4-SV8)
-   */
-  int mpcVersion() const;
-
-  unsigned int totalFrames() const;
-  unsigned int sampleFrames() const;
-
-  /*!
-  * Returns the track gain as an integer value,
-  * to convert to dB: trackGain in dB = 64.82 - (trackGain / 256)
-  */
-  int trackGain() const;
-
-  /*!
-  * Returns the track peak as an integer value,
-  * to convert to dB: trackPeak in dB = trackPeak / 256
-  * to convert to floating [-1..1]: trackPeak = 10^(trackPeak / 256 / 20)/32768
-  */
-  int trackPeak() const;
-
-  /*!
-  * Returns the album gain as an integer value,
-  * to convert to dB: albumGain in dB = 64.82 - (albumGain / 256)
-  */
-  int albumGain() const;
-
-  /*!
-  * Returns the album peak as an integer value,
-  * to convert to dB: albumPeak in dB = albumPeak / 256
-  * to convert to floating [-1..1]: albumPeak = 10^(albumPeak / 256 / 20)/32768
-  */
-  int albumPeak() const;
-
- private:
-  void readSV7(const ByteVector &data, long long streamLength);
-  void readSV8(File *file, long long streamLength);
-
-  class AudioPropertiesPrivate;
-  AudioPropertiesPrivate *d;
-};
-}  // namespace MPC
-}  // namespace TagLib
-}  // namespace Strawberry_TagLib
-
-#endif