slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add support for m3u8 playlist formats

Browse Source 
m3u8 is just a unicode version of m3u so we can already handle these
without any extra coding other than adding it as a format

Change-Id: Icec0f1844bd2b0a0ea3c39b98f7b06cc402a3309
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
This commit is contained in:
Andy Shaw
2013-03-22 15:14:17 +01:00
committed by The Qt Project
parent d64a68f5c8
commit b7b9c1c1f6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/m3u/qm3uhandler.cpp
View File

@@ -190,7 +190,7 @@ QM3uPlaylistPlugin::~QM3uPlaylistPlugin()
bool QM3uPlaylistPlugin::canRead(QIODevice *device, const QByteArray &format) const bool QM3uPlaylistPlugin::canRead(QIODevice *device, const QByteArray &format) const
{ {
return device->isReadable() && (format == "m3u" || format.isEmpty()); return device->isReadable() && (format == "m3u" || format == "m3u8" || format.isEmpty());
} }
bool QM3uPlaylistPlugin::canRead(const QUrl& location, const QByteArray &format) const bool QM3uPlaylistPlugin::canRead(const QUrl& location, const QByteArray &format) const
@@ -198,18 +198,18 @@ bool QM3uPlaylistPlugin::canRead(const QUrl& location, const QByteArray &format)
if (!QFileInfo(location.toLocalFile()).isReadable()) if (!QFileInfo(location.toLocalFile()).isReadable())
return false; return false;
if (format == "m3u") if (format == "m3u" || format == "m3u8")
return true; return true;
if (!format.isEmpty()) if (!format.isEmpty())
return false; return false;
else QString localFile = location.toLocalFile().toLower();
return location.toLocalFile().toLower().endsWith(QLatin1String("m3u")); return localFile.endsWith(QLatin1String("m3u")) || localFile.endsWith(QLatin1String("m3u8"));
} }
bool QM3uPlaylistPlugin::canWrite(QIODevice *device, const QByteArray &format) const bool QM3uPlaylistPlugin::canWrite(QIODevice *device, const QByteArray &format) const
{ {
return device->isOpen() && device->isWritable() && format == "m3u"; return device->isOpen() && device->isWritable() && (format == "m3u" || format == "m3u8");
} }
QMediaPlaylistReader *QM3uPlaylistPlugin::createReader(QIODevice *device, const QByteArray &format) QMediaPlaylistReader *QM3uPlaylistPlugin::createReader(QIODevice *device, const QByteArray &format)