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

Remove unnecessary warning in QMediaPlaylistNavigator.

Browse Source 
Task-number: QTBUG-33862
Change-Id: Ie74e649ebb5819ccf6300492bdce2a0046b87f02
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Yoann Lopes
2013-10-08 17:26:16 +02:00
committed by The Qt Project
parent 1598f79b17
commit 7c9ff56f2f
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/multimedia/playback/qmediaplaylistnavigator.cpp
View File

@@ -433,10 +433,8 @@ void QMediaPlaylistNavigator::jump(int position)
{ {
Q_D(QMediaPlaylistNavigator); Q_D(QMediaPlaylistNavigator);
if (position<-1 || position>=d->playlist->mediaCount()) { if (position < -1 || position >= d->playlist->mediaCount())
qWarning() << "QMediaPlaylistNavigator: Jump outside playlist range";
position = -1; position = -1;
}
if (position != -1) if (position != -1)
d->lastValidPos = position; d->lastValidPos = position;

1
tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp
View File

@@ -276,7 +276,6 @@ void tst_QMediaPlaylist::currentItem()
QCOMPARE(playlist.previousIndex(), 0); QCOMPARE(playlist.previousIndex(), 0);
QCOMPARE(playlist.previousIndex(2), -1); QCOMPARE(playlist.previousIndex(2), -1);
QTest::ignoreMessage(QtWarningMsg, "QMediaPlaylistNavigator: Jump outside playlist range ");
playlist.setCurrentIndex(2); playlist.setCurrentIndex(2);
QCOMPARE(playlist.currentIndex(), -1); QCOMPARE(playlist.currentIndex(), -1);

4
tests/auto/unit/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp
View File

@@ -115,8 +115,7 @@ void tst_QMediaPlaylistNavigator::linearPlayback()
QMediaPlaylistNavigator navigator(&playlist); QMediaPlaylistNavigator navigator(&playlist);
navigator.setPlaybackMode(QMediaPlaylist::Sequential); navigator.setPlaybackMode(QMediaPlaylist::Sequential);
QTest::ignoreMessage(QtWarningMsg, "QMediaPlaylistNavigator: Jump outside playlist range "); navigator.jump(0);
navigator.jump(0);//it's ok to have warning here
QVERIFY(navigator.currentItem().isNull()); QVERIFY(navigator.currentItem().isNull());
QCOMPARE(navigator.currentIndex(), -1); QCOMPARE(navigator.currentIndex(), -1);
@@ -169,7 +168,6 @@ void tst_QMediaPlaylistNavigator::loopPlayback()
QMediaPlaylistNavigator navigator(&playlist); QMediaPlaylistNavigator navigator(&playlist);
navigator.setPlaybackMode(QMediaPlaylist::Loop); navigator.setPlaybackMode(QMediaPlaylist::Loop);
QTest::ignoreMessage(QtWarningMsg, "QMediaPlaylistNavigator: Jump outside playlist range ");
navigator.jump(0); navigator.jump(0);
QVERIFY(navigator.currentItem().isNull()); QVERIFY(navigator.currentItem().isNull());
QCOMPARE(navigator.currentIndex(), -1); QCOMPARE(navigator.currentIndex(), -1);