Remove unimplemented BG playback feature.
Prototype that wasn't implemented should be removed for 5.0. Change-Id: I3b90658ad8dc0b64003a5bb741fc3c93c7d87dff Reviewed-by: Ling Hu <ling.hu@nokia.com>
This commit is contained in:
Michael Goddard
committed by
Qt by Nokia
Qt by Nokia
parent
34f2494df1
commit
cb39035162
@@ -16,7 +16,6 @@ PUBLIC_HEADERS += \
|
||||
controls/qcameralockscontrol.h \
|
||||
controls/qcameraviewfinderresolutioncontrol.h \
|
||||
controls/qimageencodercontrol.h \
|
||||
controls/qmediabackgroundplaybackcontrol.h \
|
||||
controls/qmediacontainercontrol.h \
|
||||
controls/qmediagaplessplaybackcontrol.h \
|
||||
controls/qmedianetworkaccesscontrol.h \
|
||||
@@ -54,7 +53,6 @@ SOURCES += \
|
||||
controls/qcameralockscontrol.cpp \
|
||||
controls/qcameraviewfinderresolutioncontrol.cpp \
|
||||
controls/qimageencodercontrol.cpp \
|
||||
controls/qmediabackgroundplaybackcontrol.cpp \
|
||||
controls/qmediacontainercontrol.cpp \
|
||||
controls/qmediagaplessplaybackcontrol.cpp \
|
||||
controls/qmedianetworkaccesscontrol.cpp \
|
||||
|
||||
@@ -1,143 +0,0 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/
|
||||
**
|
||||
** This file is part of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** GNU Lesser General Public License Usage
|
||||
** This file may be used under the terms of the GNU Lesser General Public
|
||||
** License version 2.1 as published by the Free Software Foundation and
|
||||
** appearing in the file LICENSE.LGPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU Lesser
|
||||
** General Public License version 2.1 requirements will be met:
|
||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Nokia gives you certain additional
|
||||
** rights. These rights are described in the Nokia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU General
|
||||
** Public License version 3.0 as published by the Free Software Foundation
|
||||
** and appearing in the file LICENSE.GPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU General
|
||||
** Public License version 3.0 requirements will be met:
|
||||
** http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
** Other Usage
|
||||
** Alternatively, this file may be used in accordance with the terms and
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "qmediabackgroundplaybackcontrol.h"
|
||||
#include "qmediacontrol_p.h"
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
|
||||
/*!
|
||||
\class QMediaBackgroundPlaybackControl
|
||||
\inmodule QtMultimedia
|
||||
|
||||
\ingroup multimedia
|
||||
\ingroup multimedia_control
|
||||
|
||||
\brief The QMediaBackgroundPlaybackControl class provides access to the background playback
|
||||
related control of a QMediaService.
|
||||
|
||||
If a QMediaService can play media in background, it should implement QMediaBackgroundPlaybackControl.
|
||||
This control provides a means to set the \l {setContextId()}{contextId} for application,
|
||||
\l {acquire()}{acquire the resource for playback} and \l {release()} {release the playback resource}.
|
||||
|
||||
The interface name of QMediaBackgroundPlaybackControl is \c com.nokia.Qt.QMediaBackgroundPlaybackControl/1.0 as
|
||||
defined in QMediaBackgroundPlaybackControl_iid.
|
||||
|
||||
\sa QMediaService::requestControl(), QMediaPlayer
|
||||
*/
|
||||
|
||||
/*!
|
||||
\macro QMediaBackgroundPlaybackControl_iid
|
||||
|
||||
\c com.nokia.Qt.QMediaBackgroundPlaybackControl/1.0
|
||||
|
||||
Defines the interface name of the QMediaBackgroundPlaybackControl class.
|
||||
|
||||
\relates QMediaBackgroundPlaybackControl
|
||||
*/
|
||||
|
||||
/*!
|
||||
Destroys a media background playback control.
|
||||
*/
|
||||
QMediaBackgroundPlaybackControl::~QMediaBackgroundPlaybackControl()
|
||||
{
|
||||
}
|
||||
|
||||
/*!
|
||||
Constructs a new media background playback control with the given \a parent.
|
||||
*/
|
||||
QMediaBackgroundPlaybackControl::QMediaBackgroundPlaybackControl(QObject *parent):
|
||||
QMediaControl(*new QMediaControlPrivate, parent)
|
||||
{
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QMediaBackgroundPlaybackControl::setContextId(const QString& contextId)
|
||||
|
||||
Sets the contextId for the application, the last contextId will be released if previously set.
|
||||
\l {acquire()}{acquire method} will be automatically invoked after setting a new contextId.
|
||||
|
||||
contextId is an unique string set by the application and is used by the background daemon to
|
||||
distinguish and manage different context for different application.
|
||||
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QMediaBackgroundPlaybackControl::acquire()
|
||||
|
||||
Try to acquire the playback resource for current application
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QMediaBackgroundPlaybackControl::release()
|
||||
|
||||
Give up the playback resource if current applicaiton holds it.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\property QMediaBackgroundPlaybackControl::isAcquired()
|
||||
\brief indicate whether the background playback resource is granted or not
|
||||
|
||||
It may take sometime for the backend to actually update this value before the first use.
|
||||
|
||||
By default this property is false
|
||||
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QMediaBackgroundPlaybackControl::acquired()
|
||||
|
||||
Signals that the playback resource is acquired
|
||||
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QMediaBackgroundPlaybackControl::lost()
|
||||
|
||||
Signals that the playback resource is lost
|
||||
|
||||
*/
|
||||
|
||||
#include "moc_qmediabackgroundplaybackcontrol.cpp"
|
||||
QT_END_NAMESPACE
|
||||
|
||||
|
||||
@@ -1,83 +0,0 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/
|
||||
**
|
||||
** This file is part of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** GNU Lesser General Public License Usage
|
||||
** This file may be used under the terms of the GNU Lesser General Public
|
||||
** License version 2.1 as published by the Free Software Foundation and
|
||||
** appearing in the file LICENSE.LGPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU Lesser
|
||||
** General Public License version 2.1 requirements will be met:
|
||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Nokia gives you certain additional
|
||||
** rights. These rights are described in the Nokia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU General
|
||||
** Public License version 3.0 as published by the Free Software Foundation
|
||||
** and appearing in the file LICENSE.GPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU General
|
||||
** Public License version 3.0 requirements will be met:
|
||||
** http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
** Other Usage
|
||||
** Alternatively, this file may be used in accordance with the terms and
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef QMEDIABACKGROUNDPLAYBACKCONTROL_H
|
||||
#define QMEDIABACKGROUNDPLAYBACKCONTROL_H
|
||||
|
||||
#include "qmediacontrol.h"
|
||||
|
||||
QT_BEGIN_HEADER
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
QT_MODULE(Multimedia)
|
||||
|
||||
|
||||
class Q_MULTIMEDIA_EXPORT QMediaBackgroundPlaybackControl : public QMediaControl
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
virtual ~QMediaBackgroundPlaybackControl();
|
||||
|
||||
virtual void setContextId(const QString& contextId) = 0;
|
||||
virtual void acquire() = 0;
|
||||
virtual void release() = 0;
|
||||
|
||||
virtual bool isAcquired() const = 0;
|
||||
|
||||
Q_SIGNALS:
|
||||
void acquired();
|
||||
void lost();
|
||||
|
||||
protected:
|
||||
QMediaBackgroundPlaybackControl(QObject* parent = 0);
|
||||
};
|
||||
|
||||
#define QMediaBackgroundPlaybackControl_iid "com.nokia.Qt.QMediaBackgroundPlaybackControl/1.0"
|
||||
Q_MEDIA_DECLARE_CONTROL(QMediaBackgroundPlaybackControl, QMediaBackgroundPlaybackControl_iid)
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
QT_END_HEADER
|
||||
|
||||
|
||||
#endif // QMEDIABACKGROUNDPLAYBACKCONTROL_H
|
||||
Reference in New Issue
Block a user