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

Remove some unsued functions, etc.

Browse Source
This commit is contained in:
Craig Drummond
2015-12-23 22:55:18 +00:00
committed by Craig Drummond
parent 8c48be1569
commit ad731cf0fd
5 changed files with 0 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
models/musiclibraryitemalbum.cpp
View File

@@ -28,19 +28,12 @@
#include "musiclibraryitemartist.h"
#include "musiclibraryitemalbum.h"
#include "musiclibraryitemsong.h"
#include "gui/covers.h"
#include "widgets/icons.h"
#ifdef ENABLE_DEVICES_SUPPORT
#include "devices/device.h"
#include "support/utils.h"
#endif
#include <QPixmap>
#include <QApplication>
#include <QFontMetrics>
#ifdef ENABLE_UBUNTU
static const QString constDefaultCover=QLatin1String("qrc:/album.svg");
#endif
static bool dateSort=false;
void MusicLibraryItemAlbum::setSortByDate(bool sd)
@@ -58,10 +51,6 @@ bool MusicLibraryItemAlbum::lessThan(const MusicLibraryItem *a, const MusicLibra
const MusicLibraryItemAlbum *aa=static_cast<const MusicLibraryItemAlbum *>(a);
const MusicLibraryItemAlbum *ab=static_cast<const MusicLibraryItemAlbum *>(b);
if (aa->isSingleTracks() != ab->isSingleTracks()) {
return aa->isSingleTracks() > ab->isSingleTracks();
}
if (!MusicLibraryItemAlbum::sortByDate() || aa->year()==ab->year()) {
int compare=aa->sortString().localeAwareCompare(ab->sortString());
return compare==0 ? aa->id().compare(ab->id())<0 : compare<0;
@@ -80,10 +69,6 @@ MusicLibraryItemAlbum::MusicLibraryItemAlbum(const QString &data, const QString
, m_numTracks(0)
, m_originalName(original!=data ? original : QString())
, m_id(mbId)
#ifdef ENABLE_UBUNTU
, m_coverRequested(false)
#endif
, m_type(Song::Standard)
{
if (!sort.isEmpty()) {
m_sortString=sort;
@@ -101,19 +86,6 @@ QString MusicLibraryItemAlbum::displayData(bool full) const
return dateSort || full ? Song::displayAlbum(m_itemData, m_year) : m_itemData;
}
#ifdef ENABLE_UBUNTU
const QString & MusicLibraryItemAlbum::cover() const
{
if (Song::SingleTracks!=m_type && m_coverName.isEmpty() && !m_coverRequested && childCount()) {
m_coverName=Covers::self()->requestImage(coverSong()).fileName;
if (!m_coverName.isEmpty()) {
m_coverRequested=false;
}
}
return m_coverName.isEmpty() ? constDefaultCover : m_coverName;
}
#endif
quint32 MusicLibraryItemAlbum::totalTime()
{
updateStats();
@@ -140,36 +112,12 @@ void MusicLibraryItemAlbum::updateStats()
}
}
void MusicLibraryItemAlbum::addTracks(MusicLibraryItemAlbum *other)
{
m_type=Song::SingleTracks;
foreach (MusicLibraryItem *track, other->m_childItems) {
static_cast<MusicLibraryItemSong*>(track)->song().type=Song::SingleTracks;
m_singleTrackFiles.insert(static_cast<MusicLibraryItemSong*>(track)->song().file);
track->setParent(this);
}
}
void MusicLibraryItemAlbum::setIsSingleTracks()
{
foreach (MusicLibraryItem *track, m_childItems) {
static_cast<MusicLibraryItemSong*>(track)->song().type=Song::SingleTracks;
m_singleTrackFiles.insert(static_cast<MusicLibraryItemSong*>(track)->song().file);
}
m_type=Song::SingleTracks;
}
void MusicLibraryItemAlbum::append(MusicLibraryItem *i)
{
MusicLibraryItemSong *song=static_cast<MusicLibraryItemSong *>(i);
setYear(song);
MusicLibraryItemContainer::append(i);
if (Song::SingleTracks==m_type) {
song->song().type=Song::SingleTracks;
m_singleTrackFiles.insert(song->song().file);
}
m_totalTime=0;
m_artists.clear();
}
void MusicLibraryItemAlbum::remove(int row)
@@ -184,7 +132,6 @@ void MusicLibraryItemAlbum::remove(int row)
}
delete i;
m_totalTime=0;
m_artists.clear();
resetRows();
}
@@ -206,7 +153,6 @@ void MusicLibraryItemAlbum::removeAll(const QSet<QString> &fileNames)
fn.remove(song->file());
delete m_childItems.takeAt(i);
m_totalTime=0;
m_artists.clear();
} else {
++i;
}
@@ -230,17 +176,6 @@ QMap<QString, Song> MusicLibraryItemAlbum::getSongs(const QSet<QString> &fileNam
return map;
}
const MusicLibraryItemSong * MusicLibraryItemAlbum::getCueFile() const
{
foreach (const MusicLibraryItem *s, m_childItems) {
if (static_cast<const MusicLibraryItemSong *>(s)->song().isCueFile()) {
return static_cast<const MusicLibraryItemSong *>(s);
}
}
return 0;
}
bool MusicLibraryItemAlbum::updateYear()
{
quint32 currentYear=m_year;
@@ -259,17 +194,6 @@ bool MusicLibraryItemAlbum::updateYear()
return true;
}
bool MusicLibraryItemAlbum::containsArtist(const QString &a)
{
if (m_artists.isEmpty()) {
foreach (MusicLibraryItem *itm, m_childItems) {
m_artists.insert(static_cast<MusicLibraryItemSong *>(itm)->song().basicArtist());
}
}
return m_artists.contains(a);
}
Song MusicLibraryItemAlbum::coverSong() const
{
Song song;
@@ -282,7 +206,6 @@ Song MusicLibraryItemAlbum::coverSong() const
song.setComposer(firstSong->song().composer());
song.year=m_year;
song.file=firstSong->file();
song.type=m_type;
#if defined ENABLE_DEVICES_SUPPORT
MusicLibraryItemRoot *root=parentItem() && parentItem()->parentItem() && MusicLibraryItem::Type_Root==parentItem()->parentItem()->itemType()
? static_cast<MusicLibraryItemRoot *>(parentItem()->parentItem()) : 0;

27
models/musiclibraryitemalbum.h
View File

@@ -49,38 +49,22 @@ public:
virtual ~MusicLibraryItemAlbum();
QString displayData(bool full=false) const;
#ifdef ENABLE_UBUNTU
const QString & cover() const;
#endif
quint32 year() const { return m_year; }
quint32 totalTime();
quint32 trackCount();
void addTracks(MusicLibraryItemAlbum *other);
bool isSingleTracks() const { return Song::SingleTracks==m_type; }
void setIsSingleTracks();
bool isSingleTrackFile(const Song &s) const { return m_singleTrackFiles.contains(s.file); }
void append(MusicLibraryItem *i);
void remove(int row);
void remove(MusicLibraryItemSong *i);
void removeAll(const QSet<QString> &fileNames);
QMap<QString, Song> getSongs(const QSet<QString> &fileNames) const;
Song::Type songType() const { return m_type; }
Type itemType() const { return Type_Album; }
const MusicLibraryItemSong * getCueFile() const;
const QString & imageUrl() const { return m_imageUrl; }
void setImageUrl(const QString &u) { m_imageUrl=u; }
bool updateYear();
bool containsArtist(const QString &a);
// Return orignal album name. If we are grouping by composer, then album will appear as "Album (Artist)"
const QString & originalName() const { return m_originalName; }
const QString & id() const { return m_id; }
const QString & albumId() const { return m_id.isEmpty() ? (m_originalName.isEmpty() ? m_itemData : m_originalName) : m_id; }
const QString & sortString() const { return m_sortString.isEmpty() ? m_itemData : m_sortString; }
bool hasSort() const { return !m_sortString.isEmpty(); }
#ifdef ENABLE_UBUNTU
void setCover(const QString &c) { m_coverName="file://"+c; m_coverRequested=false; }
const QString & coverName() { return m_coverName; }
#endif
Song coverSong() const;
private:
@@ -97,17 +81,6 @@ private:
QString m_sortString;
QString m_id;
mutable Song m_coverSong;
#ifdef ENABLE_UBUNTU
mutable bool m_coverRequested;
mutable QString m_coverName;
#endif
Song::Type m_type;
QSet<QString> m_singleTrackFiles;
QString m_imageUrl;
// m_artists is used to cache the list of artists in a various artists album
// this is built when containsArtist() is called, and is mainly used by the
// context view
QSet<QString> m_artists;
};
#endif

