Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

..

1 Commits
master ... bump-check

Author SHA1 Message Date
John Maguire
fa93e3111d Use checkout@v3 github action 2023-04-07 11:14:51 +01:00
105 changed files with 222275 additions and 35612 deletions

299
.github/workflows/all.yml vendored

@ -10,10 +10,10 @@ on:
jobs:
lint:
name: Lint
runs-on: ubuntu-24.04
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: clang-format
uses: clementine-player/clang-format-lint-action@master
with:
@ -25,15 +25,10 @@ jobs:
push_translations:
name: Push translation sources to Transifex
if: github.ref == 'refs/heads/master'
runs-on: ubuntu-24.04
runs-on: ubuntu-22.04
container:
image: ubuntu:noble
image: ubuntu:bionic
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
@ -49,7 +44,7 @@ jobs:
libchromaprint-dev
libdbus-1-dev
libfftw3-dev
libglew-dev
libglew1.5-dev
libglib2.0-dev
libgpod-dev
libgstreamer-plugins-base1.0-dev
@ -69,14 +64,16 @@ jobs:
qttools5-dev
libsparsehash-dev
ssh
- name: Install tx
run: pip3 install transifex-client==0.13.9
- name: Checkout
uses: actions/checkout@v1.2.0
uses: actions/checkout@v3
- name: git hackery
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
- name: tx init
env:
TX_TOKEN: ${{ secrets.TX_TOKEN }}
run: tx init
run: tx init --no-interactive --force
- name: cmake
working-directory: bin
run: cmake ..
@ -86,7 +83,7 @@ jobs:
- 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
run: tx config mapping --execute -r clementine.clementineplayer -f src/translations/translations.pot -s en -t PO --expression 'src/translations/<lang>.po'
- name: tx push
env:
TX_TOKEN: ${{ secrets.TX_TOKEN }}
@ -94,50 +91,43 @@ jobs:
create_release:
name: Create GitHub Release
runs-on: ubuntu-24.04
runs-on: ubuntu-22.04
if: github.ref == 'refs/heads/master'
needs:
- build_bionic_64
- build_bullseye_64
- build_buster_64
- build_fedora_39
- build_fedora_40
- build_fedora_36
- build_fedora_37
- build_focal_64
- build_jammy_64
- build_noble_64
# - build_mac
- build_kinetic_64
- build_mac
- build_mingw
- build_source
permissions:
contents: write
- build_stretch_64
steps:
- uses: actions/checkout@v1.2.0
- uses: actions/download-artifact@v4
- uses: actions/checkout@v3
- uses: actions/download-artifact@v2
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
assets=()
for asset in $(find release_artifacts -type f); do
echo "Adding asset: ${asset}"
assets+=("-a" "$asset")
done
hub release create -p "${assets[@]}" -m "$VERSION" -t "$GITHUB_SHA" "$VERSION"
build_source:
name: Build source tarball
runs-on: ubuntu-24.04
runs-on: ubuntu-22.04
container:
image: ubuntu:focal
steps:
@ -181,7 +171,9 @@ jobs:
qttools5-dev-tools
qttools5-dev
ssh
- uses: actions/checkout@v1.2.0
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: git hackery
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
- name: cmake
@ -190,16 +182,16 @@ jobs:
- name: Build source tarball
working-directory: bin
run: ../dist/maketarball.sh
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v2
with:
name: release_source
path: bin/clementine-*.tar.xz
build_fedora_39:
name: Build Fedora 39 RPM
runs-on: ubuntu-24.04
build_fedora_36:
name: Build Fedora 36 RPM
runs-on: ubuntu-22.04
container:
image: fedora:39
image: fedora:36
env:
RPM_BUILD_NCPUS: "2"
steps:
@ -210,7 +202,6 @@ jobs:
alsa-lib-devel
boost-devel
cmake
cryptopp
cryptopp-devel
dbus-devel
desktop-file-utils
@ -240,19 +231,20 @@ jobs:
qt5-qtbase-devel
qt5-qtx11extras-devel
qt5-rpm-macros
qtsingleapplication-qt5-devel
qtsinglecoreapplication-qt5-devel
rpmdevtools
sha2-devel
sparsehash-devel
sqlite-devel
taglib-devel
tar
- uses: actions/checkout@v1.2.0
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: git hackery
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
- name: cmake
working-directory: bin
run: cmake -DUSE_SYSTEM_QTSINGLEAPPLICATION=On ..
run: cmake ..
- name: Build source tarball
working-directory: bin
run: ../dist/maketarball.sh
@ -264,16 +256,16 @@ jobs:
- name: Build RPM
working-directory: bin
run: rpmbuild -ba ../dist/clementine.spec
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v2
with:
name: release_fedora_39
name: release_fedora_36
path: ~/rpmbuild/RPMS/*/clementine-*.rpm
build_fedora_40:
name: Build Fedora 40 RPM
runs-on: ubuntu-24.04
build_fedora_37:
name: Build Fedora 37 RPM
runs-on: ubuntu-22.04
container:
image: fedora:40
image: fedora:37
env:
RPM_BUILD_NCPUS: "2"
steps:
@ -284,7 +276,6 @@ jobs:
alsa-lib-devel
boost-devel
cmake
cryptopp
cryptopp-devel
dbus-devel
desktop-file-utils
@ -314,19 +305,20 @@ jobs:
qt5-qtbase-devel
qt5-qtx11extras-devel
qt5-rpm-macros
qtsingleapplication-qt5-devel
qtsinglecoreapplication-qt5-devel
rpmdevtools
sha2-devel
sparsehash-devel
sqlite-devel
taglib-devel
tar
- uses: actions/checkout@v1.2.0
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: git hackery
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
- name: cmake
working-directory: bin
run: cmake -DUSE_SYSTEM_QTSINGLEAPPLICATION=On ..
run: cmake ..
- name: Build source tarball
working-directory: bin
run: ../dist/maketarball.sh
@ -338,14 +330,14 @@ jobs:
- name: Build RPM
working-directory: bin
run: rpmbuild -ba ../dist/clementine.spec
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v2
with:
name: release_fedora_40
name: release_fedora_37
path: ~/rpmbuild/RPMS/*/clementine-*.rpm
build_mingw:
name: Build Windows Installer
runs-on: ubuntu-24.04
runs-on: ubuntu-22.04
container:
image: eu.gcr.io/clementine-data/mingw-w64:latest
env:
@ -353,7 +345,9 @@ jobs:
steps:
- name: Fix liblastfm includes
run: ln -s /target/include/lastfm /target/include/lastfm5
- uses: actions/checkout@v1.2.0
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: git hackery
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
- name: cmake
@ -531,14 +525,136 @@ jobs:
- name: Build Windows installer
working-directory: dist/windows
run: makensis clementine.nsi
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v2
with:
name: release_mingw
path: dist/windows/ClementineSetup*.exe
build_stretch_64:
name: Build Debian Stretch 64-bit deb
runs-on: ubuntu-22.04
container:
image: debian:stretch
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@v3
with:
fetch-depth: 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=stretch
-DENABLE_SPOTIFY_BLOB=OFF
- name: make
working-directory: bin
run : make -j2 deb
- uses: actions/upload-artifact@v2
with:
name: release_stretch_64
path: bin/clementine_*.deb
build_bionic_64:
name: Build Ubuntu Bionic 64-bit deb
runs-on: ubuntu-22.04
container:
image: ubuntu:bionic
steps:
- 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
libglew1.5-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
qtbase5-dev
qttools5-dev-tools
qttools5-dev
libsparsehash-dev
ssh
- uses: actions/checkout@v3
with:
fetch-depth: 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=bionic
-DENABLE_SPOTIFY_BLOB=OFF
- name: make
working-directory: bin
run : make -j2 deb
- uses: actions/upload-artifact@v2
with:
name: release_bionic_64
path: bin/clementine_*.deb
build_bullseye_64:
name: Build Debian Bullseye 64-bit deb
runs-on: ubuntu-24.04
runs-on: ubuntu-22.04
container:
image: debian:bullseye
steps:
@ -577,7 +693,9 @@ jobs:
qttools5-dev-tools
qttools5-dev
ssh
- uses: actions/checkout@v1.2.0
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: git hackery
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
- name: cmake
@ -591,14 +709,14 @@ jobs:
- name: make
working-directory: bin
run : make -j2 deb
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v2
with:
name: release_bullseye_64
path: bin/clementine_*.deb
build_buster_64:
name: Build Debian Buster 64-bit deb
runs-on: ubuntu-24.04
runs-on: ubuntu-22.04
container:
image: debian:buster
steps:
@ -636,7 +754,9 @@ jobs:
qttools5-dev-tools
qttools5-dev
ssh
- uses: actions/checkout@v1.2.0
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: git hackery
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
- name: cmake
@ -650,14 +770,14 @@ jobs:
- name: make
working-directory: bin
run : make -j2 deb
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v2
with:
name: release_buster_64
path: bin/clementine_*.deb
build_focal_64:
name: Build Ubuntu Focal 64-bit deb
runs-on: ubuntu-24.04
runs-on: ubuntu-22.04
container:
image: ubuntu:focal
steps:
@ -701,7 +821,9 @@ jobs:
qttools5-dev-tools
qttools5-dev
ssh
- uses: actions/checkout@v1.2.0
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: git hackery
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
- name: cmake
@ -715,14 +837,14 @@ jobs:
- name: make
working-directory: bin
run : make -j2 deb
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v2
with:
name: release_focal_64
path: bin/clementine_*.deb
build_jammy_64:
name: Build Ubuntu Jammy 64-bit deb
runs-on: ubuntu-24.04
runs-on: ubuntu-22.04
container:
image: ubuntu:jammy
steps:
@ -769,7 +891,9 @@ jobs:
qttools5-dev-tools
qttools5-dev
ssh
- uses: actions/checkout@v1.2.0
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: git hackery
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
- name: cmake
@ -783,16 +907,16 @@ jobs:
- name: make
working-directory: bin
run : make -j2 deb
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v2
with:
name: release_jammy_64
path: bin/clementine_*.deb
build_noble_64:
name: Build Ubuntu Noble 64-bit deb
runs-on: ubuntu-24.04
build_kinetic_64:
name: Build Ubuntu Kinetic 64-bit deb
runs-on: ubuntu-22.04
container:
image: ubuntu:noble
image: ubuntu:kinetic
steps:
- name: Install dependencies
env:
@ -837,7 +961,9 @@ jobs:
qttools5-dev-tools
qttools5-dev
ssh
- uses: actions/checkout@v1.2.0
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: git hackery
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
- name: cmake
@ -846,22 +972,23 @@ jobs:
cmake ..
-DWITH_DEBIAN=ON
-DDEB_ARCH=amd64
-DDEB_DIST=noble
-DDEB_DIST=kinetic
-DENABLE_SPOTIFY_BLOB=OFF
- name: make
working-directory: bin
run : make -j2 deb
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v2
with:
name: release_noble_64
name: release_kinetic_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
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: git hackery
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
- name: Install dependencies
@ -918,7 +1045,7 @@ jobs:
- name: Build DMG
working-directory: bin
run: make dmg
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v2
with:
name: release_mac
path: bin/clementine-*.dmg

