slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Doc: Fix module name format

Browse Source 
Follow the conventions at
http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation

QtMultimedia -> Qt Multimedia

(Also, QtMultimediaKit has been merged into Qt Multimedia in Qt 5)

Change-Id: I3c23435d5eceb946ea320756b835da937726db24
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
This commit is contained in:
Sze Howe Koh
2013-01-27 12:25:02 +08:00
committed by The Qt Project
parent 52ad3219f0
commit 28ee5b12ff
16 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/multimedia/spectrum/README.txt
View File

@@ -4,7 +4,7 @@ Spectrum analyser demo app
Introduction Introduction
------------ ------------
This application is a demo which uses the QtMultimedia APIs to capture and play back PCM audio. While either recording or playback is ongoing, the application performs real-time level and frequency spectrum analysis, displaying the results in its main window. This application is a demo which uses the Qt Multimedia APIs to capture and play back PCM audio. While either recording or playback is ongoing, the application performs real-time level and frequency spectrum analysis, displaying the results in its main window.
Acknowledgments Acknowledgments
@@ -96,7 +96,7 @@ If you don't like the combination of the waveform and progress bar in a single w
The spectrum.h file defines a number of parameters which can be played with. These control things such as the number of audio samples analysed per FFT calculation, the range and number of bands displayed by the spectrograph, and so on. The spectrum.h file defines a number of parameters which can be played with. These control things such as the number of audio samples analysed per FFT calculation, the range and number of bands displayed by the spectrograph, and so on.
The part of the application which interacts with QtMultimedia is in the Engine class. The part of the application which interacts with Qt Multimedia is in the Engine class.
Some ideas for enhancements to the app are listed in TODO.txt. Feel free to start work on any of them :) Some ideas for enhancements to the app are listed in TODO.txt. Feel free to start work on any of them :)

2
examples/multimedia/spectrum/app/engine.h
View File

@@ -68,7 +68,7 @@ class QAudioOutput;
QT_END_NAMESPACE QT_END_NAMESPACE
/** /**
* This class interfaces with the QtMultimedia audio classes, and also with * This class interfaces with the Qt Multimedia audio classes, and also with
* the SpectrumAnalyser class. Its role is to manage the capture and playback * the SpectrumAnalyser class. Its role is to manage the capture and playback
* of audio data, meanwhile performing real-time analysis of the audio level * of audio data, meanwhile performing real-time analysis of the audio level
* and frequency spectrum. * and frequency spectrum.

2
examples/multimedia/spectrum/app/main.cpp
View File

@@ -44,7 +44,7 @@
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
QApplication app(argc, argv); QApplication app(argc, argv);
app.setApplicationName("QtMultimedia spectrum analyzer"); app.setApplicationName("Qt Multimedia spectrum analyzer");
MainWidget w; MainWidget w;
w.show(); w.show();

2
examples/multimedia/spectrum/doc/src/spectrum.qdoc
View File

@@ -36,7 +36,7 @@
\image spectrum-demo.png \image spectrum-demo.png
Because QtMultimedia allows the application to access the raw audio Because Qt Multimedia allows the application to access the raw audio
stream, the data can either be inspected or modified by the application. stream, the data can either be inspected or modified by the application.
The Spectrum Analyzer example displays three pieces of information while The Spectrum Analyzer example displays three pieces of information while
audio is being either captured or played back: audio is being either captured or played back:

4
examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDummy.qml
View File

@@ -41,7 +41,7 @@
import QtQuick 2.0 import QtQuick 2.0
// Item which is loaded by CameraItem if QtMultimediaKit is not available // Item which is loaded by CameraItem if Qt Multimedia is not available
Rectangle { Rectangle {
id: root id: root
color: "grey" color: "grey"
@@ -56,7 +56,7 @@ Rectangle {
anchors.margins: 10 anchors.margins: 10
color: "white" color: "white"
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: "Failed to create Camera item\n\nCheck that QtMultimediaKit is installed" text: "Failed to create Camera item\n\nCheck that Qt Multimedia is installed"
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
wrapMode: Text.Wrap wrapMode: Text.Wrap
} }

4
examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDummy.qml
View File

@@ -41,7 +41,7 @@
import QtQuick 2.0 import QtQuick 2.0
// Item which is loaded by VideoItem if QtMultimediaKit is not available // Item which is loaded by VideoItem if Qt Multimedia is not available
Rectangle { Rectangle {
id: root id: root
color: "grey" color: "grey"
@@ -61,7 +61,7 @@ Rectangle {
anchors.margins: 10 anchors.margins: 10
color: "white" color: "white"
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: "Failed to create Video item\n\nCheck that QtMultimediaKit is installed" text: "Failed to create Video item\n\nCheck that Qt Multimedia is installed"
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
wrapMode: Text.Wrap wrapMode: Text.Wrap
} }

2
examples/multimediawidgets/camera/doc/src/camera.qdoc
View File

@@ -35,7 +35,7 @@
\brief The Camera Example shows how to use the API to capture a still image \brief The Camera Example shows how to use the API to capture a still image
or video. or video.
The Camera Example demonstrates how you can use QtMultimedia to implement The Camera Example demonstrates how you can use Qt Multimedia to implement
some basic Camera functionality to take still images and record video clips some basic Camera functionality to take still images and record video clips
with audio. with audio.

2
examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc
View File

@@ -32,7 +32,7 @@
\brief This example demonstrates how to stream video on a graphics scene. \brief This example demonstrates how to stream video on a graphics scene.
The Video Graphics Item example shows how to implement a QGraphicsItem that displays video on a The Video Graphics Item example shows how to implement a QGraphicsItem that displays video on a
graphics scene using QtMultimedia's QAbstractVideoSurface. graphics scene using Qt Multimedia's QAbstractVideoSurface.
\image video-videographicsitem.png \image video-videographicsitem.png

2
examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc
View File

@@ -32,7 +32,7 @@
\brief This example is a simple video player \brief This example is a simple video player
The Video Widget example denonstrates how to implement a video widget using The Video Widget example denonstrates how to implement a video widget using
QtMultimedia's QAbstractVideoSurface. Qt Multimedia's QAbstractVideoSurface.
\image video-videowidget.png \image video-videowidget.png
*/ */