66
models/musiclibraryitemartist.cpp
View File

@@ -30,7 +30,6 @@
#include "musiclibraryitemsong.h"
#include "mpd-interface/mpdparseutils.h"
#include "support/localize.h"
#include "gui/covers.h"
#include "widgets/icons.h"
#ifdef ENABLE_DEVICES_SUPPORT
#include "devices/device.h"
@@ -48,18 +47,10 @@ bool MusicLibraryItemArtist::lessThan(const MusicLibraryItem *a, const MusicLibr
return aa->sortString().localeAwareCompare(ab->sortString())<0;
}
#ifdef ENABLE_UBUNTU
static const QString constDefaultCover=QLatin1String("qrc:/artist.svg");
static const QString constDefaultVariousCover=QLatin1String("qrc:/variousartists.svg");
#endif
static const QLatin1String constThe("The ");
MusicLibraryItemArtist::MusicLibraryItemArtist(const QString &data, const QString &artistName, const QString &artistSort, MusicLibraryItemContainer *parent)
: MusicLibraryItemContainer(data, parent)
#ifdef ENABLE_UBUNTU
, m_coverRequested(false)
#endif
, m_various(false)
, m_haveSort(false)
, m_actualArtist(artistName==data ? QString() : artistName)
@@ -76,33 +67,6 @@ MusicLibraryItemArtist::MusicLibraryItemArtist(const QString &data, const QStrin
}
}
#ifdef ENABLE_UBUNTU
const QString & MusicLibraryItemArtist::cover() const
{
if (m_various) {
return constDefaultVariousCover;
}
if (m_coverName.isEmpty() && !m_coverRequested && childCount()) {
m_coverRequested=true;
m_coverName=Covers::self()->requestImage(coverSong()).fileName;
if (!m_coverName.isEmpty()) {
m_coverRequested=false;
}
}
return m_coverName.isEmpty() ? constDefaultCover : m_coverName;
}
void MusicLibraryItemArtist::setCover(const QString &c)
{
if (!c.isEmpty()) {
m_coverName="file://"+c;
}
m_coverRequested=false;
}
#endif
MusicLibraryItemAlbum * MusicLibraryItemArtist::album(const Song &s, bool create)
{
MusicLibraryItemAlbum *albumItem=getAlbum(s.albumId());
@@ -121,36 +85,6 @@ MusicLibraryItemAlbum * MusicLibraryItemArtist::createAlbum(const Song &s)
return item;
}
bool MusicLibraryItemArtist::allSingleTrack() const
{
foreach (MusicLibraryItem *a, m_childItems) {
if (a->childCount()>1) {
return false;
}
}
return true;
}
void MusicLibraryItemArtist::addToSingleTracks(MusicLibraryItemArtist *other)
{
Song s;
s.album=i18n("Single Tracks");
MusicLibraryItemAlbum *single=album(s);
foreach (MusicLibraryItem *album, other->childItems()) {
single->addTracks(static_cast<MusicLibraryItemAlbum *>(album));
}
}
bool MusicLibraryItemArtist::isFromSingleTracks(const Song &s) const
{
if (Song::SingleTracks==s.type) {
return true;
}
MusicLibraryItemAlbum *st=getAlbum(i18n("Single Tracks"));
return st && st->isSingleTrackFile(s);
}
void MusicLibraryItemArtist::remove(MusicLibraryItemAlbum *album)
{
int index=m_childItems.indexOf(album);

15
models/musiclibraryitemartist.h
View File

@@ -33,7 +33,6 @@
#include "musiclibraryitem.h"
#include "mpd-interface/song.h"
class QPixmap;
class MusicLibraryItemRoot;
class MusicLibraryItemAlbum;
@@ -50,31 +49,17 @@ public:
const QString & sortString() const { return m_sortString.isEmpty() ? m_itemData : m_sortString; }
bool hasSort() const { return m_haveSort && !m_sortString.isEmpty(); }
bool isVarious() const { return m_various; }
bool allSingleTrack() const;
void addToSingleTracks(MusicLibraryItemArtist *other);
bool isFromSingleTracks(const Song &s) const;
bool isComposer() const { return !m_actualArtist.isEmpty() && Song::isComposerGenre(coverSong().genre); }
void remove(MusicLibraryItemAlbum *album);
Type itemType() const { return Type_Artist; }
#ifdef ENABLE_UBUNTU
const QString & cover() const;
#endif
// 'data' could be 'Composer' if we are set to use that, but need to save real artist...
const QString & actualArtist() const { return m_actualArtist; }
#ifdef ENABLE_UBUNTU
void setCover(const QString &c);
const QString & coverName() { return m_coverName; }
#endif
Song coverSong() const;
private:
MusicLibraryItemAlbum * getAlbum(const QString &key) const;
private:
#ifdef ENABLE_UBUNTU
mutable QString m_coverName;
mutable bool m_coverRequested;
#endif
bool m_various;
bool m_haveSort;
QString m_sortString; // Do we have an actual artist-sort, or is m_sortString just "Artist, The" ??? - needed for cache saving

3
models/musiclibrarymodel.cpp
View File

@@ -198,9 +198,6 @@ QVariant MusicLibraryModel::data(const QModelIndex &index, int role) const
if (MusicLibraryItem::Type_Root==song->parentItem()->itemType()) {
return song->song().trackAndTitleStr();
}
if (static_cast<MusicLibraryItemAlbum *>(song->parentItem())->isSingleTracks()) {
return song->song().artistSong();
}
return song->song().trackAndTitleStr();
}
return item->displayData();