18
.github/workflows/translations.yml vendored

@ -6,22 +6,20 @@ on:
jobs:
pull_translations:
name: Pull translations from Transifex
runs-on: ubuntu-22.04
runs-on: ubuntu-18.04
container:
image: ubuntu:jammy
image: ubuntu:bionic
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
python3-pip
ssh
- name: Install tx
run: pip3 install transifex-client==0.13.9
- name: Checkout
uses: actions/checkout@v1.2.0
- name: git hackery
@ -31,15 +29,15 @@ jobs:
- name: tx init
env:
TX_TOKEN: ${{ secrets.TX_TOKEN }}
run: tx init
run: tx init --no-interactive --force
- 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
run: tx config mapping --execute -r clementine.clementineplayer -s en -t PO --expression 'src/translations/<lang>.po'
- name: tx pull
env:
TX_TOKEN: ${{ secrets.TX_TOKEN }}
run: tx pull -f -a
run: tx pull --all -f --no-interactive
- name: Setup git SSH
uses: webfactory/ssh-agent@v0.4.1
with:

128
3rdparty/libmygpo-qt/qjsonwrapper/Json.cpp vendored Normal file

@ -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
}
}

36
3rdparty/libmygpo-qt/qjsonwrapper/Json.h vendored Normal file

@ -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

2
3rdparty/libprojectm/CMakeLists.txt vendored

@ -24,6 +24,8 @@ set(BUILD_PROJECTM_STATIC ON)
set(DISABLE_NATIVE_PRESETS ON)
set(DISABLE_MILKDROP_PRESETS OFF)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
pkg_check_modules(GLEW glew)
if(DISABLE_NATIVE_PRESETS)

