FCL/sf/mw/qtextensions: comparison qtmobility/src/multimedia/qvideowidget.cpp

equal deleted inserted replaced

-:06b8e2af4411
+:6fbed849b4f4
 **
 ****************************************************************************/
 #include "qvideowidget_p.h"
-#include "qmediaobject.h"
+#include <qmediaobject.h>
-#include "qmediaservice.h"
+#include <qmediaservice.h>
-#include "qvideooutputcontrol.h"
+#include <qvideowindowcontrol.h>
-#include "qvideowindowcontrol.h"
+#include <qvideowidgetcontrol.h>
-#include "qvideowidgetcontrol.h"
+#include <qpaintervideosurface_p.h>
-#include "qpaintervideosurface_p.h"
+#include <qvideorenderercontrol.h>
-#include "qvideorenderercontrol.h"
+#include <qvideosurfaceformat.h>
-#include <QtMultimedia/qvideosurfaceformat.h>
 #include <qpainter.h>
 #include <qapplication.h>
 #include <qevent.h>
 #include <qdialog.h>
 using namespace Qt;
 QT_BEGIN_NAMESPACE
 QVideoWidgetControlBackend::QVideoWidgetControlBackend(
-QVideoWidgetControl *control, QWidget *widget)
+QMediaService *service, QVideoWidgetControl *control, QWidget *widget)
-: m_widgetControl(control)
+: m_service(service)
+, m_widgetControl(control)
 {
 connect(control, SIGNAL(brightnessChanged(int)), widget, SLOT(_q_brightnessChanged(int)));
 connect(control, SIGNAL(contrastChanged(int)), widget, SLOT(_q_contrastChanged(int)));
 connect(control, SIGNAL(hueChanged(int)), widget, SLOT(_q_hueChanged(int)));
 connect(control, SIGNAL(saturationChanged(int)), widget, SLOT(_q_saturationChanged(int)));
 layout->addWidget(control->videoWidget());
 widget->setLayout(layout);
 }
+void QVideoWidgetControlBackend::releaseControl()
+{
+m_service->releaseControl(m_widgetControl);
+}
 void QVideoWidgetControlBackend::setBrightness(int brightness)
 {
 m_widgetControl->setBrightness(brightness);
 }
 {
 m_widgetControl->setAspectRatioMode(mode);
 }
 QRendererVideoWidgetBackend::QRendererVideoWidgetBackend(
-QVideoRendererControl *control, QWidget *widget)
+QMediaService *service, QVideoRendererControl *control, QWidget *widget)
-: m_rendererControl(control)
+: m_service(service)
+, m_rendererControl(control)
 , m_widget(widget)
 , m_surface(new QPainterVideoSurface)
 , m_aspectRatioMode(Qt::KeepAspectRatio)
 , m_updatePaintDevice(true)
 {
 }
 QRendererVideoWidgetBackend::~QRendererVideoWidgetBackend()
 {
 delete m_surface;
+}
+void QRendererVideoWidgetBackend::releaseControl()
+{
+m_service->releaseControl(m_rendererControl);
 }
 void QRendererVideoWidgetBackend::clearSurface()
 {
 m_rendererControl->setSurface(0);
 0, 0, size.width() / m_nativeSize.width(), size.height() / m_nativeSize.height());
 m_sourceRect.moveCenter(QPointF(0.5, 0.5));
 }
 }
-QWindowVideoWidgetBackend::QWindowVideoWidgetBackend(QVideoWindowControl *control, QWidget *widget)
+QWindowVideoWidgetBackend::QWindowVideoWidgetBackend(
-: m_windowControl(control)
+QMediaService *service, QVideoWindowControl *control, QWidget *widget)
+: m_service(service)
+, m_windowControl(control)
 , m_widget(widget)
 , m_aspectRatioMode(Qt::KeepAspectRatio)
 {
 connect(control, SIGNAL(brightnessChanged(int)), m_widget, SLOT(_q_brightnessChanged(int)));
 connect(control, SIGNAL(contrastChanged(int)), m_widget, SLOT(_q_contrastChanged(int)));
 QWindowVideoWidgetBackend::~QWindowVideoWidgetBackend()
 {
 }
+void QWindowVideoWidgetBackend::releaseControl()
+{
+m_service->releaseControl(m_windowControl);
+}
 void QWindowVideoWidgetBackend::setBrightness(int brightness)
 {
 m_windowControl->setBrightness(brightness);
 }
 currentControl->setSaturation(saturation);
 currentControl->setAspectRatioMode(aspectRatioMode);
 }
 }
