Automatic merge of translations from Transifex

This commit fixes: #7375.

.clang-format

@@ -0,0 +1,3 @@
+BasedOnStyle: Google
+DerivePointerBinding: false
+Standard: Cpp11

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,18 @@
+### Before posting
+
+Please follow the steps below and check the boxes with [x] once you did the step.
+
+- [ ] I checked the issue tracker for similar issues
+- [ ] I checked the [changelog](https://github.com/clementine-player/Clementine/blob/master/Changelog) if the issue is already resolved
+- [ ] I tried the latest Clementine build from [here](https://builds.clementine-player.org/)
+
+### System information
+
+Please provide information about your system and the version of Clementine used.
+
+- Operating System:
+- Clementine version: 
+
+### Expected behaviour / actual behaviour
+
+### Steps to reproduce the problem (only for bugs)

.github/workflows/all.yml

@@ -0,0 +1,924 @@
+name: all
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: clang-format
+        uses: clementine-player/clang-format-lint-action@master
+        with:
+          style: "{BasedOnStyle: Google, DerivePointerBinding: false, Standard: Cpp11}"
+          source: ./src
+          clangFormatVersion: 9
+
+
+  push_translations:
+    name: Push translation sources to Transifex
+    if: github.ref == 'refs/heads/master'
+    runs-on: ubuntu-24.04
+    container:
+      image: ubuntu:noble
+    steps:
+      - uses: supplypike/setup-bin@v3
+        with:
+          uri: https://github.com/transifex/cli/releases/download/v1.6.17/tx-linux-amd64.tar.gz
+          name: tx
+          version: 1.6.17
+      - name: Install dependencies
+        env:
+          DEBIAN_FRONTEND: noninteractive
+        run: >
+          apt-get update && apt-get install -y
+          build-essential
+          cmake
+          gettext
+          git
+          libasound2-dev
+          libboost-dev
+          libcdio-dev
+          libchromaprint-dev
+          libdbus-1-dev
+          libfftw3-dev
+          libglew-dev
+          libglib2.0-dev
+          libgpod-dev
+          libgstreamer-plugins-base1.0-dev
+          libgstreamer1.0-dev
+          liblastfm5-dev
+          libmtp-dev
+          libprotobuf-dev
+          libpulse-dev
+          libqt5x11extras5-dev
+          libsqlite3-dev
+          libtag1-dev
+          pkg-config
+          protobuf-compiler
+          python3-pip
+          qtbase5-dev
+          qttools5-dev-tools
+          qttools5-dev
+          libsparsehash-dev
+          ssh
+      - name: Checkout
+        uses: actions/checkout@v1.2.0
+      - name: git hackery
+        run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
+      - name: tx init
+        env:
+          TX_TOKEN: ${{ secrets.TX_TOKEN }}
+        run: tx init
+      - name: cmake
+        working-directory: bin
+        run: cmake ..
+      - name: make
+        working-directory: bin
+        run: make -j2
+      - name: tx config
+        env:
+          TX_TOKEN: ${{ secrets.TX_TOKEN }}
+        run: tx add --organization davidsansome --project clementine --resource clementineplayer --file-filter 'src/translations/<lang>.po' --type PO src/translations/en.po
+      - name: tx push
+        env:
+          TX_TOKEN: ${{ secrets.TX_TOKEN }}
+        run: tx push -s
+
+  create_release:
+    name: Create GitHub Release
+    runs-on: ubuntu-24.04
+    if: github.ref == 'refs/heads/master'
+    needs:
+      - build_bullseye_64
+      - build_buster_64
+      - build_fedora_39
+      - build_fedora_40
+      - build_focal_64
+      - build_jammy_64
+      - build_noble_64
+      # - build_mac
+      - build_mingw
+      - build_source
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v1.2.0
+      - uses: actions/download-artifact@v4
+        with:
+          path: release_artifacts
+      - name: Create draft pre-release
+        id: tag_name
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          set -x
+          VERSION=$(echo release_artifacts/**/*.tar.xz | sed -e 's/.*clementine-\(.*\).tar.xz/\1/')
+          echo "Version: ${VERSION}"
+          echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
+      - name: Create draft pre-release
+        uses: softprops/action-gh-release@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          name: ${{ steps.tag_name.outputs.version }}
+          tag_name: ${{ steps.tag_name.outputs.version }}
+          files: "release_artifacts/**/*"
+          fail_on_unmatched_files: true
+          draft: false
+          prerelease: false
+
+  build_source:
+    name: Build source tarball
+    runs-on: ubuntu-24.04
+    container:
+      image: ubuntu:focal
+    steps:
+      - name: Install dependencies
+        env:
+          DEBIAN_FRONTEND: noninteractive
+        run: >
+          apt-get update && apt-get install -y
+          cmake
+          fakeroot
+          gettext
+          git
+          libasound2-dev
+          libboost-dev
+          libboost-serialization-dev
+          libcdio-cdda2
+          libcdio-dev
+          libchromaprint-dev
+          libcrypto++-dev
+          libdbus-1-dev
+          libfftw3-dev
+          libglew1.5-dev
+          libgpod-dev
+          libgstreamer-plugins-base1.0-dev
+          libgstreamer1.0-dev
+          liblastfm5-dev
+          libmtp-dev
+          libmygpo-qt-dev
+          libplist-dev
+          libprotobuf-dev
+          libpulse-dev
+          libqca-qt5-2-dev
+          libqca-qt5-2-plugins
+          libqt5x11extras5-dev
+          libsparsehash-dev
+          libsqlite3-dev
+          libtag1-dev
+          libusbmuxd-dev
+          protobuf-compiler
+          qtbase5-dev
+          qttools5-dev-tools
+          qttools5-dev
+          ssh
+      - uses: actions/checkout@v1.2.0
+      - name: git hackery
+        run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
+      - name: cmake
+        working-directory: bin
+        run: cmake ..
+      - name: Build source tarball
+        working-directory: bin
+        run: ../dist/maketarball.sh
+      - uses: actions/upload-artifact@v4
+        with:
+          name: release_source
+          path: bin/clementine-*.tar.xz
+
+  build_fedora_39:
+    name: Build Fedora 39 RPM
+    runs-on: ubuntu-24.04
+    container:
+      image: fedora:39
+    env:
+      RPM_BUILD_NCPUS: "2"
+    steps:
+      - name: Install dependencies
+        run: >
+          dnf install --assumeyes
+          @development-tools
+          alsa-lib-devel
+          boost-devel
+          cmake
+          cryptopp
+          cryptopp-devel
+          dbus-devel
+          desktop-file-utils
+          fftw-devel
+          gcc-c++
+          gettext
+          git
+          glew-devel
+          gstreamer1-devel
+          gstreamer1-plugins-base-devel
+          hicolor-icon-theme
+          libappstream-glib
+          libcdio-devel
+          libchromaprint-devel
+          libgpod-devel
+          liblastfm-qt5-devel
+          libmtp-devel
+          libnotify-devel
+          openssh
+          pkgconfig
+          protobuf-compiler
+          protobuf-devel
+          pulseaudio-libs-devel
+          qca-qt5-devel
+          qca-qt5-ossl
+          qt5-linguist
+          qt5-qtbase-devel
+          qt5-qtx11extras-devel
+          qt5-rpm-macros
+          qtsingleapplication-qt5-devel
+          qtsinglecoreapplication-qt5-devel
+          rpmdevtools
+          sparsehash-devel
+          sqlite-devel
+          taglib-devel
+          tar
+      - uses: actions/checkout@v1.2.0
+      - name: git hackery
+        run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
+      - name: cmake
+        working-directory: bin
+        run: cmake -DUSE_SYSTEM_QTSINGLEAPPLICATION=On ..
+      - name: Build source tarball
+        working-directory: bin
+        run: ../dist/maketarball.sh
+      - name: Create rpmbuild directory
+        run: mkdir -p ~/rpmbuild/SOURCES
+      - name: Move source tarball
+        working-directory: bin
+        run: mv clementine-*.tar.xz ~/rpmbuild/SOURCES
+      - name: Build RPM
+        working-directory: bin
+        run: rpmbuild -ba ../dist/clementine.spec
+      - uses: actions/upload-artifact@v4
+        with:
+          name: release_fedora_39
+          path: ~/rpmbuild/RPMS/*/clementine-*.rpm
+
+  build_fedora_40:
+    name: Build Fedora 40 RPM
+    runs-on: ubuntu-24.04
+    container:
+      image: fedora:40
+    env:
+      RPM_BUILD_NCPUS: "2"
+    steps:
+      - name: Install dependencies
+        run: >
+          dnf install --assumeyes
+          @development-tools
+          alsa-lib-devel
+          boost-devel
+          cmake
+          cryptopp
+          cryptopp-devel
+          dbus-devel
+          desktop-file-utils
+          fftw-devel
+          gcc-c++
+          gettext
+          git
+          glew-devel
+          gstreamer1-devel
+          gstreamer1-plugins-base-devel
+          hicolor-icon-theme
+          libappstream-glib
+          libcdio-devel
+          libchromaprint-devel
+          libgpod-devel
+          liblastfm-qt5-devel
+          libmtp-devel
+          libnotify-devel
+          openssh
+          pkgconfig
+          protobuf-compiler
+          protobuf-devel
+          pulseaudio-libs-devel
+          qca-qt5-devel
+          qca-qt5-ossl
+          qt5-linguist
+          qt5-qtbase-devel
+          qt5-qtx11extras-devel
+          qt5-rpm-macros
+          qtsingleapplication-qt5-devel
+          qtsinglecoreapplication-qt5-devel
+          rpmdevtools
+          sparsehash-devel
+          sqlite-devel
+          taglib-devel
+          tar
+      - uses: actions/checkout@v1.2.0
+      - name: git hackery
+        run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
+      - name: cmake
+        working-directory: bin
+        run: cmake -DUSE_SYSTEM_QTSINGLEAPPLICATION=On ..
+      - name: Build source tarball
+        working-directory: bin
+        run: ../dist/maketarball.sh
+      - name: Create rpmbuild directory
+        run: mkdir -p ~/rpmbuild/SOURCES
+      - name: Move source tarball
+        working-directory: bin
+        run: mv clementine-*.tar.xz ~/rpmbuild/SOURCES
+      - name: Build RPM
+        working-directory: bin
+        run: rpmbuild -ba ../dist/clementine.spec
+      - uses: actions/upload-artifact@v4
+        with:
+          name: release_fedora_40
+          path: ~/rpmbuild/RPMS/*/clementine-*.rpm
+
+  build_mingw:
+    name: Build Windows Installer
+    runs-on: ubuntu-24.04
+    container:
+      image: eu.gcr.io/clementine-data/mingw-w64:latest
+    env:
+      PKG_CONFIG_PATH: /target/lib/pkgconfig
+    steps:
+      - name: Fix liblastfm includes
+        run: ln -s /target/include/lastfm /target/include/lastfm5
+      - uses: actions/checkout@v1.2.0
+      - name: git hackery
+        run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
+      - name: cmake
+        working-directory: bin
+        run: >
+          cmake ..
+          -DCMAKE_TOOLCHAIN_FILE=../Toolchain-mingw32.cmake
+          -DCMAKE_BUILD_TYPE=Release
+      - name: make
+        working-directory: bin
+        run: make -j2
+      - name: Copy output exes
+        working-directory: dist/windows
+        run: cp ../../bin/*.exe .
+      - name: Copy base runtime DLLs
+        run: >
+          cp
+          /usr/lib/gcc/i686-w64-mingw32/*-posix/libgcc_s_sjlj-1.dll
+          /usr/lib/gcc/i686-w64-mingw32/*-posix/libstdc++-6.dll
+          /usr/i686-w64-mingw32/lib/libwinpthread-1.dll
+          dist/windows
+      - name: Copy DLL depdendencies
+        working-directory: /target/bin
+        run: >
+            cp
+            glew32.dll
+            libcdio-19.dll
+            libchromaprint.dll
+            libcrypto-1_1.dll
+            libfaad-2.dll
+            libffi-7.dll
+            libfftw3-3.dll
+            libFLAC-8.dll
+            libgcrypt-20.dll
+            libgio-2.0-0.dll
+            libglib-2.0-0.dll
+            libgmodule-2.0-0.dll
+            libgmp-10.dll
+            libgnutls-30.dll
+            libgobject-2.0-0.dll
+            libgpg-error-0.dll
+            libgpod.dll
+            libgstapp-1.0-0.dll
+            libgstaudio-1.0-0.dll
+            libgstbase-1.0-0.dll
+            libgstfft-1.0-0.dll
+            libgstnet-1.0-0.dll
+            libgstpbutils-1.0-0.dll
+            libgstreamer-1.0-0.dll
+            libgstriff-1.0-0.dll
+            libgstrtp-1.0-0.dll
+            libgstrtsp-1.0-0.dll
+            libgstsdp-1.0-0.dll
+            libgsttag-1.0-0.dll
+            libgstvideo-1.0-0.dll
+            libgthread-2.0-0.dll
+            libhogweed-6.dll
+            libiconv-2.dll
+            libintl-8.dll
+            liblastfm5.dll
+            libmms-0.dll
+            libmp3lame-0.dll
+            libnettle-8.dll
+            libogg-0.dll
+            liboil-0.3-0.dll
+            libopus-0.dll
+            liborc-0.4-0.dll
+            liborc-test-0.4-0.dll
+            libp11-kit-0.dll
+            libpcre-1.dll
+            libplist.dll
+            libprotobuf-17.dll
+            libpsl-5.dll
+            libssl-1_1.dll
+            libsoup-2.4-1.dll
+            libspeex-1.dll
+            libspotify.dll
+            libsqlite3-0.dll
+            libtag.dll
+            libtasn1-6.dll
+            libunistring-2.dll
+            libvorbis-0.dll
+            libvorbisenc-2.dll
+            libxml2-2.dll
+            libwavpack-1.dll
+            Qt5Concurrent.dll
+            Qt5Core.dll
+            Qt5Gui.dll
+            Qt5Network.dll
+            Qt5OpenGL.dll
+            Qt5Sql.dll
+            Qt5Svg.dll
+            Qt5Widgets.dll
+            Qt5WinExtras.dll
+            Qt5Xml.dll
+            zlib1.dll
+            ${GITHUB_WORKSPACE}/dist/windows
+      - run: mkdir dist/windows/imageformats
+      - name: Copy Qt imageformat plugin DLLs
+        working-directory: /target/plugins
+        run: >
+          cp
+          imageformats/qgif.dll
+          imageformats/qjpeg.dll
+          imageformats/qsvg.dll
+          ${GITHUB_WORKSPACE}/dist/windows/imageformats
+      - run: mkdir dist/windows/platforms
+      - name: Copy Qt platforms plugin DLLs
+        working-directory: /target/plugins
+        run: >
+          cp
+          platforms/qwindows.dll
+          ${GITHUB_WORKSPACE}/dist/windows/platforms
+      - run: mkdir dist/windows/styles
+      - name: Copy Qt style plugin DLLs
+        working-directory: /target/plugins
+        run: >
+          cp
+          styles/qwindowsvistastyle.dll
+          ${GITHUB_WORKSPACE}/dist/windows/styles
+      - run: mkdir dist/windows/gio-modules
+      - name: Copy GIO modules
+        run: cp /target/lib/gio/modules/libgiognutls.dll dist/windows/gio-modules
+      - run: mkdir dist/windows/gstreamer-plugins
+      - name: Copy gstreamer plugins
+        working-directory: /target/lib/gstreamer-1.0
+        run: >
+          cp
+          libgstaiff.dll
+          libgstapetag.dll
+          libgstapp.dll
+          libgstasf.dll
+          libgstasfmux.dll
+          libgstaudioconvert.dll
+          libgstaudiofx.dll
+          libgstaudioparsers.dll
+          libgstaudioresample.dll
+          libgstaudiotestsrc.dll
+          libgstautodetect.dll
+          libgstcdio.dll
+          libgstcoreelements.dll
+          libgstdirectsound.dll
+          libgstequalizer.dll
+          libgstfaad.dll
+          libgstflac.dll
+          libgstgdp.dll
+          libgstgio.dll
+          libgsticydemux.dll
+          libgstid3demux.dll
+          libgstid3tag.dll
+          libgstisomp4.dll
+          libgstlame.dll
+          libgstlibav.dll
+          libgstmms.dll
+          libgstogg.dll
+          libgstopus.dll
+          libgstopusparse.dll
+          libgstpbtypes.dll
+          libgstplayback.dll
+          libgstreplaygain.dll
+          libgstrtp.dll
+          libgstrtsp.dll
+          libgstsoup.dll
+          libgstspectrum.dll
+          libgstspeex.dll
+          libgsttaglib.dll
+          libgsttcp.dll
+          libgsttypefindfunctions.dll
+          libgstudp.dll
+          libgstvolume.dll
+          libgstvorbis.dll
+          libgstwavpack.dll
+          libgstwavparse.dll
+          ${GITHUB_WORKSPACE}/dist/windows/gstreamer-plugins
+      - name: Build Windows installer
+        working-directory: dist/windows
+        run: makensis clementine.nsi
+      - uses: actions/upload-artifact@v4
+        with:
+          name: release_mingw
+          path: dist/windows/ClementineSetup*.exe
+
+  build_bullseye_64:
+    name: Build Debian Bullseye 64-bit deb
+    runs-on: ubuntu-24.04
+    container:
+      image: debian:bullseye
+    steps:
+      - name: Install dependencies
+        run: >
+          apt-get update && apt-get install -y
+          build-essential
+          cmake
+          debhelper
+          gettext
+          git
+          libasound2-dev
+          libboost-dev
+          libcdio-dev
+          libchromaprint-dev
+          libcrypto++-dev
+          libdbus-1-dev
+          libfftw3-dev
+          libglew1.5-dev
+          libglib2.0-dev
+          libgpod-dev
+          libgstreamer-plugins-base1.0-dev
+          libgstreamer1.0-dev
+          liblastfm5-dev
+          libmtp-dev
+          libmygpo-qt-dev
+          libprotobuf-dev
+          libpulse-dev
+          libqt5x11extras5-dev
+          libsparsehash-dev
+          libsqlite3-dev
+          libtag1-dev
+          pkg-config
+          protobuf-compiler
+          qtbase5-dev
+          qttools5-dev-tools
+          qttools5-dev
+          ssh
+      - uses: actions/checkout@v1.2.0
+      - name: git hackery
+        run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
+      - name: cmake
+        working-directory: bin
+        run: >
+          cmake ..
+          -DWITH_DEBIAN=ON
+          -DDEB_ARCH=amd64
+          -DDEB_DIST=bullseye
+          -DENABLE_SPOTIFY_BLOB=OFF
+      - name: make
+        working-directory: bin
+        run : make -j2 deb
+      - uses: actions/upload-artifact@v4
+        with:
+          name: release_bullseye_64
+          path: bin/clementine_*.deb
+
+  build_buster_64:
+    name: Build Debian Buster 64-bit deb
+    runs-on: ubuntu-24.04
+    container:
+      image: debian:buster
+    steps:
+      - name: Install dependencies
+        run: >
+          apt-get update && apt-get install -y
+          build-essential
+          cmake
+          gettext
+          git
+          libasound2-dev
+          libboost-dev
+          libcdio-dev
+          libchromaprint-dev
+          libcrypto++-dev
+          libdbus-1-dev
+          libfftw3-dev
+          libglew1.5-dev
+          libglib2.0-dev
+          libgpod-dev
+          libgstreamer-plugins-base1.0-dev
+          libgstreamer1.0-dev
+          liblastfm5-dev
+          libmtp-dev
+          libmygpo-qt-dev
+          libprotobuf-dev
+          libpulse-dev
+          libqt5x11extras5-dev
+          libsparsehash-dev
+          libsqlite3-dev
+          libtag1-dev
+          pkg-config
+          protobuf-compiler
+          qtbase5-dev
+          qttools5-dev-tools
+          qttools5-dev
+          ssh
+      - uses: actions/checkout@v1.2.0
+      - name: git hackery
+        run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
+      - name: cmake
+        working-directory: bin
+        run: >
+          cmake ..
+          -DWITH_DEBIAN=ON
+          -DDEB_ARCH=amd64
+          -DDEB_DIST=buster
+          -DENABLE_SPOTIFY_BLOB=OFF
+      - name: make
+        working-directory: bin
+        run : make -j2 deb
+      - uses: actions/upload-artifact@v4
+        with:
+          name: release_buster_64
+          path: bin/clementine_*.deb
+
+  build_focal_64:
+    name: Build Ubuntu Focal 64-bit deb
+    runs-on: ubuntu-24.04
+    container:
+      image: ubuntu:focal
+    steps:
+      - name: Install dependencies
+        env:
+          DEBIAN_FRONTEND: noninteractive
+        run: >
+          apt-get update && apt-get install -y
+          cmake
+          fakeroot
+          gettext
+          git
+          libasound2-dev
+          libboost-dev
+          libboost-serialization-dev
+          libcdio-cdda2
+          libcdio-dev
+          libchromaprint-dev
+          libcrypto++-dev
+          libdbus-1-dev
+          libfftw3-dev
+          libglew1.5-dev
+          libgpod-dev
+          libgstreamer-plugins-base1.0-dev
+          libgstreamer1.0-dev
+          liblastfm5-dev
+          libmtp-dev
+          libmygpo-qt-dev
+          libplist-dev
+          libprotobuf-dev
+          libpulse-dev
+          libqca-qt5-2-dev
+          libqca-qt5-2-plugins
+          libqt5x11extras5-dev
+          libsparsehash-dev
+          libsqlite3-dev
+          libtag1-dev
+          libusbmuxd-dev
+          protobuf-compiler
+          qtbase5-dev
+          qttools5-dev-tools
+          qttools5-dev
+          ssh
+      - uses: actions/checkout@v1.2.0
+      - name: git hackery
+        run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
+      - name: cmake
+        working-directory: bin
+        run: >
+          cmake ..
+          -DWITH_DEBIAN=ON
+          -DDEB_ARCH=amd64
+          -DDEB_DIST=focal
+          -DENABLE_SPOTIFY_BLOB=OFF
+      - name: make
+        working-directory: bin
+        run : make -j2 deb
+      - uses: actions/upload-artifact@v4
+        with:
+          name: release_focal_64
+          path: bin/clementine_*.deb
+
+  build_jammy_64:
+    name: Build Ubuntu Jammy 64-bit deb
+    runs-on: ubuntu-24.04
+    container:
+      image: ubuntu:jammy
+    steps:
+      - name: Install dependencies
+        env:
+          DEBIAN_FRONTEND: noninteractive
+        run: >
+          apt-get update && apt-get install -y
+          cmake
+          dpkg-dev
+          debhelper
+          fakeroot
+          g++
+          gettext
+          git
+          libasound2-dev
+          libboost-dev
+          libboost-serialization-dev
+          libcdio-cdda2
+          libcdio-dev
+          libchromaprint-dev
+          libcrypto++-dev
+          libdbus-1-dev
+          libfftw3-dev
+          libglew-dev
+          libgpod-dev
+          libgstreamer-plugins-base1.0-dev
+          libgstreamer1.0-dev
+          liblastfm5-dev
+          libmtp-dev
+          libmygpo-qt-dev
+          libplist-dev
+          libprotobuf-dev
+          libpulse-dev
+          libqca-qt5-2-dev
+          libqca-qt5-2-plugins
+          libqt5x11extras5-dev
+          libsparsehash-dev
+          libsqlite3-dev
+          libtag1-dev
+          libusbmuxd-dev
+          protobuf-compiler
+          qtbase5-dev
+          qttools5-dev-tools
+          qttools5-dev
+          ssh
+      - uses: actions/checkout@v1.2.0
+      - name: git hackery
+        run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
+      - name: cmake
+        working-directory: bin
+        run: >
+          cmake ..
+          -DWITH_DEBIAN=ON
+          -DDEB_ARCH=amd64
+          -DDEB_DIST=jammy
+          -DENABLE_SPOTIFY_BLOB=OFF
+      - name: make
+        working-directory: bin
+        run : make -j2 deb
+      - uses: actions/upload-artifact@v4
+        with:
+          name: release_jammy_64
+          path: bin/clementine_*.deb
+
+  build_noble_64:
+    name: Build Ubuntu Noble 64-bit deb
+    runs-on: ubuntu-24.04
+    container:
+      image: ubuntu:noble
+    steps:
+      - name: Install dependencies
+        env:
+          DEBIAN_FRONTEND: noninteractive
+        run: >
+          apt-get update && apt-get install -y
+          cmake
+          dpkg-dev
+          debhelper
+          fakeroot
+          g++
+          gettext
+          git
+          libasound2-dev
+          libboost-dev
+          libboost-serialization-dev
+          libcdio-cdda2
+          libcdio-dev
+          libchromaprint-dev
+          libcrypto++-dev
+          libdbus-1-dev
+          libfftw3-dev
+          libglew-dev
+          libgpod-dev
+          libgstreamer-plugins-base1.0-dev
+          libgstreamer1.0-dev
+          liblastfm5-dev
+          libmtp-dev
+          libmygpo-qt-dev
+          libplist-dev
+          libprotobuf-dev
+          libpulse-dev
+          libqca-qt5-2-dev
+          libqca-qt5-2-plugins
+          libqt5x11extras5-dev
+          libsparsehash-dev
+          libsqlite3-dev
+          libtag1-dev
+          libusbmuxd-dev
+          protobuf-compiler
+          qtbase5-dev
+          qttools5-dev-tools
+          qttools5-dev
+          ssh
+      - uses: actions/checkout@v1.2.0
+      - name: git hackery
+        run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
+      - name: cmake
+        working-directory: bin
+        run: >
+          cmake ..
+          -DWITH_DEBIAN=ON
+          -DDEB_ARCH=amd64
+          -DDEB_DIST=noble
+          -DENABLE_SPOTIFY_BLOB=OFF
+      - name: make
+        working-directory: bin
+        run : make -j2 deb
+      - uses: actions/upload-artifact@v4
+        with:
+          name: release_noble_64
+          path: bin/clementine_*.deb
+
+  build_mac:
+    if: false
+    name: Build Mac DMG
+    runs-on: macos-10.15
+    steps:
+      - uses: actions/checkout@v1.2.0
+      - name: git hackery
+        run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
+      - name: Install dependencies
+        run: brew bundle
+
+      - name: Build libgpod
+        shell: bash
+        env:
+          PERL_MM_USE_DEFAULT: 1
+        run: |
+          sudo cpan install XML::Parser
+          wget https://downloads.sourceforge.net/project/gtkpod/libgpod/libgpod-0.8/libgpod-0.8.3.tar.bz2
+          tar -xvf libgpod-0.8.3.tar.bz2
+          cd libgpod-0.8.3
+          wget https://raw.githubusercontent.com/macports/macports-ports/master/multimedia/libgpod/files/autogen.sh
+          wget https://raw.githubusercontent.com/macports/macports-ports/master/multimedia/libgpod/files/patch-tools-generic-callout.c.diff
+          patch -p0 < patch-tools-generic-callout.c.diff
+          patch -p1 < $GITHUB_WORKSPACE/3rdparty/libgpod/patches/0001-Look-for-libplist-2.0.patch
+          chmod u+x autogen.sh
+          ./autogen.sh
+          ./configure --disable-more-warnings \
+                      --disable-silent-rules \
+                      --disable-udev \
+                      --disable-pygobject \
+                      --with-python=no
+          make -j2
+          sudo make install
+
+      - name: Fix liblastfm includes
+        run: ln -s /usr/local/include/lastfm /usr/local/include/lastfm5
+      - name: cmake
+        env:
+          PKG_CONFIG_PATH: /usr/local/lib/pkgconfig
+          Qt5_DIR: /usr/local/opt/qt5/lib/cmake/Qt5
+          Qt5LinguistTools_DIR: /usr/local/opt/qt5/lib/cmake/Qt5LinguistTools
+          GST_SCANNER_PATH: /usr/local/opt/gstreamer/libexec/gstreamer-1.0/gst-plugin-scanner
+          GST_PLUGIN_PATH: /usr/local/lib/gstreamer-1.0
+          DEVELOPER_DIR: /Applications/Xcode_10.3.app/Contents/Developer
+        working-directory: bin
+        run: >
+          cmake ..
+          -Wno-dev
+          -DCMAKE_BUILD_TYPE=Release
+          -DCMAKE_OSX_ARCHITECTURES=x86_64
+          -DGETTEXT_MSGMERGE_EXECUTABLE=/usr/local/opt/gettext/bin/msgmerge
+          -DGETTEXT_MSGFMT_EXECUTABLE=/usr/local/opt/gettext/bin/msgfmt
+          -DGETTEXT_XGETTEXT_EXECUTABLE=/usr/local/opt/gettext/bin/xgettext
+      - name: make
+        working-directory: bin
+        run: make -j2
+      - name: Copy icon files and resources
+        working-directory: bin
+        run: make install
+      - name: Build DMG
+        working-directory: bin
+        run: make dmg
+      - uses: actions/upload-artifact@v4
+        with:
+          name: release_mac
+          path: bin/clementine-*.dmg

.github/workflows/translations.yml

@@ -0,0 +1,53 @@
+name: translations
+on:
+  schedule:
+    - cron: '23 2 * * *'
+
+jobs:
+  pull_translations:
+    name: Pull translations from Transifex
+    runs-on: ubuntu-22.04
+    container:
+      image: ubuntu:jammy
+    steps:
+      - uses: supplypike/setup-bin@v3
+        with:
+          uri: https://github.com/transifex/cli/releases/download/v1.6.7/tx-linux-amd64.tar.gz
+          name: tx
+          version: 1.6.7
+      - name: Install dependencies
+        env:
+          DEBIAN_FRONTEND: noninteractive
+        run: >
+          apt-get update && apt-get install -y
+          git
+          ssh
+      - name: Checkout
+        uses: actions/checkout@v1.2.0
+      - name: git hackery
+        run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
+      - name: Switch to master
+        run: git checkout master
+      - name: tx init
+        env:
+          TX_TOKEN: ${{ secrets.TX_TOKEN }}
+        run: tx init
+      - name: tx config
+        env:
+          TX_TOKEN: ${{ secrets.TX_TOKEN }}
+        run: tx add --organization davidsansome --project clementine --resource clementineplayer --file-filter 'src/translations/<lang>.po' --type PO src/translations/en.po
+      - name: tx pull
+        env:
+          TX_TOKEN: ${{ secrets.TX_TOKEN }}
+        run: tx pull -f -a
+      - name: Setup git SSH
+        uses: webfactory/ssh-agent@v0.4.1
+        with:
+          ssh-private-key: ${{ secrets.TX_KEY }}
+      - name: git add
+        run: git add src/translations/*
+      - name: git commit and push
+        env:
+          GIT_SSH_COMMAND: "ssh -o StrictHostKeyChecking=no"
+        run: |
+          [ -z "$(git status --porcelain)" ] || git -c 'user.name=Clementine Buildbot' -c 'user.email=buildbot@clementine-player.org' commit -m 'Automatic merge of translations from Transifex' && git push 'git@github.com:clementine-player/Clementine.git' master

.gitignore

@@ -5,7 +5,6 @@
 # *.[oa]
 # *~
 *.pyc
-*.dll
 *.exe
 *.pyd
 build/
@@ -19,7 +18,6 @@ dist/windows/clementine.nsi
 dist/windows/gstreamer-plugins
 dist/windows/gio-modules
 dist/windows/imageformats
-dist/windows/nsisplugins
 dist/windows/PyQt4
 dist/windows/libpython2.7.zip
 mingw/
@@ -45,3 +43,5 @@ dist/windows/Python27.zip
 *.swp
 src/translations/translations.pot
 *.DS_Store
+.vscode
+*.kdev4

3rdparty/fancytabwidget/CMakeLists.txt

@@ -1,22 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-
-set(SOURCES
-  fancytabwidget.cpp
-  stylehelper.cpp
-)
-
-set(HEADERS
-  fancytabwidget.h
-)
-
-qt4_wrap_cpp(MOC ${HEADERS})
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-
-add_library(fancytabwidget STATIC
-  ${SOURCES}
-  ${MOC}
-)
-target_link_libraries(fancytabwidget
-  ${QT_LIBRARIES}
-)

3rdparty/google-breakpad/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.0.0)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 

3rdparty/libgpod/patches/0001-Look-for-libplist-2.0.patch

@@ -0,0 +1,25 @@
+From 27955cc4415c39f520f3674c9d1989d28e9b8670 Mon Sep 17 00:00:00 2001
+From: Jonas Kvinge <jonas@jkvinge.net>
+Date: Wed, 5 May 2021 20:10:28 +0200
+Subject: [PATCH 1/2] Look for libplist-2.0
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c4ffeaf..8052fa2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -42,7 +42,7 @@ AC_CHECK_FUNCS([localtime_r])
+ AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[#include <time.h>])
+ dnl sqlite3 is needed for newer ipod models (nano5g), and libplist is needed 
+ dnl by libgpod sqlite code
+-PKG_CHECK_MODULES(LIBGPOD, glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist >= 1.0 gmodule-2.0)
++PKG_CHECK_MODULES(LIBGPOD, glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist-2.0 gmodule-2.0)
+ 
+ dnl ***************************************************
+ dnl The following functions are only available starting
+-- 
+2.31.1
+

3rdparty/libmygpo-qt5/AUTHORS

@@ -0,0 +1,3 @@
+Stefan Derkits <stefan@derkits.at>
+Christian Wagner <christian.wagner86@gmx.at>
+Felix Winter <ixos01@gmail.com> 

3rdparty/libmygpo-qt5/CMakeLists.txt

@@ -0,0 +1,49 @@
+cmake_minimum_required( VERSION 3.0.0 FATAL_ERROR )
+
+set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" )
+
+set(MYGPO_QT_VERSION_SUFFIX 5)
+
+macro(qt_wrap_cpp)
+    qt5_wrap_cpp(${ARGN})
+endmacro()
+
+# pkg-config names of QtCore and QtNetwork are Qt5Core and Qt5Network for
+# Qt5
+set(MYGPO_QT_MAJOR_VERSION "5")
+set(MYGPO_QT4_QJSON_DEP "")
+
+# Don't use absolute path in Mygpo-qtTargets-$buildType.cmake
+# (This will have no effect with CMake < 2.8)
+# set(QT_USE_IMPORTED_TARGETS TRUE)
+
+set( MYGPO_QT_VERSION_MAJOR "1" )
+set( MYGPO_QT_VERSION_MINOR "1" )
+set( MYGPO_QT_VERSION_PATCH "0" )
+set( MYGPO_QT_VERSION "${MYGPO_QT_VERSION_MAJOR}.${MYGPO_QT_VERSION_MINOR}.${MYGPO_QT_VERSION_PATCH}" )
+
+#Configure Version.h.in with the actual version number
+configure_file( src/Version.h.in ${CMAKE_CURRENT_BINARY_DIR}/src/Version.h )
+
+include(CheckCXXCompilerFlag)
+
+if (CMAKE_COMPILER_IS_GNUCXX)
+    ADD_DEFINITIONS( -Wcast-align -Wchar-subscripts -Wpointer-arith
+       -Wwrite-strings -Wpacked -Wformat-security -Wmissing-format-attribute
+       -Wold-style-cast -Woverloaded-virtual -Wnon-virtual-dtor  -Wall -Wextra
+       -Wformat=2 -Wundef -Wstack-protector -Wmissing-include-dirs
+       -Winit-self -Wunsafe-loop-optimizations  -ggdb3 -fno-inline -DQT_STRICT_ITERATORS )
+    if ( NOT WIN32 )
+        add_definitions( -fvisibility=hidden )
+    endif()
+
+    check_cxx_compiler_flag( -Wlogical-op GNUCXX_HAS_WLOGICAL_OP )
+    if ( GNUCXX_HAS_WLOGICAL_OP )
+        add_definitions( -Wlogical-op )
+    endif()
+endif(CMAKE_COMPILER_IS_GNUCXX)
+
+set(MYGPO_QT_TARGET_NAME mygpo-qt${MYGPO_QT_VERSION_SUFFIX} CACHE INTERNAL "" FORCE )
+
+add_subdirectory( src )

3rdparty/libmygpo-qt5/LICENSE

@@ -0,0 +1,502 @@
+                  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/libmygpo-qt5/Mygpo-qtConfig.cmake.in

@@ -0,0 +1,18 @@
+get_filename_component(myDir ${CMAKE_CURRENT_LIST_FILE} PATH) # get the directory where I myself am
+get_filename_component(rootDir ${myDir}/@relInstallDir@ ABSOLUTE) # get the chosen install prefix
+
+# set the version of myself
+set(MYGPO_QT_VERSION_MAJOR @MYGPO_QT_VERSION_MAJOR@)
+set(MYGPO_QT_VERSION_MINOR @MYGPO_QT_VERSION_MINOR@)
+set(MYGPO_QT_VERSION_PATCH @MYGPO_QT_VERSION_PATCH@)
+set(MYGPO_QT_VERSION ${MYGPO_QT_VERSION_MAJOR}.${MYGPO_QT_VERSION_MINOR}.${MYGPO_QT_VERSION_PATCH} )
+
+# what is my include directory
+set(LIBMYGPO_QT_INCLUDE_DIRS "@INCLUDE_INSTALL_DIR@")
+
+# import the exported targets
+include(${myDir}/Mygpo-qt@MYGPO_QT_VERSION_SUFFIX@Targets.cmake)
+
+# set the expected library variable
+set(LIBMYGPO_QT_LIBRARIES mygpo-qt@MYGPO_QT_VERSION_SUFFIX@ )
+set(LIBMYGPO_QT_FOUND "True")

3rdparty/libmygpo-qt5/Mygpo-qtConfigVersion.cmake.in

@@ -0,0 +1,10 @@
+set(PACKAGE_VERSION @MYGPO_QT_VERSION_MAJOR@.@MYGPO_QT_VERSION_MINOR@.@MYGPO_QT_VERSION_PATCH@)
+
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+   set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+   set(PACKAGE_VERSION_COMPATIBLE TRUE)
+   if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
+      set(PACKAGE_VERSION_EXACT TRUE)
+   endif( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
+endif("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )

3rdparty/libmygpo-qt5/README

@@ -0,0 +1,42 @@
+==========  README ==========
+
+=== What is libmygpo-qt ===
+
+libmygpo-qt is a Qt Library that wraps the gpodder.net Web API (http://wiki.gpodder.org/wiki/Web_Services/API_2)
+
+=== Copyright & License ===
+
+Copyright 2010 - 2018 Stefan Derkits (stefan@derkits.at) , Christian Wagner (christian.wagner86@gmx.at) & Felix Winter (ixos01@gmail.com)
+
+See COPYING File for License
+
+=== Maintainer ===
+
+Current Maintainer: Stefan Derkits (HorusHorrendus @ irc.freenode.net)
+
+=== Requirements ===
+
+-) Qt 5.2 or higher
+-) CMake 2.8.9 or higher
+-) QJson
+
+=== Links ===
+
+Homepage:                http://wiki.gpodder.org/wiki/Libmygpo-qt
+Git Repo:                https://github.com/gpodder/libmygpo-qt
+Doxygen Documentation:   http://stefan.derkits.at/libmygpo-doc/
+Bugreports:              http://bugs.gpodder.org
+Contact:                 gpodder@freelists.org
+IRC Channel:             #gpodder on FreeNode (irc.freenode.net)
+
+=== How to Install ===
+
+-) Create Directory "build"
+-) change into build and run "cmake .. -DCMAKE_BUILD_TYPE=Debug"
+-) make
+-) make install (might need root)
+
+To use libmygpo-qt include the Header "ApiRequest.h" into your Code. You can find the cflags & linker flags for libmygpo-qt either via pkg-config (.pc file will be installed to your System)
+or via cmake (Mygpo-qtConfig.cmake will be installed to your system).
+
+You can check the Example Application to see how you can use libmygpo-qt in your Application

3rdparty/libmygpo-qt5/cmake/modules/FindQJSON.cmake

@@ -0,0 +1,50 @@
+# Find QJSON - JSON handling library for Qt
+#
+# This module defines
+#  QJSON_FOUND - whether the qsjon library was found
+#  QJSON_LIBRARIES - the qjson library
+#  QJSON_INCLUDE_DIR - the include path of the qjson library
+#
+
+if (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
+
+  # Already in cache
+  set (QJSON_FOUND TRUE)
+
+else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
+
+  if (NOT WIN32)
+    # use pkg-config to get the values of QJSON_INCLUDE_DIRS
+    # and QJSON_LIBRARY_DIRS to add as hints to the find commands.
+    include (FindPkgConfig)
+    pkg_check_modules (QJSON REQUIRED QJson>=0.5)
+  endif (NOT WIN32)
+
+  find_library (QJSON_LIBRARIES
+    NAMES
+    qjson
+    PATHS
+    ${QJSON_LIBRARY_DIRS}
+    ${LIB_INSTALL_DIR}
+    ${KDE4_LIB_DIR}
+  )
+
+  find_path (QJSON_INCLUDE_DIR
+    NAMES
+    parser.h
+    PATH_SUFFIXES
+    qjson
+    PATHS
+    ${QJSON_INCLUDE_DIRS}
+    ${INCLUDE_INSTALL_DIR}
+    ${KDE4_INCLUDE_DIR}
+  )
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(QJSON DEFAULT_MSG QJSON_LIBRARIES QJSON_INCLUDE_DIR)
+
+  if ( UNIX AND NOT APPLE )
+    set ( QJSON_LIBRARIES "${QJSON_LIBRARIES} ${QJSON_LDFLAGS}" CACHE INTERNAL "")
+  endif ()
+
+endif (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)

3rdparty/libmygpo-qt5/src/AddRemoveResult.cpp

@@ -20,11 +20,11 @@
 * USA                                                                      *
 ***************************************************************************/
 
-#include <parser.h>
-
 #include "AddRemoveResult.h"
 #include "AddRemoveResult_p.h"
 
+#include "qjsonwrapper/Json.h"
+
 using namespace mygpo;
 
 AddRemoveResultPrivate::AddRemoveResultPrivate( AddRemoveResult* qq, QNetworkReply* reply ) : q( qq ), m_reply( reply ), m_error( QNetworkReply::NoError )
@@ -64,7 +64,6 @@ QList< QPair< QUrl, QUrl > > AddRemoveResultPrivate::updateUrlsList() const
 
 bool AddRemoveResultPrivate::parse( const QVariant& data )
 {
-    QJson::Parser parser;
     if( !data.canConvert( QVariant::Map ) )
         return false;
     QVariantMap resultMap = data.toMap();
@@ -78,9 +77,8 @@ bool AddRemoveResultPrivate::parse( const QVariant& data )
 
 bool AddRemoveResultPrivate::parse( const QByteArray& data )
 {
-    QJson::Parser parser;
     bool ok;
-    QVariant variant = parser.parse( data, &ok );
+    QVariant variant = QJsonWrapper::parseJson( data, &ok );
     if( ok )
     {
         ok = ( parse( variant ) );

3rdparty/libmygpo-qt5/src/AddRemoveResult.h

@@ -65,6 +65,6 @@ typedef QSharedPointer<AddRemoveResult> AddRemoveResultPtr;
 
 }
 
-Q_DECLARE_METATYPE( mygpo::AddRemoveResultPtr );
+Q_DECLARE_METATYPE(mygpo::AddRemoveResultPtr)
 
 #endif // LIBMYGPO_QT_ADDREMOVERESULT_H

3rdparty/libmygpo-qt5/src/ApiRequest.cpp

@@ -1,6 +1,6 @@
 /***************************************************************************
 * This file is part of libmygpo-qt                                         *
-* Copyright (c) 2010 - 2013 Stefan Derkits <stefan@derkits.at>             *
+* Copyright (c) 2010 - 2014 Stefan Derkits <stefan@derkits.at>             *
 * Copyright (c) 2010 - 2011 Christian Wagner <christian.wagner86@gmx.at>   *
 * Copyright (c) 2010 - 2011 Felix Winter <ixos01@gmail.com>                *
 *                                                                          *

3rdparty/libmygpo-qt5/src/ApiRequest.h

@@ -1,6 +1,6 @@
 /***************************************************************************
 * This file is part of libmygpo-qt                                         *
-* Copyright (c) 2010 - 2013 Stefan Derkits <stefan@derkits.at>             *
+* Copyright (c) 2010 - 2014 Stefan Derkits <stefan@derkits.at>             *
 * Copyright (c) 2010 - 2011 Christian Wagner <christian.wagner86@gmx.at>   *
 * Copyright (c) 2010 - 2011 Felix Winter <ixos01@gmail.com>                *
 *                                                                          *
@@ -84,7 +84,7 @@ public:
      */
     QNetworkReply* suggestionsOpml( uint count );
 
-    QNetworkReply* downloadSubscriptionsOpml( const QString& username, const QString& device );
+    QNetworkReply* downloadSubscriptionsOpml( const QString& username, const QString& device = QString() );
 
     /**
      * Returns the TXT Result for the Simple API Call "Downloading Podcast Toplists"
@@ -111,7 +111,7 @@ public:
      */
     QNetworkReply* suggestionsTxt( uint count );
 
-    QNetworkReply* downloadSubscriptionsTxt( const QString& username, const QString& device );
+    QNetworkReply* downloadSubscriptionsTxt( const QString& username, const QString& device = QString() );
 
     /**
      * Returns the TXT Result for the Simple API Call "Downloading Podcast Toplists"
@@ -154,7 +154,7 @@ public:
      */
     PodcastListPtr suggestions( uint count );
 
-    QNetworkReply* downloadSubscriptionsJson( const QString& username, const QString& device );
+    QNetworkReply* downloadSubscriptionsJson( const QString& username, const QString& device = QString() );
 
     //ADVANCED API
 

3rdparty/libmygpo-qt5/src/CMakeLists.txt

@@ -1,11 +1,10 @@
 # Extra bits for Clementine.
 set( MYGPO_QT_VERSION_MAJOR "1" )
 set( MYGPO_QT_VERSION_MINOR "0" )
-set( MYGPO_QT_VERSION_PATCH "7" )
+set( MYGPO_QT_VERSION_PATCH "9" )
 configure_file( Version.h.in ${CMAKE_CURRENT_BINARY_DIR}/Version.h )
-include_directories("${QJSON_INCLUDEDIR}/qjson")
 
-include_directories( ${QT_INCLUDES} ${QJSON_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
+include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
 
 set ( LIBMYGPO_QT_SRC
         Config.cpp
@@ -27,6 +26,7 @@ set ( LIBMYGPO_QT_SRC
         DeviceUpdates.cpp
         DeviceList.cpp
         Device.cpp
+        qjsonwrapper/Json.cpp
 )
 
 set ( LIBMYGPO_QT_MOC_H
@@ -80,9 +80,8 @@ set ( LIBMYGPO_QT_INSTALL_H
         AddRemoveResult.h
 )
 
-QT4_WRAP_CPP(LIBMYGPO_QT_MOC_SRC ${LIBMYGPO_QT_MOC_H} )
+QT_WRAP_CPP(LIBMYGPO_QT_MOC_SRC ${LIBMYGPO_QT_MOC_H} )
 
-add_library( mygpo-qt STATIC ${LIBMYGPO_QT_SRC} ${LIBMYGPO_QT_MOC_SRC} )
+add_library( ${MYGPO_QT_TARGET_NAME} STATIC ${LIBMYGPO_QT_SRC} ${LIBMYGPO_QT_MOC_SRC} )
 
-target_link_libraries( mygpo-qt ${QJSON_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY}  )
-set_target_properties( mygpo-qt PROPERTIES VERSION ${MYGPO_QT_VERSION} SOVERSION ${MYGPO_QT_SONAME} DEFINE_SYMBOL MYGPO_MAKEDLL)
+target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QJSON_LIBRARIES} Qt5::Core Qt5::Network )

3rdparty/libmygpo-qt5/src/Config.cpp

@@ -29,7 +29,7 @@ using namespace mygpo;
 
 Config* Config::s_instance = 0;
 
-ConfigPrivate::ConfigPrivate( Config* qq ) : q( qq ), m_mygpoBaseUrl( QUrl( QLatin1String( "http://gpodder.net" ) ) ), m_userAgentPrefix( QString() )
+ConfigPrivate::ConfigPrivate( Config* qq ) : q( qq ), m_mygpoBaseUrl( QUrl( QLatin1String( "https://gpodder.net" ) ) ), m_userAgentPrefix( QString() )
 {
 
 }

3rdparty/libmygpo-qt5/src/Device.h

@@ -66,6 +66,6 @@ typedef QSharedPointer<Device> DevicePtr;
 
 }
 
-Q_DECLARE_METATYPE( mygpo::DevicePtr );
+Q_DECLARE_METATYPE(mygpo::DevicePtr)
 
 #endif //LIBMYGPO_QT_DEVICE_H

3rdparty/libmygpo-qt5/src/DeviceList.cpp

@@ -22,7 +22,7 @@
 
 #include "DeviceList_p.h"
 
-#include <parser.h>
+#include "qjsonwrapper/Json.h"
 
 using namespace mygpo;
 
@@ -73,9 +73,8 @@ bool DeviceListPrivate::parse( const QVariant& data )
 
 bool DeviceListPrivate::parse( const QByteArray& data )
 {
-    QJson::Parser parser;
     bool ok;
-    QVariant variant = parser.parse( data, &ok );
+    QVariant variant = QJsonWrapper::parseJson( data, &ok );
     if( ok )
     {
         ok = ( parse( variant ) );

3rdparty/libmygpo-qt5/src/DeviceList.h

@@ -63,6 +63,6 @@ typedef QSharedPointer<DeviceList> DeviceListPtr;
 
 }
 
-Q_DECLARE_METATYPE( mygpo::DeviceListPtr );
+Q_DECLARE_METATYPE(mygpo::DeviceListPtr)
 
 #endif //LIBMYGPO_QT_DEVICELIST_H

3rdparty/libmygpo-qt5/src/DeviceSyncResult.cpp

@@ -20,7 +20,7 @@
 
 #include "DeviceSyncResult_p.h"
 
-#include <parser.h>
+#include "qjsonwrapper/Json.h"
 
 using namespace mygpo;
 
@@ -85,9 +85,8 @@ bool DeviceSyncResultPrivate::parse( const QVariant& data )
 
 bool DeviceSyncResultPrivate::parse( const QByteArray& data )
 {
-    QJson::Parser parser;
     bool ok;
-    QVariant variant = parser.parse( data, &ok );
+    QVariant variant = QJsonWrapper::parseJson( data, &ok );
     if( ok )
     {
         ok = ( parse( variant ) );

3rdparty/libmygpo-qt5/src/DeviceUpdates.cpp

@@ -22,7 +22,7 @@
 
 #include "DeviceUpdates_p.h"
 
-#include <parser.h>
+#include "qjsonwrapper/Json.h"
 
 using namespace mygpo;
 
@@ -102,9 +102,8 @@ bool DeviceUpdatesPrivate::parse( const QVariant& data )
 
 bool DeviceUpdatesPrivate::parse( const QByteArray& data )
 {
-    QJson::Parser parser;
     bool ok;
-    QVariant variant = parser.parse( data, &ok );
+    QVariant variant = QJsonWrapper::parseJson( data, &ok );
     if( ok )
     {
         ok = ( parse( variant ) );

3rdparty/libmygpo-qt5/src/Episode.cpp

@@ -22,7 +22,7 @@
 
 #include "Episode_p.h"
 
-#include <parser.h>
+#include "qjsonwrapper/Json.h"
 
 using namespace mygpo;
 
@@ -115,9 +115,8 @@ bool EpisodePrivate::parse ( const QVariant& data )
 
 bool EpisodePrivate::parse ( const QByteArray& data )
 {
-    QJson::Parser parser;
     bool ok;
-    QVariant variant = parser.parse ( data, &ok );
+    QVariant variant = QJsonWrapper::parseJson( data, &ok );
     if ( ok )
     {
         if ( !parse ( variant ) ) return false;

3rdparty/libmygpo-qt5/src/Episode.h

@@ -91,6 +91,6 @@ typedef QSharedPointer<Episode> EpisodePtr;
 
 }
 
-Q_DECLARE_METATYPE( mygpo::EpisodePtr );
+Q_DECLARE_METATYPE(mygpo::EpisodePtr)
 
 #endif // LIBMYGPO_QT_EPISODE_H

3rdparty/libmygpo-qt5/src/EpisodeAction.cpp

@@ -22,7 +22,7 @@
 
 #include "EpisodeAction_p.h"
 
-#include <parser.h>
+#include "qjsonwrapper/Json.h"
 
 using namespace mygpo;
 
@@ -163,9 +163,8 @@ bool EpisodeActionPrivate::parseActionType( const QString& data )
 
 bool EpisodeActionPrivate::parse( const QByteArray& data )
 {
-    QJson::Parser parser;
     bool ok;
-    QVariant variant = parser.parse( data, &ok );
+    QVariant variant = QJsonWrapper::parseJson( data, &ok );
     if( ok )
     {
         if( !parse( variant ) ) return false;

3rdparty/libmygpo-qt5/src/EpisodeAction.h

@@ -75,6 +75,6 @@ typedef QSharedPointer<EpisodeAction> EpisodeActionPtr;
 
 }
 
-Q_DECLARE_METATYPE( mygpo::EpisodeActionPtr );
+Q_DECLARE_METATYPE(mygpo::EpisodeActionPtr)
 
 #endif // LIBMYGPO_QT_EPISODEACTION_H

3rdparty/libmygpo-qt5/src/EpisodeActionList.cpp

@@ -22,7 +22,7 @@
 
 #include "EpisodeActionList_p.h"
 
-#include <parser.h>
+#include "qjsonwrapper/Json.h"
 
 using namespace mygpo;
 
@@ -88,9 +88,8 @@ bool EpisodeActionListPrivate::parse( const QVariant& data )
 
 bool EpisodeActionListPrivate::parse( const QByteArray& data )
 {
-    QJson::Parser parser;
     bool ok;
-    QVariant variant = parser.parse( data, &ok );
+    QVariant variant = QJsonWrapper::parseJson( data, &ok );
     if( ok )
     {
         ok = ( parse( variant ) );

3rdparty/libmygpo-qt5/src/EpisodeActionList.h

@@ -66,6 +66,6 @@ typedef QSharedPointer<EpisodeActionList> EpisodeActionListPtr;
 
 }
 
-Q_DECLARE_METATYPE( mygpo::EpisodeActionListPtr );
+Q_DECLARE_METATYPE(mygpo::EpisodeActionListPtr)
 
 #endif // LIBMYGPO_QT_EPISODEACTIONLIST_H

3rdparty/libmygpo-qt5/src/EpisodeList.cpp

@@ -22,7 +22,7 @@
 
 #include "EpisodeList_p.h"
 
-#include <parser.h>
+#include "qjsonwrapper/Json.h"
 
 using namespace mygpo;
 
@@ -71,9 +71,8 @@ bool EpisodeListPrivate::parse( const QVariant& data )
 
 bool EpisodeListPrivate::parse( const QByteArray& data )
 {
-    QJson::Parser parser;
     bool ok;
-    QVariant variant = parser.parse( data, &ok );
+    QVariant variant = QJsonWrapper::parseJson( data, &ok );
     if( ok )
     {
         ok = ( parse( variant ) );

3rdparty/libmygpo-qt5/src/EpisodeList_p.h

@@ -52,6 +52,6 @@ private slots:
 
 };
 
-};
+}  // namespace mygpo
 
 #endif // EPISODELIST_PRIVATE_H

3rdparty/libmygpo-qt5/src/Episode_p.h

@@ -66,6 +66,6 @@ private slots:
 
 };
 
-};
+}  // namespace mygpo
 
 #endif // EPISODE_PRIVATE_H

3rdparty/libmygpo-qt5/src/JsonCreator.cpp

@@ -20,47 +20,44 @@
 * USA                                                                      *
 ***************************************************************************/
 
-#include <QVariant>
+//#include <QVariant>
 #include <QList>
 #include <QUrl>
 #include <QString>
 #include <QDateTime>
 
-#include <serializer.h>
-
 #include "JsonCreator.h"
 
+#include "qjsonwrapper/Json.h"
+
 using namespace mygpo;
 
 static qulonglong c_maxlonglong = (2^64)-1;
 
 QByteArray JsonCreator::addRemoveSubsToJSON( const QList< QUrl >& add, const QList< QUrl >& remove )
 {
-    QJson::Serializer serializer;
     QVariantMap jsonData;
     QVariant addVar( urlListToQVariantList( add ) );
     QVariant removeVar( urlListToQVariantList( remove ) );
     jsonData.insert( QString( QLatin1String( "add" ) ), addVar );
     jsonData.insert( QString( QLatin1String( "remove" ) ), removeVar );
-    QByteArray jsonByteArray = serializer.serialize( QVariant( jsonData ) );
+    QByteArray jsonByteArray = QJsonWrapper::toJson( QVariant( jsonData ) );
     return jsonByteArray;
 }
 
 QByteArray JsonCreator::saveSettingsToJSON( const QMap< QString, QVariant >& set, const QList< QString >& remove )
 {
-    QJson::Serializer serializer;
     QVariantMap jsonData;
     //QVariant setVar(stringMapToQVariantMap(set));
     QVariant removeVar( stringListToQVariantList( remove ) );
     jsonData.insert( QString( QLatin1String( "set" ) ), set );
     jsonData.insert( QString( QLatin1String( "remove" ) ), removeVar );
-    QByteArray jsonByteArray = serializer.serialize( QVariant( jsonData ) );
+    QByteArray jsonByteArray = QJsonWrapper::toJson( QVariant( jsonData ) );
     return jsonByteArray;
 }
 
 QByteArray JsonCreator::episodeActionListToJSON( const QList<EpisodeActionPtr>& episodeActions )
 {
-    QJson::Serializer serializer;
     QVariantList jsonData;
 
     foreach( const EpisodeActionPtr episodeAction, episodeActions )
@@ -68,19 +65,18 @@ QByteArray JsonCreator::episodeActionListToJSON( const QList<EpisodeActionPtr>&
         jsonData.append( episodeActionToQVariantMap( episodeAction ) );
     }
 
-    QByteArray jsonByteArray = serializer.serialize( QVariant( jsonData ) );
+    QByteArray jsonByteArray = QJsonWrapper::toJson( QVariant( jsonData ) );
     return jsonByteArray;
 }
 
 QByteArray JsonCreator::renameDeviceStringToJSON( const QString& caption, const QString& type )
 {
-    QJson::Serializer serializer;
     QVariantMap jsonData;
     QVariant captionVar( caption );
     QVariant typeVar( type );
     jsonData.insert( QString( QLatin1String( "caption" ) ), captionVar );
     jsonData.insert( QString( QLatin1String( "type" ) ), typeVar );
-    QByteArray jsonByteArray = serializer.serialize( QVariant( jsonData ) );
+    QByteArray jsonByteArray = QJsonWrapper::toJson( QVariant( jsonData ) );
     return jsonByteArray;
 
 }
@@ -130,7 +126,7 @@ QByteArray JsonCreator::deviceSynchronizationListsToJSON(const QList< QStringLis
     jsonStr.append(syncVar);
     jsonStr.append(QLatin1String(" ,\"stop-synchronize\" : "));
     jsonStr.append(stopVar);
-    jsonStr.append(QLatin1String(" }\n"));
+    jsonStr.append(QLatin1String(" }"));
     return jsonStr.toLocal8Bit();
 }
 

3rdparty/libmygpo-qt5/src/Podcast.cpp

@@ -22,7 +22,7 @@
 
 #include "Podcast_p.h"
 
-#include <parser.h>
+#include "qjsonwrapper/Json.h"
 
 using namespace mygpo;
 
@@ -145,9 +145,12 @@ bool PodcastPrivate::parse( const QVariant& data )
         return false;
     QVariantMap podcastMap = data.toMap();
     QVariant v = podcastMap.value( QLatin1String( "url" ) );
-    if ( !v.canConvert( QVariant::Url ) )
+    if ( !v.canConvert( QVariant::ByteArray ) )
         return false;
-    m_url = v.toUrl();
+    m_url = QUrl::fromEncoded(v.toByteArray(), QUrl::StrictMode);
+    if (!m_url.isValid()) { 
+        return false;
+    }
     v = podcastMap.value( QLatin1String( "title" ) );
     if ( !v.canConvert( QVariant::String ) )
         return false;
@@ -181,9 +184,8 @@ bool PodcastPrivate::parse( const QVariant& data )
 
 bool PodcastPrivate::parse( const QByteArray& data )
 {
-    QJson::Parser parser;
     bool ok;
-    QVariant variant = parser.parse( data, &ok );
+    QVariant variant = QJsonWrapper::parseJson( data, &ok );
     if ( ok )
     {
         if ( !parse( variant ) ) return false;
@@ -197,8 +199,6 @@ bool PodcastPrivate::parse( const QByteArray& data )
 
 void PodcastPrivate::parseData()
 {
-    //parsen und signal senden
-    QJson::Parser parser;
     if ( parse( m_reply->readAll( ) ) )
     {
         emit q->finished();

3rdparty/libmygpo-qt5/src/Podcast.h

@@ -79,6 +79,6 @@ typedef QSharedPointer<Podcast> PodcastPtr;
 
 }
 
-Q_DECLARE_METATYPE( mygpo::PodcastPtr );
+Q_DECLARE_METATYPE(mygpo::PodcastPtr)
 
 #endif // LIBMYGPO_QT_PODCAST_H

3rdparty/libmygpo-qt5/src/PodcastList.cpp

@@ -22,7 +22,7 @@
 
 #include "PodcastList_p.h"
 
-#include <parser.h>
+#include "qjsonwrapper/Json.h"
 
 using namespace mygpo;
 
@@ -71,9 +71,8 @@ bool PodcastListPrivate::parse( const QVariant& data )
 
 bool PodcastListPrivate::parse( const QByteArray& data )
 {
-    QJson::Parser parser;
     bool ok;
-    QVariant variant = parser.parse( data, &ok );
+    QVariant variant = QJsonWrapper::parseJson( data, &ok );
     if( ok )
     {
         ok = ( parse( variant ) );

3rdparty/libmygpo-qt5/src/Podcast_p.h

@@ -66,6 +66,6 @@ private slots:
     void error( QNetworkReply::NetworkError error );
 };
 
-};
+}  // namespace mygpo
 
 #endif // PODCAST_PRIVATE_H

3rdparty/libmygpo-qt5/src/RequestHandler.cpp

@@ -77,5 +77,5 @@ void RequestHandler::addAuthData( QNetworkRequest& request )
 
 void RequestHandler::addUserAgent( QNetworkRequest &request )
 {
-    request.setRawHeader("User-Agent", Config::instance()->userAgent().toAscii() );
+    request.setRawHeader("User-Agent", Config::instance()->userAgent().toLatin1() );
 }

3rdparty/libmygpo-qt5/src/Settings.cpp

@@ -22,7 +22,7 @@
 
 #include "Settings_p.h"
 
-#include <parser.h>
+#include "qjsonwrapper/Json.h"
 
 using namespace mygpo;
 
@@ -49,9 +49,8 @@ bool SettingsPrivate::parse( const QVariant& data )
 
 bool SettingsPrivate::parse( const QByteArray& data )
 {
-    QJson::Parser parser;
     bool ok;
-    QVariant variant = parser.parse( data, &ok );
+    QVariant variant = QJsonWrapper::parseJson( data, &ok );
     if( ok )
     {
         ok = ( parse( variant ) );
@@ -63,7 +62,6 @@ void SettingsPrivate::parseData()
 {
     if( m_reply->error() == QNetworkReply::NoError )
     {
-        QJson::Parser parser;
         if( parse( m_reply->readAll() ) )
         {
             emit q->finished();

3rdparty/libmygpo-qt5/src/Tag.h

@@ -54,6 +54,6 @@ typedef QSharedPointer<Tag> TagPtr;
 
 }
 
-Q_DECLARE_METATYPE( mygpo::TagPtr );
+Q_DECLARE_METATYPE(mygpo::TagPtr)
 
 #endif // LIBMYGPO_QT_TAG_H

3rdparty/libmygpo-qt5/src/TagList.cpp

@@ -22,7 +22,7 @@
 
 #include "TagList_p.h"
 
-#include <parser.h>
+#include "qjsonwrapper/Json.h"
 
 using namespace mygpo;
 
@@ -70,9 +70,8 @@ bool TagListPrivate::parse( const QVariant& data )
 
 bool TagListPrivate::parse( const QByteArray& data )
 {
-    QJson::Parser parser;
     bool ok;
-    QVariant variant = parser.parse( data, &ok );
+    QVariant variant = QJsonWrapper::parseJson( data, &ok );
     if( ok )
     {
         ok = ( parse( variant ) );

3rdparty/libmygpo-qt5/src/TagList.h

@@ -61,6 +61,6 @@ typedef QSharedPointer<TagList> TagListPtr;
 
 }
 
-Q_DECLARE_METATYPE( mygpo::TagListPtr );
+Q_DECLARE_METATYPE(mygpo::TagListPtr)
 
 #endif // LIBMYGPO_QT_TAGLIST_H

3rdparty/libmygpo-qt5/src/UrlBuilder.cpp

@@ -30,7 +30,6 @@
 
 using namespace mygpo;
 
-const QString UrlBuilder::s_server = Config::instance()->mygpoBaseUrl().toString();
 const QString UrlBuilder::s_api2 = QLatin1String( "/api/2" );
 const QString UrlBuilder::s_api1 = QLatin1String( "/api/1" );
 
@@ -58,92 +57,110 @@ static QString getFormatExtension( UrlBuilder::Format f )
 QString UrlBuilder::getToplistUrl( uint i, Format f )
 {
     QString numString = QString::number(( i == 0 ) ? 1 : i );
-    return s_server % QLatin1String( "/toplist/" ) % numString % getFormatExtension( f );
+    return Config::instance()->mygpoBaseUrl().toString() %
+        QLatin1String( "/toplist/" ) % numString % getFormatExtension( f );
 }
 
 QString UrlBuilder::getSuggestionsUrl( uint i, Format f )
 {
     QString numString = QString::number(( i == 0 ) ? 1 : i );
-    return s_server % QLatin1String( "/suggestions/" ) % numString % getFormatExtension( f );
+    return Config::instance()->mygpoBaseUrl().toString() %
+        QLatin1String( "/suggestions/" ) % numString % getFormatExtension( f );
 }
 
 QString UrlBuilder::getPodcastSearchUrl( const QString& query, Format f )
 {
-    return s_server % QLatin1String( "/search" ) % getFormatExtension( f ) % QLatin1String( "?q=" ) % query;
+    return Config::instance()->mygpoBaseUrl().toString() %
+        QLatin1String( "/search" ) % getFormatExtension( f ) % QLatin1String( "?q=" ) % query;
 }
 
 QString UrlBuilder::getSubscriptionsUrl( const QString& username, const QString& device, UrlBuilder::Format f)
 {
-    return s_server % QLatin1String( "/subscriptions/" ) % username % QLatin1String( "/" ) % device % getFormatExtension( f );
+    QString deviceString = device.isNull() ? QString(QLatin1String("")) : (QLatin1String( "/" ) % device);
+    return Config::instance()->mygpoBaseUrl().toString() %
+        QLatin1String( "/subscriptions/" ) % username % deviceString % getFormatExtension( f );
 }
 
 QString UrlBuilder::getTopTagsUrl( uint i )
 {
     QString numString = QString::number(( i == 0 ) ? 1 : i );
-    return s_server % s_api2 % QLatin1String( "/tags/" ) % numString % QLatin1String( ".json" );
+    return Config::instance()->mygpoBaseUrl().toString() %
+        s_api2 % QLatin1String( "/tags/" ) % numString % QLatin1String( ".json" );
 }
 
 QString UrlBuilder::getPodcastsOfTagUrl( const QString& tag, uint i )
 {
     QString numString = QString::number(( i == 0 ) ? 1 : i );
-    return s_server % s_api2 % QLatin1String( "/tag/" ) % tag % QLatin1String( "/" ) % numString % QLatin1String( ".json" );
+    return Config::instance()->mygpoBaseUrl().toString() %
+        s_api2 % QLatin1String( "/tag/" ) % tag % QLatin1String( "/" ) % numString % QLatin1String( ".json" );
 }
 
 QString UrlBuilder::getPodcastDataUrl( const QString& url )
 {
-    return s_server % s_api2 % QLatin1String( "/data/podcast" ) % QLatin1String( ".json" ) % QLatin1String( "?url=" ) % url;
+    return Config::instance()->mygpoBaseUrl().toString() %
+        s_api2 % QLatin1String( "/data/podcast" ) % QLatin1String( ".json" ) % QLatin1String( "?url=" ) % url;
 }
 
 QString UrlBuilder::getEpisodeDataUrl( const QString& podcastUrl, const QString& episodeUrl )
 {
-    return s_server % s_api2 % QLatin1String( "/data/episode" ) % QLatin1String( ".json" ) % QLatin1String( "?podcast=" ) % podcastUrl % QLatin1String( "&url=" ) % episodeUrl;
+    return Config::instance()->mygpoBaseUrl().toString() %
+        s_api2 % QLatin1String( "/data/episode" ) % QLatin1String( ".json" ) % QLatin1String( "?podcast=" ) % podcastUrl % QLatin1String( "&url=" ) % episodeUrl;
 }
 
 QString UrlBuilder::getFavEpisodesUrl( const QString& username )
 {
-    return s_server % s_api2 % QLatin1String( "/favorites/" ) % username % QLatin1String( ".json" );
+    return Config::instance()->mygpoBaseUrl().toString() %
+        s_api2 % QLatin1String( "/favorites/" ) % username % QLatin1String( ".json" );
 }
 
 
 QString UrlBuilder::getAddRemoveSubUrl( const QString& username, const QString& deviceId )
 {
-    return s_server % s_api2 % QLatin1String( "/subscriptions/" ) % username % QLatin1String( "/" ) % deviceId % QLatin1String( ".json" );
+    return Config::instance()->mygpoBaseUrl().toString() %
+        s_api2 % QLatin1String( "/subscriptions/" ) % username % QLatin1String( "/" ) % deviceId % QLatin1String( ".json" );
 }
 
 QString UrlBuilder::getAccountSettingsUrl( const QString& username )
 {
-    return s_server % s_api2 % QLatin1String( "/settings/" ) % username % QLatin1String( "/account" ) % QLatin1String( ".json" );
+    return Config::instance()->mygpoBaseUrl().toString() %
+        s_api2 % QLatin1String( "/settings/" ) % username % QLatin1String( "/account" ) % QLatin1String( ".json" );
 }
 
 QString UrlBuilder::getDeviceSettingsUrl( const QString& username, const QString& deviceId )
 {
-    return s_server % s_api2 % QLatin1String( "/settings/" ) % username % QLatin1String( "/device" ) % QLatin1String( ".json" ) % QLatin1String( "?device=" ) % deviceId;
+    return Config::instance()->mygpoBaseUrl().toString() %
+        s_api2 % QLatin1String( "/settings/" ) % username % QLatin1String( "/device" ) % QLatin1String( ".json" ) % QLatin1String( "?device=" ) % deviceId;
 }
 
 QString UrlBuilder::getPodcastSettingsUrl( const QString& username, const QString& podcastUrl )
 {
-    return s_server % s_api2 % QLatin1String( "/settings/" ) % username % QLatin1String( "/podcast" ) % QLatin1String( ".json" ) % QLatin1String( "?podcast=" ) % podcastUrl;
+    return Config::instance()->mygpoBaseUrl().toString() %
+        s_api2 % QLatin1String( "/settings/" ) % username % QLatin1String( "/podcast" ) % QLatin1String( ".json" ) % QLatin1String( "?podcast=" ) % podcastUrl;
 }
 
 QString UrlBuilder::getEpisodeSettingsUrl( const QString& username, const QString& podcastUrl, const QString& episodeUrl )
 {
-    return s_server % s_api2 % QLatin1String( "/settings/" ) % username % QLatin1String( "/episode" ) % QLatin1String( ".json" ) % QLatin1String( "?podcast=" ) % podcastUrl % QLatin1String( "&episode=" ) % episodeUrl;
+    return Config::instance()->mygpoBaseUrl().toString() %
+        s_api2 % QLatin1String( "/settings/" ) % username % QLatin1String( "/episode" ) % QLatin1String( ".json" ) % QLatin1String( "?podcast=" ) % podcastUrl % QLatin1String( "&episode=" ) % episodeUrl;
 }
 
 QString UrlBuilder::getDeviceListUrl( const QString& username )
 {
-    return s_server % s_api2 % QLatin1String( "/devices/" ) % username % QLatin1String( ".json" ) ;
+    return Config::instance()->mygpoBaseUrl().toString() %
+        s_api2 % QLatin1String( "/devices/" ) % username % QLatin1String( ".json" ) ;
 }
 
 QString UrlBuilder::getDeviceUpdatesUrl( const QString& username, const QString& deviceId, qulonglong timestamp )
 {
     QString numString = QString::number( timestamp );
-    return s_server % s_api2 % QLatin1String( "/updates/" ) % username % QLatin1String( "/" ) % deviceId % QLatin1String( ".json?since=" ) % numString;
+    return Config::instance()->mygpoBaseUrl().toString() %
+        s_api2 % QLatin1String( "/updates/" ) % username % QLatin1String( "/" ) % deviceId % QLatin1String( ".json?since=" ) % numString;
 }
 
 QString UrlBuilder::getRenameDeviceUrl( const QString& username, const QString& deviceId )
 {
-    return s_server % s_api2 % QLatin1String( "/devices/" ) % username % QLatin1String( "/" ) % deviceId % QLatin1String( ".json" );
+    return Config::instance()->mygpoBaseUrl().toString() %
+        s_api2 % QLatin1String( "/devices/" ) % username % QLatin1String( "/" ) % deviceId % QLatin1String( ".json" );
 }
 
 QString UrlBuilder::getEpisodeActionsUrl( const QString& username, const bool aggregated )
@@ -154,7 +171,8 @@ QString UrlBuilder::getEpisodeActionsUrl( const QString& username, const bool ag
     else
         agg = QLatin1String( "" );
 
-    return s_server % s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json" ) % agg;
+    return Config::instance()->mygpoBaseUrl().toString() %
+        s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json" ) % agg;
 }
 
 QString UrlBuilder::getEpisodeActionsUrlByPodcast( const QString& username, const QString& podcastUrl, const bool aggregated )
@@ -165,7 +183,8 @@ QString UrlBuilder::getEpisodeActionsUrlByPodcast( const QString& username, cons
     else
         agg = QLatin1String( "" );
 
-    return s_server % s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json?podcast=" ) % podcastUrl % agg;
+    return Config::instance()->mygpoBaseUrl().toString() %
+        s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json?podcast=" ) % podcastUrl % agg;
 }
 
 QString UrlBuilder::getEpisodeActionsUrlByDevice( const QString& username, const QString& deviceId, bool aggregated )
@@ -176,33 +195,39 @@ QString UrlBuilder::getEpisodeActionsUrlByDevice( const QString& username, const
     else
         agg = QLatin1String( "" );
 
-    return s_server % s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json?device=" ) % deviceId % agg;
+    return Config::instance()->mygpoBaseUrl().toString() %
+        s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json?device=" ) % deviceId % agg;
 }
 
 QString UrlBuilder::getEpisodeActionsUrlByTimestamp( const QString& username, qulonglong since )
 {
     QString numString = QString::number( since );
-    return s_server % s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json?since=" ) % numString;
+    return Config::instance()->mygpoBaseUrl().toString() %
+        s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json?since=" ) % numString;
 }
 
 QString UrlBuilder::getEpisodeActionsUrlByPodcastAndTimestamp( const QString& username, const QString& podcastUrl, qulonglong since )
 {
     QString numString = QString::number( since );
-    return s_server % s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json?podcast=" ) % podcastUrl % QLatin1String( "&since=" ) % numString;
+    return Config::instance()->mygpoBaseUrl().toString() %
+        s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json?podcast=" ) % podcastUrl % QLatin1String( "&since=" ) % numString;
 }
 
 QString UrlBuilder::getEpisodeActionsUrlByDeviceAndTimestamp( const QString& username, const QString& deviceId, qulonglong since )
 {
     QString numString = QString::number( since );
-    return s_server % s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json?device=" ) % deviceId % QLatin1String( "&since=" ) % numString;
+    return Config::instance()->mygpoBaseUrl().toString() %
+        s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json?device=" ) % deviceId % QLatin1String( "&since=" ) % numString;
 }
 
 QString UrlBuilder::getUploadEpisodeActionsUrl( const QString& username )
 {
-    return s_server % s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json" );
+    return Config::instance()->mygpoBaseUrl().toString() %
+        s_api2 % QLatin1String( "/episodes/" ) % username % QLatin1String( ".json" );
 }
 
 QString UrlBuilder::getDeviceSynchronizationStatusUrl ( const QString& username )
 {
-    return s_server % s_api2 % QLatin1String( "/sync-devices/" ) % username % QLatin1String( ".json" );
+    return Config::instance()->mygpoBaseUrl().toString() %
+        s_api2 % QLatin1String( "/sync-devices/" ) % username % QLatin1String( ".json" );
 }

3rdparty/libmygpo-qt5/src/UrlBuilder.h

@@ -137,7 +137,6 @@ public:
 private:
     UrlBuilder() {};
     UrlBuilder( const UrlBuilder& ) {};
-    static const QString s_server;
     static const QString s_api2;
     static const QString s_api1;
 };

3rdparty/libmygpo-qt5/src/mygpo_export.h

@@ -25,7 +25,7 @@
 
 #include <QtCore/qglobal.h>
 
-#ifndef MYGPO_EXPORT
+#ifndef MYGPO_STATIC
 # if defined(MYGPO_MAKEDLL)
 /* We are building this library */
 #  define MYGPO_EXPORT Q_DECL_EXPORT
@@ -33,6 +33,8 @@
 /* We are using this library */
 #  define MYGPO_EXPORT Q_DECL_IMPORT
 # endif
+#else
+# define MYGPO_EXPORT
 #endif
 
 #endif // MYGPO_EXPORT_H

3rdparty/libmygpo-qt5/src/qjsonwrapper/Json.cpp

@@ -0,0 +1,128 @@
+/* Copyright 2014, Uwe L. Korn <uwelk@xhochy.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "Json.h"
+
+// Qt version specific includes
+#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
+    #include <QJsonDocument>
+    #include <QMetaProperty>
+#else
+    #include <qjson/parser.h>
+    #include <qjson/qobjecthelper.h>
+    #include <qjson/serializer.h>
+#endif
+
+namespace QJsonWrapper
+{
+
+QVariantMap
+qobject2qvariant( const QObject* object )
+{
+#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
+    QVariantMap map;
+    if ( object == NULL )
+    {
+        return map;
+    }
+
+    const QMetaObject* metaObject = object->metaObject();
+    for ( int i = 0; i < metaObject->propertyCount(); ++i )
+    {
+        QMetaProperty metaproperty = metaObject->property( i );
+        if ( metaproperty.isReadable() )
+        {
+            map[ QLatin1String( metaproperty.name() ) ] = object->property( metaproperty.name() );
+        }
+    }
+    return map;
+#else
+    return QJson::QObjectHelper::qobject2qvariant( object );
+#endif
+}
+
+
+void
+qvariant2qobject( const QVariantMap& variant, QObject* object )
+{
+#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
+    for ( QVariantMap::const_iterator iter = variant.begin(); iter != variant.end(); ++iter )
+    {
+        QVariant property = object->property( iter.key().toLatin1() );
+        Q_ASSERT( property.isValid() );
+        if ( property.isValid() )
+        {
+            QVariant value = iter.value();
+            if ( value.canConvert( property.type() ) )
+            {
+                value.convert( property.type() );
+                object->setProperty( iter.key().toLatin1(), value );
+            } else if ( QString( QLatin1String("QVariant") ).compare( QLatin1String( property.typeName() ) ) == 0 ) {
+                object->setProperty( iter.key().toLatin1(), value );
+            }
+        }
+    }
+#else
+    QJson::QObjectHelper::qvariant2qobject( variant, object );
+#endif
+}
+
+
+QVariant
+parseJson( const QByteArray& jsonData, bool* ok )
+{
+#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
+    QJsonParseError error;
+    QJsonDocument doc = QJsonDocument::fromJson( jsonData, &error );
+    if ( ok != NULL )
+    {
+        *ok = ( error.error == QJsonParseError::NoError );
+    }
+    return doc.toVariant();
+#else
+    QJson::Parser p;
+    return p.parse( jsonData, ok );
+#endif
+}
+
+
+QByteArray
+toJson( const QVariant &variant, bool* ok )
+{
+#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
+    QJsonDocument doc = QJsonDocument::fromVariant( variant );
+    if ( ok != NULL )
+    {
+        *ok = !doc.isNull();
+    }
+    return doc.toJson( QJsonDocument::Compact );
+#else
+    QJson::Serializer serializer;
+    QByteArray ret = serializer.serialize( variant );
+    if ( ok != NULL )
+    {
+        *ok = !ret.isNull();
+    }
+    return ret;
+#endif
+}
+
+}

3rdparty/libmygpo-qt5/src/qjsonwrapper/Json.h

@@ -0,0 +1,36 @@
+/* Copyright 2014, Uwe L. Korn <uwelk@xhochy.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#pragma once
+#ifndef QJSONWRAPPER_JSON_H
+#define QJSONWRAPPER_JSON_H
+
+#include <QVariant>
+
+namespace QJsonWrapper
+{
+    QVariantMap qobject2qvariant( const QObject* object );
+    void qvariant2qobject( const QVariantMap& variant, QObject* object );
+    QVariant parseJson( const QByteArray& jsonData, bool* ok = 0 );
+    QByteArray toJson( const QVariant &variant, bool* ok = 0 );
+}
+
+#endif // QJSONWRAPPER_JSON_H

3rdparty/libprojectm/CMakeLists.txt

@@ -1,5 +1,5 @@
 PROJECT(projectM)
-cmake_minimum_required(VERSION 2.6.0)
+cmake_minimum_required(VERSION 3.0.0)
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The projectM core library.")
 
 include(CheckCXXCompilerFlag)
@@ -24,6 +24,8 @@ set(BUILD_PROJECTM_STATIC ON)
 set(DISABLE_NATIVE_PRESETS ON)
 set(DISABLE_MILKDROP_PRESETS OFF)
 
+pkg_check_modules(GLEW glew)
+
 if(DISABLE_NATIVE_PRESETS)
   ADD_DEFINITIONS(-DDISABLE_NATIVE_PRESETS)
 endif(DISABLE_NATIVE_PRESETS)
@@ -36,7 +38,7 @@ if (USE_NATIVE_GLEW)
   SET(GLEW_LIBRARIES )
 else(USE_NATIVE_GLEW)
   SET(GLEW_SOURCES )
-  find_library(GLEW_LIBRARIES NAMES glew GLEW glew32)
+  find_library(GLEW_LIBRARIES NAMES glew32.dll glew GLEW glew32)
   find_path(GLEW_INCLUDE_DIRS GL/glew.h HINTS /sw/include)
   include_directories(${GLEW_INCLUDE_DIRS})
 endif(USE_NATIVE_GLEW)

3rdparty/libprojectm/MilkdropPresetFactory/CMakeLists.txt

@@ -1,5 +1,5 @@
 PROJECT(MilkdropPresetFactory)
-cmake_minimum_required(VERSION 2.4.0)
+cmake_minimum_required(VERSION 3.0.0)
 
     if(COMMAND cmake_policy)
       cmake_policy(SET CMP0003 NEW)

3rdparty/libprojectm/MilkdropPresetFactory/IdlePreset.cpp

@@ -197,13 +197,13 @@ return out.str();
 
 }
 
-std::auto_ptr<Preset> IdlePresets::allocate(const std::string & name, PresetOutputs & presetOutputs)
+std::unique_ptr<Preset> IdlePresets::allocate(const std::string & name, PresetOutputs & presetOutputs)
 {
 
   if (name == IDLE_PRESET_NAME) {
   	std::istringstream in(presetText());
-  	return std::auto_ptr<Preset>(new MilkdropPreset(in, IDLE_PRESET_NAME, presetOutputs));
+  	return std::unique_ptr<Preset>(new MilkdropPreset(in, IDLE_PRESET_NAME, presetOutputs));
   }
   else
-	return std::auto_ptr<Preset>(0);
+	return std::unique_ptr<Preset>(nullptr);
 }

3rdparty/libprojectm/MilkdropPresetFactory/IdlePreset.hpp

@@ -12,7 +12,7 @@ class IdlePresets {
   public:
 	/// Allocate a new idle preset instance
 	/// \returns a newly allocated auto pointer of an idle preset instance
-	static std::auto_ptr<Preset> allocate(const std::string & path, PresetOutputs & outputs);
+	static std::unique_ptr<Preset> allocate(const std::string & path, PresetOutputs & outputs);
   private:
 	static std::string presetText();
 	static const std::string IDLE_PRESET_NAME;

3rdparty/libprojectm/MilkdropPresetFactory/InitCond.cpp

@@ -138,7 +138,7 @@ void InitCond::init_cond_to_string() {
 		return;
 	
 	/* Copy the string into the initial condition string buffer */	
-	strncpy(init_cond_string_buffer + init_cond_string_buffer_index, string, string_length);
+	memcpy(init_cond_string_buffer + init_cond_string_buffer_index, string, string_length + 1);
 	
 	/* Increment the string buffer, offset by one for the null terminator, which will be
 	   overwritten by the next call to this function */

3rdparty/libprojectm/MilkdropPresetFactory/MilkdropPresetFactory.cpp

@@ -212,7 +212,7 @@ PresetOutputs* MilkdropPresetFactory::createPresetOutputs(int gx, int gy)
 }
 
 
-std::auto_ptr<Preset> MilkdropPresetFactory::allocate(const std::string & url, const std::string & name, const std::string & author) {
+std::unique_ptr<Preset> MilkdropPresetFactory::allocate(const std::string & url, const std::string & name, const std::string & author) {
 
     PresetOutputs *presetOutputs = _usePresetOutputs ? _presetOutputs : _presetOutputs2;
 
@@ -223,5 +223,5 @@ std::auto_ptr<Preset> MilkdropPresetFactory::allocate(const std::string & url, c
 	if (PresetFactory::protocol(url, path) == PresetFactory::IDLE_PRESET_PROTOCOL) {
 		return IdlePresets::allocate(path, *presetOutputs);
 	} else
-		return std::auto_ptr<Preset>(new MilkdropPreset(url, name, *presetOutputs));
+		return std::unique_ptr<Preset>(new MilkdropPreset(url, name, *presetOutputs));
 }

3rdparty/libprojectm/MilkdropPresetFactory/MilkdropPresetFactory.hpp

@@ -26,7 +26,7 @@ public:
 
  virtual ~MilkdropPresetFactory();
 
- std::auto_ptr<Preset> allocate(const std::string & url, const std::string & name = std::string(),
+ std::unique_ptr<Preset> allocate(const std::string & url, const std::string & name = std::string(),
 	const std::string & author = std::string());
 
  std::string supportedExtensions() const { return "milk prjm"; }