Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

Change domain

This commit is contained in:
Jonas Kvinge 2019-09-24 00:06:37 +02:00
parent e3aebf1ca2
commit ab72207027
16 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -4,10 +4,10 @@
Strawberry is a music player and music collection organizer. It is a fork of Clementine released in 2018 aimed at music collectors, audio enthusiasts and audiophiles. The name is inspired by the band Strawbs. It's based on a heavily modified version of Clementine created in 2012-2013. It's written in C++ and Qt 5. Strawberry is a music player and music collection organizer. It is a fork of Clementine released in 2018 aimed at music collectors, audio enthusiasts and audiophiles. The name is inspired by the band Strawbs. It's based on a heavily modified version of Clementine created in 2012-2013. It's written in C++ and Qt 5.
* Website: https://www.strawbs.org/ * Website: https://www.strawberrymusicplayer.org/
* Github: https://github.com/jonaski/strawberry * Github: https://github.com/jonaski/strawberry
* Buildbot: http://buildbot.strawbs.net/ * Buildbot: http://buildbot.strawberrymusicplayer.org/
* Latest builds: https://builds.strawbs.org/ * Latest builds: https://builds.strawberrymusicplayer.org/
### :heavy_check_mark: Features: ### :heavy_check_mark: Features:
@ -84,7 +84,7 @@ You should also install the gstreamer plugins base and good, and optionally bad
### :computer: Screenshot ### :computer: Screenshot
![Browse](https://www.strawbs.org/pictures/screenshot-002-large.png) ![Browse](https://www.strawberrymusicplayer.org/pictures/screenshot-002-large.png)
### :moneybag: Donate ### :moneybag: Donate

2
data/html/oauthsuccess.html
View File

@ -1,7 +1,7 @@
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<link href="http://www.strawbs.org/favicon.ico" rel="shortcut icon"> <link href="https://www.strawberrymusicplayer.org/favicon.ico" rel="shortcut icon">
<title>tr("Return to Strawberry")</title> <title>tr("Return to Strawberry")</title>
<style> <style>

2
debian/control vendored
View File

@ -44,7 +44,7 @@ Depends: ${shlibs:Depends},
gstreamer1.0-plugins-good, gstreamer1.0-plugins-good,
gstreamer1.0-alsa, gstreamer1.0-alsa,
gstreamer1.0-pulseaudio gstreamer1.0-pulseaudio
Homepage: http://www.strawbs.org/ Homepage: http://www.strawberrymusicplayer.org/
Description: Audio player and music collection organizer Description: Audio player and music collection organizer
Strawberry is a music player aimed at music collectors, audio enthusiasts and audiophiles. Strawberry is a music player aimed at music collectors, audio enthusiasts and audiophiles.
. .

2
debian/copyright vendored
View File

@ -1,7 +1,7 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: strawberry Upstream-Name: strawberry
Upstream-Contact: Jonas Kvinge <jonas@jkvinge.net> Upstream-Contact: Jonas Kvinge <jonas@jkvinge.net>
Source: https://www.strawbs.org/ Source: https://www.strawberrymusicplayer.org/
Files: * Files: *
Copyright: 2010-2015, David Sansome <me@davidsansome.com> Copyright: 2010-2015, David Sansome <me@davidsansome.com>

4
dist/CMakeLists.txt vendored
View File

@ -15,8 +15,8 @@ if (UNIX AND NOT APPLE)
install(FILES ../data/icons/48x48/strawberry.png DESTINATION share/icons/hicolor/48x48/apps/) install(FILES ../data/icons/48x48/strawberry.png DESTINATION share/icons/hicolor/48x48/apps/)
install(FILES ../data/icons/64x64/strawberry.png DESTINATION share/icons/hicolor/64x64/apps/) install(FILES ../data/icons/64x64/strawberry.png DESTINATION share/icons/hicolor/64x64/apps/)
install(FILES ../data/icons/128x128/strawberry.png DESTINATION share/icons/hicolor/128x128/apps/) install(FILES ../data/icons/128x128/strawberry.png DESTINATION share/icons/hicolor/128x128/apps/)
install(FILES unix/org.strawbs.strawberry.desktop DESTINATION share/applications) install(FILES unix/org.strawberrymusicplayer.strawberry.desktop DESTINATION share/applications)
install(FILES unix/org.strawbs.strawberry.appdata.xml DESTINATION share/metainfo) install(FILES unix/org.strawberrymusicplayer.strawberry.appdata.xml DESTINATION share/metainfo)
install(FILES man/strawberry.1 man/strawberry-tagreader.1 DESTINATION share/man/man1) install(FILES man/strawberry.1 man/strawberry-tagreader.1 DESTINATION share/man/man1)
endif() endif()

2
dist/macos/Info.plist.in vendored
View File

@ -13,7 +13,7 @@
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>strawberry.icns</string> <string>strawberry.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>org.strawbs.strawberry</string> <string>org.strawberrymusicplayer.strawberry</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleLongVersionString</key> <key>CFBundleLongVersionString</key>

2
dist/pacman/PKGBUILD.in vendored
View File

@ -4,7 +4,7 @@ pkgver=@STRAWBERRY_VERSION_PAC_V@
pkgrel=@STRAWBERRY_VERSION_PAC_R@ pkgrel=@STRAWBERRY_VERSION_PAC_R@
pkgdesc="A music player aimed at audio enthusiasts and music collectors" pkgdesc="A music player aimed at audio enthusiasts and music collectors"
arch=(x86_64) arch=(x86_64)
url="http://www.strawbs.org/" url="https://www.strawberrymusicplayer.org/"
license=(GPL3) license=(GPL3)
makedepends=(git cmake make gcc boost gettext qt5-tools) makedepends=(git cmake make gcc boost gettext qt5-tools)
depends=( depends=(

12
dist/rpm/strawberry.spec.in vendored
View File

@ -4,7 +4,7 @@ Release: @STRAWBERRY_VERSION_RPM_R@.@RPM_DISTRO@
Summary: A music player and music collection organiser Summary: A music player and music collection organiser
Group: Applications/Multimedia Group: Applications/Multimedia
License: GPL-3.0+ License: GPL-3.0+
URL: http://www.strawbs.org/ URL: https://www.strawberrymusicplayer.org/
Source0: %{name}-@STRAWBERRY_VERSION_PACKAGE@.tar.xz Source0: %{name}-@STRAWBERRY_VERSION_PACKAGE@.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -146,11 +146,11 @@ Features:
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} < 1500 %if 0%{?suse_version} && 0%{?suse_version} < 1500
rm -f %{buildroot}%{_datadir}/metainfo/org.strawbs.strawberry.appdata.xml rm -f %{buildroot}%{_datadir}/metainfo/org.strawberrymusicplayer.strawberry.appdata.xml
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
%suse_update_desktop_file org.strawbs.strawberry Qt AudioVideo Audio Player %suse_update_desktop_file org.strawberrymusicplayer.strawberry Qt AudioVideo Audio Player
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} < 1500 %if 0%{?suse_version} && 0%{?suse_version} < 1500
@ -164,12 +164,12 @@ rm -f %{buildroot}%{_datadir}/metainfo/org.strawbs.strawberry.appdata.xml
%endif %endif
%check %check
desktop-file-validate %{buildroot}%{_datadir}/applications/org.strawbs.strawberry.desktop desktop-file-validate %{buildroot}%{_datadir}/applications/org.strawberrymusicplayer.strawberry.desktop
%if 0%{?fedora_version} %if 0%{?fedora_version}
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.strawbs.strawberry.appdata.xml appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.strawberrymusicplayer.strawberry.appdata.xml
%else %else
%if ! 0%{?suse_version} || ( 0%{?suse_version} && 0%{?suse_version} >= 1500 ) %if ! 0%{?suse_version} || ( 0%{?suse_version} && 0%{?suse_version} >= 1500 )
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.strawbs.strawberry.appdata.xml appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.strawberrymusicplayer.strawberry.appdata.xml
%endif %endif
%endif %endif

10
dist/unix/org.strawbs.strawberry.appdata.xml → dist/unix/org.strawberrymusicplayer.strawberry.appdata.xml vendored
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<component> <component>
<id>org.strawbs.strawberry</id> <id>org.strawberrymusicplayer.strawberry</id>
<launchable type="desktop-id">org.strawbs.strawberry.desktop</launchable> <launchable type="desktop-id">org.strawberrymusicplayer.strawberry.desktop</launchable>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0+</project_license> <project_license>GPL-3.0+</project_license>
<provides> <provides>
@ -10,7 +10,7 @@
</provides> </provides>
<name>Strawberry Music Player</name> <name>Strawberry Music Player</name>
<summary>A music player and collection organizer</summary> <summary>A music player and collection organizer</summary>
<url type="homepage">https://www.strawbs.org/</url> <url type="homepage">https://www.strawberrymusicplayer.org/</url>
<url type="bugtracker">https://github.com/jonaski/strawberry/</url> <url type="bugtracker">https://github.com/jonaski/strawberry/</url>
​<translation type="qt">strawberry</translation> ​<translation type="qt">strawberry</translation>
<description> <description>
@ -41,11 +41,11 @@
<screenshots> <screenshots>
<screenshot type="default"> <screenshot type="default">
<caption>Song playing showing context</caption> <caption>Song playing showing context</caption>
<image width="1600" height="874">https://www.strawbs.org/pictures/appdata-screenshot-001.png</image> <image width="1600" height="874">https://www.strawberrymusicplayer.org/pictures/appdata-screenshot-001.png</image>
</screenshot> </screenshot>
<screenshot> <screenshot>
<caption>Collection overview</caption> <caption>Collection overview</caption>
<image width="1600" height="874">https://www.strawbs.org/pictures/appdata-screenshot-002.png</image> <image width="1600" height="874">https://www.strawberrymusicplayer.org/pictures/appdata-screenshot-002.png</image>
</screenshot> </screenshot>
</screenshots> </screenshots>
<update_contact>eclipseo@fedoraproject.org</update_contact> <update_contact>eclipseo@fedoraproject.org</update_contact>

0
dist/unix/org.strawbs.strawberry.desktop → dist/unix/org.strawberrymusicplayer.strawberry.desktop vendored
View File

2
dist/windows/strawberry.nsi.in vendored
View File

@ -47,7 +47,7 @@
!define PRODUCT_DISPLAY_VERSION_SHORT "@STRAWBERRY_VERSION_PACKAGE@" !define PRODUCT_DISPLAY_VERSION_SHORT "@STRAWBERRY_VERSION_PACKAGE@"
!define PRODUCT_PUBLISHER "Jonas Kvinge" !define PRODUCT_PUBLISHER "Jonas Kvinge"
!define PRODUCT_WEB_SITE "http://www.strawbs.org/" !define PRODUCT_WEB_SITE "https://www.strawberrymusicplayer.org/"
!define PRODUCT_UNINST_ROOT_KEY "HKLM" !define PRODUCT_UNINST_ROOT_KEY "HKLM"

2
ext/gstmoodbar/gstmoodbarplugin.cpp
View File

@ -46,5 +46,5 @@ int gstfastspectrum_register_static() {
"GPL", "GPL",
"FastSpectrum", "FastSpectrum",
"FastSpectrum", "FastSpectrum",
"https://www.strawbs.org"); "https://www.strawberrymusicplayer.org");
} }

