From a0f19e5923f580f1a09070d0c6e4d6b4eb3b47be Mon Sep 17 00:00:00 2001 From: John Maguire Date: Sun, 23 May 2010 17:04:55 +0000 Subject: [PATCH] Remove unnecessary checks. --- src/playlistparsers/m3uparser.cpp | 6 +----- src/playlistparsers/xspfparser.cpp | 7 +------ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/playlistparsers/m3uparser.cpp b/src/playlistparsers/m3uparser.cpp index 232d1c9f8..df85e593d 100644 --- a/src/playlistparsers/m3uparser.cpp +++ b/src/playlistparsers/m3uparser.cpp @@ -102,11 +102,7 @@ void M3UParser::Save(const SongList &songs, QIODevice *device, const QDir &dir) } QString meta = QString("#EXTINF:%1,%2 - %3\n").arg(song.length()).arg(song.artist()).arg(song.title()); device->write(meta.toLatin1()); - if (song.filetype() == Song::Type_Stream) { - device->write(song.filename().toLatin1()); - } else { - device->write(MakeRelativeTo(song.filename(), dir).toLatin1()); - } + device->write(MakeRelativeTo(song.filename(), dir).toLatin1()); device->write("\n"); } } diff --git a/src/playlistparsers/xspfparser.cpp b/src/playlistparsers/xspfparser.cpp index b9492b17f..7f98915dd 100644 --- a/src/playlistparsers/xspfparser.cpp +++ b/src/playlistparsers/xspfparser.cpp @@ -145,12 +145,7 @@ void XSPFParser::Save(const SongList &songs, QIODevice *device, const QDir &dir) QDomElement track_list = doc.createElement("trackList"); root.appendChild(track_list); foreach (const Song& song, songs) { - QString url; - if (song.filetype() == Song::Type_Stream) { - url = song.filename(); - } else { - url = QUrl::fromLocalFile(MakeRelativeTo(song.filename(), dir)).toString(); - } + QString url = MakeRelativeTo(song.filename(), dir); if (url.isEmpty()) { continue; // Skip empty items like Last.fm streams. }