Improve the playlist parser

The main goals of this change is to make the parser more
lightweight, e.g., by removing unneeded QObject allocations,
and make it possible to stop the parsing more quickly. In
addition, support for the same resources as the media player was added,
that is, support for QMediaContent, QMediaResource, and QIODevice.
The combination of these changes should make it easier and faster to use
the parser internally.

Change-Id: I1f25d6529fa9bab0c6c3c9d9de35b7f8b4a708e0
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>

1 files changed, 0 insertions, 104 deletions

diff --git a/src/multimedia/playback/playlistfileparser_p.h b/src/multimedia/playback/playlistfileparser_p.h
deleted file mode 100644
index bdf95fe7a..000000000
--- a/src/multimedia/playback/playlistfileparser_p.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef PLAYLISTFILEPARSER_P_H
-#define PLAYLISTFILEPARSER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qtmultimediaglobal.h"
-#include <QtNetwork/QNetworkRequest>
-
-QT_BEGIN_NAMESPACE
-
-class QPlaylistFileParserPrivate;
-
-class Q_MULTIMEDIA_EXPORT QPlaylistFileParser : public QObject
-{
-    Q_OBJECT
-public:
-    QPlaylistFileParser(QObject *parent = 0);
-
-    enum FileType
-    {
-        UNKNOWN,
-        M3U,
-        M3U8, // UTF-8 version of M3U
-        PLS
-    };
-
-    enum ParserError
-    {
-        NoError,
-        FormatError,
-        FormatNotSupportedError,
-        NetworkError
-    };
-
-    static FileType findPlaylistType(const QString& uri, const QString& mime, const void *data, quint32 size);
-
-    void start(const QNetworkRequest &request, bool utf8 = false);
-    void stop();
-
-Q_SIGNALS:
-    void newItem(const QVariant& content);
-    void finished();
-    void error(QPlaylistFileParser::ParserError err, const QString& errorMsg);
-
-private:
-    Q_DISABLE_COPY(QPlaylistFileParser)
-    Q_DECLARE_PRIVATE(QPlaylistFileParser)
-    Q_PRIVATE_SLOT(d_func(), void _q_handleData())
-    Q_PRIVATE_SLOT(d_func(), void _q_handleError())
-    Q_PRIVATE_SLOT(d_func(), void _q_handleParserError(QPlaylistFileParser::ParserError err, const QString& errorMsg))
-    Q_PRIVATE_SLOT(d_func(), void _q_handleParserFinished())
-};
-
-QT_END_NAMESPACE
-
-#endif // PLAYLISTFILEPARSER_P_H