6
snap/snapcraft.yaml
View File

@ -74,8 +74,8 @@ parts:
cmake ../src -DCMAKE_INSTALL_PREFIX=/usr cmake ../src -DCMAKE_INSTALL_PREFIX=/usr
make -j $(getconf _NPROCESSORS_ONLN) make -j $(getconf _NPROCESSORS_ONLN)
make DESTDIR=$SNAPCRAFT_PART_INSTALL install make DESTDIR=$SNAPCRAFT_PART_INSTALL install
sed -i 's|Icon=strawberry|Icon=/usr/share/icons/hicolor/128x128/apps/strawberry\.png|' $SNAPCRAFT_PART_INSTALL/usr/share/applications/org.strawbs.strawberry.desktop sed -i 's|Icon=strawberry|Icon=/usr/share/icons/hicolor/128x128/apps/strawberry\.png|' $SNAPCRAFT_PART_INSTALL/usr/share/applications/org.strawberrymusicplayer.strawberry.desktop
sed -i 's|TryExec=.*|TryExec=/snap/bin/strawberry|' $SNAPCRAFT_PART_INSTALL/usr/share/applications/org.strawbs.strawberry.desktop sed -i 's|TryExec=.*|TryExec=/snap/bin/strawberry|' $SNAPCRAFT_PART_INSTALL/usr/share/applications/org.strawberrymusicplayer.strawberry.desktop
build-packages: build-packages:
- cmake - cmake
@ -166,7 +166,7 @@ parts:
apps: apps:
strawberry: strawberry:
command: desktop-launch $SNAP/usr/bin/strawberry command: desktop-launch $SNAP/usr/bin/strawberry
desktop: usr/share/applications/org.strawbs.strawberry.desktop desktop: usr/share/applications/org.strawberrymusicplayer.strawberry.desktop
environment: environment:
ALSA_CONFIG_PATH: /snap/$SNAPCRAFT_PROJECT_NAME/current/usr/share/alsa/alsa.conf ALSA_CONFIG_PATH: /snap/$SNAPCRAFT_PROJECT_NAME/current/usr/share/alsa/alsa.conf
LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio

