diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2012-12-11 13:30:35 +0100 |
|---|---|---|
| committer | George Kiagiadakis <george.kiagiadakis@collabora.com> | 2012-12-12 18:46:30 +0200 |
| commit | d03743ca717559bdb51f5802a0dcc50cd6fa44ad (patch) | |
| tree | 8821c66c3dece897fcf60a7a6d964d1eb8d3b38e | |
| parent | 21c2b9ce20a47ea7b8f1f0364fc225b563748ff0 (diff) | |
Rename DiscovererInfo::subTitleStream() to subtitleStream()
| -rw-r--r-- | src/QGst/discoverer.cpp | 4 | ||||
| -rw-r--r-- | src/QGst/discoverer.h | 2 | ||||
| -rw-r--r-- | tests/auto/discoverertest.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/QGst/discoverer.cpp b/src/QGst/discoverer.cpp index 9bbeaf5..4b6fda9 100644 --- a/src/QGst/discoverer.cpp +++ b/src/QGst/discoverer.cpp @@ -210,7 +210,7 @@ QList<DiscovererStreamInfoPtr> DiscovererInfo::videoStreams() const return wrapStreamInfoList(gst_discoverer_info_get_video_streams(object<GstDiscovererInfo>()), false); } -QList<DiscovererStreamInfoPtr> DiscovererInfo::subTitleStreams() const +QList<DiscovererStreamInfoPtr> DiscovererInfo::subtitleStreams() const { return wrapStreamInfoList(gst_discoverer_info_get_subtitle_streams(object<GstDiscovererInfo>()), false); } @@ -420,7 +420,7 @@ QDebug operator<<(QDebug debug, DiscovererInfoPtr info) debug.nospace() << ", streams=" << info->streams(); debug.nospace() << ", audioStreams=" << info->audioStreams(); debug.nospace() << ", videoStreams=" << info->videoStreams(); - debug.nospace() << ", subTitleStreams=" << info->subTitleStreams(); + debug.nospace() << ", subtitleStreams=" << info->subtitleStreams(); debug.nospace() << ", containerStreams=" << info->containerStreams(); } else { debug << "<null>"; diff --git a/src/QGst/discoverer.h b/src/QGst/discoverer.h index 4fa4a76..fb3e023 100644 --- a/src/QGst/discoverer.h +++ b/src/QGst/discoverer.h @@ -120,7 +120,7 @@ public: QList<DiscovererStreamInfoPtr> streams(QGlib::Type streamType) const; QList<DiscovererStreamInfoPtr> audioStreams() const; QList<DiscovererStreamInfoPtr> videoStreams() const; - QList<DiscovererStreamInfoPtr> subTitleStreams() const; + QList<DiscovererStreamInfoPtr> subtitleStreams() const; QList<DiscovererStreamInfoPtr> containerStreams() const; }; diff --git a/tests/auto/discoverertest.cpp b/tests/auto/discoverertest.cpp index 4785db8..8154b17 100644 --- a/tests/auto/discoverertest.cpp +++ b/tests/auto/discoverertest.cpp @@ -469,9 +469,9 @@ void DiscovererTest::verifyStreamInfo(QGst::DiscovererInfoPtr info) QCOMPARE(info->streams(GST_TYPE_DISCOVERER_VIDEO_INFO).count(), videoStreams.count()); QCOMPARE(info->videoStreams().count(), videoStreams.count()); - const StreamInfoList subTitleStreams = filterByStreamType(streams, GST_TYPE_DISCOVERER_SUBTITLE_INFO); - QCOMPARE(info->streams(GST_TYPE_DISCOVERER_SUBTITLE_INFO).count(), subTitleStreams.count()); - QCOMPARE(info->subTitleStreams().count(), subTitleStreams.count()); + const StreamInfoList subtitleStreams = filterByStreamType(streams, GST_TYPE_DISCOVERER_SUBTITLE_INFO); + QCOMPARE(info->streams(GST_TYPE_DISCOVERER_SUBTITLE_INFO).count(), subtitleStreams.count()); + QCOMPARE(info->subtitleStreams().count(), subtitleStreams.count()); const StreamInfoList containerStreams = filterByStreamType(streams, GST_TYPE_DISCOVERER_CONTAINER_INFO); QCOMPARE(info->streams(GST_TYPE_DISCOVERER_CONTAINER_INFO).count(), containerStreams.count()); |