Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

When loading part of a cuesheet that wasn't in the library on startup, keep the metadata that was loaded last time instead of replacing it with what is in the file's tags

This commit is contained in:
David Sansome 2011-03-06 14:45:56 +00:00
parent cce41f1372
commit 8e70124830
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/playlist/songplaylistitem.cpp
View File

@ -39,13 +39,12 @@ bool SongPlaylistItem::InitFromQuery(const SqlRow& query) {
const int row = (Song::kColumns.count() + 1) * 3;
QString filename(query.value(row + 1).toString());
QString title(query.value(row + 2).toString());
QString artist(query.value(row + 3).toString());
QString album(query.value(row + 4).toString());
qint64 length(query.value(row + 5).toLongLong());
if (type() == "Stream") {
QString title(query.value(row + 2).toString());
QString artist(query.value(row + 3).toString());
QString album(query.value(row + 4).toString());
int length(query.value(row + 5).toInt());
song_.set_filename(filename);
song_.set_filetype(Song::Type_Stream);
@ -53,9 +52,18 @@ bool SongPlaylistItem::InitFromQuery(const SqlRow& query) {
} else {
song_.InitFromFile(filename, -1);
qint64 beginning(query.value(row + 7).toInt());
qint64 beginning(query.value(row + 7).toLongLong());
QString cue_path(query.value(row + 8).toString());
// If the song was part of a cuesheet then keep the title, artist etc. that
// was loaded last time.
if (!cue_path.isEmpty()) {
song_.set_title(title);
song_.set_artist(artist);
song_.set_album(album);
song_.set_length_nanosec(length);
}
song_.set_beginning_nanosec(beginning);
song_.set_cue_path(cue_path);
}