iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Try to detect DLNA streams (e.g. when using upmpdcli), and show as regular albums in grouped view.

Browse Source
This commit is contained in:
Craig Drummond
2016-01-27 20:06:11 +00:00
committed by Craig Drummond
parent 9d21ec6761
commit f190ec8eb4
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -1,6 +1,8 @@
2.1.0
-----
1. Re-add all album sorts from Cantata 1.x
2. Try to detect DLNA streams (e.g. when using upmpdcli), and show as regular
albums in grouped view.
2.0.0
-----

3
mpd-interface/song.h
View File

@@ -197,7 +197,8 @@ struct Song
static QString capitalize(const QString &s);
bool capitalise();
bool isStream() const { return Stream==type || CantataStream==type; }
bool isStandardStream() const { return Stream==type; }
bool isStandardStream() const { return Stream==type && !isDlnaStream(); }
bool isDlnaStream() const { return Stream==type && !albumArtist().isEmpty() && !album.isEmpty() && track>0; }
bool isNonMPD() const { return isStream() || OnlineSvrTrack==type || Cdda==type || (!file.isEmpty() && file.startsWith(Utils::constDirSep)); }
bool isCantataStream() const { return CantataStream==type; }
bool isCdda() const { return Cdda==type; }

2
widgets/nowplayingwidget.cpp
View File

@@ -317,7 +317,7 @@ void NowPlayingWidget::update(const Song &song)
if (song.isEmpty()) {
track->setText(" ");
artist->setText(" ");
} else if (song.isStream() && !song.isCantataStream() && !song.isCdda()) {
} else if (song.isStream() && !song.isCantataStream() && !song.isCdda() && !song.isDlnaStream()) {
track->setText(name.isEmpty() ? Song::unknown() : name);
if (song.artist.isEmpty() && song.title.isEmpty() && !name.isEmpty()) {
artist->setText(i18n("(Stream)"));