4
src/core/mpris2.cpp
View File

@ -370,7 +370,7 @@ void Mpris2::SetShuffle(bool enable) {
QVariantMap Mpris2::Metadata() const { return last_metadata_; } QVariantMap Mpris2::Metadata() const { return last_metadata_; }
QString Mpris2::current_track_id() const { QString Mpris2::current_track_id() const {
return QString("/org/strawbs/strawberry/Track/%1").arg(QString::number(app_->playlist_manager()->active()->current_row())); return QString("/org/strawberrymusicplayer/strawberry/Track/%1").arg(QString::number(app_->playlist_manager()->active()->current_row()));
} }
// We send Metadata change notification as soon as the process of changing song starts... // We send Metadata change notification as soon as the process of changing song starts...
@ -541,7 +541,7 @@ QStringList Mpris2::Orderings() const { return QStringList() << "User"; }
namespace { namespace {
QDBusObjectPath MakePlaylistPath(int id) { QDBusObjectPath MakePlaylistPath(int id) {
return QDBusObjectPath(QString("/org/strawbs/strawberry/PlaylistId/%1").arg(id)); return QDBusObjectPath(QString("/org/strawberrymusicplayer/strawberry/PlaylistId/%1").arg(id));
} }
} }

2
src/main.cpp
View File

@ -118,7 +118,7 @@ int main(int argc, char* argv[]) {
QCoreApplication::setOrganizationName("strawberry"); QCoreApplication::setOrganizationName("strawberry");
#endif #endif
QCoreApplication::setApplicationVersion(STRAWBERRY_VERSION_DISPLAY); QCoreApplication::setApplicationVersion(STRAWBERRY_VERSION_DISPLAY);
QCoreApplication::setOrganizationDomain("strawbs.org"); QCoreApplication::setOrganizationDomain("strawberrymusicplayer.org");
// This makes us show up nicely in gnome-volume-control // This makes us show up nicely in gnome-volume-control
#if !GLIB_CHECK_VERSION(2, 36, 0) // Deprecated in glib 2.36.0 #if !GLIB_CHECK_VERSION(2, 36, 0) // Deprecated in glib 2.36.0

2
src/scrobbler/scrobblingapi20.cpp
View File

@ -61,7 +61,7 @@
const char *ScrobblingAPI20::kApiKey = "211990b4c96782c05d1536e7219eb56e"; const char *ScrobblingAPI20::kApiKey = "211990b4c96782c05d1536e7219eb56e";
const char *ScrobblingAPI20::kSecret = "80fd738f49596e9709b1bf9319c444a8"; const char *ScrobblingAPI20::kSecret = "80fd738f49596e9709b1bf9319c444a8";
const char *ScrobblingAPI20::kRedirectUrl = "https://oauth.strawbs.net"; const char *ScrobblingAPI20::kRedirectUrl = "https://oauth.strawberrymusicplayer.org";
const int ScrobblingAPI20::kScrobblesPerRequest = 50; const int ScrobblingAPI20::kScrobblesPerRequest = 50;
ScrobblingAPI20::ScrobblingAPI20(const QString &name, const QString &settings_group, const QString &auth_url, const QString &api_url, const bool batch, Application *app, QObject *parent) : ScrobblingAPI20::ScrobblingAPI20(const QString &name, const QString &settings_group, const QString &auth_url, const QString &api_url, const bool batch, Application *app, QObject *parent) :