-void QVideoWidgetPrivate::show()
-{
-if (outputControl) {
-if (widgetBackend != 0) {
-setCurrentControl(widgetBackend);
-outputControl->setOutput(QVideoOutputControl::WidgetOutput);
-} else if (windowBackend != 0 && (q_func()->window() == 0
-|| !q_func()->window()->testAttribute(Qt::WA_DontShowOnScreen))) {
-windowBackend->showEvent();
-currentBackend = windowBackend;
-setCurrentControl(windowBackend);
-outputControl->setOutput(QVideoOutputControl::WindowOutput);
-} else if (rendererBackend != 0) {
-rendererBackend->showEvent();
-currentBackend = rendererBackend;
-setCurrentControl(rendererBackend);
-outputControl->setOutput(QVideoOutputControl::RendererOutput);
-} else {
-outputControl->setOutput(QVideoOutputControl::NoOutput);
-}
-}
-}
 void QVideoWidgetPrivate::clearService()
 {
 if (service) {
 QObject::disconnect(service, SIGNAL(destroyed()), q_func(), SLOT(_q_serviceDestroyed()));
-if (outputControl)
-outputControl->setOutput(QVideoOutputControl::NoOutput);
 if (widgetBackend) {
 QLayout *layout = q_func()->layout();
 for (QLayoutItem *item = layout->takeAt(0); item; item = layout->takeAt(0)) {
 item->widget()->setParent(0);
 delete item;
 }
 delete layout;
+widgetBackend->releaseControl();
 delete widgetBackend;
 widgetBackend = 0;
-}
+} else if (rendererBackend) {
-delete windowBackend;
-windowBackend = 0;
-if (rendererBackend) {
 rendererBackend->clearSurface();
+rendererBackend->releaseControl();
 delete rendererBackend;
 rendererBackend = 0;
+} else {
+windowBackend->releaseControl();
+delete windowBackend;
+windowBackend = 0;
 }
 currentBackend = 0;
 currentControl = 0;
-outputControl = 0;
 service = 0;
 }
 }
