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

Added metaDataChanged(key,value) signal to metadata controls.

Browse Source 
It may be more efficient and convenient for application to use this
signal instead of metaDataChanged().

metaDataChanged() signal is emitted for compatibility,
backends should emit both signals.

Signal added QMetadataReader/WritterControl,
QMediaObject and QMediaRecorder.

Change-Id: I5ca34a40e64b22034e6fde8cd7f9735cc3f72c68
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Dmytro Poplavskiy
2012-02-03 14:23:56 +10:00
committed by Qt by Nokia
parent fb73a56574
commit fd3a3a7292
15 changed files with 141 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/multimedia/controls/qmetadatareadercontrol.cpp
View File

@@ -126,6 +126,16 @@ QMetaDataReaderControl::~QMetaDataReaderControl()
\fn void QMetaDataReaderControl::metaDataChanged()
Signal the changes of meta-data.
If multiple meta-data elements are changed,
metaDataChanged(const QString &key, const QVariant &value) signal is emitted
for each of them with metaDataChanged() changed emitted once.
*/
/*!
\fn void QMetaDataReaderControl::metaDataChanged(const QString &key, const QVariant &value)
Signal the changes of one meta-data element \a value with the given \a key.
*/
/*!

1
src/multimedia/controls/qmetadatareadercontrol.h
View File

@@ -71,6 +71,7 @@ public:
Q_SIGNALS:
void metaDataChanged();
void metaDataChanged(const QString &key, const QVariant &value);
void metaDataAvailableChanged(bool available);

10
src/multimedia/controls/qmetadatawritercontrol.cpp
View File

@@ -139,6 +139,16 @@ QMetaDataWriterControl::~QMetaDataWriterControl()
\fn void QMetaDataWriterControl::metaDataChanged()
Signal the changes of meta-data.
If multiple meta-data elements are changed,
metaDataChanged(const QString &key, const QVariant &value) signal is emitted
for each of them with metaDataChanged() changed emitted once.
*/
/*!
\fn void QMetaDataWriterControl::metaDataChanged(const QString &key, const QVariant &value)
Signal the changes of one meta-data element \a value with the given \a key.
*/
/*!

1
src/multimedia/controls/qmetadatawritercontrol.h
View File

@@ -73,6 +73,7 @@ public:
Q_SIGNALS:
void metaDataChanged();
void metaDataChanged(const QString &key, const QVariant &value);
void writableChanged(bool writable);
void metaDataAvailableChanged(bool available);

14
src/multimedia/qmediaobject.cpp
View File

@@ -347,8 +347,19 @@ QStringList QMediaObject::availableMetaData() const
\fn QMediaObject::metaDataChanged()
Signals that this media object's meta-data has changed.
If multiple meta-data elements are changed,
metaDataChanged(const QString &key, const QVariant &value) signal is emitted
for each of them with metaDataChanged() changed emitted once.
*/
/*!
\fn QMediaObject::metaDataChanged(const QString &key, const QVariant &value)
Signal the changes of one meta-data element \a value with the given \a key.
*/
void QMediaObject::setupMetaData()
{
Q_D(QMediaObject);
@@ -359,6 +370,9 @@ void QMediaObject::setupMetaData()
if (d->metaDataControl) {
connect(d->metaDataControl, SIGNAL(metaDataChanged()), SIGNAL(metaDataChanged()));
connect(d->metaDataControl,
SIGNAL(metaDataChanged(QString,QVariant)),
SIGNAL(metaDataChanged(QString,QVariant)));
connect(d->metaDataControl,
SIGNAL(metaDataAvailableChanged(bool)),
SIGNAL(metaDataAvailableChanged(bool)));

1
src/multimedia/qmediaobject.h
View File

@@ -87,6 +87,7 @@ Q_SIGNALS:
void metaDataAvailableChanged(bool available);
void metaDataChanged();
void metaDataChanged(const QString &key, const QVariant &value);
void availabilityChanged(bool available);

14
src/multimedia/recording/qmediarecorder.cpp
View File

@@ -290,6 +290,8 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object)
if (d->metaDataControl) {
disconnect(d->metaDataControl, SIGNAL(metaDataChanged()),
this, SIGNAL(metaDataChanged()));
disconnect(d->metaDataControl, SIGNAL(metaDataChanged(QString,QVariant)),
this, SIGNAL(metaDataChanged(QString,QVariant)));
disconnect(d->metaDataControl, SIGNAL(metaDataAvailableChanged(bool)),
this, SIGNAL(metaDataAvailableChanged(bool)));
disconnect(d->metaDataControl, SIGNAL(writableChanged(bool)),
@@ -331,6 +333,8 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object)
connect(d->metaDataControl,
SIGNAL(metaDataChanged()),
SIGNAL(metaDataChanged()));
connect(d->metaDataControl, SIGNAL(metaDataChanged(QString,QVariant)),
this, SIGNAL(metaDataChanged(QString,QVariant)));
connect(d->metaDataControl,
SIGNAL(metaDataAvailableChanged(bool)),
SIGNAL(metaDataAvailableChanged(bool)));
@@ -939,6 +943,16 @@ QStringList QMediaRecorder::availableMetaData() const
\fn QMediaRecorder::metaDataChanged()
Signals that a media object's meta-data has changed.
If multiple meta-data elements are changed,
metaDataChanged(const QString &key, const QVariant &value) signal is emitted
for each of them with metaDataChanged() changed emitted once.
*/
/*!
\fn QMediaRecorder::metaDataChanged(const QString &key, const QVariant &value)
Signal the changes of one meta-data element \a value with the given \a key.
*/
#include "moc_qmediarecorder.cpp"

1
src/multimedia/recording/qmediarecorder.h
View File

@@ -171,6 +171,7 @@ Q_SIGNALS:
void metaDataAvailableChanged(bool available);
void metaDataWritableChanged(bool writable);
void metaDataChanged();
void metaDataChanged(const QString &key, const QVariant &value);
protected:
QMediaRecorder(QMediaRecorderPrivate &dd, QMediaObject *mediaObject, QObject *parent = 0);