version bump. bit of cleanup

a-dekker · Oct 17, 2021 · 1937e6d · 1937e6d
1 parent 1e8b616
commit 1937e6d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 45 deletions.
diff --git a/rpm/harbour-smpc.changes b/rpm/harbour-smpc.changes
@@ -8,6 +8,8 @@
 # * date Author's Name <author's email> version-release
 # - Summary of changes
 
+* Wed Aug 18 2021 Arno Dekker <jack.tar@example.com> 1.3.25-1
+- Show only comment in playlist if radiostation has '#' comment in url (thanks sh6668)
 * Wed Aug 18 2021 Arno Dekker <jack.tar@example.com> 1.3.24-1
 - Patch for bug album list was empty with old mpd <0.21 (like in volumio) (thanks sh6668)
 - Position and volume slider now optional in control panel (thanks sh6668)

diff --git a/rpm/harbour-smpc.spec b/rpm/harbour-smpc.spec
@@ -6,7 +6,7 @@ Name:       harbour-smpc
 # << macros
 
 Summary:    SailfishOS Port of qmobilempd client
-Version:    1.3.24
+Version:    1.3.25
 Release:    1
 Group:      Qt/Qt
 License:    GPLv3

diff --git a/src/mpd/mpdtrack.cpp b/src/mpd/mpdtrack.cpp
@@ -135,20 +135,7 @@ QString MpdTrack::getFileName() const {
     splitted = getFileUri().split('/');
     return (splitted.last() !="" ? splitted.last() : getFileUri());
 }
-/*
-QString MpdTrack::getFileName() const {
-    QStringList splitted;
-    QString fileUri = getFileUri();
-    if (fileUri.toLower().startsWith("http://") || fileUri.toLower().startsWith("https://")) {
-        splitted = fileUri.split('#');
-        if (splitted.last() !="") {
-           return splitted.last();
-        }
-    }
-    splitted = fileUri.split('/');
-    return (splitted.last() !="" ? splitted.last() : getFileUri());
-}
-*/
+
 QString MpdTrack::getTrackMBID() const {
     return mTrackMBID;
 }

diff --git a/src/mpd/networkaccess.cpp b/src/mpd/networkaccess.cpp
@@ -117,11 +117,6 @@ void NetworkAccess::getAlbums()
     emit ready();
 }
 
-//QList<MpdAlbum *> *NetworkAccess::parseMPDAlbums()
-//{
-//    return parseMPDAlbums("");
-//}
-
 QList<MpdAlbum *> *NetworkAccess::parseMPDAlbums(QString listedArtist = nullptr)
 {
 
@@ -799,31 +794,6 @@ void NetworkAccess::addArtistAlbumToPlaylist(QString artist, QString album)
 }
 
 
-
-//void NetworkAccess::addArtistAlbumToPlaylist(QVariant albuminfo)
-//{
-//    // New qt 5.4 qml->c++ qvariant cast
-//    if (albuminfo.userType() == qMetaTypeId<QJSValue>()) {
-//        albuminfo = qvariant_cast<QJSValue>(albuminfo).toVariant();
-//    }
-
-//    QStringList strings = albuminfo.toStringList();
-//    addArtistAlbumToPlaylist(strings[0],strings[1]);
-//}
-
-//void NetworkAccess::playArtistAlbum(QVariant albuminfo)
-//{
-//    clearPlaylist();
-//    // New qt 5.4 qml->c++ qvariant cast
-//    if (albuminfo.userType() == qMetaTypeId<QJSValue>()) {
-//        albuminfo = qvariant_cast<QJSValue>(albuminfo).toVariant();
-//    }
-////    addArtistAlbumToPlaylist(albuminfo);
-//    playTrackByNumber(0);
-//    setRandom(false);
-//    setRepeat(false);
-//}
-
 void NetworkAccess::playArtistAlbum(QString artist, QString album)
 {
     clearPlaylist();