+bool QVideoWidgetPrivate::createWidgetBackend()
+{
+if (QMediaControl *control = service->requestControl(QVideoWidgetControl_iid)) {
+if (QVideoWidgetControl *widgetControl = qobject_cast<QVideoWidgetControl *>(control)) {
+widgetBackend = new QVideoWidgetControlBackend(service, widgetControl, q_func());
+setCurrentControl(widgetBackend);
+return true;
+}
+service->releaseControl(control);
+}
+return false;
+}
+bool QVideoWidgetPrivate::createWindowBackend()
+{
+if (QMediaControl *control = service->requestControl(QVideoWindowControl_iid)) {
+if (QVideoWindowControl *windowControl = qobject_cast<QVideoWindowControl *>(control)) {
+windowBackend = new QWindowVideoWidgetBackend(service, windowControl, q_func());
+currentBackend = windowBackend;
+setCurrentControl(windowBackend);
+return true;
+}
+service->releaseControl(control);
+}
+return false;
+}
+bool QVideoWidgetPrivate::createRendererBackend()
+{
+if (QMediaControl *control = service->requestControl(QVideoRendererControl_iid)) {
+if (QVideoRendererControl *rendererControl = qobject_cast<QVideoRendererControl *>(control)) {
+rendererBackend = new QRendererVideoWidgetBackend(service, rendererControl, q_func());
+currentBackend = rendererBackend;
+setCurrentControl(rendererBackend);
+return true;
+}
+service->releaseControl(control);
+}
+return false;
+}
 void QVideoWidgetPrivate::_q_serviceDestroyed()
 {
-if (widgetBackend) {
+if (widgetBackend)
 delete q_func()->layout();
 delete widgetBackend;
-widgetBackend = 0;
-}
 delete windowBackend;
+delete rendererBackend;
+widgetBackend = 0;
 windowBackend = 0;
-delete rendererBackend;
 rendererBackend = 0;
 currentControl = 0;
 currentBackend = 0;
-outputControl = 0;
 service = 0;
-}
-void QVideoWidgetPrivate::_q_mediaObjectDestroyed()
-{
-mediaObject = 0;
-clearService();
 }
 void QVideoWidgetPrivate::_q_brightnessChanged(int b)
 {
 if (b != brightness)
 constructor, and detached by destroying the QVideoWidget.
 \code
 player = new QMediaPlayer;
-widget = new QVideoWidget(player);
+widget = new QVideoWidget;
 widget->show();
+player->setVideoOutput(widget);
 player->setMedia(QUrl("http://example.com/movie.mp4"));
 player->play();
 \endcode
 \bold {Note}: Only a single display output can be attached to a media
 /*!
 Destroys a video widget.
 */
 QVideoWidget::~QVideoWidget()
 {
-setMediaObject(0);
+d_ptr->clearService();
 delete d_ptr;
 }
 /*!
 \property QVideoWidget::mediaObject
 QMediaObject *QVideoWidget::mediaObject() const
 {
 return d_func()->mediaObject;
 }
-void QVideoWidget::setMediaObject(QMediaObject *object)
+bool QVideoWidget::setMediaObject(QMediaObject *object)
 {
 Q_D(QVideoWidget);
 if (object == d->mediaObject)
-return;
+return true;
-if (d->mediaObject) {
-disconnect(d->mediaObject, SIGNAL(destroyed()), this, SLOT(_q_mediaObjectDestroyed()));
-d->mediaObject->unbind(this);
-}
 d->clearService();
 d->mediaObject = object;
-if (d->mediaObject) {
+if (d->mediaObject)
 d->service = d->mediaObject->service();
-connect(d->mediaObject, SIGNAL(destroyed()), this, SLOT(_q_mediaObjectDestroyed()));
-d->mediaObject->bind(this);
-}
 if (d->service) {
+if (d->createWidgetBackend()) {
+// Nothing to do here.
+} else if ((!window() || !window()->testAttribute(Qt::WA_DontShowOnScreen))
+&& d->createWindowBackend()) {
+if (isVisible())
+d->windowBackend->showEvent();
+} else if (d->createRendererBackend()) {
+if (isVisible())
+d->rendererBackend->showEvent();
+} else {
+d->service = 0;
+d->mediaObject = 0;
+return false;
+}
 connect(d->service, SIGNAL(destroyed()), SLOT(_q_serviceDestroyed()));
+} else {
-d->outputControl = qobject_cast<QVideoOutputControl *>(
+d->mediaObject = 0;
-d->service->control(QVideoOutputControl_iid));
+return false;
-QVideoWidgetControl *widgetControl = qobject_cast<QVideoWidgetControl *>(
+}
-d->service->control(QVideoWidgetControl_iid));
+return true;
-if (widgetControl != 0) {
-d->widgetBackend = new QVideoWidgetControlBackend(widgetControl, this);
-} else {
-QVideoWindowControl *windowControl = qobject_cast<QVideoWindowControl *>(
-d->service->control(QVideoWindowControl_iid));
-if (windowControl != 0)
-d->windowBackend = new QWindowVideoWidgetBackend(windowControl, this);
-QVideoRendererControl *rendererControl = qobject_cast<QVideoRendererControl *>(
-d->service->control(QVideoRendererControl_iid));
-if (rendererControl != 0)
-d->rendererBackend = new QRendererVideoWidgetBackend(rendererControl, this);
-}
-if (isVisible())
-d->show();
-}
 }
 /*!
 \property QVideoWidget::aspectRatioMode
 \brief how video is scaled with respect to its aspect ratio.
 {
 Q_D(QVideoWidget);
 QWidget::showEvent(event);
-d->show();
+// The window backend won't work for re-directed windows so use the renderer backend instead.
+if (d->windowBackend && window()->testAttribute(Qt::WA_DontShowOnScreen)) {
+d->windowBackend->releaseControl();
+delete d->windowBackend;
+d->windowBackend = 0;
+d->createRendererBackend();
+}
+if (d->currentBackend)
+d->currentBackend->showEvent();
 }
 /*!
 Handles the hide \a event.

changeset 14	6fbed849b4f4
parent 11	06b8e2af4411