diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2013-03-22 15:14:17 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-24 15:42:59 +0100 |
| commit | b7b9c1c1f67fe25fbadaae03cc1550a83bca5561 (patch) | |
| tree | c353d7685fe3fcd664b3fdadfac1e115578de919 | |
| parent | d64a68f5c8386e82fe9aa5e8eaf94f78124602f5 (diff) | |
Add support for m3u8 playlist formats
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>
| -rw-r--r-- | src/plugins/m3u/qm3uhandler.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/m3u/qm3uhandler.cpp b/src/plugins/m3u/qm3uhandler.cpp index 6dd3fae3d..b2e17fc49 100644 --- a/src/plugins/m3u/qm3uhandler.cpp +++ b/src/plugins/m3u/qm3uhandler.cpp @@ -190,7 +190,7 @@ QM3uPlaylistPlugin::~QM3uPlaylistPlugin() 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 @@ -198,18 +198,18 @@ bool QM3uPlaylistPlugin::canRead(const QUrl& location, const QByteArray &format) if (!QFileInfo(location.toLocalFile()).isReadable()) return false; - if (format == "m3u") + if (format == "m3u" || format == "m3u8") return true; if (!format.isEmpty()) return false; - else - return location.toLocalFile().toLower().endsWith(QLatin1String("m3u")); + QString localFile = location.toLocalFile().toLower(); + return localFile.endsWith(QLatin1String("m3u")) || localFile.endsWith(QLatin1String("m3u8")); } 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) |