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

Rename QtMultimediaKit to QtMultimedia.

Browse Source 
There are a few legacy bits left in place so it passes CI, and
then qt5.git etc can be updated.

Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a
Reviewed-on: http://codereview.qt-project.org/5368
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2011-10-06 14:31:58 +10:00
committed by Qt by Nokia
parent 55bc4f2b46
commit 03f22bcdaf
395 changed files with 1393 additions and 3088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,7 @@ or video.
The Camera Example demonstrates how you can use the QtMultimediaKit to implement
The Camera Example demonstrates how you can use QtMultimedia to implement
some basic Camera functionality to take still images and record video clips
with audio.

8
doc/src/multimedia.qdoc
View File

@@ -42,7 +42,7 @@ collection of media content.
Multimedia provides a set of APIs that allow the developer to play, record
and manage a collection of media content. It is dependent on the
QtMultimediaKit module. QtMultimediaKit is the recommended API to build multimedia
QtMultimedia module. QtMultimedia is the recommended API to build multimedia
applications using Qt. The Phonon API is no longer recommended.
\tableofcontents
@@ -67,7 +67,7 @@ from a remote location and identified by a URL. Finally, many different
codecs are supported 'out
of the box'.
The supplied \l {qtmultimediakit examples}{examples} give a good idea at the ease of use of the API. When
The supplied \l {qtmultimedia examples}{examples} give a good idea at the ease of use of the API. When
the supporting user interface code is ignored we can see that functionality
is immediately available with minimal effort.
@@ -304,7 +304,7 @@ the operation can be cancelled by calling
cancellation can be done by calling \l {QCamera::unlock()}{unlock}(QCamera::LockFocus).
\target qtmultimediakit examples
\target qtmultimedia examples
\section1 Examples
\section2 Record a Sound Source
@@ -326,7 +326,7 @@ QVideoWidget classes.
\section2 Camera Example
The \l{Camera Example} shows how use the QtMultimediaKit API to quickly
The \l{Camera Example} shows how use the QtMultimedia API to quickly
write a camera application in C++.
\section2 QML Camera Example

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

@@ -55,7 +55,7 @@
\qml
import Qt 4.7
import QtMultimediaKit 1.1
import QtMultimedia 4.0
// ...
Audio {
@@ -238,7 +238,7 @@
\qml
import Qt 4.7
import QtMultimediaKit 1.1
import QtMultimedia 4.0
SoundEffect {
@@ -265,7 +265,7 @@
\qml
import Qt 4.7
import QtMultimediaKit 1.1
import QtMultimedia 4.0
Camera {
focus : visible // to receive focus and capture key events when visible

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

@@ -45,7 +45,7 @@
#include <qmediarecorder.h>
#include <qmediaservice.h>
#include <QtMultimediaKit/qaudioformat.h>
#include <QtMultimedia/qaudioformat.h>
#include "audiorecorder.h"

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

@@ -210,7 +210,7 @@ void MediaExample::MediaRecorder()
QAudioEncoderSettings audioSettings;
audioSettings.setCodec("audio/vorbis");
audioSettings.setQuality(QtMultimediaKit::HighQuality);
audioSettings.setQuality(QtMultimedia::HighQuality);
recorder->setEncodingSettings(audioSettings);

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

@@ -4,14 +4,14 @@ TEMPLATE = lib
TARGET = qtmmksnippets
INCLUDEPATH += ../../../../src/global \
../../../../src/multimediakit \
../../../../src/multimediakit/audio \
../../../../src/multimediakit/video \
../../../../src/multimediakit/effects
../../../../src/multimedia \
../../../../src/multimedia/audio \
../../../../src/multimedia/video \
../../../../src/multimedia/effects
CONFIG += console
qtAddLibrary(QtMultimediaKit)
QT += multimedia
SOURCES += \
audio.cpp \

8
doc/src/snippets/multimedia-snippets/player.cpp
View File

@@ -177,14 +177,14 @@ void Player::positionChanged(qint64 progress)
void Player::metaDataChanged()
{
//qDebug() << "update metadata" << player->metaData(QtMultimediaKit::Title).toString();
//qDebug() << "update metadata" << player->metaData(QtMultimedia::Title).toString();
if (player->isMetaDataAvailable()) {
setTrackInfo(QString("%1 - %2")
.arg(player->metaData(QtMultimediaKit::AlbumArtist).toString())
.arg(player->metaData(QtMultimediaKit::Title).toString()));
.arg(player->metaData(QtMultimedia::AlbumArtist).toString())
.arg(player->metaData(QtMultimedia::Title).toString()));
if (coverLabel) {
QUrl url = player->metaData(QtMultimediaKit::CoverArtUrlLarge).value<QUrl>();
QUrl url = player->metaData(QtMultimedia::CoverArtUrlLarge).value<QUrl>();
coverLabel->setPixmap(!url.isEmpty()
? QPixmap(url.toString())

2
doc/src/snippets/multimedia-snippets/soundeffect.qml
View File

@@ -41,7 +41,7 @@
//! [complete snippet]
import Qt 4.7
import QtMultimediaKit 1.1
import QtMultimedia 4.0
Text {
text: "Click Me!";

6
examples/audiodevices/audiodevices.pro
View File

@@ -1,7 +1,7 @@
TEMPLATE = app
TARGET = audiodevices
QT += multimediakit
QT += multimedia
HEADERS = audiodevices.h
@@ -10,9 +10,9 @@ SOURCES = audiodevices.cpp \
FORMS += audiodevicesbase.ui
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiodevices
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiodevices
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiodevices
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiodevices
INSTALLS += target sources

6
examples/audioinput/audioinput.pro
View File

@@ -1,16 +1,16 @@
TEMPLATE = app
TARGET = audioinput
QT += multimediakit
QT += multimedia
HEADERS = audioinput.h
SOURCES = audioinput.cpp \
main.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audioinput
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audioinput
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audioinput
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audioinput
INSTALLS += target sources

6
examples/audiooutput/audiooutput.pro
View File

@@ -1,16 +1,16 @@
TEMPLATE = app
TARGET += audiooutput
QT += multimediakit
QT += multimedia
HEADERS = audiooutput.h
SOURCES = audiooutput.cpp \
main.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiooutput
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiooutput
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiooutput
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiooutput
INSTALLS += target sources

10
examples/audiorecorder/audiorecorder.cpp
View File

@@ -88,8 +88,8 @@ AudioRecorder::AudioRecorder(QWidget *parent)
sampleRate));
}
ui->qualitySlider->setRange(0, int(QtMultimediaKit::VeryHighQuality));
ui->qualitySlider->setValue(int(QtMultimediaKit::NormalQuality));
ui->qualitySlider->setRange(0, int(QtMultimedia::VeryHighQuality));
ui->qualitySlider->setValue(int(QtMultimedia::NormalQuality));
//bitrates:
ui->bitrateBox->addItem(QString("Default"), QVariant(0));
@@ -172,10 +172,10 @@ void AudioRecorder::toggleRecord()
settings.setCodec(boxValue(ui->audioCodecBox).toString());
settings.setSampleRate(boxValue(ui->sampleRateBox).toInt());
settings.setBitRate(boxValue(ui->bitrateBox).toInt());
settings.setQuality(QtMultimediaKit::EncodingQuality(ui->qualitySlider->value()));
settings.setQuality(QtMultimedia::EncodingQuality(ui->qualitySlider->value()));
settings.setEncodingMode(ui->constantQualityRadioButton->isChecked() ?
QtMultimediaKit::ConstantQualityEncoding :
QtMultimediaKit::ConstantBitRateEncoding);
QtMultimedia::ConstantQualityEncoding :
QtMultimedia::ConstantBitRateEncoding);
QString container = boxValue(ui->containerBox).toString();

6
examples/audiorecorder/audiorecorder.pro
View File

@@ -1,7 +1,7 @@
TEMPLATE = app
TARGET = audiorecorder
QT += multimediakit
QT += multimedia
HEADERS = \
audiorecorder.h
@@ -16,9 +16,9 @@ maemo*: {
FORMS += audiorecorder.ui
}
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiorecorder
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiorecorder
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiorecorder
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiorecorder
INSTALLS += target sources

2
examples/camera/camera.cpp
View File

@@ -124,7 +124,7 @@ void Camera::setCamera(const QByteArray &cameraDevice)
connect(mediaRecorder, SIGNAL(durationChanged(qint64)), this, SLOT(updateRecordTime()));
connect(mediaRecorder, SIGNAL(error(QMediaRecorder::Error)), this, SLOT(displayRecorderError()));
mediaRecorder->setMetaData(QtMultimediaKit::Title, QVariant(QLatin1String("Test Title")));
mediaRecorder->setMetaData(QtMultimedia::Title, QVariant(QLatin1String("Test Title")));
connect(ui->exposureCompensation, SIGNAL(valueChanged(int)), SLOT(setExposureCompensation(int)));

6
examples/camera/camera.pro
View File

@@ -1,7 +1,7 @@
TEMPLATE = app
TARGET = camera
QT += multimediakit multimediakitwidgets
QT += multimedia multimediawidgets
HEADERS = \
camera.h \
@@ -19,9 +19,9 @@ FORMS += \
videosettings.ui \
imagesettings.ui
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/camera
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/camera
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/camera
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/camera
INSTALLS += target sources

4
examples/camera/imagesettings.cpp
View File

@@ -62,7 +62,7 @@ ImageSettings::ImageSettings(QCameraImageCapture *imageCapture, QWidget *parent)
ui->imageCodecBox->addItem(codecName+": "+description, QVariant(codecName));
}
ui->imageQualitySlider->setRange(0, int(QtMultimediaKit::VeryHighQuality));
ui->imageQualitySlider->setRange(0, int(QtMultimedia::VeryHighQuality));
ui->imageResolutionBox->addItem(tr("Default Resolution"));
QList<QSize> supportedResolutions = imagecapture->supportedResolutions();
@@ -93,7 +93,7 @@ QImageEncoderSettings ImageSettings::imageSettings() const
{
QImageEncoderSettings settings = imagecapture->encodingSettings();
settings.setCodec(boxValue(ui->imageCodecBox).toString());
settings.setQuality(QtMultimediaKit::EncodingQuality(ui->imageQualitySlider->value()));
settings.setQuality(QtMultimedia::EncodingQuality(ui->imageQualitySlider->value()));
settings.setResolution(boxValue(ui->imageResolutionBox).toSize());
return settings;

8
examples/camera/videosettings.cpp
View File

@@ -66,7 +66,7 @@ VideoSettings::VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent) :
ui->audioSampleRateBox->addItem(QString::number(sampleRate), QVariant(sampleRate));
}
ui->audioQualitySlider->setRange(0, int(QtMultimediaKit::VeryHighQuality));
ui->audioQualitySlider->setRange(0, int(QtMultimedia::VeryHighQuality));
//video codecs
ui->videoCodecBox->addItem(tr("Default video codec"), QVariant(QString()));
@@ -75,7 +75,7 @@ VideoSettings::VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent) :
ui->videoCodecBox->addItem(codecName+": "+description, QVariant(codecName));
}
ui->videoQualitySlider->setRange(0, int(QtMultimediaKit::VeryHighQuality));
ui->videoQualitySlider->setRange(0, int(QtMultimedia::VeryHighQuality));
ui->videoResolutionBox->addItem(tr("Default"));
@@ -122,7 +122,7 @@ QAudioEncoderSettings VideoSettings::audioSettings() const
{
QAudioEncoderSettings settings = mediaRecorder->audioSettings();
settings.setCodec(boxValue(ui->audioCodecBox).toString());
settings.setQuality(QtMultimediaKit::EncodingQuality(ui->audioQualitySlider->value()));
settings.setQuality(QtMultimedia::EncodingQuality(ui->audioQualitySlider->value()));
settings.setSampleRate(boxValue(ui->audioSampleRateBox).toInt());
return settings;
}
@@ -138,7 +138,7 @@ QVideoEncoderSettings VideoSettings::videoSettings() const
{
QVideoEncoderSettings settings = mediaRecorder->videoSettings();
settings.setCodec(boxValue(ui->videoCodecBox).toString());
settings.setQuality(QtMultimediaKit::EncodingQuality(ui->videoQualitySlider->value()));
settings.setQuality(QtMultimedia::EncodingQuality(ui->videoQualitySlider->value()));
settings.setResolution(boxValue(ui->videoResolutionBox).toSize());
settings.setFrameRate(boxValue(ui->videoFramerateBox).value<qreal>());

2
examples/declarative-camera/CameraPropertyButton.qml
View File

@@ -39,7 +39,7 @@
****************************************************************************/
import Qt 4.7
import QtMultimediaKit 1.1
import QtMultimedia 4.0
Item {
id: propertyButton

2
examples/declarative-camera/CaptureControls.qml
View File

@@ -39,7 +39,7 @@
****************************************************************************/
import Qt 4.7
import QtMultimediaKit 1.1
import QtMultimedia 4.0
FocusScope {
property Camera camera

2
examples/declarative-camera/FocusButton.qml
View File

@@ -39,7 +39,7 @@
****************************************************************************/
import Qt 4.7
import QtMultimediaKit 1.1
import QtMultimedia 4.0
CameraButton {
property Camera camera

2
examples/declarative-camera/PhotoPreview.qml
View File

@@ -39,7 +39,7 @@
****************************************************************************/
import Qt 4.7
import QtMultimediaKit 1.1
import QtMultimedia 4.0
Item {
property alias source : preview.source

2
examples/declarative-camera/ZoomControl.qml
View File

@@ -39,7 +39,7 @@
****************************************************************************/
import Qt 4.7
import QtMultimediaKit 1.1
import QtMultimedia 4.0
Item {
id : zoomControl

6
examples/declarative-camera/declarative-camera.pro
View File

@@ -1,7 +1,7 @@
TEMPLATE=app
QT += declarative qtquick1 network multimediakit
QT += declarative qtquick1 network multimedia
contains(QT_CONFIG, opengl) {
QT += opengl
@@ -13,9 +13,9 @@ else:TARGET = QmlCamera
RESOURCES += declarative-camera.qrc
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/qml_camera
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/qml_camera
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/qml_camera
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/qml_camera
INSTALLS += target sources

2
examples/declarative-camera/declarative-camera.qml
View File

@@ -39,7 +39,7 @@
****************************************************************************/
import Qt 4.7
import QtMultimediaKit 1.1
import QtMultimedia 4.0
Rectangle {
id : cameraUI

2
examples/declarative-radio/declarative-radio.pro
View File

@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = declarative-radio
DEPENDPATH += .
INCLUDEPATH += .
QT += declarative multimediakit
QT += declarative multimedia
# Input
SOURCES += main.cpp

2
examples/declarative-radio/view.qml
View File

@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
import Qt.multimediakit 4.0
import Qt.multimedia 4.0
Rectangle {
width: 400; height: 300;

8
examples/player/player.cpp
View File

@@ -221,14 +221,14 @@ void Player::positionChanged(qint64 progress)
void Player::metaDataChanged()
{
//qDebug() << "update metadata" << player->metaData(QtMultimediaKit::Title).toString();
//qDebug() << "update metadata" << player->metaData(QtMultimedia::Title).toString();
if (player->isMetaDataAvailable()) {
setTrackInfo(QString("%1 - %2")
.arg(player->metaData(QtMultimediaKit::AlbumArtist).toString())
.arg(player->metaData(QtMultimediaKit::Title).toString()));
.arg(player->metaData(QtMultimedia::AlbumArtist).toString())
.arg(player->metaData(QtMultimedia::Title).toString()));
if (coverLabel) {
QUrl url = player->metaData(QtMultimediaKit::CoverArtUrlLarge).value<QUrl>();
QUrl url = player->metaData(QtMultimedia::CoverArtUrlLarge).value<QUrl>();
coverLabel->setPixmap(!url.isEmpty()
? QPixmap(url.toString())

8
examples/player/player.pro
View File

@@ -5,8 +5,8 @@ CONFIG += qt warn_on
QT += network \
xml \
multimediakit \
multimediakitwidgets
multimedia \
multimediawidgets
HEADERS = \
player.h \
@@ -24,9 +24,9 @@ maemo* {
}
#install
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/player
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/player
sources.files = $$SOURCES $HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/player
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/player
INSTALLS += target sources
QT+=widgets

2
examples/player/playlistmodel.h
View File

@@ -41,7 +41,7 @@
#ifndef PLAYLISTMODEL_H
#define PLAYLISTMODEL_H
#include <qtmultimediakitdefs.h>
#include <qtmultimediadefs.h>
#include <QtCore/qabstractitemmodel.h>
QT_BEGIN_NAMESPACE

6
examples/radio/radio.pro
View File

@@ -1,7 +1,7 @@
TEMPLATE = app
TARGET = radio
QT += multimediakit
QT += multimedia
HEADERS = \
radio.h
@@ -10,9 +10,9 @@ SOURCES = \
main.cpp \
radio.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/radio
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/radio
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/radio
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/radio
INSTALLS += target sources

6
examples/slideshow/slideshow.pro
View File

@@ -1,7 +1,7 @@
TEMPLATE = app
TARGET = slideshow
QT += multimediakit multimediakitwidgets
QT += multimedia multimediawidgets
HEADERS = \
slideshow.h
@@ -10,9 +10,9 @@ SOURCES = \
main.cpp \
slideshow.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/slideshow
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/slideshow
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/slideshow
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/slideshow
INSTALLS += target sources

2
examples/spectrum/3rdparty/fftreal/fftreal.pro vendored
View File

@@ -41,6 +41,6 @@ macx {
sources.files = $$SOURCES $$HEADERS fftreal.pro readme.txt license.txt
sources.files += bwins/fftreal.def eabi/fftreal.def
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/spectrum/3rdparty/fftreal
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum/3rdparty/fftreal
INSTALLS += sources

4
examples/spectrum/README.txt
View File

@@ -4,7 +4,7 @@ Spectrum analyser demo app
Introduction
------------
This application is a demo which uses the QtMultimediaKit 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 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.
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 part of the application which interacts with QtMultimediaKit is in the Engine class.
The part of the application which interacts with QtMultimedia 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 :)

6
examples/spectrum/app/app.pro
View File

@@ -6,7 +6,7 @@ TEMPLATE = app
TARGET = spectrum
QT += multimediakit
QT += multimedia
SOURCES += main.cpp \
engine.cpp \
@@ -59,9 +59,9 @@ RESOURCES = spectrum.qrc
# Install
sources.files = $$SOURCES $$HEADERS $$RESOURCES app.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/spectrum/app
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum/app
images.files += images/record.png images/settings.png
images.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/spectrum/app/images
images.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum/app/images
INSTALLS += sources images
# Deployment

4
examples/spectrum/app/engine.cpp
View File

@@ -47,8 +47,8 @@
#include <QCoreApplication>
#include <QMetaObject>
#include <QSet>
#include <QtMultimediaKit/QAudioInput>
#include <QtMultimediaKit/QAudioOutput>
#include <QtMultimedia/QAudioInput>
#include <QtMultimedia/QAudioOutput>
#include <QDebug>
#include <QThread>
#include <QFile>

6
examples/spectrum/app/engine.h
View File

@@ -49,8 +49,8 @@
#include <QByteArray>
#include <QBuffer>
#include <QVector>
#include <QtMultimediaKit/QAudioDeviceInfo>
#include <QtMultimediaKit/QAudioFormat>
#include <QtMultimedia/QAudioDeviceInfo>
#include <QtMultimedia/QAudioFormat>
#ifdef DUMP_CAPTURED_AUDIO
#define DUMP_DATA
@@ -70,7 +70,7 @@ QT_FORWARD_DECLARE_CLASS(QAudioOutput)
QT_FORWARD_DECLARE_CLASS(QFile)
/**
* This class interfaces with the QtMultimediaKit audio classes, and also with
* This class interfaces with the QtMultimedia audio classes, and also with
* the SpectrumAnalyser class. Its role is to manage the capture and playback
* of audio data, meanwhile performing real-time analysis of the audio level
* and frequency spectrum.

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

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

2
examples/spectrum/app/mainwidget.h
View File

@@ -43,7 +43,7 @@
#include <QWidget>
#include <QIcon>
#include <QtMultimediaKit/qaudio.h>
#include <QtMultimedia/qaudio.h>
class Engine;
class FrequencySpectrum;

2
examples/spectrum/app/settingsdialog.h
View File

@@ -43,7 +43,7 @@
#include "spectrum.h"
#include <QDialog>
#include <QtMultimediaKit/QAudioDeviceInfo>
#include <QtMultimedia/QAudioDeviceInfo>
QT_FORWARD_DECLARE_CLASS(QComboBox)
QT_FORWARD_DECLARE_CLASS(QCheckBox)

2
examples/spectrum/app/spectrumanalyser.cpp
View File

@@ -43,7 +43,7 @@
#include <QtCore/qmath.h>
#include <QtCore/qmetatype.h>
#include <QtMultimediaKit/QAudioFormat>
#include <QtMultimedia/QAudioFormat>
#include <QThread>
#include "fftreal_wrapper.h"

2
examples/spectrum/app/tonegenerator.cpp
View File

@@ -41,7 +41,7 @@
#include "spectrum.h"
#include "utils.h"
#include <QByteArray>
#include <QtMultimediaKit/QAudioFormat>
#include <QtMultimedia/QAudioFormat>
#include <QtCore/qmath.h>
#include <QtCore/qendian.h>

2
examples/spectrum/app/tonegeneratordialog.h
View File

@@ -43,7 +43,7 @@
#include "spectrum.h"
#include <QDialog>
#include <QtMultimediaKit/QAudioDeviceInfo>
#include <QtMultimedia/QAudioDeviceInfo>
QT_FORWARD_DECLARE_CLASS(QCheckBox)
QT_FORWARD_DECLARE_CLASS(QSlider)

2
examples/spectrum/app/utils.cpp
View File

@@ -38,7 +38,7 @@
**
****************************************************************************/
#include <QtMultimediaKit/QAudioFormat>
#include <QtMultimedia/QAudioFormat>
#include "utils.h"
qint64 audioDuration(const QAudioFormat &format, qint64 bytes)

2
examples/spectrum/app/waveform.h
View File

@@ -42,7 +42,7 @@
#define WAVEFORM_H
#include <QWidget>
#include <QtMultimediaKit/QAudioFormat>
#include <QtMultimedia/QAudioFormat>
#include <QPixmap>
#include <QScopedPointer>

2
examples/spectrum/app/wavfile.h
View File

@@ -44,7 +44,7 @@
#include <QtCore/qobject.h>
#include <QtCore/qfile.h>
#include <QtMultimediaKit/qaudioformat.h>
#include <QtMultimedia/qaudioformat.h>
class WavFile : public QFile
{

2
examples/spectrum/spectrum.pro
View File

@@ -14,7 +14,7 @@ SUBDIRS += app
TARGET = spectrum
sources.files = README.txt spectrum.pri spectrum.pro TODO.txt
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/spectrum
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum
INSTALLS += sources
QT+=widgets

6
examples/videographicsitem/videographicsitem.pro
View File

@@ -1,7 +1,7 @@
TEMPLATE = app
TARGET = videographicsitem
QT += multimediakit multimediakitwidgets
QT += multimedia multimediawidgets
contains(QT_CONFIG, opengl): QT += opengl
@@ -12,9 +12,9 @@ SOURCES += main.cpp \
videoplayer.cpp \
videoitem.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/videographicsitem
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/videographicsitem
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/videographicsitem
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/videographicsitem
INSTALLS += target sources

6
examples/videowidget/videowidget.pro
View File

@@ -1,7 +1,7 @@
TEMPLATE = app
TARGET = videowidget
QT += multimediakit multimediakitwidgets
QT += multimedia multimediawidgets
HEADERS = \
videoplayer.h \
@@ -14,9 +14,9 @@ SOURCES = \
videowidget.cpp \
videowidgetsurface.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/videowidget
target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/videowidget
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/videowidget
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/videowidget
INSTALLS += target sources

17
modules/qt_multimedia.pri Normal file
View File

@@ -0,0 +1,17 @@
QT.multimedia.VERSION = 5.0.0
QT.multimedia.MAJOR_VERSION = 5
QT.multimedia.MINOR_VERSION = 0
QT.multimedia.PATCH_VERSION = 0
QT.multimedia.name = QtMultimedia
QT.multimedia.bins = $$QT_MODULE_BIN_BASE
QT.multimedia.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtMultimedia
QT.multimedia.private_includes = $$QT_MODULE_INCLUDE_BASE/QtMultimedia/$$QT.multimedia.VERSION
QT.multimedia.sources = $$QT_MODULE_BASE/src/multimedia
QT.multimedia.libs = $$QT_MODULE_LIB_BASE
QT.multimedia.plugins = $$QT_MODULE_PLUGIN_BASE
QT.multimedia.imports = $$QT_MODULE_IMPORT_BASE
QT.multimedia.depends = gui network
QT.multimedia.DEFINES = QT_MULTIMEDIA_LIB
QT_CONFIG += multimedia

17
modules/qt_multimediakit.pri
View File

@@ -1,17 +0,0 @@
QT.multimediakit.VERSION = 5.0.0
QT.multimediakit.MAJOR_VERSION = 5
QT.multimediakit.MINOR_VERSION = 0
QT.multimediakit.PATCH_VERSION = 0
QT.multimediakit.name = QtMultimediaKit
QT.multimediakit.bins = $$QT_MODULE_BIN_BASE
QT.multimediakit.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtMultimediaKit
QT.multimediakit.private_includes = $$QT_MODULE_INCLUDE_BASE/QtMultimediaKit/$$QT.multimediakit.VERSION
QT.multimediakit.sources = $$QT_MODULE_BASE/src/multimediakit
QT.multimediakit.libs = $$QT_MODULE_LIB_BASE
QT.multimediakit.plugins = $$QT_MODULE_PLUGIN_BASE
QT.multimediakit.imports = $$QT_MODULE_IMPORT_BASE
QT.multimediakit.depends = gui network
QT.multimediakit.DEFINES = QT_MULTIMEDIAKIT_LIB
QT_CONFIG += multimediakit

17
modules/qt_multimediakitwidgets.pri
View File

@@ -1,17 +0,0 @@
QT.multimediakitwidgets.VERSION = 5.0.0
QT.multimediakitwidgets.MAJOR_VERSION = 5
QT.multimediakitwidgets.MINOR_VERSION = 0
QT.multimediakitwidgets.PATCH_VERSION = 0
QT.multimediakitwidgets.name = QtMultimediaKitWidgets
QT.multimediakitwidgets.bins = $$QT_MODULE_BIN_BASE
QT.multimediakitwidgets.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtMultimediaKitWidgets
QT.multimediakitwidgets.private_includes = $$QT_MODULE_INCLUDE_BASE/QtMultimediaKitWidgets/$$QT.multimediakitwidgets.VERSION
QT.multimediakitwidgets.sources = $$QT_MODULE_BASE/src/multimediakitwidgets
QT.multimediakitwidgets.libs = $$QT_MODULE_LIB_BASE
QT.multimediakitwidgets.plugins = $$QT_MODULE_PLUGIN_BASE
QT.multimediakitwidgets.imports = $$QT_MODULE_IMPORT_BASE
QT.multimediakitwidgets.depends = gui network
QT.multimediakitwidgets.DEFINES = QT_MULTIMEDIAKITWIDGETS_LIB
QT_CONFIG += multimediakitwidgets

17
modules/qt_multimediawidgets.pri Normal file
View File

@@ -0,0 +1,17 @@
QT.multimediawidgets.VERSION = 5.0.0
QT.multimediawidgets.MAJOR_VERSION = 5
QT.multimediawidgets.MINOR_VERSION = 0
QT.multimediawidgets.PATCH_VERSION = 0
QT.multimediawidgets.name = QtMultimediaWidgets
QT.multimediawidgets.bins = $$QT_MODULE_BIN_BASE
QT.multimediawidgets.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtMultimediaWidgets
QT.multimediawidgets.private_includes = $$QT_MODULE_INCLUDE_BASE/QtMultimediaWidgets/$$QT.multimediawidgets.VERSION
QT.multimediawidgets.sources = $$QT_MODULE_BASE/src/multimediawidgets
QT.multimediawidgets.libs = $$QT_MODULE_LIB_BASE
QT.multimediawidgets.plugins = $$QT_MODULE_PLUGIN_BASE
QT.multimediawidgets.imports = $$QT_MODULE_IMPORT_BASE
QT.multimediawidgets.depends = gui network
QT.multimediawidgets.DEFINES = QT_MULTIMEDIAWIDGETS_LIB
QT_CONFIG += multimediawidgets

21
qtmultimedia.pro Normal file
View File

@@ -0,0 +1,21 @@
TEMPLATE = subdirs
module_qtmultimedia_src.subdir = src
module_qtmultimedia_src.target = module-qtmultimedia-src
module_qtmultimedia_examples.subdir = examples
module_qtmultimedia_examples.target = module-qtmultimedia-examples
module_qtmultimedia_examples.depends = module_qtmultimedia_src
!contains(QT_BUILD_PARTS,examples) {
module_qtmultimedia_examples.CONFIG = no_default_target no_default_install
}
module_qtmultimedia_tests.subdir = tests
module_qtmultimedia_tests.target = module-qtmultimedia-tests
module_qtmultimedia_tests.depends = module_qtmultimedia_src
module_qtmultimedia_tests.CONFIG = no_default_target no_default_install
SUBDIRS += module_qtmultimedia_src \
module_qtmultimedia_examples \
module_qtmultimedia_tests \

23
qtmultimediakit.pro
View File

@@ -1,21 +1,4 @@
TEMPLATE = subdirs
module_qtmultimediakit_src.subdir = src
module_qtmultimediakit_src.target = module-qtmultimediakit-src
module_qtmultimediakit_examples.subdir = examples
module_qtmultimediakit_examples.target = module-qtmultimediakit-examples
module_qtmultimediakit_examples.depends = module_qtmultimediakit_src
!contains(QT_BUILD_PARTS,examples) {
module_qtmultimediakit_examples.CONFIG = no_default_target no_default_install
}
module_qtmultimediakit_tests.subdir = tests
module_qtmultimediakit_tests.target = module-qtmultimediakit-tests
module_qtmultimediakit_tests.depends = module_qtmultimediakit_src
module_qtmultimediakit_tests.CONFIG = no_default_target no_default_install
SUBDIRS += module_qtmultimediakit_src \
module_qtmultimediakit_examples \
module_qtmultimediakit_tests \
# This is only so that Qt5.git still builds, since it's expecting
# the .pro file to match the directory name
include(qtmultimedia.pro)

3
src/imports/multimedia/multimedia.cpp
View File

@@ -68,7 +68,8 @@ class QMultimediaDeclarativeModule : public QDeclarativeExtensionPlugin
public:
virtual void registerTypes(const char *uri)
{
Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.multimediakit"));
Q_ASSERT(QLatin1String(uri) == QLatin1String("QtMultimedia")
|| QLatin1String(uri) == QLatin1String("Qt.multimediakit"));
qmlRegisterType<QSoundEffect>(uri, 4, 0, "SoundEffect");
qmlRegisterType<QDeclarativeAudio>(uri, 4, 0, "Audio");

18
src/imports/multimedia/multimedia.pro
View File

@@ -1,11 +1,11 @@
TARGET = declarative_multimedia
TARGETPATH = Qt/multimediakit
TARGETPATH = QtMultimedia
include(../qimportbase.pri)
QT += declarative network multimediakit-private
QT += declarative network multimedia-private
DESTDIR = $$QT.multimediakit.imports/$$TARGETPATH
DESTDIR = $$QT.multimedia.imports/$$TARGETPATH
target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
HEADERS += \
@@ -59,4 +59,16 @@ disabled {
qmldir.files += $$PWD/qmldir
qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
# another copy of the qmldir file so the old import works
OLDQMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir.qtmultimediakit
oldcopy2build.input = OLDQMLDIRFILE
oldcopy2build.output = $$QT.multimedia.imports/Qt/multimediakit/qmldir
!contains(TEMPLATE_PREFIX, vc):oldcopy2build.variable_out = PRE_TARGETDEPS
oldcopy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
oldcopy2build.name = COPY ${QMAKE_FILE_IN}
oldcopy2build.CONFIG += no_link
# `clean' should leave the build in a runnable state, which means it shouldn't delete qmldir
oldcopy2build.CONFIG += no_clean
QMAKE_EXTRA_COMPILERS += oldcopy2build
INSTALLS += target qmldir

94
src/imports/multimedia/qdeclarativeaudio.cpp
View File

@@ -52,11 +52,11 @@ QT_BEGIN_NAMESPACE
\ingroup qml-multimedia
This element is part of the \bold{QtMultimediaKit 1.1} module.
This element is part of the \bold{QtMultimedia 4.0} module.
\qml
import Qt 4.7
import QtMultimediaKit 1.1
import QtMultimedia 4.0
Text {
text: "Click Me!";
@@ -333,7 +333,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the tile of the media.
\sa {QtMultimediaKit::Title}
\sa {QtMultimedia::Title}
*/
/*!
@@ -341,7 +341,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the sub-title of the media.
\sa {QtMultimediaKit::SubTitle}
\sa {QtMultimedia::SubTitle}
*/
/*!
@@ -349,7 +349,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the author of the media.
\sa {QtMultimediaKit::Author}
\sa {QtMultimedia::Author}
*/
/*!
@@ -357,7 +357,7 @@ void QDeclarativeAudio::componentComplete()
This property holds a user comment about the media.
\sa {QtMultimediaKit::Comment}
\sa {QtMultimedia::Comment}
*/
/*!
@@ -365,7 +365,7 @@ void QDeclarativeAudio::componentComplete()
This property holds a description of the media.
\sa {QtMultimediaKit::Description}
\sa {QtMultimedia::Description}
*/
/*!
@@ -373,7 +373,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the category of the media
\sa {QtMultimediaKit::Category}
\sa {QtMultimedia::Category}
*/
/*!
@@ -381,7 +381,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the genre of the media.
\sa {QtMultimediaKit::Genre}
\sa {QtMultimedia::Genre}
*/
/*!
@@ -389,7 +389,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the year of release of the media.
\sa {QtMultimediaKit::Year}
\sa {QtMultimedia::Year}
*/
/*!
@@ -397,7 +397,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the date of the media.
\sa {QtMultimediaKit::Date}
\sa {QtMultimedia::Date}
*/
/*!
@@ -405,7 +405,7 @@ void QDeclarativeAudio::componentComplete()
This property holds a user rating of the media in the range of 0 to 100.
\sa {QtMultimediaKit::UserRating}
\sa {QtMultimedia::UserRating}
*/
/*!
@@ -413,7 +413,7 @@ void QDeclarativeAudio::componentComplete()
This property holds a list of keywords describing the media.
\sa {QtMultimediaKit::Keywords}
\sa {QtMultimedia::Keywords}
*/
/*!
@@ -421,7 +421,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the language of the media, as an ISO 639-2 code.
\sa {QtMultimediaKit::Language}
\sa {QtMultimedia::Language}
*/
/*!
@@ -429,7 +429,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the publisher of the media.
\sa {QtMultimediaKit::Publisher}
\sa {QtMultimedia::Publisher}
*/
/*!
@@ -437,7 +437,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the media's copyright notice.
\sa {QtMultimediaKit::Copyright}
\sa {QtMultimedia::Copyright}
*/
/*!
@@ -445,7 +445,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the parental rating of the media.
\sa {QtMultimediaKit::ParentalRating}
\sa {QtMultimedia::ParentalRating}
*/
/*!
@@ -454,7 +454,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the name of the rating organisation responsible for the
parental rating of the media.
\sa {QtMultimediaKit::RatingOrganisation}
\sa {QtMultimedia::RatingOrganisation}
*/
/*!
@@ -462,7 +462,7 @@ void QDeclarativeAudio::componentComplete()
This property property holds the size of the media in bytes.
\sa {QtMultimediaKit::Size}
\sa {QtMultimedia::Size}
*/
/*!
@@ -470,7 +470,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the type of the media.
\sa {QtMultimediaKit::MediaType}
\sa {QtMultimedia::MediaType}
*/
/*!
@@ -479,7 +479,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the bit rate of the media's audio stream ni bits per
second.
\sa {QtMultimediaKit::AudioBitRate}
\sa {QtMultimedia::AudioBitRate}
*/
/*!
@@ -487,7 +487,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the encoding of the media audio stream.
\sa {QtMultimediaKit::AudioCodec}
\sa {QtMultimedia::AudioCodec}
*/
/*!
@@ -495,7 +495,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the average volume level of the media.
\sa {QtMultimediaKit::AverageLevel}
\sa {QtMultimedia::AverageLevel}
*/
/*!
@@ -503,7 +503,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the number of channels in the media's audio stream.
\sa {QtMultimediaKit::ChannelCount}
\sa {QtMultimedia::ChannelCount}
*/
/*!
@@ -511,7 +511,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the peak volume of media's audio stream.
\sa {QtMultimediaKit::PeakValue}
\sa {QtMultimedia::PeakValue}
*/
/*!
@@ -519,7 +519,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the sample rate of the media's audio stream in hertz.
\sa {QtMultimediaKit::SampleRate}
\sa {QtMultimedia::SampleRate}
*/
/*!
@@ -527,7 +527,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the title of the album the media belongs to.
\sa {QtMultimediaKit::AlbumTitle}
\sa {QtMultimedia::AlbumTitle}
*/
/*!
@@ -536,7 +536,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the name of the principal artist of the album the media
belongs to.
\sa {QtMultimediaKit::AlbumArtist}
\sa {QtMultimedia::AlbumArtist}
*/
/*!
@@ -544,7 +544,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the names of artists contributing to the media.
\sa {QtMultimediaKit::ContributingArtist}
\sa {QtMultimedia::ContributingArtist}
*/
/*!
@@ -552,7 +552,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the composer of the media.
\sa {QtMultimediaKit::Composer}
\sa {QtMultimedia::Composer}
*/
/*!
@@ -560,7 +560,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the conductor of the media.
\sa {QtMultimediaKit::Conductor}
\sa {QtMultimedia::Conductor}
*/
/*!
@@ -568,7 +568,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the lyrics to the media.
\sa {QtMultimediaKit::Lyrics}
\sa {QtMultimedia::Lyrics}
*/
/*!
@@ -576,7 +576,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the mood of the media.
\sa {QtMultimediaKit::Mood}
\sa {QtMultimedia::Mood}
*/
/*!
@@ -584,7 +584,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the track number of the media.
\sa {QtMultimediaKit::TrackNumber}
\sa {QtMultimedia::TrackNumber}
*/
/*!
@@ -592,7 +592,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the number of track on the album containing the media.
\sa {QtMultimediaKit::TrackNumber}
\sa {QtMultimedia::TrackNumber}
*/
/*!
@@ -600,7 +600,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the URL of a small cover art image.
\sa {QtMultimediaKit::CoverArtUrlSmall}
\sa {QtMultimedia::CoverArtUrlSmall}
*/
/*!
@@ -608,7 +608,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the URL of a large cover art image.
\sa {QtMultimediaKit::CoverArtUrlLarge}
\sa {QtMultimedia::CoverArtUrlLarge}
*/
/*!
@@ -616,7 +616,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the dimension of an image or video.
\sa {QtMultimediaKit::Resolution}
\sa {QtMultimedia::Resolution}
*/
/*!
@@ -624,7 +624,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the pixel aspect ratio of an image or video.
\sa {QtMultimediaKit::PixelAspectRatio}
\sa {QtMultimedia::PixelAspectRatio}
*/
/*!
@@ -632,7 +632,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the frame rate of the media's video stream.
\sa {QtMultimediaKit::VideoFrameRate}
\sa {QtMultimedia::VideoFrameRate}
*/
/*!
@@ -641,7 +641,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the bit rate of the media's video stream in bits per
second.
\sa {QtMultimediaKit::VideoBitRate}
\sa {QtMultimedia::VideoBitRate}
*/
/*!
@@ -649,7 +649,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the encoding of the media's video stream.
\sa {QtMultimediaKit::VideoCodec}
\sa {QtMultimedia::VideoCodec}
*/
/*!
@@ -657,7 +657,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the URL of a poster image.
\sa {QtMultimediaKit::PosterUrl}
\sa {QtMultimedia::PosterUrl}
*/
/*!
@@ -665,7 +665,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the chapter number of the media.
\sa {QtMultimediaKit::ChapterNumber}
\sa {QtMultimedia::ChapterNumber}
*/
/*!
@@ -673,7 +673,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the director of the media.
\sa {QtMultimediaKit::Director}
\sa {QtMultimedia::Director}
*/
/*!
@@ -681,7 +681,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the lead performer in the media.
\sa {QtMultimediaKit::LeadPerformer}
\sa {QtMultimedia::LeadPerformer}
*/
/*!
@@ -689,7 +689,7 @@ void QDeclarativeAudio::componentComplete()
This property holds the writer of the media.
\sa {QtMultimediaKit::Writer}
\sa {QtMultimedia::Writer}
*/
QT_END_NAMESPACE

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

@@ -75,11 +75,11 @@ void QDeclarativeCamera::_q_updateState(QCamera::State state)
\ingroup qml-multimedia
\inherits Item
This element is part of the \bold{QtMultimediaKit 1.1} module.
This element is part of the \bold{QtMultimedia 4.0} module.
\qml
import Qt 4.7
import QtMultimediaKit 1.1
import QtMultimedia 4.0
Camera {
id: camera

4
src/imports/multimedia/qdeclarativecameraexposure.cpp
View File

@@ -50,13 +50,13 @@ QT_BEGIN_NAMESPACE
\brief The CameraExposure element provides interface for exposure related camera settings.
\ingroup qml-multimedia
This element is part of the \bold{Qt.multimediakit 4.0} module.
This element is part of the \bold{QtMultimedia 4.0} module.
It should not be constructed separately but provided by Camera.exposure.
\qml
import QtQuick 2.0
import Qt.multimediakit 4.0
import QtMultimedia 4.0
Camera {
id: camera

4
src/imports/multimedia/qdeclarativecameraflash.cpp
View File

@@ -50,13 +50,13 @@ QT_BEGIN_NAMESPACE
\brief The CameraFlash element provides interface for flash related camera settings.
\ingroup qml-multimedia
This element is part of the \bold{Qt.multimediakit 4.0} module.
This element is part of the \bold{QtMultimedia 4.0} module.
It should not be constructed separately but provided by Camera.flash.
\qml
import QtQuick 2.0
import Qt.multimediakit 4.0
import QtMultimedia 4.0
Camera {
id: camera

4
src/imports/multimedia/qdeclarativecamerafocus.cpp
View File

@@ -50,13 +50,13 @@ QT_BEGIN_NAMESPACE
\brief The CameraFocus element provides interface for focus related camera settings.
\ingroup qml-multimedia
This element is part of the \bold{Qt.multimediakit 4.0} module.
This element is part of the \bold{QtMultimedia 4.0} module.
It should not be constructed separately but provided by Camera.focus.
\qml
import QtQuick 2.0
import Qt.multimediakit 4.0
import QtMultimedia 4.0
Camera {
id: camera

6
src/imports/multimedia/qdeclarativemediabase.cpp
View File

@@ -109,9 +109,9 @@ public:
bool isMetaDataAvailable() const { return false; }
QVariant metaData(QtMultimediaKit::MetaData) const { return QVariant(); }
QList<QtMultimediaKit::MetaData> availableMetaData() const {
return QList<QtMultimediaKit::MetaData>(); }
QVariant metaData(QtMultimedia::MetaData) const { return QVariant(); }
QList<QtMultimedia::MetaData> availableMetaData() const {
return QList<QtMultimedia::MetaData>(); }
QVariant extendedMetaData(const QString &) const { return QVariant(); }
QStringList availableExtendedMetaData() const { return QStringList(); }

92
src/imports/multimedia/qdeclarativemediametadata_p.h
View File

@@ -117,57 +117,57 @@ public:
{
}
QVariant title() const { return m_control->metaData(QtMultimediaKit::Title); }
QVariant subTitle() const { return m_control->metaData(QtMultimediaKit::SubTitle); }
QVariant author() const { return m_control->metaData(QtMultimediaKit::Author); }
QVariant comment() const { return m_control->metaData(QtMultimediaKit::Comment); }
QVariant description() const { return m_control->metaData(QtMultimediaKit::Description); }
QVariant category() const { return m_control->metaData(QtMultimediaKit::Category); }
QVariant genre() const { return m_control->metaData(QtMultimediaKit::Genre); }
QVariant year() const { return m_control->metaData(QtMultimediaKit::Year); }
QVariant date() const { return m_control->metaData(QtMultimediaKit::Date); }
QVariant userRating() const { return m_control->metaData(QtMultimediaKit::UserRating); }
QVariant keywords() const { return m_control->metaData(QtMultimediaKit::Keywords); }
QVariant language() const { return m_control->metaData(QtMultimediaKit::Language); }
QVariant publisher() const { return m_control->metaData(QtMultimediaKit::Publisher); }
QVariant copyright() const { return m_control->metaData(QtMultimediaKit::Copyright); }
QVariant parentalRating() const { return m_control->metaData(QtMultimediaKit::ParentalRating); }
QVariant title() const { return m_control->metaData(QtMultimedia::Title); }
QVariant subTitle() const { return m_control->metaData(QtMultimedia::SubTitle); }
QVariant author() const { return m_control->metaData(QtMultimedia::Author); }
QVariant comment() const { return m_control->metaData(QtMultimedia::Comment); }
QVariant description() const { return m_control->metaData(QtMultimedia::Description); }
QVariant category() const { return m_control->metaData(QtMultimedia::Category); }
QVariant genre() const { return m_control->metaData(QtMultimedia::Genre); }
QVariant year() const { return m_control->metaData(QtMultimedia::Year); }
QVariant date() const { return m_control->metaData(QtMultimedia::Date); }
QVariant userRating() const { return m_control->metaData(QtMultimedia::UserRating); }
QVariant keywords() const { return m_control->metaData(QtMultimedia::Keywords); }
QVariant language() const { return m_control->metaData(QtMultimedia::Language); }
QVariant publisher() const { return m_control->metaData(QtMultimedia::Publisher); }
QVariant copyright() const { return m_control->metaData(QtMultimedia::Copyright); }
QVariant parentalRating() const { return m_control->metaData(QtMultimedia::ParentalRating); }
QVariant ratingOrganisation() const {
return m_control->metaData(QtMultimediaKit::RatingOrganisation); }
QVariant size() const { return m_control->metaData(QtMultimediaKit::Size); }
QVariant mediaType() const { return m_control->metaData(QtMultimediaKit::MediaType); }
QVariant duration() const { return m_control->metaData(QtMultimediaKit::Duration); }
QVariant audioBitRate() const { return m_control->metaData(QtMultimediaKit::AudioBitRate); }
QVariant audioCodec() const { return m_control->metaData(QtMultimediaKit::AudioCodec); }
QVariant averageLevel() const { return m_control->metaData(QtMultimediaKit::AverageLevel); }
QVariant channelCount() const { return m_control->metaData(QtMultimediaKit::ChannelCount); }
QVariant peakValue() const { return m_control->metaData(QtMultimediaKit::PeakValue); }
QVariant sampleRate() const { return m_control->metaData(QtMultimediaKit::SampleRate); }
QVariant albumTitle() const { return m_control->metaData(QtMultimediaKit::AlbumTitle); }
QVariant albumArtist() const { return m_control->metaData(QtMultimediaKit::AlbumArtist); }
return m_control->metaData(QtMultimedia::RatingOrganisation); }
QVariant size() const { return m_control->metaData(QtMultimedia::Size); }
QVariant mediaType() const { return m_control->metaData(QtMultimedia::MediaType); }
QVariant duration() const { return m_control->metaData(QtMultimedia::Duration); }
QVariant audioBitRate() const { return m_control->metaData(QtMultimedia::AudioBitRate); }
QVariant audioCodec() const { return m_control->metaData(QtMultimedia::AudioCodec); }
QVariant averageLevel() const { return m_control->metaData(QtMultimedia::AverageLevel); }
QVariant channelCount() const { return m_control->metaData(QtMultimedia::ChannelCount); }
QVariant peakValue() const { return m_control->metaData(QtMultimedia::PeakValue); }
QVariant sampleRate() const { return m_control->metaData(QtMultimedia::SampleRate); }
QVariant albumTitle() const { return m_control->metaData(QtMultimedia::AlbumTitle); }
QVariant albumArtist() const { return m_control->metaData(QtMultimedia::AlbumArtist); }
QVariant contributingArtist() const {
return m_control->metaData(QtMultimediaKit::ContributingArtist); }
QVariant composer() const { return m_control->metaData(QtMultimediaKit::Composer); }
QVariant conductor() const { return m_control->metaData(QtMultimediaKit::Conductor); }
QVariant lyrics() const { return m_control->metaData(QtMultimediaKit::Lyrics); }
QVariant mood() const { return m_control->metaData(QtMultimediaKit::Mood); }
QVariant trackNumber() const { return m_control->metaData(QtMultimediaKit::TrackNumber); }
QVariant trackCount() const { return m_control->metaData(QtMultimediaKit::TrackCount); }
return m_control->metaData(QtMultimedia::ContributingArtist); }
QVariant composer() const { return m_control->metaData(QtMultimedia::Composer); }
QVariant conductor() const { return m_control->metaData(QtMultimedia::Conductor); }
QVariant lyrics() const { return m_control->metaData(QtMultimedia::Lyrics); }
QVariant mood() const { return m_control->metaData(QtMultimedia::Mood); }
QVariant trackNumber() const { return m_control->metaData(QtMultimedia::TrackNumber); }
QVariant trackCount() const { return m_control->metaData(QtMultimedia::TrackCount); }
QVariant coverArtUrlSmall() const {
return m_control->metaData(QtMultimediaKit::CoverArtUrlSmall); }
return m_control->metaData(QtMultimedia::CoverArtUrlSmall); }
QVariant coverArtUrlLarge() const {
return m_control->metaData(QtMultimediaKit::CoverArtUrlLarge); }
QVariant resolution() const { return m_control->metaData(QtMultimediaKit::Resolution); }
return m_control->metaData(QtMultimedia::CoverArtUrlLarge); }
QVariant resolution() const { return m_control->metaData(QtMultimedia::Resolution); }
QVariant pixelAspectRatio() const {
return m_control->metaData(QtMultimediaKit::PixelAspectRatio); }
QVariant videoFrameRate() const { return m_control->metaData(QtMultimediaKit::VideoFrameRate); }
QVariant videoBitRate() const { return m_control->metaData(QtMultimediaKit::VideoBitRate); }
QVariant videoCodec() const { return m_control->metaData(QtMultimediaKit::VideoCodec); }
QVariant posterUrl() const { return m_control->metaData(QtMultimediaKit::PosterUrl); }
QVariant chapterNumber() const { return m_control->metaData(QtMultimediaKit::ChapterNumber); }
QVariant director() const { return m_control->metaData(QtMultimediaKit::Director); }
QVariant leadPerformer() const { return m_control->metaData(QtMultimediaKit::LeadPerformer); }
QVariant writer() const { return m_control->metaData(QtMultimediaKit::Writer); }
return m_control->metaData(QtMultimedia::PixelAspectRatio); }
QVariant videoFrameRate() const { return m_control->metaData(QtMultimedia::VideoFrameRate); }
QVariant videoBitRate() const { return m_control->metaData(QtMultimedia::VideoBitRate); }
QVariant videoCodec() const { return m_control->metaData(QtMultimedia::VideoCodec); }
QVariant posterUrl() const { return m_control->metaData(QtMultimedia::PosterUrl); }
QVariant chapterNumber() const { return m_control->metaData(QtMultimedia::ChapterNumber); }
QVariant director() const { return m_control->metaData(QtMultimedia::Director); }
QVariant leadPerformer() const { return m_control->metaData(QtMultimedia::LeadPerformer); }
QVariant writer() const { return m_control->metaData(QtMultimedia::Writer); }
Q_SIGNALS:
void metaDataChanged();

146
src/imports/multimedia/qdeclarativevideo.cpp
View File

@@ -72,11 +72,11 @@ void QDeclarativeVideo::_q_error(int errorCode, const QString &errorString)
\inherits Item
\ingroup qml-multimedia
This element is part of the \bold{QtMultimediaKit 1.1} module.
This element is part of the \bold{QtMultimedia 4.0} module.
\qml
import Qt 4.7
import QtMultimediaKit 1.1
import QtMultimedia 4.0
Video {
id: video
@@ -427,7 +427,7 @@ QT_END_NAMESPACE
This property holds the tile of the media.
\sa {QtMultimediaKit::Title}
\sa {QtMultimedia::Title}
*/
/*!
@@ -435,7 +435,7 @@ QT_END_NAMESPACE
This property holds the sub-title of the media.
\sa {QtMultimediaKit::SubTitle}
\sa {QtMultimedia::SubTitle}
*/
/*!
@@ -443,7 +443,7 @@ QT_END_NAMESPACE
This property holds the author of the media.
\sa {QtMultimediaKit::Author}
\sa {QtMultimedia::Author}
*/
/*!
@@ -451,7 +451,7 @@ QT_END_NAMESPACE
This property holds a user comment about the media.
\sa {QtMultimediaKit::Comment}
\sa {QtMultimedia::Comment}
*/
/*!
@@ -459,7 +459,7 @@ QT_END_NAMESPACE
This property holds a description of the media.
\sa {QtMultimediaKit::Description}
\sa {QtMultimedia::Description}
*/
/*!
@@ -467,7 +467,7 @@ QT_END_NAMESPACE
This property holds the category of the media
\sa {QtMultimediaKit::Category}
\sa {QtMultimedia::Category}
*/
/*!
@@ -475,7 +475,7 @@ QT_END_NAMESPACE
This property holds the genre of the media.
\sa {QtMultimediaKit::Genre}
\sa {QtMultimedia::Genre}
*/
/*!
@@ -483,7 +483,7 @@ QT_END_NAMESPACE
This property holds the year of release of the media.
\sa {QtMultimediaKit::Year}
\sa {QtMultimedia::Year}
*/
/*!
@@ -491,7 +491,7 @@ QT_END_NAMESPACE
This property holds the date of the media.
\sa {QtMultimediaKit::Date}
\sa {QtMultimedia::Date}
*/
/*!
@@ -499,7 +499,7 @@ QT_END_NAMESPACE
This property holds a user rating of the media in the range of 0 to 100.
\sa {QtMultimediaKit::UserRating}
\sa {QtMultimedia::UserRating}
*/
/*!
@@ -507,7 +507,7 @@ QT_END_NAMESPACE
This property holds a list of keywords describing the media.
\sa {QtMultimediaKit::Keywords}
\sa {QtMultimedia::Keywords}
*/
/*!
@@ -515,7 +515,7 @@ QT_END_NAMESPACE
This property holds the language of the media, as an ISO 639-2 code.
\sa {QtMultimediaKit::Language}
\sa {QtMultimedia::Language}
*/
/*!
@@ -523,7 +523,7 @@ QT_END_NAMESPACE
This property holds the publisher of the media.
\sa {QtMultimediaKit::Publisher}
\sa {QtMultimedia::Publisher}
*/
/*!
@@ -531,7 +531,7 @@ QT_END_NAMESPACE
This property holds the media's copyright notice.
\sa {QtMultimediaKit::Copyright}
\sa {QtMultimedia::Copyright}
*/
/*!
@@ -539,7 +539,7 @@ QT_END_NAMESPACE
This property holds the parental rating of the media.
\sa {QtMultimediaKit::ParentalRating}
\sa {QtMultimedia::ParentalRating}
*/
/*!
@@ -548,7 +548,7 @@ QT_END_NAMESPACE
This property holds the name of the rating organisation responsible for the
parental rating of the media.
\sa {QtMultimediaKit::RatingOrganisation}
\sa {QtMultimedia::RatingOrganisation}
*/
/*!
@@ -556,7 +556,7 @@ QT_END_NAMESPACE
This property property holds the size of the media in bytes.
\sa {QtMultimediaKit::Size}
\sa {QtMultimedia::Size}
*/
/*!
@@ -564,7 +564,7 @@ QT_END_NAMESPACE
This property holds the type of the media.
\sa {QtMultimediaKit::MediaType}
\sa {QtMultimedia::MediaType}
*/
/*!
@@ -573,7 +573,7 @@ QT_END_NAMESPACE
This property holds the bit rate of the media's audio stream ni bits per
second.
\sa {QtMultimediaKit::AudioBitRate}
\sa {QtMultimedia::AudioBitRate}
*/
/*!
@@ -581,7 +581,7 @@ QT_END_NAMESPACE
This property holds the encoding of the media audio stream.
\sa {QtMultimediaKit::AudioCodec}
\sa {QtMultimedia::AudioCodec}
*/
/*!
@@ -589,7 +589,7 @@ QT_END_NAMESPACE
This property holds the average volume level of the media.
\sa {QtMultimediaKit::AverageLevel}
\sa {QtMultimedia::AverageLevel}
*/
/*!
@@ -597,7 +597,7 @@ QT_END_NAMESPACE
This property holds the number of channels in the media's audio stream.
\sa {QtMultimediaKit::ChannelCount}
\sa {QtMultimedia::ChannelCount}
*/
/*!
@@ -605,7 +605,7 @@ QT_END_NAMESPACE
This property holds the peak volume of media's audio stream.
\sa {QtMultimediaKit::PeakValue}
\sa {QtMultimedia::PeakValue}
*/
/*!
@@ -613,7 +613,7 @@ QT_END_NAMESPACE
This property holds the sample rate of the media's audio stream in hertz.
\sa {QtMultimediaKit::SampleRate}
\sa {QtMultimedia::SampleRate}
*/
/*!
@@ -621,7 +621,7 @@ QT_END_NAMESPACE
This property holds the title of the album the media belongs to.
\sa {QtMultimediaKit::AlbumTitle}
\sa {QtMultimedia::AlbumTitle}
*/
/*!
@@ -630,7 +630,7 @@ QT_END_NAMESPACE
This property holds the name of the principal artist of the album the media
belongs to.
\sa {QtMultimediaKit::AlbumArtist}
\sa {QtMultimedia::AlbumArtist}
*/
/*!
@@ -638,7 +638,7 @@ QT_END_NAMESPACE
This property holds the names of artists contributing to the media.
\sa {QtMultimediaKit::ContributingArtist}
\sa {QtMultimedia::ContributingArtist}
*/
/*!
@@ -646,7 +646,7 @@ QT_END_NAMESPACE
This property holds the composer of the media.
\sa {QtMultimediaKit::Composer}
\sa {QtMultimedia::Composer}
*/
/*!
@@ -654,7 +654,7 @@ QT_END_NAMESPACE
This property holds the conductor of the media.
\sa {QtMultimediaKit::Conductor}
\sa {QtMultimedia::Conductor}
*/
/*!
@@ -662,7 +662,7 @@ QT_END_NAMESPACE
This property holds the lyrics to the media.
\sa {QtMultimediaKit::Lyrics}
\sa {QtMultimedia::Lyrics}
*/
/*!
@@ -670,7 +670,7 @@ QT_END_NAMESPACE
This property holds the mood of the media.
\sa {QtMultimediaKit::Mood}
\sa {QtMultimedia::Mood}
*/
/*!
@@ -678,7 +678,7 @@ QT_END_NAMESPACE
This property holds the track number of the media.
\sa {QtMultimediaKit::TrackNumber}
\sa {QtMultimedia::TrackNumber}
*/
/*!
@@ -686,7 +686,7 @@ QT_END_NAMESPACE
This property holds the number of track on the album containing the media.
\sa {QtMultimediaKit::TrackNumber}
\sa {QtMultimedia::TrackNumber}
*/
/*!
@@ -694,7 +694,7 @@ QT_END_NAMESPACE
This property holds the URL of a small cover art image.
\sa {QtMultimediaKit::CoverArtUrlSmall}
\sa {QtMultimedia::CoverArtUrlSmall}
*/
/*!
@@ -702,7 +702,7 @@ QT_END_NAMESPACE
This property holds the URL of a large cover art image.
\sa {QtMultimediaKit::CoverArtUrlLarge}
\sa {QtMultimedia::CoverArtUrlLarge}
*/
/*!
@@ -710,7 +710,7 @@ QT_END_NAMESPACE
This property holds the dimension of an image or video.
\sa {QtMultimediaKit::Resolution}
\sa {QtMultimedia::Resolution}
*/
/*!
@@ -718,7 +718,7 @@ QT_END_NAMESPACE
This property holds the pixel aspect ratio of an image or video.
\sa {QtMultimediaKit::PixelAspectRatio}
\sa {QtMultimedia::PixelAspectRatio}
*/
/*!
@@ -726,7 +726,7 @@ QT_END_NAMESPACE
This property holds the frame rate of the media's video stream.
\sa {QtMultimediaKit::VideoFrameRate}
\sa {QtMultimedia::VideoFrameRate}
*/
/*!
@@ -735,7 +735,7 @@ QT_END_NAMESPACE
This property holds the bit rate of the media's video stream in bits per
second.
\sa {QtMultimediaKit::VideoBitRate}
\sa {QtMultimedia::VideoBitRate}
*/
/*!
@@ -743,7 +743,7 @@ QT_END_NAMESPACE
This property holds the encoding of the media's video stream.
\sa {QtMultimediaKit::VideoCodec}
\sa {QtMultimedia::VideoCodec}
*/
/*!
@@ -751,7 +751,7 @@ QT_END_NAMESPACE
This property holds the URL of a poster image.
\sa {QtMultimediaKit::PosterUrl}
\sa {QtMultimedia::PosterUrl}
*/
/*!
@@ -759,7 +759,7 @@ QT_END_NAMESPACE
This property holds the chapter number of the media.
\sa {QtMultimediaKit::ChapterNumber}
\sa {QtMultimedia::ChapterNumber}
*/
/*!
@@ -767,7 +767,7 @@ QT_END_NAMESPACE
This property holds the director of the media.
\sa {QtMultimediaKit::Director}
\sa {QtMultimedia::Director}
*/
/*!
@@ -775,7 +775,7 @@ QT_END_NAMESPACE
This property holds the lead performer in the media.
\sa {QtMultimediaKit::LeadPerformer}
\sa {QtMultimedia::LeadPerformer}
*/
/*!
@@ -783,7 +783,7 @@ QT_END_NAMESPACE
This property holds the writer of the media.
\sa {QtMultimediaKit::Writer}
\sa {QtMultimedia::Writer}
*/
// The remaining properties are related to photos, and are technically
@@ -793,157 +793,157 @@ QT_END_NAMESPACE
/*!
\qmlproperty variant Video::metaData.cameraManufacturer
\sa {QtMultimediaKit::CameraManufacturer}
\sa {QtMultimedia::CameraManufacturer}
*/
/*!
\qmlproperty variant Video::metaData.cameraModel
\sa {QtMultimediaKit::CameraModel}
\sa {QtMultimedia::CameraModel}
*/
/*!
\qmlproperty variant Video::metaData.event
\sa {QtMultimediaKit::Event}
\sa {QtMultimedia::Event}
*/
/*!
\qmlproperty variant Video::metaData.subject
\sa {QtMultimediaKit::Subject}
\sa {QtMultimedia::Subject}
*/
/*!
\qmlproperty variant Video::metaData.orientation
\sa {QtMultimediaKit::Orientation}
\sa {QtMultimedia::Orientation}
*/
/*!
\qmlproperty variant Video::metaData.exposureTime
\sa {QtMultimediaKit::ExposureTime}
\sa {QtMultimedia::ExposureTime}
*/
/*!
\qmlproperty variant Video::metaData.fNumber
\sa {QtMultimediaKit::FNumber}
\sa {QtMultimedia::FNumber}
*/
/*!
\qmlproperty variant Video::metaData.exposureProgram
\sa {QtMultimediaKit::ExposureProgram}
\sa {QtMultimedia::ExposureProgram}
*/
/*!
\qmlproperty variant Video::metaData.isoSpeedRatings
\sa {QtMultimediaKit::ISOSpeedRatings}
\sa {QtMultimedia::ISOSpeedRatings}
*/
/*!
\qmlproperty variant Video::metaData.exposureBiasValue
\sa {QtMultimediaKit::ExposureBiasValue}
\sa {QtMultimedia::ExposureBiasValue}
*/
/*!
\qmlproperty variant Video::metaData.dateTimeDigitized
\sa {QtMultimediaKit::DateTimeDigitized}
\sa {QtMultimedia::DateTimeDigitized}
*/
/*!
\qmlproperty variant Video::metaData.subjectDistance
\sa {QtMultimediaKit::SubjectDistance}
\sa {QtMultimedia::SubjectDistance}
*/
/*!
\qmlproperty variant Video::metaData.meteringMode
\sa {QtMultimediaKit::MeteringMode}
\sa {QtMultimedia::MeteringMode}
*/
/*!
\qmlproperty variant Video::metaData.lightSource
\sa {QtMultimediaKit::LightSource}
\sa {QtMultimedia::LightSource}
*/
/*!
\qmlproperty variant Video::metaData.flash
\sa {QtMultimediaKit::Flash}
\sa {QtMultimedia::Flash}
*/
/*!
\qmlproperty variant Video::metaData.focalLength
\sa {QtMultimediaKit::FocalLength}
\sa {QtMultimedia::FocalLength}
*/
/*!
\qmlproperty variant Video::metaData.exposureMode
\sa {QtMultimediaKit::ExposureMode}
\sa {QtMultimedia::ExposureMode}
*/
/*!
\qmlproperty variant Video::metaData.whiteBalance
\sa {QtMultimediaKit::WhiteBalance}
\sa {QtMultimedia::WhiteBalance}
*/
/*!
\qmlproperty variant Video::metaData.DigitalZoomRatio
\sa {QtMultimediaKit::DigitalZoomRatio}
\sa {QtMultimedia::DigitalZoomRatio}
*/
/*!
\qmlproperty variant Video::metaData.focalLengthIn35mmFilm
\sa {QtMultimediaKit::FocalLengthIn35mmFile}
\sa {QtMultimedia::FocalLengthIn35mmFile}
*/
/*!
\qmlproperty variant Video::metaData.sceneCaptureType
\sa {QtMultimediaKit::SceneCaptureType}
\sa {QtMultimedia::SceneCaptureType}
*/
/*!
\qmlproperty variant Video::metaData.gainControl
\sa {QtMultimediaKit::GainControl}
\sa {QtMultimedia::GainControl}
*/
/*!
\qmlproperty variant Video::metaData.contrast
\sa {QtMultimediaKit::contrast}
\sa {QtMultimedia::contrast}
*/
/*!
\qmlproperty variant Video::metaData.saturation
\sa {QtMultimediaKit::Saturation}
\sa {QtMultimedia::Saturation}
*/
/*!
\qmlproperty variant Video::metaData.sharpness
\sa {QtMultimediaKit::Sharpness}
\sa {QtMultimedia::Sharpness}
*/
/*!
\qmlproperty variant Video::metaData.deviceSettingDescription
\sa {QtMultimediaKit::DeviceSettingDescription}
\sa {QtMultimedia::DeviceSettingDescription}
*/
#endif

12
src/imports/multimedia/qdeclarativevideooutput.cpp
View File

@@ -46,10 +46,10 @@
#include <QtDeclarative/qsgitem.h>
#include <QtMultimediaKit/QAbstractVideoSurface>
#include <QtMultimediaKit/qmediaservice.h>
#include <QtMultimediaKit/qvideorenderercontrol.h>
#include <QtMultimediaKit/qvideosurfaceformat.h>
#include <QtMultimedia/QAbstractVideoSurface>
#include <QtMultimedia/qmediaservice.h>
#include <QtMultimedia/qvideorenderercontrol.h>
#include <QtMultimedia/qvideosurfaceformat.h>
#include <QtCore/qmetaobject.h>
@@ -112,11 +112,11 @@ private:
\ingroup qml-multimedia
This element is part of the \bold{QtMultimediaKit 4.0} module.
This element is part of the \bold{QtMultimedia 4.0} module.
\qml
import QtQuick 2.0
import Qt.multimediakit 4.0
import QtMultimedia 4.0
Rectangle {
width: 800

4
src/imports/multimedia/qdeclarativevideooutput_p.h
View File

@@ -44,8 +44,8 @@
#include <qsgitem.h>
#include <QtMultimediaKit/qvideoframe.h>
#include <QtMultimediaKit/qmediaobject.h>
#include <QtMultimedia/qvideoframe.h>
#include <QtMultimedia/qmediaobject.h>
#include <QtCore/qsharedpointer.h>

1
src/imports/multimedia/qmldir.qtmultimediakit Normal file
View File

@@ -0,0 +1 @@
plugin declarative_multimedia ../../QtMultimedia

2
src/imports/multimedia/qsgvideonode_i420.h
View File

@@ -43,7 +43,7 @@
#define QSGVIDEONODE_I420_H
#include "qsgvideonode_p.h"
#include <QtMultimediaKit/qvideosurfaceformat.h>
#include <QtMultimedia/qvideosurfaceformat.h>
class QSGVideoMaterial_YUV420;
class QSGVideoNode_I420 : public QSGVideoNode

4
src/imports/multimedia/qsgvideonode_p.h
View File

@@ -44,8 +44,8 @@
#include <QtDeclarative/qsgnode.h>
#include <QtMultimediaKit/qvideoframe.h>
#include <QtMultimediaKit/qvideosurfaceformat.h>
#include <QtMultimedia/qvideoframe.h>
#include <QtMultimedia/qvideosurfaceformat.h>
#include <QtOpenGL/qglfunctions.h>
class QSGVideoNode : public QSGGeometryNode

2
src/imports/qimportbase.pri
View File

@@ -14,7 +14,7 @@ isEmpty(TARGET) {
QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
copy2build.input = QMLDIRFILE
copy2build.output = $$QT.multimediakit.imports/$$TARGETPATH/qmldir
copy2build.output = $$QT.multimedia.imports/$$TARGETPATH/qmldir
!contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS
copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
copy2build.name = COPY ${QMAKE_FILE_IN}

40
src/meegoinstalls/Makefile
View File

@@ -1,40 +0,0 @@
PKG_NAME := qt-mobility
SPECFILE = $(addsuffix .spec, $(PKG_NAME))
YAMLFILE = $(addsuffix .yaml, $(PKG_NAME))
first: custom-help
include /usr/share/meego-packaging-tools/Makefile.common
custom-help: help
@echo "The above are common MeeGo packaging targets."
@echo "$(PKG_NAME) also has these additional targets:"
@echo " spec-git Create spec file, with options appropriate for git"
@echo " build-trunk-i686 Do a local i686 build against Trunk, without using OBS"
@echo " build-trunk-testing-i686 Do a local i686 build against Trunk:Testing, without using OBS"
spec-git:
specify --skip-scm --not-download --non-interactive
git-archive: spec-git
@VER=$$(sed -n -r -e 's|^Version: +||p' $(SPECFILE)); \
TARGZ=$$(sed -n -r \
-e 's|^Source0:.*/([^/]+)$$|\1|' \
-e 's|%\{name\}|$(PKG_NAME)|' \
-e "s|%\{version\}|$$VER|" \
-e 's|.tar.gz||p' \
$(SPECFILE) ); \
DIR="$$PWD"; \
cd $$(git rev-parse --git-dir) && \
echo "Creating $$DIR/$$TARGZ.tar.gz ..." && \
git archive HEAD --prefix=$$TARGZ/ --format=tar | gzip > "$$DIR/$$TARGZ.tar.gz"
build-no-obs = sudo build $(SPECFILE) --repository $1 --arch $2
build-no-obs-deps: /usr/bin/build git-archive
build-trunk-i686: build-no-obs-deps
$(call build-no-obs,http://download.meego.com/live/Trunk/standard/,i686)
build-trunk-testing-i686: build-no-obs-deps
$(call build-no-obs,http://download.meego.com/live/Trunk:/Testing/standard/,i686)

95
src/meegoinstalls/README
View File

@@ -1,95 +0,0 @@
This directory contains the MeeGo.com packaging metadata for Qt Mobility,
for use with the MeeGo.com OpenSuSE Build Service (OBS).
Please see http://build.meego.com/ for more information about OBS.
Quick Start: run `make' in this directory to see some useful things you
can do.
PATCHES
=======
At the time of writing, there are some MeeGo-specific patches hosted
on the MeeGo OBS. These patches are unable to be hosted in the Mobility
git repository at this time.
In order to successfully build Mobility for MeeGo, you must also obtain
these patches, or you must modify qt-mobility.yaml and qt-mobility.spec
to remove the usage of the patches.
Please do not add any more patches.
HOW TO MAKE CHANGES
===================
Within this directory, there is a yaml file and a spec file. The yaml
file is maintained by hand; the spec file is partially generated from the
yaml file, but partially maintained by hand also, in specially marked
sections.
The command used to generate the spec file from the yaml file is `specify'.
This is part of a tool named Spectacle. This can be installed from the
MeeGo tools repositories. It does not require a full MeeGo SDK install.
For example, on Ubuntu:
$ sudo /bin/sh -c 'echo deb http://repo.meego.com/MeeGo/tools/repos/ubuntu/10.04/ / > /etc/apt/sources.list.d/meego-tools.list'
$ gpg --keyserver pgpkeys.mit.edu --recv 0BC7BEC479FC1F8A && gpg --export --armor 0BC7BEC479FC1F8A | sudo apt-key add -
$ sudo apt-get update
$ sudo apt-get install meego-packaging-tools
Once you have installed meego-packaging-tools, you can run `make spec-git'
in this directory to regenerate the spec file from the yaml file.
The spec file and yaml file should be maintained together, so if you
modify the yaml file, you should do `make spec-git' and put the
modifications to the spec file in the same commit.
Please see http://wiki.meego.com/Spectacle for more information about
spectacle.
HOW TO BUILD
============
Note: these instructions are not canonical or supported in any way.
They are here as a quick start for people who want to contribute to
Qt Mobility and do not know how to compile for MeeGo.
The most accurate way to build is to use the OpenSuSE build service
on build.meego.com. Unfortunately, at time of writing, anonymous
access to this service is not available. Therefore, using build.meego.com
is not an option for most people.
However, a fairly accurate build can still be done using the `build' command
and referring to the live MeeGo repos.
Abbreviated example of how to install `build' for Ubuntu:
$ sudo /bin/sh -c 'echo deb http://repo.meego.com/MeeGo/tools/repos/ubuntu/10.04/ / > /etc/apt/sources.list.d/meego-tools.list'
$ gpg --keyserver pgpkeys.mit.edu --recv 0BC7BEC479FC1F8A && gpg --export --armor 0BC7BEC479FC1F8A | sudo apt-key add -
$ sudo apt-get update
$ sudo apt-get install build
$ gpg --keyserver pgpkeys.mit.edu --recv 79FC1F8A && gpg --export --armor 79FC1F8A | sudo rpm --import -
Then, to do the build (for i686):
$ make build-trunk-i686
Or, to use the Trunk:Testing repository (which may contain newer versions of some packages):
$ make build-trunk-testing-i686
These builds will take place in a chroot, and hence will require root access.
They will attempt to use `sudo' for this.
If you hit an error, `rpm: error while loading shared libraries: liblua-5.1.so',
edit /usr/lib/build/configs/default.conf and add liblua to one of the `Preinstall:' lines
(see http://comments.gmane.org/gmane.comp.handhelds.meego.devel/7139 )

1360
src/meegoinstalls/qt-mobility.spec
View File

File diff suppressed because it is too large Load Diff

353
src/meegoinstalls/qt-mobility.yaml
View File

@@ -1,353 +0,0 @@
Name: qt-mobility
Summary: APIs for mobile device functionality
Version: 1.1.0+git2438
Release: 1
Group: System/Libraries
License: LGPLv2.1 with exception or GPLv3
URL: http://qt.gitorious.org/qt-mobility
Sources:
- http://get.qt.nokia.com/qt/add-ons/%{name}-opensource-src-%{version}.tar.gz
SourcePrefix: "%{name}-opensource-src-%{version}"
Patches:
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality. These
APIs allow the developer to use these features with ease from one framework and
apply them to phones, netbooks and non-mobile personal computers.
Requires:
- libqtconnectivity1 = %{version}
- libqtcontacts1 = %{version}
- libqtfeedback1 = %{version}
- libqtgallery1 = %{version}
- libqtlocation1 = %{version}
- libqtmessaging1 = %{version}
- libqtmultimediakit1 = %{version}
- libqtorganizer1 = %{version}
- libqtpublishsubscribe1 = %{version}
- libqtsensors1 = %{version}
- libqtserviceframework1 = %{version}
- libqtsysteminfo1 = %{version}
- libqtversit1 = %{version}
- libqtversitorganizer1 = %{version}
PkgConfigBR:
- QtGui
- QtOpenGL
- alsa
- blkid
- bluez
- connman
- contextsubscriber-1.0
- gconf-2.0
- geoclue
- gstreamer-plugins-bad-free-0.10
- gstreamer-plugins-base-0.10
- gypsy
- libiphb
- libpulse
- libmkcal
- meegotouch
- qttracker
- qmfclient
- sensord
- udev
- x11
- xext
- xrandr
- xrender
- xv
- QtSparql
- QtSparqlTrackerExtensions
PkgBR:
- qt-devel-tools
Configure: none
Builder: none
RunFdupes: "%{_datadir}/qtmobility/translations"
SubPackages:
- Name: devel
Summary: APIs for mobile device functionality - development files
Group: Development/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains the development files needed to build Qt applications
using Qt Mobility libraries.
Requires:
- servicefw
- Name: libqtconnectivity1
AsWholeName: yes
Summary: Qt Mobility Connectivity module
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains the Connectivity API. It provides APIs for working with
local devices.
- Name: libqtcontacts1
AsWholeName: yes
Summary: Qt Mobility Contacts module
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains an API enabling clients to request contact data from
local or remote backends.
- Name: libqtfeedback1
AsWholeName: yes
Summary: Qt Mobility Feedback module
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains the Feedback API. It enables a client to control
the vibration of the device or the piezo feedback from the screen.
- Name: libqtgallery1
AsWholeName: yes
Summary: Qt Mobility Document Gallery module
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains an API for accessing collections of documents and media
and their meta-data.
- Name: libqtlocation1
AsWholeName: yes
Summary: Qt Mobility Location module
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains the Location API. It provides a library for distributing
and receiving location data using arbitrary data sources.
- Name: libqtmessaging1
AsWholeName: yes
Summary: Qt Mobility Messaging module
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains the Messaging API. It is a common interface for handling
SMS, MMS, MIME Email and TNEF Email messages.
- Name: libqtmultimediakit1
AsWholeName: yes
Summary: Qt Mobility MultimediaKit module
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains a set of APIs to play and record media, and manage a
collection of media content.
- Name: libqtorganizer1
AsWholeName: yes
Summary: Qt Mobility Organizer module
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains an API for management of calendar, scheduling and
personal data from local or remote backends. It includes the ability to create,
edit, list, delete and lookup organizer information whether it is stored
locally or remotely.
- Name: libqtpublishsubscribe1
AsWholeName: yes
Summary: Qt Mobility Publish and Subscribe module
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains the Publish and Subscribe API (containing Value Space).
It enables applications to read item values, navigate through and subscribe to
change notifications.
- Name: libqtsensors1
AsWholeName: yes
Summary: Qt Mobility Sensors module
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains the Sensors API. It provides access to sensors.
Requires:
- libqtsql4-sqlite
- sensorfw
- Name: libqtserviceframework1
AsWholeName: yes
Summary: Qt Mobility Service Framework module
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains a set of APIs to that allows clients to discover and
instantiate arbitrary services.
- Name: libqtsysteminfo1
AsWholeName: yes
Summary: Qt Mobility System Information module
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains a set of APIs to discover system related information and
capabilities.
- Name: libqtversit1
AsWholeName: yes
Summary: Qt Mobility Versit (vCard) module
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains an API to manage Versit documents, such as vCards.
- Name: libqtversitorganizer1
AsWholeName: yes
Summary: Qt Mobility Versit (Organizer) module
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains an API to manage Versit documents, such as iCalendar
documents. It interfaces the Organizer API and uses the same framework as for
vCards.
- Name: libdeclarative-contacts
AsWholeName: yes
Summary: Qt Mobility Contacts QML plugin
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains the Contacts QML plugin for QtDeclarative.
- Name: libdeclarative-feedback
AsWholeName: yes
Summary: Qt Mobility Feedback QML plugin
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains the Feedback QML plugin for QtDeclarative.
- Name: libdeclarative-gallery
AsWholeName: yes
Summary: Qt Mobility Document Gallery QML plugin
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains the Document Gallery QML plugin for QtDeclarative.
- Name: libdeclarative-location
AsWholeName: yes
Summary: Qt Mobility Location QML plugin
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains the Location QML plugin for QtDeclarative.
- Name: libdeclarative-messaging
AsWholeName: yes
Summary: Qt Mobility Messaging QML plugin
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains the Messaging QML plugin for QtDeclarative.
- Name: libdeclarative-multimedia
AsWholeName: yes
Summary: Qt Mobility Multimedia QML plugin
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains the Multimedia QML plugin for QtDeclarative.
- Name: libdeclarative-organizer
AsWholeName: yes
Summary: Qt Mobility Organizer QML plugin
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains the Organizer QML plugin for QtDeclarative.
- Name: libdeclarative-publishsubscribe
AsWholeName: yes
Summary: Qt Mobility Publish and Subscribe QML plugin
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains the Publish and Subscribe QML plugin for QtDeclarative.
- Name: libdeclarative-sensors
AsWholeName: yes
Summary: Qt Mobility Sensors Framework QML plugin
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains the Sensors QML plugin for QtDeclarative.
- Name: libdeclarative-serviceframework
AsWholeName: yes
Summary: Qt Mobility Service Framework QML plugin
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains the Service Framework QML plugin for QtDeclarative.
- Name: libdeclarative-systeminfo
AsWholeName: yes
Summary: Qt Mobility System Information QML plugin
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains the System Information QML plugin for QtDeclarative.
- Name: libdeclarative-connectivity
AsWholeName: yes
Summary: Qt Mobility Connectivity QML plugin
Group: System/Libraries
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains the Connectivity QML plugin for QtDeclarative.
- Name: servicefw
AsWholeName: yes
Summary: Qt Mobility Service Framework tool
Group: Development/Tools
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains the Service Framework tool (servicefw). It allows
to register services and make them available over the Service Framework.
- Name: examples
Summary: Qt Mobility examples
Group: System/X11
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains Qt Mobility examples.
- Name: l10n
Summary: APIs for mobile device functionality - localization files
Group: System/I18n
Description: |
Qt Mobility delivers a set of new APIs for mobile device functionality.
This package contains Qt Mobility translations.

0
src/multimediakit/audio/audio.pri → src/multimedia/audio/audio.pri
View File

2
src/multimediakit/audio/qaudio.cpp → src/multimedia/audio/qaudio.cpp
View File

@@ -65,7 +65,7 @@ public:
/*
\namespace QAudio
\brief The QAudio namespace contains enums used by the audio classes.
\inmodule QtMultimediaKit
\inmodule QtMultimedia
\ingroup multimedia
*/

2
src/multimediakit/audio/qaudio.h → src/multimedia/audio/qaudio.h
View File

@@ -43,7 +43,7 @@
#ifndef QAUDIO_H
#define QAUDIO_H
#include <qtmultimediakitdefs.h>
#include <qtmultimediadefs.h>
#include <qtmedianamespace.h>
#include <QtCore/qmetatype.h>

0
src/multimediakit/audio/qaudio_mac.cpp → src/multimedia/audio/qaudio_mac.cpp
View File

0
src/multimediakit/audio/qaudio_mac_p.h → src/multimedia/audio/qaudio_mac_p.h
View File

0
src/multimediakit/audio/qaudiodevicefactory.cpp → src/multimedia/audio/qaudiodevicefactory.cpp
View File

2
src/multimediakit/audio/qaudiodevicefactory_p.h → src/multimedia/audio/qaudiodevicefactory_p.h
View File

@@ -56,7 +56,7 @@
#include <QtCore/qbytearray.h>
#include <QtCore/qlist.h>
#include <qtmultimediakitdefs.h>
#include <qtmultimediadefs.h>
#include <qtmedianamespace.h>
#include "qaudiodeviceinfo.h"

2
src/multimediakit/audio/qaudiodeviceinfo.cpp → src/multimedia/audio/qaudiodeviceinfo.cpp
View File

@@ -93,7 +93,7 @@ public:
/*!
\class QAudioDeviceInfo
\brief The QAudioDeviceInfo class provides an interface to query audio devices and their functionality.
\inmodule QtMultimediaKit
\inmodule QtMultimedia
\ingroup multimedia
QAudioDeviceInfo lets you query for audio devices--such as sound

2
src/multimediakit/audio/qaudiodeviceinfo.h → src/multimedia/audio/qaudiodeviceinfo.h
View File

@@ -49,7 +49,7 @@
#include <QtCore/qstringlist.h>
#include <QtCore/qlist.h>
#include <qtmultimediakitdefs.h>
#include <qtmultimediadefs.h>
#include <qtmedianamespace.h>
#include <qaudio.h>

0
src/multimediakit/audio/qaudiodeviceinfo_alsa_p.cpp → src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
View File

0
src/multimediakit/audio/qaudiodeviceinfo_alsa_p.h → src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
View File

0
src/multimediakit/audio/qaudiodeviceinfo_mac_p.cpp → src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp
View File

0
src/multimediakit/audio/qaudiodeviceinfo_mac_p.h → src/multimedia/audio/qaudiodeviceinfo_mac_p.h
View File

0
src/multimediakit/audio/qaudiodeviceinfo_win32_p.cpp → src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
View File

0
src/multimediakit/audio/qaudiodeviceinfo_win32_p.h → src/multimedia/audio/qaudiodeviceinfo_win32_p.h
View File

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

@@ -92,7 +92,7 @@ public:
\class QAudioFormat
\brief The QAudioFormat class stores audio stream parameter information.
\inmodule QtMultimediaKit
\inmodule QtMultimedia
\ingroup multimedia
\since 1.0

2
src/multimediakit/audio/qaudioformat.h → src/multimedia/audio/qaudioformat.h
View File

@@ -46,7 +46,7 @@
#include <QtCore/qobject.h>
#include <QtCore/qshareddata.h>
#include <qtmultimediakitdefs.h>
#include <qtmultimediadefs.h>
#include <qtmedianamespace.h>
QT_BEGIN_HEADER

2
src/multimediakit/audio/qaudioinput.cpp → src/multimedia/audio/qaudioinput.cpp
View File

@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
\class QAudioInput
\brief The QAudioInput class provides an interface for receiving audio data from an audio input device.
\inmodule QtMultimediaKit
\inmodule QtMultimedia
\ingroup multimedia
\since 1.0

2
src/multimediakit/audio/qaudioinput.h → src/multimedia/audio/qaudioinput.h
View File

@@ -45,7 +45,7 @@
#include <QtCore/qiodevice.h>
#include <qtmultimediakitdefs.h>
#include <qtmultimediadefs.h>
#include <qtmedianamespace.h>
#include <qaudio.h>

0
src/multimediakit/audio/qaudioinput_alsa_p.cpp → src/multimedia/audio/qaudioinput_alsa_p.cpp
View File

0
src/multimediakit/audio/qaudioinput_alsa_p.h → src/multimedia/audio/qaudioinput_alsa_p.h
View File

8
src/multimediakit/audio/qaudioinput_mac_p.cpp → src/multimedia/audio/qaudioinput_mac_p.cpp
View File

@@ -63,7 +63,7 @@
QT_BEGIN_NAMESPACE
namespace QtMultimediaKitInternal
namespace QtMultimediaInternal
{
static const int default_buffer_size = 4 * 1024;
@@ -526,7 +526,7 @@ QAudioInputPrivate::QAudioInputPrivate(const QByteArray& device)
startTime = 0;
totalFrames = 0;
audioBuffer = 0;
internalBufferSize = QtMultimediaKitInternal::default_buffer_size;
internalBufferSize = QtMultimediaInternal::default_buffer_size;
clockFrequency = AudioGetHostClockFrequency() / 1000;
errorCode = QAudio::NoError;
stateCode = QAudio::StoppedState;
@@ -677,13 +677,13 @@ bool QAudioInputPrivate::open()
else
internalBufferSize -= internalBufferSize % streamFormat.mBytesPerFrame;
audioBuffer = new QtMultimediaKitInternal::QAudioInputBuffer(internalBufferSize,
audioBuffer = new QtMultimediaInternal::QAudioInputBuffer(internalBufferSize,
periodSizeBytes,
deviceFormat,
streamFormat,
this);
audioIO = new QtMultimediaKitInternal::MacInputDevice(audioBuffer, this);
audioIO = new QtMultimediaInternal::MacInputDevice(audioBuffer, this);
// Init
if (AudioUnitInitialize(audioUnit) != noErr) {

4
src/multimediakit/audio/qaudioinput_mac_p.h → src/multimedia/audio/qaudioinput_mac_p.h
View File

@@ -79,7 +79,7 @@ class QTimer;
class QIODevice;
class QAbstractAudioDeviceInfo;
namespace QtMultimediaKitInternal
namespace QtMultimediaInternal
{
class QAudioInputBuffer;
}
@@ -101,7 +101,7 @@ public:
UInt64 startTime;
QAudio::Error errorCode;
QAudio::State stateCode;
QtMultimediaKitInternal::QAudioInputBuffer* audioBuffer;
QtMultimediaInternal::QAudioInputBuffer* audioBuffer;
QMutex mutex;
QWaitCondition threadFinished;
QAtomicInt audioThreadState;

0
src/multimediakit/audio/qaudioinput_win32_p.cpp → src/multimedia/audio/qaudioinput_win32_p.cpp
View File

0
src/multimediakit/audio/qaudioinput_win32_p.h → src/multimedia/audio/qaudioinput_win32_p.h
View File

2
src/multimediakit/audio/qaudiooutput.cpp → src/multimedia/audio/qaudiooutput.cpp
View File

@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
\class QAudioOutput
\brief The QAudioOutput class provides an interface for sending audio data to an audio output device.
\inmodule QtMultimediaKit
\inmodule QtMultimedia
\ingroup multimedia
\since 1.0

Some files were not shown because too many files have changed in this diff Show More