summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/audio/qsoundeffect.cpp42
-rw-r--r--src/multimedia/doc/src/audiooverview.qdoc2
-rw-r--r--src/multimedia/doc/src/blackberry.qdoc6
-rw-r--r--src/multimedia/doc/src/multimedia.qdoc4
-rw-r--r--src/multimedia/doc/src/qtaudioengine.qdoc (renamed from src/multimedia/doc/src/audioengineoverview.qdoc)60
-rw-r--r--src/multimedia/doc/src/qtmultimedia-index.qdoc31
-rw-r--r--src/multimedia/doc/src/qtmultimedia5.qdoc2
-rw-r--r--src/multimedia/multimedia.pro3
-rw-r--r--src/multimedia/playback/qmediaplaylistnavigator.cpp4
-rw-r--r--src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h4
10 files changed, 74 insertions, 84 deletions
diff --git a/src/multimedia/audio/qsoundeffect.cpp b/src/multimedia/audio/qsoundeffect.cpp
index e9f4cf2bf..437d3a4e6 100644
--- a/src/multimedia/audio/qsoundeffect.cpp
+++ b/src/multimedia/audio/qsoundeffect.cpp
@@ -89,7 +89,7 @@ QT_BEGIN_NAMESPACE
\inmodule QtMultimedia
\ingroup multimedia_qml
\ingroup multimedia_audio_qml
- \inqmlmodule QtMultimedia 5.0
+ \inqmlmodule QtMultimedia
SoundEffect is part of the \b{QtMultimedia 5.0} module.
@@ -149,7 +149,7 @@ QStringList QSoundEffect::supportedMimeTypes()
}
/*!
- \qmlproperty url QtMultimedia5::SoundEffect::source
+ \qmlproperty url QtMultimedia::SoundEffect::source
This property holds the url for the sound to play. For the SoundEffect
to attempt to load the source, the URL must exist and the application must have read permission
@@ -182,7 +182,7 @@ void QSoundEffect::setSource(const QUrl &url)
}
/*!
- \qmlproperty int QtMultimedia5::SoundEffect::loops
+ \qmlproperty int QtMultimedia::SoundEffect::loops
This property provides a way to control the number of times to repeat the sound on each play().
@@ -232,7 +232,7 @@ void QSoundEffect::setLoopCount(int loopCount)
}
/*!
- \qmlproperty int QtMultimedia5::SoundEffect::loopsRemaining
+ \qmlproperty int QtMultimedia::SoundEffect::loopsRemaining
This property contains the number of loops remaining before the sound effect
stops by itself, or SoundEffect.Infinite if that's what has been set in \l loops.
@@ -250,7 +250,7 @@ int QSoundEffect::loopsRemaining() const
/*!
- \qmlproperty qreal QtMultimedia5::SoundEffect::volume
+ \qmlproperty qreal QtMultimedia::SoundEffect::volume
This property holds the volume of the sound effect playback, from 0.0 (silent) to 1.0 (maximum volume).
*/
@@ -285,7 +285,7 @@ void QSoundEffect::setVolume(qreal volume)
}
/*!
- \qmlproperty bool QtMultimedia5::SoundEffect::muted
+ \qmlproperty bool QtMultimedia::SoundEffect::muted
This property provides a way to control muting. A value of \c true will mute this effect.
Otherwise, playback will occur with the currently specified \l volume.
@@ -323,7 +323,7 @@ void QSoundEffect::setMuted(bool muted)
Returns whether the sound effect has finished loading the \l source().
*/
/*!
- \qmlmethod bool QtMultimedia5::SoundEffect::isLoaded()
+ \qmlmethod bool QtMultimedia::SoundEffect::isLoaded()
Returns whether the sound effect has finished loading the \l source.
*/
@@ -333,7 +333,7 @@ bool QSoundEffect::isLoaded() const
}
/*!
- \qmlmethod QtMultimedia5::SoundEffect::play()
+ \qmlmethod QtMultimedia::SoundEffect::play()
Start playback of the sound effect, looping the effect for the number of
times as specified in the loops property.
@@ -354,7 +354,7 @@ void QSoundEffect::play()
}
/*!
- \qmlproperty bool QtMultimedia5::SoundEffect::playing
+ \qmlproperty bool QtMultimedia::SoundEffect::playing
This property indicates whether the sound effect is playing or not.
*/
@@ -381,7 +381,7 @@ bool QSoundEffect::isPlaying() const
*/
/*!
- \qmlproperty enumeration QtMultimedia5::SoundEffect::status
+ \qmlproperty enumeration QtMultimedia::SoundEffect::status
This property indicates the current status of the SoundEffect
as enumerated within SoundEffect.
@@ -411,7 +411,7 @@ QSoundEffect::Status QSoundEffect::status() const
}
/*!
- \qmlproperty string QtMultimedia5::SoundEffect::category
+ \qmlproperty string QtMultimedia::SoundEffect::category
This property contains the \e category of this sound effect.
@@ -474,7 +474,7 @@ void QSoundEffect::setCategory(const QString &category)
/*!
- \qmlmethod QtMultimedia5::SoundEffect::stop()
+ \qmlmethod QtMultimedia::SoundEffect::stop()
Stop current playback.
@@ -498,7 +498,7 @@ void QSoundEffect::stop()
The \c sourceChanged signal is emitted when the source has been changed.
*/
/*!
- \qmlsignal QtMultimedia5::SoundEffect::sourceChanged()
+ \qmlsignal QtMultimedia::SoundEffect::sourceChanged()
The \c sourceChanged signal is emitted when the source has been changed.
@@ -510,7 +510,7 @@ void QSoundEffect::stop()
The \c loadedChanged signal is emitted when the loading state has changed.
*/
/*!
- \qmlsignal QtMultimedia5::SoundEffect::loadedChanged()
+ \qmlsignal QtMultimedia::SoundEffect::loadedChanged()
The \c loadedChanged signal is emitted when the loading state has changed.
@@ -523,7 +523,7 @@ void QSoundEffect::stop()
The \c loopCountChanged signal is emitted when the initial number of loops has changed.
*/
/*!
- \qmlsignal QtMultimedia5::SoundEffect::loopCountChanged()
+ \qmlsignal QtMultimedia::SoundEffect::loopCountChanged()
The \c loopCountChanged signal is emitted when the initial number of loops has changed.
@@ -536,7 +536,7 @@ void QSoundEffect::stop()
The \c loopsRemainingChanged signal is emitted when the remaining number of loops has changed.
*/
/*!
- \qmlsignal QtMultimedia5::SoundEffect::loopsRemainingChanged()
+ \qmlsignal QtMultimedia::SoundEffect::loopsRemainingChanged()
The \c loopsRemainingChanged signal is emitted when the remaining number of loops has changed.
@@ -549,7 +549,7 @@ void QSoundEffect::stop()
The \c volumeChanged signal is emitted when the volume has changed.
*/
/*!
- \qmlsignal QtMultimedia5::SoundEffect::volumeChanged()
+ \qmlsignal QtMultimedia::SoundEffect::volumeChanged()
The \c volumeChanged signal is emitted when the volume has changed.
@@ -562,7 +562,7 @@ void QSoundEffect::stop()
The \c mutedChanged signal is emitted when the mute state has changed.
*/
/*!
- \qmlsignal QtMultimedia5::SoundEffect::mutedChanged()
+ \qmlsignal QtMultimedia::SoundEffect::mutedChanged()
The \c mutedChanged signal is emitted when the mute state has changed.
@@ -575,7 +575,7 @@ void QSoundEffect::stop()
The \c playingChanged signal is emitted when the playing property has changed.
*/
/*!
- \qmlsignal QtMultimedia5::SoundEffect::playingChanged()
+ \qmlsignal QtMultimedia::SoundEffect::playingChanged()
The \c playingChanged signal is emitted when the playing property has changed.
@@ -588,7 +588,7 @@ void QSoundEffect::stop()
The \c statusChanged signal is emitted when the status property has changed.
*/
/*!
- \qmlsignal QtMultimedia5::SoundEffect::statusChanged()
+ \qmlsignal QtMultimedia::SoundEffect::statusChanged()
The \c statusChanged signal is emitted when the status property has changed.
@@ -601,7 +601,7 @@ void QSoundEffect::stop()
The \c categoryChanged signal is emitted when the category property has changed.
*/
/*!
- \qmlsignal QtMultimedia5::SoundEffect::categoryChanged()
+ \qmlsignal QtMultimedia::SoundEffect::categoryChanged()
The \c categoryChanged signal is emitted when the category property has changed.
diff --git a/src/multimedia/doc/src/audiooverview.qdoc b/src/multimedia/doc/src/audiooverview.qdoc
index 8d9ef19dc..54735da6c 100644
--- a/src/multimedia/doc/src/audiooverview.qdoc
+++ b/src/multimedia/doc/src/audiooverview.qdoc
@@ -34,7 +34,7 @@
Qt Multimedia offers a range of audio classes, covering both low and
high level approaches to audio input, output and processing. In
-addition to traditional audio usage, the \l {Positional Audio}{Qt AudioEngine}
+addition to traditional audio usage, the \l{Qt Audio Engine QML Types}{Qt Audio Engine}
QML types offer high level 3D positional audio for QML applications.
See that documentation for more information.
diff --git a/src/multimedia/doc/src/blackberry.qdoc b/src/multimedia/doc/src/blackberry.qdoc
index 0983aea10..4b494cb65 100644
--- a/src/multimedia/doc/src/blackberry.qdoc
+++ b/src/multimedia/doc/src/blackberry.qdoc
@@ -43,8 +43,8 @@ on BB10.
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.
+For the positional audio classes in the \l{Qt Audio Engine QML Types}{Qt Audio Engine}
+QML module, OpenAL is used as on all other platforms.
For recording videos and taking photos, the camapi library is used.
@@ -63,7 +63,7 @@ mmrenderer creates a seperate window displaying a video and puts that on top of
As a consequence, no other widget or QML element can be put on top of the video, and QML shaders have
no effect.
-The \l {Positional Audio} {QtAudioEngine} QML module is fully supported, as it is based on OpenAL which is available
+The \l{Qt Audio Engine QML Types}{Qt Audio Engine} QML module is fully supported, as it is based on OpenAL which is available
in BB10.
The \l {camera} {QCamera} support includes recording of videos and taking photos. The viewfinder
diff --git a/src/multimedia/doc/src/multimedia.qdoc b/src/multimedia/doc/src/multimedia.qdoc
index b18236a93..adfe686fd 100644
--- a/src/multimedia/doc/src/multimedia.qdoc
+++ b/src/multimedia/doc/src/multimedia.qdoc
@@ -46,7 +46,7 @@ Here are some examples of what can be done with Qt Multimedia APIs:
\li Record audio and compress it
\li Tune and listen to radio stations
\li Use a camera, including viewfinder, image capture, and movie recording
-\li Play 3D positional audio with \l {Positional Audio} {QtAudioEngine}
+\li Play 3D positional audio with \l{Qt Audio Engine QML Types}{Qt Audio Engine}
\li Decode audio media files into memory for processing
\li Accessing video frames or audio buffers as they are played or recorded
\endlist
@@ -180,7 +180,7 @@ The QML types are accessed by using:
import QtMultimedia 5.0
\endcode
\annotatedlist multimedia_qml
-The following types are accessed by using \l {Positional Audio} {QtAudioEngine}:
+The following types are accessed by using \l{Qt Audio Engine QML Types}{Qt Audio Engine}:
\code
import QtAudioEngine 1.0
\endcode
diff --git a/src/multimedia/doc/src/audioengineoverview.qdoc b/src/multimedia/doc/src/qtaudioengine.qdoc
index c3bf793a5..b6fec8b19 100644
--- a/src/multimedia/doc/src/audioengineoverview.qdoc
+++ b/src/multimedia/doc/src/qtaudioengine.qdoc
@@ -26,54 +26,34 @@
****************************************************************************/
/*!
-\page audioengineoverview.html
-\title Positional Audio
-\brief 3D positional audio playback and content management
+\qmlmodule QtAudioEngine 1.0
+\title Qt Audio Engine QML Types
+\ingroup qmlmodules
+\brief Provides QML types for 3D positional audio playback and content management.
-\section1 QtAudioEngine Features
+Qt Audio Engine is part of the \l{Qt Multimedia} module. Qt Audio
+Engine provides types for 3D positional audio playback and content management.
-Qt Multimedia includes the \c QtAudioEngine QML module for
-providing 3D positional audio playback and content management.
-
-QtAudioEngine enables developers to organize wave files into discrete \l Sound with different
-\l {PlayVariation}{play variations}, group sound controls by \l {AudioCategory} categories and
-define \l {AttenuationModelLinear}{attenuation models} and various 3d audio settings all in one
-place. Playback of \l {SoundInstance}{sound instances} can be conveniently activated by in-app
-events and managed by QtAudioEngine or controlled by explicitly defining \l SoundInstance
-for easier QML bindings.
-
-To access these QML types import the
-\b{QtAudioEngine 1.0} module.
-
-\qml
-import QtQuick 2.0
+The QML types can be imported into your application using the following import
+statement in your .qml file:
+\code
import QtAudioEngine 1.0
+\endcode
-AudioEngine {
-//...
-}
-\endqml
+\section1 Qt Audio Engine Features
+
+Qt Audio Engine enables developers to organize wave files into discrete \l Sound
+with different \l {PlayVariation}{play variations}, group sound controls by \l
+{AudioCategory} categories and define \l {AttenuationModelLinear}{attenuation
+models} and various 3D audio settings all in one place. Playback of \l
+{SoundInstance}{sound instances} can be conveniently activated by in-app events
+and managed by QtAudioEngine or controlled by explicitly defining \l
+SoundInstance for easier QML bindings.
\section1 Examples
\list
\li \l {AudioEngine Example}{Audio Engine}
\endlist
-\section1 Reference Documentation
-
-\section2 QML Types
-
-\list
- \li \l AudioEngine
- \li \l AudioSample
- \li \l AudioCategory
- \li \l AttenuationModelLinear
- \li \l AttenuationModelInverse
- \li \l Sound
- \li \l PlayVariation
- \li \l AudioListener
- \li \l SoundInstance
-
-\endlist
-
+\section1 QML types
*/
diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc
index 4cd59fd52..140594de1 100644
--- a/src/multimedia/doc/src/qtmultimedia-index.qdoc
+++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc
@@ -33,7 +33,9 @@
Qt Multimedia is an essential module that provides a rich set of QML types
and C++ classes to handle multimedia content. It also provides necessary
- APIs to access the camera and radio functionality.
+ APIs to access the camera and radio functionality. The included
+ \l{Qt Audio Engine QML Types}{Qt Audio Engine} provides types for
+ 3D positional audio playback and management.
The \l{Qt Multimedia Widgets} module provides widget based multimedia
classes.
@@ -74,20 +76,20 @@
\li Type
\li Description
\row
- \li \l {QtMultimedia5::Audio}{Audio}
+ \li \l {QtMultimedia::Audio}{Audio}
\li Add audio playback functionality to a scene
\row
- \li \l {QtMultimedia5::Camera}{Camera}
+ \li \l {QtMultimedia::Camera}{Camera}
\li Access camera viewfinder frames
\row
\li MediaPlayer
\li Add media playback functionality to a scene. It is same as Audio type,
but can be used for video playback with the VideoOutput type.
\row
- \li \l {QtMultimedia5::Radio}{Radio}
+ \li \l {QtMultimedia::Radio}{Radio}
\li Access radio functionality
\row
- \li \l {QtMultimedia5::Video}{Video}
+ \li \l {QtMultimedia::Video}{Video}
\li Add Video playback functionality to a scene. It uses MediaPlayer and
VideoOutput types to provide video playback functionality.
\endtable
@@ -122,7 +124,6 @@
\list
\li \l Multimedia - overview of multimedia support in Qt
\li \l{Audio Overview}
- \li \l{Positional Audio}
\li \l{Video Overview}
\li \l{Camera Overview}
\li \l{Radio Overview}
@@ -135,10 +136,20 @@
\endlist
\section2 Reference
- \list
- \li \l{Qt Multimedia QML Types}{QML Types}
- \li \l{Qt Multimedia C++ Classes}{C++ Classes}
- \endlist
+ \list
+ \li Qt Multimedia
+ \list
+ \li \l{Qt Multimedia QML Types}{QML Types}
+ \li \l{Qt Multimedia C++ Classes}{C++ Classes}
+ \endlist
+ \endlist
+
+ \list
+ \li Qt Audio Engine
+ \list
+ \li \l{Qt Audio Engine QML Types}{QML Types}
+ \endlist
+ \endlist
\section2 Examples
\list
diff --git a/src/multimedia/doc/src/qtmultimedia5.qdoc b/src/multimedia/doc/src/qtmultimedia5.qdoc
index c1267f097..0dea4cf61 100644
--- a/src/multimedia/doc/src/qtmultimedia5.qdoc
+++ b/src/multimedia/doc/src/qtmultimedia5.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
-\qmlmodule QtMultimedia 5
+\qmlmodule QtMultimedia 5.0
\title Qt Multimedia QML Types
\ingroup qmlmodules
\brief Provides QML types for multimedia support.
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro
index 41a66687a..ef6633b95 100644
--- a/src/multimedia/multimedia.pro
+++ b/src/multimedia/multimedia.pro
@@ -62,7 +62,8 @@ ANDROID_BUNDLED_FILES += \
lib/libQt5MultimediaQuick_p.so
MODULE_PLUGIN_TYPES = \
mediaservice \
- audio
+ audio \
+ video/videonode
win32:LIBS += -luuid
diff --git a/src/multimedia/playback/qmediaplaylistnavigator.cpp b/src/multimedia/playback/qmediaplaylistnavigator.cpp
index 132d3ec87..e6b169023 100644
--- a/src/multimedia/playback/qmediaplaylistnavigator.cpp
+++ b/src/multimedia/playback/qmediaplaylistnavigator.cpp
@@ -433,10 +433,8 @@ void QMediaPlaylistNavigator::jump(int position)
{
Q_D(QMediaPlaylistNavigator);
- if (position<-1 || position>=d->playlist->mediaCount()) {
- qWarning() << "QMediaPlaylistNavigator: Jump outside playlist range";
+ if (position < -1 || position >= d->playlist->mediaCount())
position = -1;
- }
if (position != -1)
d->lastValidPos = position;
diff --git a/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h b/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h
index 4590e2f96..71230ca35 100644
--- a/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h
+++ b/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h
@@ -69,7 +69,7 @@ private:
int m_orientation;
};
-class QSGVideoNodeFactoryInterface
+class Q_MULTIMEDIAQUICK_EXPORT QSGVideoNodeFactoryInterface
{
public:
virtual QList<QVideoFrame::PixelFormat> supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const = 0;
@@ -79,7 +79,7 @@ public:
#define QSGVideoNodeFactoryInterface_iid "org.qt-project.qt.sgvideonodefactory/5.0"
Q_DECLARE_INTERFACE(QSGVideoNodeFactoryInterface, QSGVideoNodeFactoryInterface_iid)
-class QSGVideoNodeFactoryPlugin : public QObject, public QSGVideoNodeFactoryInterface
+class Q_MULTIMEDIAQUICK_EXPORT QSGVideoNodeFactoryPlugin : public QObject, public QSGVideoNodeFactoryInterface
{
Q_OBJECT
Q_INTERFACES(QSGVideoNodeFactoryInterface)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 14:14:58 +0000