diff options
Diffstat (limited to 'src/multimedia/doc/snippets')
-rw-r--r-- | src/multimedia/doc/snippets/multimedia-snippets/camera.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/doc/snippets/multimedia-snippets/video.cpp | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp index 0abc4062f..b158469da 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp +++ b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp @@ -76,7 +76,7 @@ void overview_viewfinder() camera->setVideoOutput(preview); preview->show(); - camera->start(); // to start the viewfinder + camera->start(); // to start the camera //! [Camera overview viewfinder] } diff --git a/src/multimedia/doc/snippets/multimedia-snippets/video.cpp b/src/multimedia/doc/snippets/multimedia-snippets/video.cpp index ac920d858..ce35d6e74 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/video.cpp +++ b/src/multimedia/doc/snippets/multimedia-snippets/video.cpp @@ -43,7 +43,6 @@ #include "qvideosink.h" #include "qvideowindowcontrol.h" #include "qgraphicsvideoitem.h" -#include "qmediaplaylist.h" #include "qvideoframeformat.h" #include <QFormLayout> @@ -90,7 +89,6 @@ public: private: // Common naming - QMediaPlaylist *playlist; QVideoWidget *videoWidget; QWidget *widget; QFormLayout *layout; @@ -104,16 +102,12 @@ void VideoExample::VideoWidget() { //! [Video widget] player = new QMediaPlayer; - - playlist = new QMediaPlaylist(player); - playlist->addMedia(QUrl("http://example.com/myclip1.mp4")); - playlist->addMedia(QUrl("http://example.com/myclip2.mp4")); + player->setSource(QUrl("http://example.com/myclip1.mp4")); videoWidget = new QVideoWidget; player->setVideoOutput(videoWidget); videoWidget->show(); - playlist->setCurrentIndex(1); player->play(); //! [Video widget] @@ -154,7 +148,7 @@ void VideoExample::VideoGraphicsItem() graphicsView->scene()->addItem(item); graphicsView->show(); - player->setMedia(QUrl("http://example.com/myclip4.ogv")); + player->setSource(QUrl("http://example.com/myclip4.ogv")); player->play(); //! [Video graphics item] } |