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

song.id not needed - as we encode ids in path

Browse Source
This commit is contained in:
craig.p.drummond
2013-02-26 20:04:44 +00:00
parent 3269d967f7
commit 274cf50fb8
2 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
devices/mtpdevice.cpp
View File

@@ -1086,24 +1086,6 @@ void MtpDevice::rescan(bool full)
emit updateLibrary();
}
int MtpDevice::getSongId(const Song &s)
{
// Tracks are associated with Albums, but to find an existing MTP album we need to know the ID
// of one of its tracks. Tracks copied FROM the library, will have no valid ID - but if the album
// is already on the device, we can use the song id of an existing track to locate it...
foreach (MusicLibraryItem *artist, m_childItems) {
if (artist->data()==s.artist || artist->data()==s.albumartist) {
foreach (MusicLibraryItem *album, static_cast<MusicLibraryItemContainer *>(artist)->childItems()) {
if (album->data()==s.album) {
MusicLibraryItemContainer *al=static_cast<MusicLibraryItemContainer *>(album);
return currentSong.id=static_cast<MusicLibraryItemSong *>(al->childItems().at(0))->song().id;
}
}
}
}
return 0;
}
void MtpDevice::addSong(const Song &s, bool overwrite, bool copyCover)
{
Q_UNUSED(copyCover)
@@ -1132,8 +1114,6 @@ void MtpDevice::addSong(const Song &s, bool overwrite, bool copyCover)
return;
}
currentSong=s;
currentSong.id=getSongId(currentSong);
if (!opts.transcoderCodec.isEmpty()) {
encoder=Encoders::getEncoder(opts.transcoderCodec);
if (encoder.codec.isEmpty()) {

1
devices/mtpdevice.h
View File

@@ -182,7 +182,6 @@ private Q_SLOTS:
void saveProperties();
private:
int getSongId(const Song &s);
void deleteTemp();
private: