Source

Target

Commits (3)
Showing with 18 additions and 2 deletions
module QtAudioEngine
plugin declarative_audioengine plugin declarative_audioengine
typeinfo plugins.qmltypes
...@@ -132,6 +132,7 @@ Module { ...@@ -132,6 +132,7 @@ Module {
name: "QDeclarativeAudio" name: "QDeclarativeAudio"
prototype: "QObject" prototype: "QObject"
exports: ["QtMultimedia/Audio 5.0", "QtMultimedia/MediaPlayer 5.0"] exports: ["QtMultimedia/Audio 5.0", "QtMultimedia/MediaPlayer 5.0"]
exportMetaObjectRevisions: [0, 0]
Enum { Enum {
name: "Status" name: "Status"
values: { values: {
...@@ -230,6 +231,7 @@ Module { ...@@ -230,6 +231,7 @@ Module {
name: "QDeclarativeCamera" name: "QDeclarativeCamera"
prototype: "QObject" prototype: "QObject"
exports: ["QtMultimedia/Camera 5.0"] exports: ["QtMultimedia/Camera 5.0"]
exportMetaObjectRevisions: [0]
Enum { Enum {
name: "CaptureMode" name: "CaptureMode"
values: { values: {
...@@ -448,6 +450,7 @@ Module { ...@@ -448,6 +450,7 @@ Module {
name: "QDeclarativeCameraCapture" name: "QDeclarativeCameraCapture"
prototype: "QObject" prototype: "QObject"
exports: ["QtMultimedia/CameraCapture 5.0"] exports: ["QtMultimedia/CameraCapture 5.0"]
exportMetaObjectRevisions: [0]
Property { name: "ready"; type: "bool"; isReadonly: true } Property { name: "ready"; type: "bool"; isReadonly: true }
Property { name: "capturedImagePath"; type: "string"; isReadonly: true } Property { name: "capturedImagePath"; type: "string"; isReadonly: true }
Property { name: "resolution"; type: "QSize" } Property { name: "resolution"; type: "QSize" }
...@@ -506,6 +509,7 @@ Module { ...@@ -506,6 +509,7 @@ Module {
name: "QDeclarativeCameraExposure" name: "QDeclarativeCameraExposure"
prototype: "QObject" prototype: "QObject"
exports: ["QtMultimedia/CameraExposure 5.0"] exports: ["QtMultimedia/CameraExposure 5.0"]
exportMetaObjectRevisions: [0]
Property { name: "exposureCompensation"; type: "double" } Property { name: "exposureCompensation"; type: "double" }
Property { name: "iso"; type: "int"; isReadonly: true } Property { name: "iso"; type: "int"; isReadonly: true }
Property { name: "shutterSpeed"; type: "double"; isReadonly: true } Property { name: "shutterSpeed"; type: "double"; isReadonly: true }
...@@ -584,6 +588,7 @@ Module { ...@@ -584,6 +588,7 @@ Module {
name: "QDeclarativeCameraFlash" name: "QDeclarativeCameraFlash"
prototype: "QObject" prototype: "QObject"
exports: ["QtMultimedia/CameraFlash 5.0"] exports: ["QtMultimedia/CameraFlash 5.0"]
exportMetaObjectRevisions: [0]
Property { name: "ready"; type: "bool"; isReadonly: true } Property { name: "ready"; type: "bool"; isReadonly: true }
Property { name: "mode"; type: "int" } Property { name: "mode"; type: "int" }
Signal { Signal {
...@@ -603,6 +608,7 @@ Module { ...@@ -603,6 +608,7 @@ Module {
name: "QDeclarativeCameraFocus" name: "QDeclarativeCameraFocus"
prototype: "QObject" prototype: "QObject"
exports: ["QtMultimedia/CameraFocus 5.0"] exports: ["QtMultimedia/CameraFocus 5.0"]
exportMetaObjectRevisions: [0]
Property { name: "focusMode"; type: "QDeclarativeCamera::FocusMode" } Property { name: "focusMode"; type: "QDeclarativeCamera::FocusMode" }
Property { name: "focusPointMode"; type: "QDeclarativeCamera::FocusPointMode" } Property { name: "focusPointMode"; type: "QDeclarativeCamera::FocusPointMode" }
Property { name: "customFocusPoint"; type: "QPointF" } Property { name: "customFocusPoint"; type: "QPointF" }
...@@ -646,6 +652,7 @@ Module { ...@@ -646,6 +652,7 @@ Module {
name: "QDeclarativeCameraImageProcessing" name: "QDeclarativeCameraImageProcessing"
prototype: "QObject" prototype: "QObject"
exports: ["QtMultimedia/CameraImageProcessing 5.0"] exports: ["QtMultimedia/CameraImageProcessing 5.0"]
exportMetaObjectRevisions: [0]
Enum { Enum {
name: "WhiteBalanceMode" name: "WhiteBalanceMode"
values: { values: {
...@@ -720,6 +727,7 @@ Module { ...@@ -720,6 +727,7 @@ Module {
name: "QDeclarativeCameraRecorder" name: "QDeclarativeCameraRecorder"
prototype: "QObject" prototype: "QObject"
exports: ["QtMultimedia/CameraRecorder 5.0"] exports: ["QtMultimedia/CameraRecorder 5.0"]
exportMetaObjectRevisions: [0]
Enum { Enum {
name: "RecorderState" name: "RecorderState"
values: { values: {
...@@ -918,6 +926,7 @@ Module { ...@@ -918,6 +926,7 @@ Module {
name: "QDeclarativeRadio" name: "QDeclarativeRadio"
prototype: "QObject" prototype: "QObject"
exports: ["QtMultimedia/Radio 5.0"] exports: ["QtMultimedia/Radio 5.0"]
exportMetaObjectRevisions: [0]
Enum { Enum {
name: "State" name: "State"
values: { values: {
...@@ -1071,6 +1080,7 @@ Module { ...@@ -1071,6 +1080,7 @@ Module {
name: "QDeclarativeRadioData" name: "QDeclarativeRadioData"
prototype: "QObject" prototype: "QObject"
exports: ["QtMultimedia/RadioData 5.0"] exports: ["QtMultimedia/RadioData 5.0"]
exportMetaObjectRevisions: [0]
Enum { Enum {
name: "Error" name: "Error"
values: { values: {
...@@ -1192,6 +1202,7 @@ Module { ...@@ -1192,6 +1202,7 @@ Module {
name: "QDeclarativeTorch" name: "QDeclarativeTorch"
prototype: "QObject" prototype: "QObject"
exports: ["QtMultimedia/Torch 5.0"] exports: ["QtMultimedia/Torch 5.0"]
exportMetaObjectRevisions: [0]
Property { name: "enabled"; type: "bool" } Property { name: "enabled"; type: "bool" }
Property { name: "power"; type: "int" } Property { name: "power"; type: "int" }
} }
...@@ -1200,6 +1211,7 @@ Module { ...@@ -1200,6 +1211,7 @@ Module {
defaultProperty: "data" defaultProperty: "data"
prototype: "QQuickItem" prototype: "QQuickItem"
exports: ["QtMultimedia/VideoOutput 5.0"] exports: ["QtMultimedia/VideoOutput 5.0"]
exportMetaObjectRevisions: [0]
Enum { Enum {
name: "FillMode" name: "FillMode"
values: { values: {
...@@ -1289,6 +1301,7 @@ Module { ...@@ -1289,6 +1301,7 @@ Module {
name: "QSoundEffect" name: "QSoundEffect"
prototype: "QObject" prototype: "QObject"
exports: ["QtMultimedia/SoundEffect 5.0"] exports: ["QtMultimedia/SoundEffect 5.0"]
exportMetaObjectRevisions: [0]
Enum { Enum {
name: "Loop" name: "Loop"
values: { values: {
......
...@@ -1286,6 +1286,7 @@ namespace ...@@ -1286,6 +1286,7 @@ namespace
{ {
HRESULT hr = S_OK; HRESULT hr = S_OK;
Q_ASSERT(pOp != NULL); Q_ASSERT(pOp != NULL);
Q_UNUSED(pOp)
hr = processSamplesFromQueue(WriteSamples); hr = processSamplesFromQueue(WriteSamples);
// We are in the middle of an asynchronous operation, so if something failed, send an error. // We are in the middle of an asynchronous operation, so if something failed, send an error.
if (FAILED(hr)) if (FAILED(hr))
......
...@@ -105,12 +105,12 @@ QMediaServiceProviderHint::Features WMFServicePlugin::supportedFeatures( ...@@ -105,12 +105,12 @@ QMediaServiceProviderHint::Features WMFServicePlugin::supportedFeatures(
return QMediaServiceProviderHint::Features(); return QMediaServiceProviderHint::Features();
} }
QList<QByteArray> WMFServicePlugin::devices(const QByteArray &service) const QList<QByteArray> WMFServicePlugin::devices(const QByteArray &) const
{ {
return QList<QByteArray>(); return QList<QByteArray>();
} }
QString WMFServicePlugin::deviceDescription(const QByteArray &service, const QByteArray &device) QString WMFServicePlugin::deviceDescription(const QByteArray &, const QByteArray &)
{ {
return QString(); return QString();
} }
......