diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2013-12-05 09:44:46 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2013-12-05 09:44:46 +0000 |
| commit | 3e5e3d0c737d9ae2e3824a4e6ce43b518355638f (patch) | |
| tree | de8c7465f13353e95c37799d8dcfeedf45f7a304 | |
| parent | 42e9ea5256429a000d6bb269af61a99fa2821530 (diff) | |
| download | qmmp-3e5e3d0c737d9ae2e3824a4e6ce43b518355638f.tar.gz qmmp-3e5e3d0c737d9ae2e3824a4e6ce43b518355638f.tar.bz2 qmmp-3e5e3d0c737d9ae2e3824a4e6ce43b518355638f.zip | |
added m3u8 extension, fixed parsing playlists with backslashes
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3944 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp | 2 | ||||
| -rw-r--r-- | src/qmmpui/playlistparser.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp b/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp index d426fe1ff..e436eaec3 100644 --- a/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp +++ b/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp @@ -25,7 +25,7 @@ const PlayListFormatProperties M3UPlaylistFormat::properties() const { PlayListFormatProperties p; - p.filters << "*.m3u"; + p.filters << "*.m3u" << "*.m3u8"; p.shortName = "m3u"; p.contentTypes << "audio/x-mpegurl"; return p; diff --git a/src/qmmpui/playlistparser.cpp b/src/qmmpui/playlistparser.cpp index d6e79c25c..ca46ddaa9 100644 --- a/src/qmmpui/playlistparser.cpp +++ b/src/qmmpui/playlistparser.cpp @@ -124,6 +124,10 @@ QStringList PlayListParser::loadPlaylist(const QString &f_name) if (QFileInfo(list.at(i)).isRelative()) list[i].prepend(QFileInfo(f_name).canonicalPath () + "/"); +#ifdef Q_OS_WIN + list[i].replace("\\","/"); + list[i].replace("//","/"); +#endif } file.close(); return list; |