1
3rdparty/qtsingleapplication/CMakeLists.txt vendored

@ -1,4 +1,5 @@
cmake_minimum_required(VERSION 3.0.0)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
set(SINGLEAPP-SOURCES
qtlocalpeer.cpp

31
CMakeLists.txt

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.13.0)
project(clementine)
cmake_minimum_required(VERSION 3.0.0)
cmake_policy(SET CMP0053 OLD)
include(CheckCXXCompilerFlag)
@ -15,14 +15,13 @@ include(cmake/Format.cmake)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE INTERNAL "")
set(CMAKE_CXX_STANDARD 17)
if (CMAKE_CXX_COMPILER MATCHES ".*clang")
set(CMAKE_COMPILER_IS_CLANGXX 1)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-uninitialized")
if (APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --stdlib=libc++")
endif ()
endif ()
if (APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --stdlib=libc++")
endif ()
find_program(CCACHE_EXECUTABLE NAMES ccache)
@ -47,10 +46,7 @@ endif(OPENGL_FOUND)
find_package(Boost REQUIRED)
find_package(Gettext REQUIRED)
find_package(PkgConfig REQUIRED)
find_package(protobuf)
if(NOT protobuf_FOUND)
find_package(Protobuf REQUIRED)
endif()
find_package(Protobuf REQUIRED)
find_package(FFTW3)
find_package(ALSA)
if (NOT APPLE)
@ -351,18 +347,11 @@ include_directories("3rdparty/qsqlite")
# When/if upstream accepts our patches then these options can be used to link
# to system installed qtsingleapplication instead.
option(USE_SYSTEM_QTSINGLEAPPLICATION "Use the system-provided QtSingleApplication library (needs to have clementine patches, but these seem to be in Qt5)" OFF)
option(USE_SYSTEM_QTSINGLEAPPLICATION "Don't set this option unless your system QtSingleApplication library has been compiled with the Clementine patches in 3rdparty" OFF)
if(USE_SYSTEM_QTSINGLEAPPLICATION)
find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES qt5/QtSolutions REQUIRED)
find_library(QTSINGLEAPPLICATION_LIBRARIES Qt5Solutions_SingleApplication-2.6 REQUIRED)
add_library(qtsingleapplication INTERFACE)
target_link_libraries(qtsingleapplication INTERFACE QTSINGLEAPPLICATION_LIBRARIES)
target_include_directories(qtsingleapplication INTERFACE QTSINGLEAPPLICATION_INCLUDE_DIRS)
find_path(QTSINGLECOREAPPLICATION_INCLUDE_DIRS qtsinglecoreapplication.h PATH_SUFFIXES qt5/QtSolutions REQUIRED)
find_library(QTSINGLECOREAPPLICATION_LIBRARIES Qt5Solutions_SingleCoreApplication-2.6 REQUIRED)
add_library(qtsinglecoreapplication INTERFACE)
target_link_libraries(qtsinglecoreapplication INTERFACE QTSINGLECOREAPPLICATION_LIBRARIES)
target_include_directories(qtsinglecoreapplication INTERFACE QTSINGLECOREAPPLICATION_INCLUDE_DIRS)
find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES qt5/QtSolutions)
find_library(QTSINGLEAPPLICATION_LIBRARIES Qt5Solutions_SingleApplication-2.6)
find_library(QTSINGLECOREAPPLICATION_LIBRARIES Qt5Solutions_SingleCoreApplication-2.6)
else(USE_SYSTEM_QTSINGLEAPPLICATION)
add_subdirectory(3rdparty/qtsingleapplication)
set(QTSINGLEAPPLICATION_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication)

2
README.md

@ -41,7 +41,7 @@ Compile and install:
cd bin
cmake ..
make -j$(nproc)
make -j8
sudo make install
See the Wiki for more instructions and a list of dependencies:

47
data/lyrics/ultimate_providers.xml

@ -88,6 +88,17 @@
<item begin="&lt;/a" end="&gt;"/>
</exclude>
</provider>
<provider name="hindilyrics.net (Bollywood songs)" title="{title} ({album})" charset="utf-8" url="http://www.hindilyrics.net/lyrics/of-{Title}.html">
<urlFormat replace=" _@;\/&quot;'()[]" with="%20"/>
<urlFormat replace="?" with=""/>
<extract>
<item begin="&lt;div class=nm&gt;Movie&lt;/div&gt;:" end="&lt;/pre&gt;"/>
</extract>
<exclude>
<item begin="&lt;span class=" end="&quot;&gt;"/>
</exclude>
<invalidIndicator value="Couldn't find that page."/>
</provider>
<provider name="letras.mus.br" title="" charset="utf-8" url="https://www.letras.mus.br/winamp.php?musica={title}&amp;artista={artist}">
<urlFormat replace="_@,;&amp;\/&quot;" with="_"/>
<urlFormat replace=" " with="+"/>
@ -103,6 +114,13 @@
</extract>
<invalidIndicator value="ERROR"/>
</provider>
<provider name="loudson.gs" title="" charset="utf-8" url="http://www.loudson.gs/{a}/{artist}/{album}/{title}">
<urlFormat replace=" _@,;&amp;\/&quot;" with="-"/>
<urlFormat replace="." with=""/>
<extract>
<item tag="&lt;div class=&quot;middle_col_TracksLyrics &quot;&gt;"/>
</extract>
</provider>
<provider name="lyrics.com" title="{artist} - {title} Lyrics" charset="utf-8" url="http://www.lyrics.com/lyrics/{artist}/{title}.html">
<urlFormat replace=" _@,;&amp;\/&quot;" with="-"/>
<urlFormat replace="'." with=""/>
@ -176,6 +194,14 @@
</extract>
<invalidIndicator value="Page not Found"/>
</provider>
<provider name="lyricstime.com" title="{artist} - {title} Lyrics" charset="iso-8859-1" url="http://www.lyricstime.com/{artist}-{title}-lyrics.html">
<urlFormat replace=" _@,;&amp;\/&quot;'" with="-"/>
<urlFormat replace="." with=""/>
<extract>
<item tag="&lt;div id=&quot;songlyrics&quot; &gt;"/>
<item tag="&lt;p&gt;"/>
</extract>
</provider>
<provider name="lyriki.com" title="" charset="utf-8" url="http://www.lyriki.com/{artist}:{title}">
<urlFormat replace=" _@,;&amp;\/&quot;" with="_"/>
<urlFormat replace="." with=""/>
@ -184,6 +210,20 @@
<item tag="&lt;p&gt;"/>
</extract>
</provider>
<provider name="metrolyrics.com" title="{artist} - {title} LYRICS" charset="utf-8" url="http://www.metrolyrics.com/{title}-lyrics-{artist}.html">
<urlFormat replace=" _@,;&amp;\/&quot;" with="-"/>
<urlFormat replace="'." with=""/>
<extract>
<item tag="&lt;span id=&quot;lyrics&quot;&gt;"/>
</extract>
<extract>
<item tag="&lt;div id=&quot;lyrics&quot;&gt;"/>
</extract>
<exclude>
<item tag="&lt;h5&gt;"/>
</exclude>
<invalidIndicator value="These lyrics are missing"/>
</provider>
<provider name="mp3lyrics.org" title="{artist} &amp;quot;{title}&amp;quot; Lyrics" charset="utf-8" url="http://www.mp3lyrics.org/{a}/{artist}/{title}/">
<urlFormat replace=" _@,;&amp;\/&quot;" with="-"/>
<urlFormat replace="'." with=""/>
@ -211,6 +251,13 @@
</exclude>
<invalidIndicator value="We couldn't find that page."/>
</provider>
<provider name="seeklyrics.com" title="{artist} - {title} Lyrics" charset="iso-8859-1" url="http://www.seeklyrics.com/lyrics/{Artist}/{Title}.html">
<urlFormat replace=" _@,;&amp;\/'&quot;" with="-"/>
<urlFormat replace="." with=""/>
<extract>
<item tag="&lt;div id=&quot;songlyrics&quot;&gt;"/>
</extract>
</provider>
<provider name="songlyrics.com" title="{title} LYRICS - {artist}" charset="utf-8" url="http://www.songlyrics.com/{artist}/{title}-lyrics/">
<urlFormat replace=" ._@,;&amp;\/&quot;" with="-"/>
<urlFormat replace="'" with="_"/>

