Enable building the documentation snippets.
Change-Id: Ib7ef5a564408092ecd72be5d855b2defaddf9c4e Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
committed by
Qt by Nokia
parent
b48009ce9e
commit
39e6da8f8e
@@ -41,8 +41,7 @@
|
||||
|
||||
#include <QtWidgets>
|
||||
|
||||
#include <qaudiocapturesource.h>
|
||||
#include <qmediarecorder.h>
|
||||
#include <qaudiorecorder.h>
|
||||
#include <qmediaservice.h>
|
||||
|
||||
#include <QtMultimedia/qaudioformat.h>
|
||||
@@ -52,8 +51,7 @@
|
||||
AudioRecorder::AudioRecorder()
|
||||
{
|
||||
//! [create-objs-1]
|
||||
audiosource = new QAudioCaptureSource;
|
||||
capture = new QMediaRecorder(audiosource);
|
||||
capture = new QAudioRecorder();
|
||||
//! [create-objs-1]
|
||||
|
||||
// set a default file
|
||||
|
||||
@@ -43,7 +43,6 @@
|
||||
#include <QFile>
|
||||
#include <QTimer>
|
||||
|
||||
#include "qaudiocapturesource.h"
|
||||
#include "qmediaplaylist.h"
|
||||
#include "qmediarecorder.h"
|
||||
#include "qmediaservice.h"
|
||||
@@ -54,11 +53,11 @@
|
||||
#include "qradiotuner.h"
|
||||
#include "qvideowidget.h"
|
||||
#include "qcameraimagecapture.h"
|
||||
#include "qcamera.h"
|
||||
|
||||
class MediaExample : public QObject {
|
||||
Q_OBJECT
|
||||
|
||||
void AudioCaptureSource();
|
||||
void MediaControl();
|
||||
void MediaImageViewer();
|
||||
void MediaPlayer();
|
||||
@@ -77,8 +76,8 @@ private:
|
||||
QMediaContent video;
|
||||
QMediaRecorder *recorder;
|
||||
QMediaImageViewer *viewer;
|
||||
QCamera *camera;
|
||||
QCameraImageCapture *imageCapture;
|
||||
QAudioCaptureSource *audioSource;
|
||||
QString fileName;
|
||||
QRadioTuner *radio;
|
||||
QMediaContent image1;
|
||||
@@ -88,19 +87,6 @@ private:
|
||||
static const int yourRadioStationFrequency = 11;
|
||||
};
|
||||
|
||||
void MediaExample::AudioCaptureSource()
|
||||
{
|
||||
//! [Audio capture source]
|
||||
QAudioCaptureSource* audioSource = new QAudioCaptureSource;
|
||||
QMediaRecorder* recorder = new QMediaRecorder(audioSource);
|
||||
|
||||
recorder->setOutputLocation(QUrl("test.raw"));
|
||||
//! [Audio capture source]
|
||||
|
||||
Q_UNUSED(audioSource);
|
||||
}
|
||||
|
||||
|
||||
void MediaExample::MediaControl()
|
||||
{
|
||||
{
|
||||
@@ -205,8 +191,7 @@ void MediaExample::MediaRecorder()
|
||||
{
|
||||
//! [Media recorder]
|
||||
// Audio only recording
|
||||
audioSource = new QAudioCaptureSource;
|
||||
recorder = new QMediaRecorder(audioSource);
|
||||
recorder = new QMediaRecorder(camera);
|
||||
|
||||
QAudioEncoderSettings audioSettings;
|
||||
audioSettings.setCodec("audio/vorbis");
|
||||
|
||||
@@ -7,14 +7,18 @@ INCLUDEPATH += ../../../../src/global \
|
||||
../../../../src/multimedia \
|
||||
../../../../src/multimedia/audio \
|
||||
../../../../src/multimedia/video \
|
||||
../../../../src/multimedia/effects
|
||||
../../../../src/multimedia/camera
|
||||
|
||||
CONFIG += console
|
||||
|
||||
QT += multimedia
|
||||
QT += multimedia multimediawidgets
|
||||
|
||||
SOURCES += \
|
||||
audio.cpp \
|
||||
video.cpp \
|
||||
camera.cpp \
|
||||
media.cpp
|
||||
media.cpp \
|
||||
qsound.cpp
|
||||
|
||||
OTHER_FILES += \
|
||||
soundeffect.qml
|
||||
|
||||
@@ -38,12 +38,17 @@
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
//! [0]
|
||||
QSound::play("mysounds/bells.wav");
|
||||
//! [0]
|
||||
|
||||
#include "qsound.h"
|
||||
|
||||
void qsoundsnippet() {
|
||||
//! [0]
|
||||
QSound::play("mysounds/bells.wav");
|
||||
//! [0]
|
||||
|
||||
|
||||
//! [1]
|
||||
QSound bells("mysounds/bells.wav");
|
||||
bells.play();
|
||||
//! [1]
|
||||
//! [1]
|
||||
QSound bells("mysounds/bells.wav");
|
||||
bells.play();
|
||||
//! [1]
|
||||
}
|
||||
|
||||
@@ -16,8 +16,17 @@ module_qtmultimedia_tests.depends = module_qtmultimedia_src
|
||||
module_qtmultimedia_tests.CONFIG = no_default_install
|
||||
!contains(QT_BUILD_PARTS,tests):module_qtmultimedia_tests.CONFIG += no_default_target
|
||||
|
||||
module_qtmultimedia_docsnippets.subdir = doc
|
||||
module_qtmultimedia_docsnippets.target = module-qtmultimedia-doc
|
||||
module_qtmultimedia_docsnippets.depends = module_qtmultimedia_src
|
||||
module_qtmultimedia_docsnippets.CONFIG = no_default_install
|
||||
|
||||
SUBDIRS += module_qtmultimedia_src \
|
||||
module_qtmultimedia_examples \
|
||||
module_qtmultimedia_tests \
|
||||
module_qtmultimedia_tests
|
||||
|
||||
# Doc snippets use widgets
|
||||
!isEmpty(QT.widgets.name): SUBDIRS += module_qtmultimedia_docsnippets
|
||||
|
||||
# for make docs:
|
||||
include(doc/config/qtmultimedia_doc.pri)
|
||||
|
||||
Reference in New Issue
Block a user