diff options
author | Michael Goddard <michael.goddard@nokia.com> | 2012-01-06 14:29:20 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-03 03:21:43 +0100 |
commit | 78ffd1bc18ecaf5c989187f89fba82dd53503ecc (patch) | |
tree | d330232da42c89b3b16a2ad3ab58c76eb9c3c576 /doc | |
parent | 4bbe267f303f379311a2d8f98aa8dfcf173b1ad6 (diff) |
Remove QMediaImageViewer (SC break).
This class has turned out to be not very useful at this point in time.
Change-Id: Ic07132bdcd01a912a6dd1160c867979fd1307b6a
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/src/examples/slideshow.qdoc | 75 | ||||
-rw-r--r-- | doc/src/snippets/multimedia-snippets/media.cpp | 27 |
2 files changed, 0 insertions, 102 deletions
diff --git a/doc/src/examples/slideshow.qdoc b/doc/src/examples/slideshow.qdoc deleted file mode 100644 index e621e57f0..000000000 --- a/doc/src/examples/slideshow.qdoc +++ /dev/null @@ -1,75 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \example slideshow - \title SlideShow Example - - - \image slideshow-img1.png - - - Slideshow displays a series of time delayed images after you select a - source image directory to use. The folder button presents a list of three - options: browse for a directory, load a playlist or enter a location. - - This implementation uses a QMediaImageViewer object for the image with - a QVideoWidget used to do the display. Whether the the source is a - browsed directory, a playlist file or a URL to a local or remote - location the playlist object in Slideshow is updated with the file or - multiple file locations. - - \code - connect(imageViewer, SIGNAL(stateChanged(QMediaImageViewer::State)), - this, SLOT(stateChanged(QMediaImageViewer::State))); - - playlist = new QMediaPlaylist; - playlist->setMediaObject(imageViewer); - \endcode - - We create a QVideoWidget to display the viewer and add it to the dialog. - - \code - QVideoWidget *videoWidget = new QVideoWidget; - videoWidget->setMediaObject(imageViewer); - \endcode - - - \code - layout->addWidget(videoWidget, Qt::AlignCenter); - \endcode - - - The timeout between images is set by changing the timeout property in - QMediaImageViewer which is in milliseconds. So to change the timeout - to five seconds - \code - imageViewer->setTimeout( 5000 ); - \endcode - - -*/ diff --git a/doc/src/snippets/multimedia-snippets/media.cpp b/doc/src/snippets/multimedia-snippets/media.cpp index c46317641..d59374bd8 100644 --- a/doc/src/snippets/multimedia-snippets/media.cpp +++ b/doc/src/snippets/multimedia-snippets/media.cpp @@ -46,8 +46,6 @@ #include "qmediaplaylist.h" #include "qmediarecorder.h" #include "qmediaservice.h" -#include "qmediaimageviewer.h" -#include "qmediaimageviewer.h" #include "qmediaplayercontrol.h" #include "qmediaplayer.h" #include "qradiotuner.h" @@ -59,7 +57,6 @@ class MediaExample : public QObject { Q_OBJECT void MediaControl(); - void MediaImageViewer(); void MediaPlayer(); void RadioTuna(); void MediaRecorder(); @@ -75,7 +72,6 @@ private: QMediaPlaylist *playlist; QMediaContent video; QMediaRecorder *recorder; - QMediaImageViewer *viewer; QCamera *camera; QCameraImageCapture *imageCapture; QString fileName; @@ -136,29 +132,6 @@ void MediaExample::ImageEncoderSettings() //! [Image encoder settings] } -void MediaExample::MediaImageViewer() -{ - //! [Binding] - viewer = new QMediaImageViewer(this); - - videoWidget = new QVideoWidget; - viewer->bind(videoWidget); - videoWidget->show(); - //! [Binding] - - //! [Playlist] - playlist = new QMediaPlaylist(this); - playlist->setPlaybackMode(QMediaPlaylist::Loop); - playlist->addMedia(image1); - playlist->addMedia(image2); - playlist->addMedia(image3); - - viewer->setPlaylist(playlist); - viewer->setTimeout(5000); - viewer->play(); - //! [Playlist] -} - void MediaExample::MediaPlayer() { //! [Player] |