5
dist/clementine.spec.in vendored

@ -18,7 +18,6 @@ BuildRequires: liblastfm-qt5-devel
BuildRequires: desktop-file-utils
BuildRequires: hicolor-icon-theme
BuildRequires: libappstream-glib
BuildRequires: qtsingleapplication-qt5-devel
BuildRequires: pkgconfig
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gio-2.0)
@ -30,6 +29,7 @@ BuildRequires: pkgconfig(protobuf)
BuildRequires: pkgconfig(sqlite3) >= 3.7
BuildRequires: pkgconfig(taglib) >= 1.11
BuildRequires: pkgconfig(glew)
BuildRequires: pkgconfig(cryptopp)
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Widgets)
@ -46,13 +46,12 @@ BuildRequires: pkgconfig(gstreamer-app-1.0)
BuildRequires: pkgconfig(gstreamer-audio-1.0)
BuildRequires: pkgconfig(gstreamer-base-1.0)
BuildRequires: pkgconfig(gstreamer-tag-1.0)
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libcdio)
BuildRequires: pkgconfig(libchromaprint)
BuildRequires: pkgconfig(libcryptopp)
BuildRequires: pkgconfig(libgpod-1.0)
BuildRequires: pkgconfig(libmtp)
BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libudf)
# GStreamer codec dependencies

2
ext/libclementine-common/CMakeLists.txt

