diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-19 17:14:43 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-19 17:15:56 +0100 |
commit | d396262bc9771cacbc71e79215768984fa1974ff (patch) | |
tree | e029399524feabed6ebe0ee1e010af9f5e58932d /src/multimedia/doc | |
parent | 0ce2cb3ebe6289e3db14438560fa186d9e5186b8 (diff) | |
parent | 2db2cde0d8433ad1aed59412717c4cddf496ba66 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/multimedia/doc/qtmultimedia.qdocconf
src/plugins/blackberry/mediaplayer/bbmetadata.cpp
src/plugins/blackberry/mediaplayer/bbmetadata.h
tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
Change-Id: I447c297ea15a94d1d2feb0fb5f9edac8c5d4505a
Diffstat (limited to 'src/multimedia/doc')
22 files changed, 60 insertions, 51 deletions
diff --git a/src/multimedia/doc/qtmultimedia.qdocconf b/src/multimedia/doc/qtmultimedia.qdocconf index 0d5e6b102..e501deb23 100644 --- a/src/multimedia/doc/qtmultimedia.qdocconf +++ b/src/multimedia/doc/qtmultimedia.qdocconf @@ -2,8 +2,8 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = qtmultimedia description = Qt Multimedia Documentation -url = http://qt-project.org/doc/qtmultimedia -version = 5.1.0 +url = http://qt-project.org/doc/qt-$QT_VER/qtmultimedia +version = $QT_VERSION # The following parameters are for creating a qhp file, the qhelpgenerator # program can convert the qhp file into a qch file which can be opened in @@ -14,7 +14,7 @@ version = 5.1.0 # format. qhp.projects = qtmultimedia qhp.qtmultimedia.file = qtmultimedia.qhp -qhp.qtmultimedia.namespace = org.qt-project.qtmultimedia.510 +qhp.qtmultimedia.namespace = org.qt-project.qtmultimedia.$QT_VERSION_TAG qhp.qtmultimedia.indexTitle = Qt Multimedia qhp.qtmultimedia.virtualFolder = qtmultimedia @@ -26,7 +26,7 @@ qhp.qtmultimedia.subprojects.classes.selectors = class fake:headerfile qhp.qtmultimedia.subprojects.classes.sortPages = true qhp.qtmultimedia.subprojects.qmltypes.title = QML Types qhp.qtmultimedia.subprojects.qmltypes.indexTitle = Qt Multimedia QML Types -qhp.qtmultimedia.subprojects.qmltypes.selectors = class fake:headerfile +qhp.qtmultimedia.subprojects.qmltypes.selectors = fake:qmlclass qhp.qtmultimedia.subprojects.qmltypes.sortPages = true exampledirs += ../../../examples \ diff --git a/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp b/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp index a39f1c7f4..f5901f1aa 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp +++ b/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Mobility Components. @@ -58,12 +58,12 @@ public: public Q_SLOTS: void stopRecording(); - void stateChanged(QAudio::State newState); + void handleStateChanged(QAudio::State newState); private: //! [Audio input class members] - QFile destinationFile; // class member. - QAudioInput* audio; // class member. + QFile destinationFile; // Class member + QAudioInput* audio; // Class member //! [Audio input class members] }; @@ -75,7 +75,7 @@ void AudioInputExample::setup() destinationFile.open( QIODevice::WriteOnly | QIODevice::Truncate ); QAudioFormat format; - // set up the format you want, eg. + // Set up the desired format, for example: format.setSampleRate(8000); format.setChannelCount(1); format.setSampleSize(8); @@ -85,12 +85,12 @@ void AudioInputExample::setup() QAudioDeviceInfo info = QAudioDeviceInfo::defaultInputDevice(); if (!info.isFormatSupported(format)) { - qWarning()<<"default format not supported try to use nearest"; + qWarning() << "Default format not supported, trying to use the nearest."; format = info.nearestFormat(format); } audio = new QAudioInput(format, this); - connect(audio, SIGNAL(stateChanged(QAudio::State)), this, SLOT(stateChanged(QAudio::State))); + connect(audio, SIGNAL(stateChanged(QAudio::State)), this, SLOT(handleStateChanged(QAudio::State))); QTimer::singleShot(3000, this, SLOT(stopRecording())); audio->start(&destinationFile); @@ -108,7 +108,7 @@ void AudioInputExample::stopRecording() //! [Audio input stop recording] //! [Audio input state changed] -void AudioInputExample::stateChanged(QAudio::State newState) +void AudioInputExample::handleStateChanged(QAudio::State newState) { switch (newState) { case QAudio::StoppedState: @@ -137,7 +137,7 @@ public: void setup(); public Q_SLOTS: - void stateChanged(QAudio::State newState); + void handleStateChanged(QAudio::State newState); private: //! [Audio output class members] @@ -164,18 +164,18 @@ void AudioOutputExample::setup() QAudioDeviceInfo info(QAudioDeviceInfo::defaultOutputDevice()); if (!info.isFormatSupported(format)) { - qWarning() << "raw audio format not supported by backend, cannot play audio."; + qWarning() << "Raw audio format not supported by backend, cannot play audio."; return; } audio = new QAudioOutput(format, this); - connect(audio, SIGNAL(stateChanged(QAudio::State)), this, SLOT(stateChanged(QAudio::State))); + connect(audio, SIGNAL(stateChanged(QAudio::State)), this, SLOT(handleStateChanged(QAudio::State))); audio->start(&sourceFile); } //! [Audio output setup] //! [Audio output state changed] -void AudioOutputExample::stateChanged(QAudio::State newState) +void AudioOutputExample::handleStateChanged(QAudio::State newState) { switch (newState) { case QAudio::IdleState: @@ -225,7 +225,7 @@ public: void decode(); public Q_SLOTS: - void stateChanged(QAudio::State newState); + void handleStateChanged(QAudio::State newState); void readBuffer(); }; diff --git a/src/multimedia/doc/snippets/multimedia-snippets/audiorecorder.cpp b/src/multimedia/doc/snippets/multimedia-snippets/audiorecorder.cpp index e0f136910..e000d1325 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/audiorecorder.cpp +++ b/src/multimedia/doc/snippets/multimedia-snippets/audiorecorder.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Mobility Components. diff --git a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp index 757533be8..a512e0b92 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp +++ b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Mobility Components. diff --git a/src/multimedia/doc/snippets/multimedia-snippets/media.cpp b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp index 300ad392b..b6303db00 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/media.cpp +++ b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Mobility Components. diff --git a/src/multimedia/doc/snippets/multimedia-snippets/qsound.cpp b/src/multimedia/doc/snippets/multimedia-snippets/qsound.cpp index 1f7dad79f..d4eed0876 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/qsound.cpp +++ b/src/multimedia/doc/snippets/multimedia-snippets/qsound.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/multimedia/doc/snippets/multimedia-snippets/soundeffect.qml b/src/multimedia/doc/snippets/multimedia-snippets/soundeffect.qml index 9b173a46b..6c432901e 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/soundeffect.qml +++ b/src/multimedia/doc/snippets/multimedia-snippets/soundeffect.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. diff --git a/src/multimedia/doc/snippets/multimedia-snippets/video.cpp b/src/multimedia/doc/snippets/multimedia-snippets/video.cpp index 37dca0851..8faf1aeab 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/video.cpp +++ b/src/multimedia/doc/snippets/multimedia-snippets/video.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Mobility Components. @@ -79,13 +79,19 @@ class MyVideoSurface : public QAbstractVideoSurface class MyVideoProducer : public QObject { Q_OBJECT - Q_PROPERTY(QAbstractVideoSurface *videoSurface WRITE setVideoSurface) + Q_PROPERTY(QAbstractVideoSurface *videoSurface READ videoSurface WRITE setVideoSurface) public: + QAbstractVideoSurface* videoSurface() const { return m_surface; } + void setVideoSurface(QAbstractVideoSurface *surface) { + if (m_surface != surface && m_surface && m_surface->isActive()) { + m_surface->stop(); + } m_surface = surface; - m_surface->start(m_format); + if (m_surface) + m_surface->start(m_format); } // ... diff --git a/src/multimedia/doc/src/audioengineoverview.qdoc b/src/multimedia/doc/src/audioengineoverview.qdoc index 37f53ce8e..c3bf793a5 100644 --- a/src/multimedia/doc/src/audioengineoverview.qdoc +++ b/src/multimedia/doc/src/audioengineoverview.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/multimedia/doc/src/audiooverview.qdoc b/src/multimedia/doc/src/audiooverview.qdoc index 20c5342e8..8d9ef19dc 100644 --- a/src/multimedia/doc/src/audiooverview.qdoc +++ b/src/multimedia/doc/src/audiooverview.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/multimedia/doc/src/blackberry.qdoc b/src/multimedia/doc/src/blackberry.qdoc index a751cc00e..0983aea10 100644 --- a/src/multimedia/doc/src/blackberry.qdoc +++ b/src/multimedia/doc/src/blackberry.qdoc @@ -30,7 +30,7 @@ \title BlackBerry \brief Platform notes for the BlackBerry Platform -QtMultimedia supports BlackBerry devices that run the BB10 operating system. +Qt Multimedia supports BlackBerry devices that run the BB10 operating system. This page covers the availibility of different features on BB10. \section1 Implementation @@ -41,7 +41,7 @@ and video playback is \e mmrenderer. For low-latency output of raw audio samples three-dimensional positional audio playback, \e OpenAL is supported and present on BB10. -The QtMultimedia BlackBerry backend uses mmrenderer for media playback. +The Qt Multimedia BlackBerry backend uses mmrenderer for media playback. For the positional audio classes in the \l {Positional Audio} {QtAudioEngine} QML module, OpenAL is used as on all other platforms. @@ -56,7 +56,7 @@ Since the playback is delegated to mmrenderer, the supported formats are the sam mmrenderer. As mmrenderer supports streaming from HTTP and other URLs, this is supported in QMediaPlayer as well. Playlists as sources are also supported. -mmrenderer does not allow access to the pixel data of video frames, hence QtMultimedia +mmrenderer does not allow access to the pixel data of video frames, hence Qt Multimedia classes like QVideoFrame and QAbstractVideoSurface will not work since they require access to the image data. QVideoWidget and the VideoOutput QML element are implemented with an overlay window; mmrenderer creates a seperate window displaying a video and puts that on top of the Qt application. diff --git a/src/multimedia/doc/src/cameraoverview.qdoc b/src/multimedia/doc/src/cameraoverview.qdoc index 40c82a69a..71515ab19 100644 --- a/src/multimedia/doc/src/cameraoverview.qdoc +++ b/src/multimedia/doc/src/cameraoverview.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. @@ -104,14 +104,17 @@ In QML, you can use \l Camera and \l VideoOutput together to show a simple viewfinder: \qml +import QtQuick 2.0 +import QtMultimedia 5.0 + +VideoOutput { + source: camera + Camera { id: camera // You can adjust various settings in here } - - VideoOutput { - source: camera - } +} \endqml In C++, your choice depends on whether you are using widgets, or QGraphicsView. diff --git a/src/multimedia/doc/src/changes.qdoc b/src/multimedia/doc/src/changes.qdoc index aa4069261..10e9d92b8 100644 --- a/src/multimedia/doc/src/changes.qdoc +++ b/src/multimedia/doc/src/changes.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/multimedia/doc/src/multimedia.qdoc b/src/multimedia/doc/src/multimedia.qdoc index 5afa9f6a1..6e3606044 100644 --- a/src/multimedia/doc/src/multimedia.qdoc +++ b/src/multimedia/doc/src/multimedia.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. @@ -176,14 +176,14 @@ change when porting code. \section2 QML Types The following types are accessed by using: -\qml +\code import QtMultimedia 5.0 -\endqml +\endcode \annotatedlist multimedia_qml The following types are accessed by using \l {Positional Audio} {QtAudioEngine}: -\qml +\code import QtAudioEngine 1.0 -\endqml +\endcode \annotatedlist multimedia_audioengine \section2 Multimedia Classes diff --git a/src/multimedia/doc/src/multimediabackend.qdoc b/src/multimedia/doc/src/multimediabackend.qdoc index adab2b802..68159d340 100644 --- a/src/multimedia/doc/src/multimediabackend.qdoc +++ b/src/multimedia/doc/src/multimediabackend.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/multimedia/doc/src/plugins/qml-multimedia.qdoc b/src/multimedia/doc/src/plugins/qml-multimedia.qdoc index 594c77960..e1e5f8a64 100644 --- a/src/multimedia/doc/src/plugins/qml-multimedia.qdoc +++ b/src/multimedia/doc/src/plugins/qml-multimedia.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. @@ -48,7 +48,7 @@ \section2 Audio \l Audio is an easy way to add audio playback to a Qt Quick - scene. QtMultimedia provides properties for control, methods (functions) and signals. + scene. Qt Multimedia provides properties for control, methods (functions) and signals. The code extract below shows the creation and use of an Audio instance. diff --git a/src/multimedia/doc/src/qtmultimedia-cpp.qdoc b/src/multimedia/doc/src/qtmultimedia-cpp.qdoc index 938ffc3cb..3405143e5 100644 --- a/src/multimedia/doc/src/qtmultimedia-cpp.qdoc +++ b/src/multimedia/doc/src/qtmultimedia-cpp.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. @@ -30,7 +30,7 @@ \title Qt Multimedia C++ Classes \ingroup modules - \brief The \l {Qt Multimedia}{QtMultimedia} module provides audio, video, radio and camera functionality. + \brief The \l {Qt Multimedia} module provides audio, video, radio and camera functionality. The C++ classes provide more control over the multimedia content than the QML alternatives. If your application is serving complex use cases such as decoding media files, accessing video or audio buffers, diff --git a/src/multimedia/doc/src/qtmultimedia-examples.qdoc b/src/multimedia/doc/src/qtmultimedia-examples.qdoc index 4427e16f3..257e7af7c 100644 --- a/src/multimedia/doc/src/qtmultimedia-examples.qdoc +++ b/src/multimedia/doc/src/qtmultimedia-examples.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc index e7838cfd8..60e4cfbb4 100644 --- a/src/multimedia/doc/src/qtmultimedia-index.qdoc +++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/multimedia/doc/src/qtmultimedia5.qdoc b/src/multimedia/doc/src/qtmultimedia5.qdoc index 1c11e0151..bbf9907f6 100644 --- a/src/multimedia/doc/src/qtmultimedia5.qdoc +++ b/src/multimedia/doc/src/qtmultimedia5.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/multimedia/doc/src/radiooverview.qdoc b/src/multimedia/doc/src/radiooverview.qdoc index 1d19933fb..22d2ebbde 100644 --- a/src/multimedia/doc/src/radiooverview.qdoc +++ b/src/multimedia/doc/src/radiooverview.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/src/multimedia/doc/src/videooverview.qdoc b/src/multimedia/doc/src/videooverview.qdoc index 45ea87f09..9fa55f7d7 100644 --- a/src/multimedia/doc/src/videooverview.qdoc +++ b/src/multimedia/doc/src/videooverview.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. |