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

Merge remote-tracking branch 'origin/stable' into dev

Browse Source 
Conflicts:
	src/multimedia/doc/qtmultimedia.qdocconf
	src/plugins/blackberry/mediaplayer/bbmetadata.cpp
	src/plugins/blackberry/mediaplayer/bbmetadata.h
	tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp

Change-Id: I447c297ea15a94d1d2feb0fb5f9edac8c5d4505a
This commit is contained in:
Frederik Gladhorn
2013-02-19 17:14:43 +01:00
parent 0ce2cb3ebe 2db2cde0d8
commit d396262bc9
1042 changed files with 65917 additions and 1432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/blackberry/mediaplayer/bbmetadata.cpp
View File

@@ -66,6 +66,7 @@ static const char * heightKey = "md_video_height";
static const char * mediaTypeKey = "md_title_mediatype";
static const char * pixelWidthKey = "md_video_pixel_height";
static const char * pixelHeightKey = "md_video_pixel_width";
static const char * seekableKey = "md_title_seekable";
static const int mediaTypeAudioFlag = 4;
static const int mediaTypeVideoFlag = 2;
@@ -113,6 +114,8 @@ bool BbMetaData::parse(const QString &contextName)
m_pixelHeight = value.toFloat();
else if (key == titleKey)
m_title = value;
else if (key == seekableKey)
m_seekable = !(value == QLatin1String("0"));
else if (key == artistKey)
m_artist = value;
else if (key == commentKey)
@@ -143,7 +146,7 @@ void BbMetaData::clear()
m_mediaType = -1;
m_pixelWidth = 1;
m_pixelHeight = 1;
m_seekable = true;
m_title.clear();
m_artist.clear();
m_comment.clear();
@@ -203,6 +206,11 @@ QString BbMetaData::title() const
return m_title;
}
bool BbMetaData::isSeekable() const
{
return m_seekable;
}
QString BbMetaData::artist() const
{
return m_artist;