@ -2,6 +2,8 @@ include_directories(${PROTOBUF_INCLUDE_DIRS})
include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
set(SOURCES
core/closure.cpp
core/latch.cpp

12
ext/libclementine-remote/CMakeLists.txt

@ -1,17 +1,19 @@
include_directories(${PROTOBUF_INCLUDE_DIRS})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
set(MESSAGES
remotecontrolmessages.proto
)
add_library(libclementine-remote STATIC
${MESSAGES}
)
protobuf_generate_cpp(PROTO_SOURCES PROTO_HEADERS ${MESSAGES})
protobuf_generate(TARGET libclementine-remote LANGUAGE cpp)
add_library(libclementine-remote STATIC
${PROTO_SOURCES}
)
target_link_libraries(libclementine-remote
${PROTOBUF_LIBRARY}
libclementine-common
protobuf::libprotobuf
)

10
ext/libclementine-tagreader/CMakeLists.txt

@ -3,6 +3,8 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-common)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
set(MESSAGES
tagreadermessages.proto
)
@ -26,16 +28,16 @@ optional_source(HAVE_GOOGLE_DRIVE
qt5_wrap_cpp(MOC ${HEADERS})
protobuf_generate_cpp(PROTO_SOURCES PROTO_HEADERS ${MESSAGES})
add_library(libclementine-tagreader STATIC
${MESSAGES}
${PROTO_SOURCES}
${SOURCES}
${MOC}
)
protobuf_generate(TARGET libclementine-tagreader LANGUAGE cpp)
target_link_libraries(libclementine-tagreader
${PROTOBUF_LIBRARY}
libclementine-common
protobuf::libprotobuf
)

28
ext/libclementine-tagreader/cloudstream.cpp

@ -91,13 +91,9 @@ void CloudStream::Precache() {
clear();
}
#if (TAGLIB_MAJOR_VERSION == 2)
TagLib::ByteVector CloudStream::readBlock(size_t length) {
#else
TagLib::ByteVector CloudStream::readBlock(ulong length) {
#endif
const uint start = cursor_;
const uint end = qMin((size_t)(cursor_ + length - 1), (size_t)(length_ - 1));
const uint end = qMin(cursor_ + length - 1, length_ - 1);
if (end < start) {
return TagLib::ByteVector();
@ -148,19 +144,11 @@ void CloudStream::writeBlock(const TagLib::ByteVector&) {
qLog(Debug) << Q_FUNC_INFO << "not implemented";
}
#if (TAGLIB_MAJOR_VERSION == 2)
void CloudStream::insert(const TagLib::ByteVector&, TagLib::offset_t, size_t) {
#else
void CloudStream::insert(const TagLib::ByteVector&, ulong, ulong) {
#endif
qLog(Debug) << Q_FUNC_INFO << "not implemented";
}
#if (TAGLIB_MAJOR_VERSION == 2)
void CloudStream::removeBlock(TagLib::offset_t, size_t) {
#else
void CloudStream::removeBlock(ulong, ulong) {
#endif
qLog(Debug) << Q_FUNC_INFO << "not implemented";
}
@ -171,11 +159,7 @@ bool CloudStream::readOnly() const {
bool CloudStream::isOpen() const { return true; }
#if (TAGLIB_MAJOR_VERSION == 2)
void CloudStream::seek(TagLib::offset_t offset, TagLib::IOStream::Position p) {
#else
void CloudStream::seek(long offset, TagLib::IOStream::Position p) {
#endif
switch (p) {
case TagLib::IOStream::Beginning:
cursor_ = offset;
@ -187,26 +171,18 @@ void CloudStream::seek(long offset, TagLib::IOStream::Position p) {
case TagLib::IOStream::End:
// This should really not have qAbs(), but OGG reading needs it.
cursor_ = qMax(0UL, (unsigned long)(length_ - qAbs(offset)));
cursor_ = qMax(0UL, length_ - qAbs(offset));
break;
}
}
void CloudStream::clear() { cursor_ = 0; }
#if (TAGLIB_MAJOR_VERSION == 2)
TagLib::offset_t CloudStream::tell() const { return cursor_; }
TagLib::offset_t CloudStream::length() { return length_; }
void CloudStream::truncate(TagLib::offset_t) {
#else
long CloudStream::tell() const { return cursor_; }
long CloudStream::length() { return length_; }
void CloudStream::truncate(long) {
#endif
qLog(Debug) << Q_FUNC_INFO << "not implemented";
}

14
ext/libclementine-tagreader/cloudstream.h

@ -35,19 +35,6 @@ class CloudStream : public QObject, public TagLib::IOStream {
// Taglib::IOStream
virtual TagLib::FileName name() const;
#if (TAGLIB_MAJOR_VERSION == 2)
virtual TagLib::ByteVector readBlock(size_t length);
virtual void writeBlock(const TagLib::ByteVector&);
virtual void insert(const TagLib::ByteVector&, TagLib::offset_t, size_t);
virtual void removeBlock(TagLib::offset_t, size_t);
virtual bool readOnly() const;
virtual bool isOpen() const;
virtual void seek(TagLib::offset_t offset, TagLib::IOStream::Position p);
virtual void clear();
virtual TagLib::offset_t tell() const;
virtual TagLib::offset_t length();
virtual void truncate(TagLib::offset_t);
#else
virtual TagLib::ByteVector readBlock(ulong length);
virtual void writeBlock(const TagLib::ByteVector&);
virtual void insert(const TagLib::ByteVector&, ulong, ulong);
@ -59,7 +46,6 @@ class CloudStream : public QObject, public TagLib::IOStream {
virtual long tell() const;
virtual long length();
virtual void truncate(long);
#endif
google::sparsetable<char>::size_type cached_bytes() const {
return cache_.num_nonempty();

28
ext/libclementine-tagreader/tagreader.cpp

@ -198,7 +198,7 @@ void TagReader::ReadFile(const QString& filename,
// Find album artists
TagLib::APE::ItemListMap::ConstIterator it = items.find("ALBUM ARTIST");
if (it != items.end()) {
TagLib::StringList album_artists = it->second.values();
TagLib::StringList album_artists = it->second.toStringList();
if (!album_artists.isEmpty()) {
Decode(album_artists.front(), nullptr, song->mutable_albumartist());
}
@ -243,22 +243,22 @@ void TagReader::ReadFile(const QString& filename,
}
if (items.contains("BPM")) {
Decode(items["BPM"].values().toString(", "), nullptr,
Decode(items["BPM"].toStringList().toString(", "), nullptr,
song->mutable_performer());
}
if (items.contains("PERFORMER")) {
Decode(items["PERFORMER"].values().toString(", "), nullptr,
Decode(items["PERFORMER"].toStringList().toString(", "), nullptr,
song->mutable_performer());
}
if (items.contains("COMPOSER")) {
Decode(items["COMPOSER"].values().toString(", "), nullptr,
Decode(items["COMPOSER"].toStringList().toString(", "), nullptr,
song->mutable_composer());
}
if (items.contains("GROUPING")) {
Decode(items["GROUPING"].values().toString(" "), nullptr,
Decode(items["GROUPING"].toStringList().toString(" "), nullptr,
song->mutable_grouping());
}
@ -565,8 +565,8 @@ void TagReader::ReadFile(const QString& filename,
if (fileref->audioProperties()) {
song->set_bitrate(fileref->audioProperties()->bitrate());
song->set_samplerate(fileref->audioProperties()->sampleRate());
song->set_length_nanosec(fileref->audioProperties()->lengthInMilliseconds() *
kNsecPerMsec);
song->set_length_nanosec(fileref->audioProperties()->length() *
kNsecPerSec);
}
// Get the filetype if we can
@ -1376,15 +1376,9 @@ bool TagReader::ReadCloudFile(const QUrl& download_url, const QString& title,
std::unique_ptr<TagLib::File> tag;
if (mime_type == "audio/mpeg" &&
title.endsWith(".mp3", Qt::CaseInsensitive)) {
#if (TAGLIB_MAJOR_VERSION == 2)
tag.reset(new TagLib::MPEG::File(stream.get(), true,
TagLib::AudioProperties::Accurate,
TagLib::ID3v2::FrameFactory::instance()));
#else
tag.reset(new TagLib::MPEG::File(stream.get(),
TagLib::ID3v2::FrameFactory::instance(),
TagLib::AudioProperties::Accurate));
#endif
} else if (mime_type == "audio/mp4" ||
(mime_type == "audio/mpeg" &&
title.endsWith(".m4a", Qt::CaseInsensitive))) {
@ -1404,15 +1398,9 @@ bool TagReader::ReadCloudFile(const QUrl& download_url, const QString& title,
TagLib::AudioProperties::Accurate));
} else if (mime_type == "application/x-flac" || mime_type == "audio/flac" ||
mime_type == "audio/x-flac") {
#if (TAGLIB_MAJOR_VERSION == 2)
tag.reset(new TagLib::FLAC::File(stream.get(), true,
TagLib::AudioProperties::Accurate,
TagLib::ID3v2::FrameFactory::instance()));
#else
tag.reset(new TagLib::FLAC::File(stream.get(),
TagLib::ID3v2::FrameFactory::instance(),
true, TagLib::AudioProperties::Accurate));
#endif
} else if (mime_type == "audio/x-ms-wma") {
tag.reset(new TagLib::ASF::File(stream.get(), true,
TagLib::AudioProperties::Accurate));
@ -1443,7 +1431,7 @@ bool TagReader::ReadCloudFile(const QUrl& download_url, const QString& title,
song->set_type(cpb::tagreader::SongMetadata_Type_STREAM);
if (tag->audioProperties()) {
song->set_length_nanosec(tag->audioProperties()->lengthInMilliseconds() * kNsecPerMsec);
song->set_length_nanosec(tag->audioProperties()->length() * kNsecPerSec);
}
return true;
}

2
gst/moodbar/CMakeLists.txt

@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.0.0)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall --std=c++0x")
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})

2
src/core/organiseformat.h

@ -27,7 +27,7 @@
#include "core/song.h"
struct TranscoderPreset;
class TranscoderPreset;
class OrganiseFormat {
public:

10
src/internet/digitally/digitallyimportedservicebase.h

@ -41,16 +41,16 @@ class DigitallyImportedServiceBase : public InternetService {
const QString& api_service_name,
Application* app, InternetModel* model,
bool has_premium, QObject* parent = nullptr);
~DigitallyImportedServiceBase() override;
~DigitallyImportedServiceBase();
static const char* kSettingsGroup;
static const int kStreamsCacheDurationSecs;
QStandardItem* CreateRootItem() override;
void LazyPopulate(QStandardItem* parent) override;
void ShowContextMenu(const QPoint& global_pos) override;
QStandardItem* CreateRootItem();
void LazyPopulate(QStandardItem* parent);
void ShowContextMenu(const QPoint& global_pos);
void ReloadSettings() override;
void ReloadSettings();
bool is_premium_account() const;

10
src/internet/icecast/icecastservice.h

@ -40,7 +40,7 @@ class IcecastService : public InternetService {
public:
IcecastService(Application* app, InternetModel* parent);
~IcecastService() override;
~IcecastService();
static const char* kServiceName;
static const char* kDirectoryUrl;
@ -51,12 +51,12 @@ class IcecastService : public InternetService {
Type_Genre,
};
QStandardItem* CreateRootItem() override;
void LazyPopulate(QStandardItem* item) override;
QStandardItem* CreateRootItem();
void LazyPopulate(QStandardItem* item);
void ShowContextMenu(const QPoint& global_pos) override;
void ShowContextMenu(const QPoint& global_pos);
QWidget* HeaderWidget() const override;
QWidget* HeaderWidget() const;
private slots:
void LoadDirectory();

12
src/internet/intergalacticfm/intergalacticfmservice.h

@ -39,7 +39,7 @@ class IntergalacticFMServiceBase : public InternetService {
const QString& name, const QUrl& channel_list_url,
const QUrl& homepage_url,
const QUrl& donate_page_url, const QIcon& icon);
~IntergalacticFMServiceBase() override;
~IntergalacticFMServiceBase();
enum ItemType {
Type_Stream = 2000,
@ -59,14 +59,14 @@ class IntergalacticFMServiceBase : public InternetService {
const QString& url_scheme() const { return url_scheme_; }
const QIcon& icon() const { return icon_; }
QStandardItem* CreateRootItem() override;
void LazyPopulate(QStandardItem* item) override;
void ShowContextMenu(const QPoint& global_pos) override;
QStandardItem* CreateRootItem();
void LazyPopulate(QStandardItem* item);
void ShowContextMenu(const QPoint& global_pos);
PlaylistItem::Options playlistitem_options() const override;
PlaylistItem::Options playlistitem_options() const;
QNetworkAccessManager* network() const { return network_; }
void ReloadSettings() override;
void ReloadSettings();
bool IsStreamListStale() const { return streams_.IsStale(); }
StreamList Streams();

8
src/internet/internetradio/savedradio.h

@ -34,7 +34,7 @@ class SavedRadio : public InternetService {
public:
SavedRadio(Application* app, InternetModel* parent);
~SavedRadio() override;
~SavedRadio();
enum ItemType {
Type_Stream = 2000,
@ -57,10 +57,10 @@ class SavedRadio : public InternetService {
static const char* kServiceName;
static const char* kSettingsGroup;
QStandardItem* CreateRootItem() override;
void LazyPopulate(QStandardItem* item) override;
QStandardItem* CreateRootItem();
void LazyPopulate(QStandardItem* item);
void ShowContextMenu(const QPoint& global_pos) override;
void ShowContextMenu(const QPoint& global_pos);
void Add(const QUrl& url, const QString& name = QString(),
const QUrl& url_logo = QUrl());

10
src/internet/jamendo/jamendoservice.h

@ -43,14 +43,14 @@ class JamendoService : public InternetService {
public:
JamendoService(Application* app, InternetModel* parent);
~JamendoService() override;
~JamendoService();
QStandardItem* CreateRootItem() override;
void LazyPopulate(QStandardItem* item) override;
QStandardItem* CreateRootItem();
void LazyPopulate(QStandardItem* item);
void ShowContextMenu(const QPoint& global_pos) override;
void ShowContextMenu(const QPoint& global_pos);
QWidget* HeaderWidget() const override;
QWidget* HeaderWidget() const;
LibraryBackend* library_backend() const { return library_backend_.get(); }

14
src/internet/magnatune/magnatuneservice.h

@ -38,7 +38,7 @@ class MagnatuneService : public InternetService {
public:
MagnatuneService(Application* app, InternetModel* parent);
~MagnatuneService() override;
~MagnatuneService();
// Values are saved in QSettings and are indices into the combo box in
// MagnatuneConfig
@ -71,14 +71,14 @@ class MagnatuneService : public InternetService {
static QString ReadElementText(QXmlStreamReader& reader);
QStandardItem* CreateRootItem() override;
void LazyPopulate(QStandardItem* item) override;
QStandardItem* CreateRootItem();
void LazyPopulate(QStandardItem* item);
void ShowContextMenu(const QPoint& global_pos) override;
void ShowContextMenu(const QPoint& global_pos);
QWidget* HeaderWidget() const override;
QWidget* HeaderWidget() const;
void ReloadSettings() override;
void ReloadSettings();
// Magnatune specific stuff
MembershipType membership_type() const { return membership_; }
@ -99,7 +99,7 @@ class MagnatuneService : public InternetService {
void Download();
void Homepage();
void ShowConfig() override;
void ShowConfig();
private:
void EnsureMenuCreated();

16
src/internet/podcasts/podcastservice.h

@ -44,7 +44,7 @@ class PodcastService : public InternetService {
public:
PodcastService(Application* app, InternetModel* parent);
~PodcastService() override;
~PodcastService();
static const char* kServiceName;
static const char* kSettingsGroup;
@ -57,12 +57,12 @@ class PodcastService : public InternetService {
enum Role { Role_Podcast = InternetModel::RoleCount, Role_Episode };
QStandardItem* CreateRootItem() override;
void LazyPopulate(QStandardItem* parent) override;
bool has_initial_load_settings() const override { return true; }
void ShowContextMenu(const QPoint& global_pos) override;
void ReloadSettings() override;
void InitialLoadSettings() override;
QStandardItem* CreateRootItem();
void LazyPopulate(QStandardItem* parent);
bool has_initial_load_settings() const { return true; }
void ShowContextMenu(const QPoint& global_pos);
void ReloadSettings();
void InitialLoadSettings();
// Called by SongLoader when the user adds a Podcast URL directly. Adds a
// subscription to the podcast and displays it in the UI. If the QVariant
// contains an OPML file then this displays it in the Add Podcast dialog.
@ -81,7 +81,7 @@ class PodcastService : public InternetService {
void DeleteDownloadedData();
void SetNew();
void SetListened();
void ShowConfig() override;
void ShowConfig();
void SubscriptionAdded(const Podcast& podcast);
void SubscriptionRemoved(const Podcast& podcast);

2
src/internet/radiobrowser/radiobrowserservice.h

@ -35,7 +35,7 @@ class RadioBrowserService : public InternetService {
public:
RadioBrowserService(Application* app, InternetModel* parent);
~RadioBrowserService() override{};
~RadioBrowserService(){};
enum ItemType {
Type_Stream = 2000,

12
src/internet/somafm/somafmservice.h

@ -39,7 +39,7 @@ class SomaFMServiceBase : public InternetService {
const QString& name, const QUrl& channel_list_url,
const QUrl& homepage_url, const QUrl& donate_page_url,
const QIcon& icon);
~SomaFMServiceBase() override;
~SomaFMServiceBase();
enum ItemType {
Type_Stream = 2000,
@ -59,14 +59,14 @@ class SomaFMServiceBase : public InternetService {
const QString& url_scheme() const { return url_scheme_; }
const QIcon& icon() const { return icon_; }
QStandardItem* CreateRootItem() override;
void LazyPopulate(QStandardItem* item) override;
void ShowContextMenu(const QPoint& global_pos) override;
QStandardItem* CreateRootItem();
void LazyPopulate(QStandardItem* item);
void ShowContextMenu(const QPoint& global_pos);
PlaylistItem::Options playlistitem_options() const override;
PlaylistItem::Options playlistitem_options() const;
QNetworkAccessManager* network() const { return network_; }
void ReloadSettings() override;
void ReloadSettings();
bool IsStreamListStale() const { return streams_.IsStale(); }
StreamList Streams();

5
src/internet/subsonic/subsonicservice.cpp

@ -530,11 +530,6 @@ void SubsonicLibraryScanner::OnGetAlbumFinished(QNetworkReply* reply) {
// Read song information
while (reader.readNextStartElement()) {
// skip multi-artist and multi-genre tags
if ((reader.name() == "artists") || (reader.name() == "genres")) {
reader.skipCurrentElement();
continue;
}
if (reader.name() != "song") {
ParsingError("song tag expected. Aborting scan.");
return;

16
src/internet/subsonic/subsonicservice.h

@ -42,7 +42,7 @@ class SubsonicService : public InternetService {
public:
SubsonicService(Application* app, InternetModel* parent);
~SubsonicService() override;
~SubsonicService();
enum LoginState {
LoginState_Loggedin,
@ -90,11 +90,11 @@ class SubsonicService : public InternetService {
bool IsConfigured() const;
bool IsAmpache() const;
QStandardItem* CreateRootItem() override;
void LazyPopulate(QStandardItem* item) override;
void ShowContextMenu(const QPoint& global_pos) override;
QWidget* HeaderWidget() const override;
void ReloadSettings() override;
QStandardItem* CreateRootItem();
void LazyPopulate(QStandardItem* item);
void ShowContextMenu(const QPoint& global_pos);
QWidget* HeaderWidget() const;
void ReloadSettings();
void Login();
void Login(const QString& server, const QString& username,
@ -175,7 +175,7 @@ class SubsonicService : public InternetService {
void OnLoginStateChanged(SubsonicService::LoginState newstate);
void OnPingFinished(QNetworkReply* reply);
void ShowConfig() override;
void ShowConfig();
};
class SubsonicLibraryScanner : public QObject {
@ -184,7 +184,7 @@ class SubsonicLibraryScanner : public QObject {
public:
explicit SubsonicLibraryScanner(SubsonicService* service,
QObject* parent = nullptr);
~SubsonicLibraryScanner() override;
~SubsonicLibraryScanner();
void Scan();
const SongList& GetSongs() const { return songs_; }

2
src/library/librarybackend.cpp

@ -896,7 +896,7 @@ LibraryBackend::AlbumList LibraryBackend::GetAlbums(const QString& artist,
QString last_artist;
QString last_album_artist;
while (query.Next()) {
bool compilation = query.Value(3).toBool() || query.Value(4).toBool();
bool compilation = query.Value(3).toBool() | query.Value(4).toBool();
Album info;
info.artist = compilation ? QString() : query.Value(1).toString();

2
src/moodbar/moodbarbuilder.cpp

@ -92,10 +92,12 @@ void MoodbarBuilder::Normalize(QList<Rgb>* vals, double Rgb::*member) {
}
double avg = 0;
int t = 0;
for (const Rgb& rgb : *vals) {
const double value = rgb.*member;
if (value != mini && value != maxi) {
avg += value / vals->count();
t++;
}
}

2
src/networkremote/outgoingdatacreator.cpp

@ -98,6 +98,7 @@ void OutgoingDataCreator::CheckEnabledProviders() {
<< "lyricstime.com"
<< "lyricsreg.com"
<< "lyricsmania.com"
<< "metrolyrics.com"
<< "azlyrics.com"
<< "songlyrics.com"
<< "elyrics.net"
@ -105,6 +106,7 @@ void OutgoingDataCreator::CheckEnabledProviders() {
<< "lyrics.com"
<< "lyricsbay.com"
<< "directlyrics.com"
<< "loudson.gs"
<< "teksty.org"
<< "tekstowo.pl (Polish translations)"
<< "vagalume.uol.com.br"

2
src/playlist/playlist.cpp

@ -1729,11 +1729,13 @@ PlaylistItemList Playlist::RemoveItemsWithoutUndo(int row, int count) {
endRemoveRows();
QList<int>::iterator it = virtual_items_.begin();
int i = 0;
while (it != virtual_items_.end()) {
if (*it >= items_.count())
it = virtual_items_.erase(it);
else
++it;
++i;
}
// Reset current_virtual_index_

6
src/ripper/ripper.cpp

@ -34,6 +34,12 @@
#undef AddJob
#endif
namespace {
const char kWavHeaderRiffMarker[] = "RIFF";
const char kWavFileTypeFormatChunk[] = "WAVEfmt ";
const char kWavDataString[] = "data";
} // namespace
Ripper::Ripper(int track_count, QObject* parent)
: QObject(parent),
track_count_(track_count),

3
src/songinfo/songinfoview.cpp

@ -90,8 +90,10 @@ void SongInfoView::ReloadSettings() {
QVariantList default_order;
default_order << "lyrics.wikia.com"
<< "lyricstime.com"
<< "lyricsreg.com"
<< "lyricsmania.com"
<< "metrolyrics.com"
<< "azlyrics.com"
<< "songlyrics.com"
<< "elyrics.net"
@ -99,6 +101,7 @@ void SongInfoView::ReloadSettings() {
<< "lyrics.com"
<< "lyricsbay.com"
<< "directlyrics.com"
<< "loudson.gs"
<< "teksty.org"
<< "tekstowo.pl (Polish translations)"
<< "vagalume.uol.com.br"

3816
src/translations/af.po

File diff suppressed because it is too large Load Diff

3818
src/translations/ar.po

File diff suppressed because it is too large Load Diff

3872
src/translations/be.po

File diff suppressed because it is too large Load Diff

3844
src/translations/bg.po

File diff suppressed because it is too large Load Diff

3690
src/translations/bn.po

File diff suppressed because it is too large Load Diff

3879
src/translations/br.po

File diff suppressed because it is too large Load Diff

3686
src/translations/bs.po

File diff suppressed because it is too large Load Diff

3878
src/translations/ca.po

File diff suppressed because it is too large Load Diff

3862
src/translations/cs.po

File diff suppressed because it is too large Load Diff

3682
src/translations/cy.po

File diff suppressed because it is too large Load Diff

3876
src/translations/da.po

File diff suppressed because it is too large Load Diff

3877
src/translations/de.po

File diff suppressed because it is too large Load Diff

3876
src/translations/el.po

File diff suppressed because it is too large Load Diff

3726
src/translations/en_CA.po

File diff suppressed because it is too large Load Diff

3860
src/translations/en_GB.po

File diff suppressed because it is too large Load Diff

3725
src/translations/eo.po

File diff suppressed because it is too large Load Diff

3876
src/translations/es.po

File diff suppressed because it is too large Load Diff

3910
src/translations/et.po

File diff suppressed because it is too large Load Diff

3746
src/translations/eu.po

File diff suppressed because it is too large Load Diff

3796
src/translations/fa.po

File diff suppressed because it is too large Load Diff

3954
src/translations/fi.po

File diff suppressed because it is too large Load Diff

4096
src/translations/fr.po

File diff suppressed because it is too large Load Diff

3715
src/translations/ga.po

File diff suppressed because it is too large Load Diff

3869
src/translations/gl.po

File diff suppressed because it is too large Load Diff

3770
src/translations/he.po

File diff suppressed because it is too large Load Diff

3685
src/translations/he_IL.po

File diff suppressed because it is too large Load Diff

3682
src/translations/hi.po

File diff suppressed because it is too large Load Diff

3870
src/translations/hr.po

File diff suppressed because it is too large Load Diff

3876
src/translations/hu.po

File diff suppressed because it is too large Load Diff

3682
src/translations/hy.po

File diff suppressed because it is too large Load Diff

3684
src/translations/ia.po

File diff suppressed because it is too large Load Diff

3836
src/translations/id.po

File diff suppressed because it is too large Load Diff

3876
src/translations/is.po

File diff suppressed because it is too large Load Diff

3862
src/translations/it.po

File diff suppressed because it is too large Load Diff

3820
src/translations/ja.po

File diff suppressed because it is too large Load Diff

4195
src/translations/ka.po

File diff suppressed because it is too large Load Diff

3690
src/translations/kk.po

File diff suppressed because it is too large Load Diff

4241
src/translations/ko.po

File diff suppressed because it is too large Load Diff

3866
src/translations/lt.po

File diff suppressed because it is too large Load Diff

3772
src/translations/lv.po

File diff suppressed because it is too large Load Diff

3732
src/translations/mk_MK.po

File diff suppressed because it is too large Load Diff

3682
src/translations/mr.po

File diff suppressed because it is too large Load Diff

3858
src/translations/ms.po

File diff suppressed because it is too large Load Diff

3794
src/translations/my.po

File diff suppressed because it is too large Load Diff

3836
src/translations/nb.po

File diff suppressed because it is too large Load Diff

3868
src/translations/nl.po

File diff suppressed because it is too large Load Diff

3682
src/translations/oc.po

File diff suppressed because it is too large Load Diff

3682
src/translations/pa.po

File diff suppressed because it is too large Load Diff

3874
src/translations/pl.po

File diff suppressed because it is too large Load Diff

3880
src/translations/pt.po

File diff suppressed because it is too large Load Diff

3866
src/translations/pt_BR.po

File diff suppressed because it is too large Load Diff

4310
src/translations/ro.po

File diff suppressed because it is too large Load Diff

3902
src/translations/ru.po

File diff suppressed because it is too large Load Diff

3683
src/translations/si_LK.po

File diff suppressed because it is too large Load Diff

3860
src/translations/sk.po

File diff suppressed because it is too large Load Diff

4030
src/translations/sl.po

File diff suppressed because it is too large Load Diff

3880
src/translations/sr.po

File diff suppressed because it is too large Load Diff

3854
src/translations/sr@latin.po

File diff suppressed because it is too large Load Diff

3878
src/translations/sv.po

File diff suppressed because it is too large Load Diff

3682
src/translations/te.po

File diff suppressed because it is too large Load Diff

3876
src/translations/tr.po

File diff suppressed because it is too large Load Diff

3872
src/translations/tr_TR.po

File diff suppressed because it is too large Load Diff

3860
src/translations/uk.po

File diff suppressed because it is too large Load Diff

3714
src/translations/uz.po

File diff suppressed because it is too large Load Diff

3828
src/translations/vi.po

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More