diff options
Diffstat (limited to 'src')
9 files changed, 31 insertions, 11 deletions
diff --git a/src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp b/src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp index 6624773b6..0f359e12e 100644 --- a/src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp +++ b/src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp @@ -94,8 +94,10 @@ void QDeclarativeAttenuationModel::setName(const QString& name) \since 5.0 \brief The AttenuationModelLinear element allows you to define a linear attenuation curve for Sound element. - \ingroup qml-multimedia + \inmodule QtMultimedia + \ingroup multimedia_audioengine \inherits Item + \preliminary This element is part of the \bold{QtAudioEngine 1.0} module. @@ -224,8 +226,10 @@ qreal QDeclarativeAttenuationModelLinear::calculateGain(const QVector3D &listene \since 5.0 \brief The AttenuationModelInverse element allows you to define a non-linear attenuation curve for Sound element. - \ingroup qml-multimedia + \inmodule QtMultimedia + \ingroup multimedia_audioengine \inherits Item + \preliminary This element is part of the \bold{QtAudioEngine 1.0} module. diff --git a/src/imports/audioengine/qdeclarative_audiocategory_p.cpp b/src/imports/audioengine/qdeclarative_audiocategory_p.cpp index a7379c24b..7b56daf5f 100644 --- a/src/imports/audioengine/qdeclarative_audiocategory_p.cpp +++ b/src/imports/audioengine/qdeclarative_audiocategory_p.cpp @@ -50,8 +50,10 @@ QT_USE_NAMESPACE \qmlclass AudioCategory QDeclarativeAudioCategory \since 5.0 \brief The AudioCategory element allows you to control all active sound instances by group - \ingroup qml-multimedia + \inmodule QtMultimedia + \ingroup multimedia_audioengine \inherits Item + \preliminary This element is part of the \bold{QtAudioEngine 1.0} module. diff --git a/src/imports/audioengine/qdeclarative_audioengine_p.cpp b/src/imports/audioengine/qdeclarative_audioengine_p.cpp index a2763e021..11870d53b 100644 --- a/src/imports/audioengine/qdeclarative_audioengine_p.cpp +++ b/src/imports/audioengine/qdeclarative_audioengine_p.cpp @@ -59,8 +59,10 @@ QT_USE_NAMESPACE \qmlclass AudioEngine QDeclarativeAudioEngine \since 5.0 \brief The AudioEngine element allows you to organize all your 3d audio content in one place. - \ingroup qml-multimedia + \inmodule QtMultimedia + \ingroup multimedia_audioengine \inherits Item + \preliminary This element is part of the \bold{QtAudioEngine 1.0} module. diff --git a/src/imports/audioengine/qdeclarative_audiolistener_p.cpp b/src/imports/audioengine/qdeclarative_audiolistener_p.cpp index 97c424f97..274e48913 100644 --- a/src/imports/audioengine/qdeclarative_audiolistener_p.cpp +++ b/src/imports/audioengine/qdeclarative_audiolistener_p.cpp @@ -51,8 +51,10 @@ QT_USE_NAMESPACE \qmlclass AudioListener QDeclarativeAudioListener \since 5.0 \brief The AudioListener element allows you to control global listener parameters. - \ingroup qml-multimedia + \inmodule QtMultimedia + \ingroup multimedia_audioengine \inherits Item + \preliminary This element is part of the \bold{QtAudioEngine 1.0} module. diff --git a/src/imports/audioengine/qdeclarative_audiosample_p.cpp b/src/imports/audioengine/qdeclarative_audiosample_p.cpp index 24a88ae76..b731b5dce 100644 --- a/src/imports/audioengine/qdeclarative_audiosample_p.cpp +++ b/src/imports/audioengine/qdeclarative_audiosample_p.cpp @@ -53,8 +53,10 @@ QT_USE_NAMESPACE \qmlclass AudioSample QDeclarativeAudioSample \since 5.0 \brief The AudioSample element allows you to load audio samples, mostly wav file. - \ingroup qml-multimedia + \inmodule QtMultimedia + \ingroup multimedia_audioengine \inherits Item + \preliminary This element is part of the \bold{QtAudioEngine 1.0} module. diff --git a/src/imports/audioengine/qdeclarative_playvariation_p.cpp b/src/imports/audioengine/qdeclarative_playvariation_p.cpp index ec0682723..4aab02317 100644 --- a/src/imports/audioengine/qdeclarative_playvariation_p.cpp +++ b/src/imports/audioengine/qdeclarative_playvariation_p.cpp @@ -55,8 +55,10 @@ QT_USE_NAMESPACE So each time the playback of the same sound can be a slightly different even with the same AudioSample. - \ingroup qml-multimedia + \inmodule QtMultimedia + \ingroup multimedia_audioengine \inherits Item + \preliminary This element is part of the \bold{QtAudioEngine 1.0} module. diff --git a/src/imports/audioengine/qdeclarative_sound_p.cpp b/src/imports/audioengine/qdeclarative_sound_p.cpp index 37912732b..12d4f84d1 100644 --- a/src/imports/audioengine/qdeclarative_sound_p.cpp +++ b/src/imports/audioengine/qdeclarative_sound_p.cpp @@ -142,8 +142,10 @@ void QDeclarativeSoundCone::componentComplete() \since 5.0 \brief The Sound element allows you to define a variety of samples and parameters to be used for SoundInstance. - \ingroup qml-multimedia + \inmodule QtMultimedia + \ingroup multimedia_audioengine \inherits Item + \preliminary This element is part of the \bold{QtAudioEngine 1.0} module. diff --git a/src/imports/audioengine/qdeclarative_soundinstance_p.cpp b/src/imports/audioengine/qdeclarative_soundinstance_p.cpp index 4f3ade9ea..689d8255f 100644 --- a/src/imports/audioengine/qdeclarative_soundinstance_p.cpp +++ b/src/imports/audioengine/qdeclarative_soundinstance_p.cpp @@ -54,8 +54,10 @@ QT_USE_NAMESPACE \qmlclass SoundInstance QDeclarativeSoundInstance \since 5.0 \brief The SoundInstance element allows you to play 3d audio content. - \ingroup qml-multimedia + \inmodule QtMultimedia + \ingroup multimedia_audioengine \inherits Item + \preliminary This element is part of the \bold{QtAudioEngine 1.0} module. diff --git a/src/multimedia/audio/qaudioprobe.cpp b/src/multimedia/audio/qaudioprobe.cpp index e51c56a7c..9a71b65d6 100644 --- a/src/multimedia/audio/qaudioprobe.cpp +++ b/src/multimedia/audio/qaudioprobe.cpp @@ -151,14 +151,16 @@ bool QAudioProbe::setSource(QMediaObject *source) /*! Starts monitoring the given \a mediaRecorder. + Returns true on success. + If \a source is zero, this probe will be deactivated - and this function wil return true. + and this function will return true. If the media recorder instance does not support monitoring audio, this function will return false. Any previously monitored objects will no longer be monitored. - Passing in the same object will be ignored, but + Passing in the same (valid) object will be ignored, but monitoring will continue. */ bool QAudioProbe::setSource(QMediaRecorder *mediaRecorder) |