2
src/imports/multimedia/qdeclarativecamera.cpp
View File

@@ -151,7 +151,7 @@ void QDeclarativeCamera::_q_availabilityChanged(QMultimedia::AvailabilityStatus
Basic camera state management, error reporting, and simple zoom properties are Basic camera state management, error reporting, and simple zoom properties are
available in the Camera itself. For integration with C++ code, the available in the Camera itself. For integration with C++ code, the
\l mediaObject property allows you to \l mediaObject property allows you to
access the standard QtMultimedia camera controls. access the standard Qt Multimedia camera controls.
Many of the camera settings may take some time to apply, and might be limited Many of the camera settings may take some time to apply, and might be limited
to certain supported values depending on the hardware. Some camera settings may be to certain supported values depending on the hardware. Some camera settings may be

2
src/multimedia/audio/qaudioformat.cpp
View File

@@ -159,7 +159,7 @@ public:
In the common case of interleaved linear PCM data, the codec will In the common case of interleaved linear PCM data, the codec will
be "audio/pcm", and the samples for all channels will be interleaved. be "audio/pcm", and the samples for all channels will be interleaved.
One sample for each channel for the same instant in time is referred One sample for each channel for the same instant in time is referred
to as a frame in QtMultimedia (and other places). to as a frame in Qt Multimedia (and other places).
*/ */
/*! /*!

6
src/multimedia/doc/src/blackberry.qdoc
View File

@@ -30,7 +30,7 @@
\title BlackBerry \title BlackBerry
\brief Platform notes for the BlackBerry Platform \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. This page covers the availibility of different features on BB10.
\section1 Implementation \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 three-dimensional positional audio playback, \e OpenAL is supported and present
on BB10. 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 For the positional audio classes in the \l {Positional Audio} {QtAudioEngine} QML
module, OpenAL is used as on all other platforms. module, OpenAL is used as on all other platforms.
@@ -54,7 +54,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 mmrenderer. As mmrenderer supports streaming from HTTP and other URLs, this is
supported in QMediaPlayer as well. Playlists as sources are also supported. 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 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; 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. mmrenderer creates a seperate window displaying a video and puts that on top of the Qt application.

2
src/multimedia/doc/src/plugins/qml-multimedia.qdoc
View File

@@ -48,7 +48,7 @@
\section2 Audio \section2 Audio
\l Audio is an easy way to add audio playback to a Qt Quick \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. The code extract below shows the creation and use of an Audio instance.

2
src/multimedia/doc/src/qtmultimedia-cpp.qdoc
View File

@@ -30,7 +30,7 @@
\title Qt Multimedia C++ Classes \title Qt Multimedia C++ Classes
\ingroup modules \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. 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, If your application is serving complex use cases such as decoding media files, accessing video or audio buffers,

2
src/multimediawidgets/multimediawidgets.pro
View File

@@ -1,4 +1,4 @@
# distinct from QtMultimedia # distinct from Qt Multimedia
TARGET = QtMultimediaWidgets TARGET = QtMultimediaWidgets
QT = core gui multimedia-private widgets-private QT = core gui multimedia-private widgets-private
qtHaveModule(opengl):!contains(QT_CONFIG, opengles1) { qtHaveModule(opengl):!contains(QT_CONFIG, opengles1) {

2
src/plugins/plugins.pro
View File

@@ -1,6 +1,6 @@
###################################################################### ######################################################################
# #
# QtMultimedia # Qt Multimedia
# #
###################################################################### ######################################################################