diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-19 17:14:43 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-19 17:15:56 +0100 |
| commit | d396262bc9771cacbc71e79215768984fa1974ff (patch) | |
| tree | e029399524feabed6ebe0ee1e010af9f5e58932d /src/plugins/blackberry/mediaplayer/bbmetadata.cpp | |
| parent | 0ce2cb3ebe6289e3db14438560fa186d9e5186b8 (diff) | |
| parent | 2db2cde0d8433ad1aed59412717c4cddf496ba66 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
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
Diffstat (limited to 'src/plugins/blackberry/mediaplayer/bbmetadata.cpp')
| -rw-r--r-- | src/plugins/blackberry/mediaplayer/bbmetadata.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/plugins/blackberry/mediaplayer/bbmetadata.cpp b/src/plugins/blackberry/mediaplayer/bbmetadata.cpp index 38bb0c80b..680833e85 100644 --- a/src/plugins/blackberry/mediaplayer/bbmetadata.cpp +++ b/src/plugins/blackberry/mediaplayer/bbmetadata.cpp @@ -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; |