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

21
tests/auto/unit/qmediaobject/tst_qmediaobject.cpp
View File

@@ -370,13 +370,24 @@ void tst_QMediaObject::metaDataChanged()
QtTestMetaDataService service;
QtTestMediaObject object(&service);
QSignalSpy spy(&object, SIGNAL(metaDataChanged()));
QSignalSpy changedSpy(&object, SIGNAL(metaDataChanged()));
QSignalSpy changedWithValueSpy(&object, SIGNAL(metaDataChanged(QString, QVariant)));
service.metaData.metaDataChanged();
QCOMPARE(spy.count(), 1);
service.metaData.setMetaData("key", "Value");
QCOMPARE(changedSpy.count(), 1);
QCOMPARE(changedWithValueSpy.count(), 1);
QCOMPARE(changedWithValueSpy.last()[0], QVariant("key"));
QCOMPARE(changedWithValueSpy.last()[1].value<QVariant>(), QVariant("Value"));
service.metaData.metaDataChanged();
QCOMPARE(spy.count(), 2);
service.metaData.setMetaData("key", "Value");
QCOMPARE(changedSpy.count(), 1);
QCOMPARE(changedWithValueSpy.count(), 1);
service.metaData.setMetaData("key2", "Value");
QCOMPARE(changedSpy.count(), 2);
QCOMPARE(changedWithValueSpy.count(), 2);
QCOMPARE(changedWithValueSpy.last()[0], QVariant("key2"));
QCOMPARE(changedWithValueSpy.last()[1].value<QVariant>(), QVariant("Value"));
}
void tst_QMediaObject::metaData_data()

21
tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
View File

@@ -833,13 +833,24 @@ void tst_QMediaRecorder::metaDataChanged()
QMediaRecorder recorder(&object);
QSignalSpy spy(&recorder, SIGNAL(metaDataChanged()));
QSignalSpy changedSpy(&recorder, SIGNAL(metaDataChanged()));
QSignalSpy changedWithValueSpy(&recorder, SIGNAL(metaDataChanged(QString,QVariant)));
service.mockMetaDataControl->metaDataChanged();
QCOMPARE(spy.count(), 1);
service.mockMetaDataControl->setMetaData("key", "Value");
QCOMPARE(changedSpy.count(), 1);
QCOMPARE(changedWithValueSpy.count(), 1);
QCOMPARE(changedWithValueSpy.last()[0], QVariant("key"));
QCOMPARE(changedWithValueSpy.last()[1].value<QVariant>(), QVariant("Value"));
service.mockMetaDataControl->metaDataChanged();
QCOMPARE(spy.count(), 2);
service.mockMetaDataControl->setMetaData("key", "Value");
QCOMPARE(changedSpy.count(), 1);
QCOMPARE(changedWithValueSpy.count(), 1);
service.mockMetaDataControl->setMetaData("key2", "Value");
QCOMPARE(changedSpy.count(), 2);
QCOMPARE(changedWithValueSpy.count(), 2);
QCOMPARE(changedWithValueSpy.last()[0], QVariant("key2"));
QCOMPARE(changedWithValueSpy.last()[1].value<QVariant>(), QVariant("Value"));
}
void tst_QMediaRecorder::metaData_data()

13
tests/auto/unit/qmultimedia_common/mockmetadatareadercontrol.h
View File

@@ -73,6 +73,19 @@ public:
return m_data.value(key);
}
void setMetaData(const QString &key, const QVariant &value)
{
if (m_data[key] != value) {
if (value.isNull())
m_data.remove(key);
else
m_data[key] = value;
emit metaDataChanged(key, value);
emit metaDataChanged();
}
}
using QMetaDataReaderControl::metaDataChanged;
void populateMetaData()

10
tests/auto/unit/qmultimedia_common/mockmetadatawritercontrol.h
View File

@@ -72,7 +72,15 @@ public:
QVariant metaData(const QString &key) const { return m_data.value(key); }//Getting the metadata from Multimediakit
void setMetaData(const QString &key, const QVariant &value)
{
m_data.insert(key, value);
if (m_data[key] != value) {
if (value.isNull())
m_data.remove(key);
else
m_data[key] = value;
emit metaDataChanged(key, value);
emit metaDataChanged();
}
}
using QMetaDataWriterControl::metaDataChanged;