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

Updated declarative camera recorder with C++ API changes.

Browse Source 
Added key,value parameters to metadataChanged() signal;
Added a separate actualLocation property to desribe the path of
recorded file. It may be different from outputLocation when default
location is used.

Change-Id: I5a4b77833b6458a19ed7e1dcf7e53fc7400cdf21
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Dmytro Poplavskiy
2012-02-07 14:34:50 +10:00
committed by Qt by Nokia
parent 00d1e2f65e
commit 96aa2e9af7
2 changed files with 46 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/imports/multimedia/qdeclarativecamerarecorder_p.h
View File

@@ -84,6 +84,7 @@ class QDeclarativeCameraRecorder : public QObject
Q_PROPERTY(qint64 duration READ duration NOTIFY durationChanged)
Q_PROPERTY(QString outputLocation READ outputLocation WRITE setOutputLocation NOTIFY outputLocationChanged)
Q_PROPERTY(QString actualLocation READ actualLocation NOTIFY actualLocationChanged)
Q_PROPERTY(bool muted READ isMuted WRITE setMuted NOTIFY mutedChanged)
Q_PROPERTY(QString errorString READ errorString NOTIFY error)
@@ -101,6 +102,8 @@ public:
QSize captureResolution();
QString outputLocation() const;
QString actualLocation() const;
qint64 duration() const;
bool isMuted() const;
@@ -118,7 +121,7 @@ public:
int audioSampleRate() const;
public Q_SLOTS:
void setOutputLocation(const QUrl &location);
void setOutputLocation(const QString &location);
void record();
void stop();
@@ -143,12 +146,11 @@ Q_SIGNALS:
void durationChanged(qint64 duration);
void mutedChanged(bool muted);
void outputLocationChanged(const QString &location);
void actualLocationChanged(const QString &location);
void error(QMediaRecorder::Error errorCode);
void metaDataAvailableChanged(bool available);
void metaDataWritableChanged(bool writable);
void metaDataChanged();
void metaDataChanged(const QString &key, const QVariant &value);
void captureResolutionChanged(const QSize &);
void audioCodecChanged(const QString &codec);
@@ -164,6 +166,7 @@ Q_SIGNALS:
private slots:
void updateRecorderState(QMediaRecorder::State);
void updateRecorderError(QMediaRecorder::Error);
void updateActualLocation(const QUrl&);
private:
friend class QDeclarativeCamera;