devel→master: Final commits for 0.3.0-rc1 (#23)

* [README.md] Description stub and History * [.gitignore] Add missed space character in comment * [README.md] Enhance table with screenshots * [flowplayer.spec] Revert part of e11649d * [build-on-tags.yml] Fix using the wrong action-branch for SFOS < 4.1.0 (#18) * [README.md] Fix table rendering by inserting ` '`s * [README.md] Optimise table spans, again * [README.md] Large screenshot subtitles * [README.md] Final screenshots-table formatting fix-up … …, hopefully. * [flowplayer.spec] Do first release for years still without `Vendor` set * [README.md] Use relative image links * Update README.md with License link * [README.md] Link issue, fix italicisation. * [README.md] Fix link: https://app.transifex.com/olf/flowplayer-1 * Add missing QImage includes. * Adjust calls for GStreamer 1.0 API. * Remove internal taglib * Use QStandardPaths instead of hardcoded paths. * Adjust some icon sizes * Remove `taglib` and `mytaglib` (#22) * Delete src/taglib directory Obsoleted by PR #19 by @dcaliste * Delete src/mytaglib directory Obsoleted by PR #19 by @dcaliste * Delete lib directory Obsoleted by PR #19 by @dcaliste * Update README.md to recent changes * Update README.md * [README.md] Fix spell'o * [flowplayer.spec] Up `version`-`release` to 0.3.0-rc1 * Update flowplayer.changes for v0.3.0 * Update flowplayer.changes --------- Co-authored-by: Damien Caliste <[email protected]>
sailfishos-applications · Dec 5, 2023 · 952fc82 · 952fc82
2 parents e092b50 + a4eee43
commit 952fc82
Show file tree

Hide file tree

Showing 440 changed files with 182 additions and 70,562 deletions.
diff --git a/.github/workflows/build-on-tags.yml b/.github/workflows/build-on-tags.yml
@@ -47,20 +47,14 @@ jobs:
     - name: Prepare
       run: mkdir RPMS
 
-    - name: Build aarch64 on ${{ env.RELEASE }}
-      uses: coderus/github-sfos-build@master
-      with:
-        release: ${{ env.RELEASE }}
-        arch: aarch64
-
     - name: Build armv7hl on ${{ env.RELEASE }}
-      uses: coderus/github-sfos-build@master
+      uses: coderus/github-sfos-build@old-stable
       with:
         release: ${{ env.RELEASE }}
         arch: armv7hl
 
     - name: Build i486 on ${{ env.RELEASE }}
-      uses: coderus/github-sfos-build@master
+      uses: coderus/github-sfos-build@old-stable
       with:
         release: ${{ env.RELEASE }}
         arch: i486
@@ -97,13 +91,13 @@ jobs:
       run: mkdir RPMS
 
     - name: Build armv7hl on ${{ env.RELEASE }}
-      uses: coderus/github-sfos-build@master
+      uses: coderus/github-sfos-build@old-stable
       with:
         release: ${{ env.RELEASE }}
         arch: armv7hl
 
     - name: Build i486 on ${{ env.RELEASE }}
-      uses: coderus/github-sfos-build@master
+      uses: coderus/github-sfos-build@old-stable
       with:
         release: ${{ env.RELEASE }}
         arch: i486
@@ -140,19 +134,19 @@ jobs:
       run: mkdir RPMS
 
     - name: Build aarch64 on 4.0.1.45
-      uses: coderus/github-sfos-build@master
+      uses: coderus/github-sfos-build@old-stable
       with:
         release: 4.0.1.45
         arch: aarch64
 
     - name: Build armv7hl on ${{ env.RELEASE }}
-      uses: coderus/github-sfos-build@master
+      uses: coderus/github-sfos-build@old-stable
       with:
         release: ${{ env.RELEASE }}
         arch: armv7hl
 
     - name: Build i486 on ${{ env.RELEASE }}
-      uses: coderus/github-sfos-build@master
+      uses: coderus/github-sfos-build@old-stable
       with:
         release: ${{ env.RELEASE }}
         arch: i486

diff --git a/.gitignore b/.gitignore
@@ -27,7 +27,7 @@ Makefile*
 *.autosave
 *.list
 
-#QtCtreator Qml
+# QtCtreator Qml
 *.qmlproject.user
 *.qmlproject.user.*
 

diff --git a/FlowPlayer.pro b/FlowPlayer.pro
@@ -4,23 +4,9 @@ QT += core network sql xml
 
 
 CONFIG += link_pkgconfig
-PKGCONFIG += gstreamer-0.10 libresource libresource-glib
+PKGCONFIG += gstreamer-1.0 libresource libresource-glib taglib
 
-LIBS += -L"$$_PRO_FILE_PWD_/lib" -lmytaglib
-
-INCLUDEPATH += src/taglib \
-               src/taglib/taglib \
-               src/taglib/taglib/toolkit \
-               src/taglib/taglib/ogg \
-               src/taglib/taglib/riff \
-               src/taglib/taglib/mpeg/id3v1 \
-               src/taglib/taglib/mpeg/id3v2 \
-               src/taglib/taglib/mpeg/id3v2/frames \
-               src/taglib/taglib/flac \
-               src/taglib/taglib/mod \
-               src/taglib/taglib/xm \
-
-CONFIG += sailfishapp #taglib
+CONFIG += sailfishapp
 
 SOURCES += src/FlowPlayer.cpp \
     src/utils.cpp \
@@ -130,8 +116,3 @@ HEADERS += \
     src/player.h \
     src/audioresource.h \
     src/audioresourceqt.h
-
-tag.files = lib/libmytaglib.so.1
-tag.path = /usr/share/flowplayer/lib
-
-INSTALLS += tag
diff --git a/README.md b/README.md
@@ -1,19 +1,43 @@
 # FlowPlayer for SailfishOS
 
+**FlowPlayer is a music player with lyrics support, online radio and 10-band equalizer.**
+
+Features:
+- *<ToDo: A pull request providing a list of features will be very welcome>*
+
+<sup>Note that the ability to ... may be broken (this is [known for XXX](https://github.com/sailfishos-applications/flowplayer/issues/) ‒ currently nothing) due to API changes in recent SailfishOS releases.</sup><br />
+Pull requests with fixes, improvements and enhancements are welcome!
+
 ## Translating FlowPlayer (l10n / i18n)
 
 If you want to translate FlowPlayer to a language it does not support yet or improve an extant translation, please [read the translations-README](./translations#readme).
 
 ## Screenshots of FlowPlayer
 
-|     |     |     |     |
-| --- | --- | --- | --- |
-| ![Music Player](https://github.com/sailfishos-applications/flowplayer/raw/master/.xdata/screenshots/screenshot-20150711134510.jpg) | ![Song list (album)](https://github.com/sailfishos-applications/flowplayer/raw/master/.xdata/screenshots/screenshot-20150711134427.jpg) | ![Album covers](https://github.com/sailfishos-applications/flowplayer/raw/master/.xdata/screenshots/screenshot-20150711134124.jpg) | ![Albums by artist](https://github.com/sailfishos-applications/flowplayer/raw/master/.xdata/screenshots/screenshot-20150711134236.jpg) |
-| ![Covers by artist](https://github.com/sailfishos-applications/flowplayer/raw/master/.xdata/screenshots/screenshot-20150711134206.jpg) | ![Playlists](https://github.com/sailfishos-applications/flowplayer/raw/master/.xdata/screenshots/screenshot-20150711134443.jpg) | ![FileCase cover](https://github.com/sailfishos-applications/flowplayer/raw/master/.xdata/screenshots/screenshot-20150711134615.jpg) | ![Lyrics](https://github.com/sailfishos-applications/flowplayer/raw/master/.xdata/screenshots/screenshot-20150701221204.jpg)
+|       |       |       |       |
+| :---: | :---: | :---: | :---: |
+|       |       |       |       |
+| ![Music Player](./.xdata/screenshots/screenshot-20150711134510.jpg?raw=true) | ![Song list (album)](./.xdata/screenshots/screenshot-20150711134427.jpg?raw=true) | ![Album covers](./.xdata/screenshots/screenshot-20150711134124.jpg?raw=true) | ![Albums by artist](./.xdata/screenshots/screenshot-20150711134236.jpg?raw=true) |
+| Music Player | Song list (album) | Album covers | Albums by artist |
+|       |       |       |       |
+|       |       |       |       |
+| ![Covers by artist](./.xdata/screenshots/screenshot-20150711134206.jpg?raw=true) | ![Playlists](./.xdata/screenshots/screenshot-20150711134443.jpg?raw=true) | ![FileCase's cover](./.xdata/screenshots/screenshot-20150711134615.jpg?raw=true) | ![Lyrics](./.xdata/screenshots/screenshot-20150701221204.jpg?raw=true)
+| &nbsp;&nbsp;Covers&nbsp;by&nbsp;artist&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Playlists&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | FlowPlayer's&nbsp;cover | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Lyrics&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; |
+|       |       |       |       |
+
+## History of FlowPlayer
+
+The original [FlowPlayer for SailfishOS (2015 - 2016)](https://openrepos.net/content/cepiperez/flowplayer-0#content) started as a port of [FlowPlayer for MeeGo-Harmattan (2014)](https://openrepos.net/content/cepiperez/flowplayer#content).  Both were solely written by [Matias Perez (CepiPerez)](https://github.com/CepiPerez).  In 2021 Matias [released the source code of FlowPlayer](https://github.com/sailfishos-applications/flowplayer/commits/master?after=c4f36e1cb3a80b7c7b220a379c9bdaca3a300113+49) by creating this git repository at GitHub.
+
+In 2023 [olf (Olf0)](https://github.com/Olf0) overhauled infrastructure aspects, such as this README, a [new OpenRepos page](https://openrepos.net/content/olf/flowplayer#content), the [Transifex integration](https://github.com/sailfishos-applications/flowplayer/pull/7), making the spec file suitable for [the Sailfish-OBS](https://build.sailfishos.org/) and [the SailfishOS:Chum community repository](https://build.sailfishos.org/project/show/sailfishos:chum) etc.
 
 ## Credits
 #### Original author
 [Matias Perez (CepiPerez)](https://github.com/CepiPerez)
 #### Contributors
 - [olf (Olf0)](https://github.com/Olf0)
+- [Damien Caliste (dcaliste)](https://github.com/dcaliste)
+<br />
+
+### License: [MPL 2.0](https://spdx.org/licenses/MPL-2.0-no-copyleft-exception.html)
 
diff --git a/lib/i486/libmytaglib.so b/lib/i486/libmytaglib.so
diff --git a/lib/i486/libmytaglib.so.1 b/lib/i486/libmytaglib.so.1
diff --git a/lib/libmytaglib.so b/lib/libmytaglib.so
diff --git a/lib/libmytaglib.so.1 b/lib/libmytaglib.so.1
diff --git a/qml/pages/AddFolder.qml b/qml/pages/AddFolder.qml
@@ -57,7 +57,7 @@ Dialog {
             anchors.verticalCenter: header2.verticalCenter
             anchors.left: parent.left
             anchors.leftMargin: Theme.paddingMedium
-            icon.source: "image://theme/icon-l-up"
+            icon.source: "image://theme/icon-m-up"
             onClicked: {
                 foldersModel.clear()
                 utils.getFolderItemsUp(currentPath);

diff --git a/qml/pages/CoverDownload.qml b/qml/pages/CoverDownload.qml
@@ -86,7 +86,7 @@ Page {
                     height: Theme.itemSizeExtraSmall
                     width: height
                     opacity: !searching? 1 : 0.5
-                    icon.source: searching? "image://theme/icon-l-cancel" : "image://theme/icon-m-search"
+                    icon.source: searching? "image://theme/icon-m-cancel" : "image://theme/icon-m-search"
                     icon.height: height -Theme.paddingMedium
                     icon.width: icon.height
                     onClicked: {

diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml
@@ -133,7 +133,7 @@ Page {
                         anchors.rightMargin: Theme.paddingMedium
                         height: Theme.itemSizeExtraSmall
                         width: height
-                        icon.source: enableSearch && searchInput2.text!==""? "image://theme/icon-m-search" : "image://theme/icon-l-cancel"
+                        icon.source: enableSearch && searchInput2.text!==""? "image://theme/icon-m-search" : "image://theme/icon-m-cancel"
                         icon.height: height -Theme.paddingMedium
                         icon.width: icon.height
                         enabled: searchInput2.text!=="" || searchValue!==""
@@ -233,7 +233,7 @@ Page {
                         anchors.rightMargin: Theme.paddingMedium
                         height: Theme.itemSizeExtraSmall
                         width: height
-                        icon.source: enableSearch && searchInput.text!==""? "image://theme/icon-m-search" : "image://theme/icon-l-cancel"
+                        icon.source: enableSearch && searchInput.text!==""? "image://theme/icon-m-search" : "image://theme/icon-m-cancel"
                         icon.height: height -Theme.paddingMedium
                         icon.width: icon.height
                         enabled: searchInput.text!=="" || searchValue!==""

diff --git a/qml/pages/NowPlaying.qml b/qml/pages/NowPlaying.qml
@@ -411,7 +411,7 @@ Page {
             anchors.right: parent.right
             //anchors.rightMargin: Theme.paddingMedium
             anchors.bottom: bigCoverList.bottom
-            icon.source: "image://theme/icon-l-down"
+            icon.source: "image://theme/icon-m-down"
             onClicked: pageStack.pop()
         }*/
 
@@ -599,7 +599,7 @@ Page {
             anchors.bottom: parent.bottom
             anchors.bottomMargin: -Theme.paddingSmall
             anchors.horizontalCenter: parent.horizontalCenter
-            icon.source: "image://theme/icon-l-up"
+            icon.source: "image://theme/icon-m-up"
             icon.height: Theme.itemSizeMedium/2
             icon.width: icon.height
             onClicked: dockPanel.open = false

diff --git a/qml/pages/SearchRadio.qml b/qml/pages/SearchRadio.qml
@@ -118,7 +118,7 @@ Page {
                     anchors.rightMargin: Theme.paddingMedium
                     height: Theme.itemSizeExtraSmall
                     width: height
-                    icon.source: enableSearch && searchInput2.text!==""? "image://theme/icon-m-search" : "image://theme/icon-l-cancel"
+                    icon.source: enableSearch && searchInput2.text!==""? "image://theme/icon-m-search" : "image://theme/icon-m-cancel"
                     icon.height: height -Theme.paddingMedium
                     icon.width: icon.height
                     enabled: searchInput2.text!=="" || searchValue!==""

diff --git a/qml/pages/SongsPage.qml b/qml/pages/SongsPage.qml
@@ -91,7 +91,7 @@ Page {
                     anchors.rightMargin: Theme.paddingMedium
                     height: Theme.itemSizeExtraSmall
                     width: height
-                    icon.source: enableSearch && searchInput2.text!==""? "image://theme/icon-m-search" : "image://theme/icon-l-cancel"
+                    icon.source: enableSearch && searchInput2.text!==""? "image://theme/icon-m-search" : "image://theme/icon-m-cancel"
                     icon.height: height -Theme.paddingMedium
                     icon.width: icon.height
                     enabled: searchInput2.text!=="" || searchValue!==""

diff --git a/rpm/flowplayer.changes b/rpm/flowplayer.changes
@@ -1,5 +1,21 @@
-* Mon Sep 18 2023 olf <[email protected]> - 0.1-10
-- 
+* Tue Dec 05 2023 olf <[email protected]> - 0.3.0
+- Create README
+- Add screenshots (#3 etc.)
+- Overhaul RPM related files (#4 etc.)
+- Clean up thoroughly (#5, #6 etc.)
+- Add Transifex integration (#7)
+- Add GitHub-workflows (#8 etc.)
+- Create TEMPLATES (#9)
+- Update translations (#12, #13, #14, #15, #16)
+- Omit hardcoded paths to `/home/nemo` and use available icons sizes (#21) by @dcaliste
+- Use GStreamer 1.0 and fix compiling (#19) by @dcaliste
+- Remove taglib and mytaglib (#22)
+
+* Sat Apr 30 2016 Matias Perez <[email protected]> - 0.2-1
+- Lost commits, only binary RPM file for armv7hl still exists.
+
+* Sun Feb 21 2016 Matias Perez <[email protected]> - 0.2-0
+- Lost commits, only binary RPM file for armv7hl still exists.
 
 * Fri Nov 06 2015 Matias Perez <[email protected]> - 0.1-9
 - Added search artist image option

diff --git a/rpm/flowplayer.spec b/rpm/flowplayer.spec
@@ -1,5 +1,5 @@
 Name:       flowplayer
-
+ 
 # These macros should already be defined in the RPMbuild environment, see: rpm --showrc
 %{!?qtc_qmake:%define qtc_qmake %qmake}
 %{!?qtc_qmake5:%define qtc_qmake5 %qmake5}
@@ -10,9 +10,9 @@ Name:       flowplayer
 Summary:    Music Player for SailfishOS
 # The <version> tag must adhere to semantic versioning: Among multiple other
 # reasons due to its use for `qmake5` in line 56.  See https://semver.org/
-Version:    0.1
-# The <release> tag *may* comprise one of {alpha,beta,rc,release} postfixed with
-# a natural number greater or equal to 1 (e.g., "beta3") and may additionally be
+Version:    0.3.0
+# The <release> tag comprises one of {alpha,beta,rc,release} postfixed with a
+# natural number greater or equal to 1 (e.g., "beta3") and may additionally be
 # postfixed with a plus character ("+"), the name of the packager and a release
 # number chosen by her (e.g., "rc2+jane4").  `{alpha|beta|rc|release}`
 # indicates the expected status of the software.  No other identifiers shall be
@@ -21,20 +21,20 @@ Version:    0.1
 # build at GitHub and OBS, when configured accordingly; mind the sorting
 # (`adud` < `alpha`).  For details and reasons, see
 # https://github.com/storeman-developers/harbour-storeman/wiki/Git-tag-format
-Release:    10
+Release:    rc1
 # The Group tag should comprise one of the groups listed here:
 # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
 Group:      Applications/Multimedia
 License:    MPL-2.0-no-copyleft-exception
 URL:        https://github.com/sailfishos-applications/%{name}
 # Altering the `Vendor:` field breaks the update path on SailfishOS, see
 # https://en.opensuse.org/SDB:Vendor_change_update#Disabling_Vendor_stickiness
-Vendor:     meego
+#Vendor:     meego
 # The "Source0:" line below requires that the value of %%{name} is also the
-# project name at GitHub and the value of `%%{version}-%%{release}` is also
+# project name at GitHub and the value of `%%{release}/%%{version}` is also
 # the name of a correspondingly set Git tag.  For details and reasons, see
 # https://github.com/storeman-developers/harbour-storeman/wiki/Git-tag-format
-Source0:    %{url}/archive/%{version}-%{release}/%{name}-%{version}.tar.gz
+Source0:    %{url}/archive/%{release}/%{version}/%{name}-%{version}.tar.gz
 # Note that the rpmlintrc file MUST be named exactly so according to
 # https://en.opensuse.org/openSUSE:Packaging_checks#Building_Packages_in_spite_of_errors
 Source99:   %{name}.rpmlintrc
@@ -43,8 +43,9 @@ BuildRequires:  pkgconfig(sailfishapp) >= 1.0.2
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Qml)
 BuildRequires:  pkgconfig(Qt5Quick)
-#BuildRequires:  gstreamer1.0-devel  # Something in the build configuration currently wants `gstreamer-devel-0.10`
-# and `BuildRequires:  pkgconfig(gstreamer1.0)` does not seem to work in contrast to `BuildRequires:  gstreamer1.0-devel`
+BuildRequires:  pkgconfig(gstreamer-1.0)
+BuildRequires:  pkgconfig(libresource)
+BuildRequires:  pkgconfig(taglib)
 BuildRequires:  desktop-file-utils
 
 # This description section includes metadata for SailfishOS:Chum, see

diff --git a/src/coversearch.cpp b/src/coversearch.cpp
@@ -6,6 +6,7 @@
 #include <QStringList>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QStandardPaths>
 
 #define BING_ID "A16EECFD14108C2794E4BC29D4DE59C308685B4A"
 
@@ -295,7 +296,7 @@ void CoverSearch::downloaded(QNetworkReply *respuesta)
     else if ( d->searchTry == 3 )
     {
         QImage image = QImage::fromData(reply->readAll());
-        QString path = "/home/nemo/.cache/flowplayer/" + hash(d->foundedCovers.at(0)) + ".jpeg";
+        QString path = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/" + hash(d->foundedCovers.at(0)) + ".jpeg";
         image.save(path, "JPEG");
         d->items.at(d->curDown)->art = path;
         emit(d->q->dataChanged(d->q->index(d->curDown) , d->q->index(d->curDown)));
@@ -352,7 +353,7 @@ void CoverSearch::paintImg(QString image, int index)
 
 void CoverSearch::saveImage(QString artist, QString album, QString imagepath)
 {
-    QString th2 = "/home/nemo/.cache/media-art/album-"+ doubleHash(artist, album) + ".jpeg";
+    QString th2 = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + "/media-art/album-"+ doubleHash(artist, album) + ".jpeg";
 
     QImage image(imagepath);
     image.save(th2, "JPEG");
@@ -362,7 +363,7 @@ void CoverSearch::saveImage(QString artist, QString album, QString imagepath)
 
 void CoverSearch::saveArtistImage(QString artist, QString imagepath)
 {
-    QString th2 = "/home/nemo/.cache/flowplayer/artist-" + hash(artist) + ".jpeg";
+    QString th2 = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/artist-" + hash(artist) + ".jpeg";
 
     QImage image(imagepath);
     image.save(th2, "JPEG");

diff --git a/src/datareader.cpp b/src/datareader.cpp
@@ -1,21 +1,21 @@
 #include "datareader.h"
 
-#include "taglib/mpeg/mpegfile.h"
-#include "taglib/flac/flacfile.h"
-#include "taglib/toolkit/tlist.h"
-#include "taglib/ogg/vorbis/vorbisfile.h"
-#include "taglib/mp4/mp4file.h"
-#include "taglib/riff/wav/wavfile.h"
-#include "taglib/ogg/speex/speexfile.h"
-#include "taglib/ogg/flac/oggflacfile.h"
-#include "taglib/riff/aiff/aifffile.h"
-#include "taglib/wavpack/wavpackfile.h"
-#include "taglib/trueaudio/trueaudiofile.h"
-#include "taglib/asf/asffile.h"
-#include "taglib/ape/apefile.h"
-#include "taglib/mpc/mpcfile.h"
-#include "taglib/mod/modfile.h"
-#include "taglib/xm/xmfile.h"
+#include <mpegfile.h>
+#include <flacfile.h>
+#include <tlist.h>
+#include <vorbisfile.h>
+#include <mp4file.h>
+#include <wavfile.h>
+#include <speexfile.h>
+#include <oggflacfile.h>
+#include <aifffile.h>
+#include <wavpackfile.h>
+#include <trueaudiofile.h>
+#include <asffile.h>
+#include <apefile.h>
+#include <mpcfile.h>
+#include <modfile.h>
+#include <xmfile.h>
 
 
 #include <QDir>