Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Three fixes from Shane after QtMultimedia was split into two dlls.
  Fix compile errors in Direct Show media service.
  Add EXPORT defines for QtMediaServices library.
  Fixed configure check for gstreamer.
  WebKit; build with change to mediaservices.
  QtMediaservices -> QtMediaServices.
  configure; Fixes for changes to use mediaservices.
  Fixed compile errors in pulseaudio backend for soundeffect
  Rebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2d
  Fixed compile errors with gstreamer plugin
  Create Mediaservices lib, separate from Multimedia.
  Gstreamer media backend: seek to media start on end of stream.

1 files changed, 91 insertions, 0 deletions

diff --git a/src/multimedia/mediaservices/base/qvideooutputcontrol.h b/src/multimedia/mediaservices/base/qvideooutputcontrol.h
new file mode 100644
index 0000000..f87bb3c
--- /dev/null
+++ b/src/multimedia/mediaservices/base/qvideooutputcontrol.h
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtMediaServices module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QVIDEOOUTPUTCONTROL_H
+#define QVIDEOOUTPUTCONTROL_H
+
+#include <QtMediaServices/qmediacontrol.h>
+
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Multimedia)
+
+
+class Q_MEDIASERVICES_EXPORT QVideoOutputControl : public QMediaControl
+{
+    Q_OBJECT
+
+public:
+    enum Output
+    {
+        NoOutput,
+        WindowOutput,
+        RendererOutput,
+        WidgetOutput,
+        UserOutput = 100,
+        MaxUserOutput = 1000
+    };
+
+    ~QVideoOutputControl();
+
+    virtual QList<Output> availableOutputs() const = 0;
+
+    virtual Output output() const = 0;
+    virtual void setOutput(Output output) = 0;
+
+Q_SIGNALS:
+    void availableOutputsChanged(const QList<QVideoOutputControl::Output> &outputs);
+
+protected:
+    QVideoOutputControl(QObject *parent = 0);
+};
+
+#define QVideoOutputControl_iid "com.nokia.Qt.QVideoOutputControl/1.0"
+Q_MEDIA_DECLARE_CONTROL(QVideoOutputControl, QVideoOutputControl_iid)
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif