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

Fix a number of doc errors and warnings.

Browse Source 
* Document a few missing classes/functions/methods
* Fix a number of QML snippets that wouldn't work as standalone snippets
* Add files to .pro so they show up in Creator..

Still the mysterious lack of controls dir documentation persists :/

Change-Id: I57162371a4d966e4db5bdb1b71d1baf9c0ca57c3
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2012-04-10 20:19:34 +10:00
committed by Qt by Nokia
parent 9b162f9844
commit 8484b0ff9c
20 changed files with 594 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,32 +93,38 @@ void QDeclarativeCamera::_q_availabilityChanged(QtMultimedia::AvailabilityError
import QtQuick 2.0
import QtMultimedia 5.0
Camera {
id: camera
Item {
width: 640
height: 360
imageProcessing.whiteBalanceMode: CameraImageProcessing.WhiteBalanceFlash
Camera {
id: camera
exposure {
exposureCompensation: -1.0
exposureMode: Camera.ExposurePortrait
}
imageProcessing.whiteBalanceMode: CameraImageProcessing.WhiteBalanceFlash
flash.mode: Camera.FlashRedEyeReduction
exposure {
exposureCompensation: -1.0
exposureMode: Camera.ExposurePortrait
}
imageCapture {
onImageCaptured: {
photoPreview.source = preview // Show the preview in an Image element
flash.mode: Camera.FlashRedEyeReduction
imageCapture {
onImageCaptured: {
photoPreview.source = preview // Show the preview in an Image element
}
}
}
}
VideoOutput {
source: camera
focus : visible // to receive focus and capture key events when visible
}
VideoOutput {
source: camera
anchors.fill: parent
focus : visible // to receive focus and capture key events when visible
}
Image {
id: photoPreview
Image {
id: photoPreview
}
}
\endqml

38
src/imports/multimedia/qdeclarativecameracapture.cpp
View File

@@ -67,29 +67,35 @@ QT_BEGIN_NAMESPACE
import QtQuick 2.0
import QtMultimedia 5.0
Camera {
id: camera
Item {
width: 640
height: 360
imageCapture {
onImageCaptured: {
// Show the preview in an Image element
photoPreview.source = preview
Camera {
id: camera
imageCapture {
onImageCaptured: {
// Show the preview in an Image element
photoPreview.source = preview
}
}
}
}
VideoOutput {
source: camera
focus : visible // to receive focus and capture key events when visible
VideoOutput {
source: camera
focus : visible // to receive focus and capture key events when visible
anchors.fill: parent
MouseArea {
anchors.fill: parent;
onClicked: camera.imageCapture.capture();
MouseArea {
anchors.fill: parent;
onClicked: camera.imageCapture.capture();
}
}
}
Image {
id: photoPreview
Image {
id: photoPreview
}
}
\endqml

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

@@ -64,13 +64,23 @@ QT_BEGIN_NAMESPACE
import QtQuick 2.0
import QtMultimedia 5.0
Camera {
id: camera
Item {
width: 640
height: 360
focus {
focusMode: Camera.FocusMacro
focusPointMode: Camera.FocusPointCustom
customFocusPoint: Qt.point(0.2, 0.2) //focus to top-left corner
Camera {
id: camera
focus {
focusMode: Camera.FocusMacro
focusPointMode: Camera.FocusPointCustom
customFocusPoint: Qt.point(0.2, 0.2) //focus to top-left corner
}
}
VideoOutput {
source: camera
anchors.fill: parent
}
}
@@ -232,7 +242,7 @@ void QDeclarativeCameraFocus::setCustomFocusPoint(const QPointF &point)
color: "transparent"
// Map from the relative, normalized frame coordinates
property mappedRect: viewfinder.mapNormalizedRectToItem(area);
property variant mappedRect: viewfinder.mapNormalizedRectToItem(area);
x: mappedRect.x
y: mappedRect.y

51
src/imports/multimedia/qdeclarativeradio.cpp
View File

@@ -419,34 +419,39 @@ void QDeclarativeRadio::scanUp()
and if the user presses a station, the radio is tuned to this station.
\qml
Radio {
id: radio
onStationFound: radioStations.append({"frequency": frequency, "stationId": stationId})
}
Item {
width: 640
height: 360
ListModel {
id: radioStations
}
Radio {
id: radio
onStationFound: radioStations.append({"frequency": frequency, "stationId": stationId})
}
ListView {
model: radioStations
delegate: Rectangle {
MouseArea {
anchors.fill: parent
onClicked: radio.frequency = frequency
ListModel {
id: radioStations
}
ListView {
model: radioStations
delegate: Rectangle {
MouseArea {
anchors.fill: parent
onClicked: radio.frequency = frequency
}
Text {
anchors.fill: parent
text: stationId
}
}
}
Text {
anchors.fill: parent
text: stationId
}
Rectangle {
MouseArea {
anchors.fill: parent
onClicked: radio.searchAllStations(Radio.SearchGetStationId)
}
}
Rectangle {
MouseArea {
anchors.fill: parent
onClicked: radio.searchAllStations(Radio.SearchGetStationId)
}
}
\endqml