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

Enable building the documentation snippets.

Browse Source 
Change-Id: Ib7ef5a564408092ecd72be5d855b2defaddf9c4e
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2012-01-11 14:45:11 +10:00
committed by Qt by Nokia
parent b48009ce9e
commit 39e6da8f8e
5 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/src/snippets/multimedia-snippets/audiorecorder.cpp
View File

@@ -41,8 +41,7 @@
#include <QtWidgets> #include <QtWidgets>
#include <qaudiocapturesource.h> #include <qaudiorecorder.h>
#include <qmediarecorder.h>
#include <qmediaservice.h> #include <qmediaservice.h>
#include <QtMultimedia/qaudioformat.h> #include <QtMultimedia/qaudioformat.h>
@@ -52,8 +51,7 @@
AudioRecorder::AudioRecorder() AudioRecorder::AudioRecorder()
{ {
//! [create-objs-1] //! [create-objs-1]
audiosource = new QAudioCaptureSource; capture = new QAudioRecorder();
capture = new QMediaRecorder(audiosource);
//! [create-objs-1] //! [create-objs-1]
// set a default file // set a default file

21
doc/src/snippets/multimedia-snippets/media.cpp
View File

@@ -43,7 +43,6 @@
#include <QFile> #include <QFile>
#include <QTimer> #include <QTimer>
#include "qaudiocapturesource.h"
#include "qmediaplaylist.h" #include "qmediaplaylist.h"
#include "qmediarecorder.h" #include "qmediarecorder.h"
#include "qmediaservice.h" #include "qmediaservice.h"
@@ -54,11 +53,11 @@
#include "qradiotuner.h" #include "qradiotuner.h"
#include "qvideowidget.h" #include "qvideowidget.h"
#include "qcameraimagecapture.h" #include "qcameraimagecapture.h"
#include "qcamera.h"
class MediaExample : public QObject { class MediaExample : public QObject {
Q_OBJECT Q_OBJECT
void AudioCaptureSource();
void MediaControl(); void MediaControl();
void MediaImageViewer(); void MediaImageViewer();
void MediaPlayer(); void MediaPlayer();
@@ -77,8 +76,8 @@ private:
QMediaContent video; QMediaContent video;
QMediaRecorder *recorder; QMediaRecorder *recorder;
QMediaImageViewer *viewer; QMediaImageViewer *viewer;
QCamera *camera;
QCameraImageCapture *imageCapture; QCameraImageCapture *imageCapture;
QAudioCaptureSource *audioSource;
QString fileName; QString fileName;
QRadioTuner *radio; QRadioTuner *radio;
QMediaContent image1; QMediaContent image1;
@@ -88,19 +87,6 @@ private:
static const int yourRadioStationFrequency = 11; 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() void MediaExample::MediaControl()
{ {
{ {
@@ -205,8 +191,7 @@ void MediaExample::MediaRecorder()
{ {
//! [Media recorder] //! [Media recorder]
// Audio only recording // Audio only recording
audioSource = new QAudioCaptureSource; recorder = new QMediaRecorder(camera);
recorder = new QMediaRecorder(audioSource);
QAudioEncoderSettings audioSettings; QAudioEncoderSettings audioSettings;
audioSettings.setCodec("audio/vorbis"); audioSettings.setCodec("audio/vorbis");

10
doc/src/snippets/multimedia-snippets/multimedia-snippets.pro
View File

@@ -7,14 +7,18 @@ INCLUDEPATH += ../../../../src/global \
../../../../src/multimedia \ ../../../../src/multimedia \
../../../../src/multimedia/audio \ ../../../../src/multimedia/audio \
../../../../src/multimedia/video \ ../../../../src/multimedia/video \
../../../../src/multimedia/effects ../../../../src/multimedia/camera
CONFIG += console CONFIG += console
QT += multimedia QT += multimedia multimediawidgets
SOURCES += \ SOURCES += \
audio.cpp \ audio.cpp \
video.cpp \ video.cpp \
camera.cpp \ camera.cpp \
media.cpp media.cpp \
qsound.cpp
OTHER_FILES += \
soundeffect.qml

19
doc/src/snippets/multimedia-snippets/qsound.cpp
View File

@@ -38,12 +38,17 @@
** **
****************************************************************************/ ****************************************************************************/
//! [0]
QSound::play("mysounds/bells.wav"); #include "qsound.h"
//! [0]
void qsoundsnippet() {
//! [0]
QSound::play("mysounds/bells.wav");
//! [0]
//! [1] //! [1]
QSound bells("mysounds/bells.wav"); QSound bells("mysounds/bells.wav");
bells.play(); bells.play();
//! [1] //! [1]
}

11
qtmultimedia.pro
View File

@@ -16,8 +16,17 @@ module_qtmultimedia_tests.depends = module_qtmultimedia_src
module_qtmultimedia_tests.CONFIG = no_default_install module_qtmultimedia_tests.CONFIG = no_default_install
!contains(QT_BUILD_PARTS,tests):module_qtmultimedia_tests.CONFIG += no_default_target !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 \ SUBDIRS += module_qtmultimedia_src \
module_qtmultimedia_examples \ 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) include(doc/config/qtmultimedia_doc.pri)