Kill the current QMediaRecorder class

The class provides only minimal convenience over using
QMediaCaptureSession directly.

Change-Id: I706bb6821fbf8a7cc79a86819001ee1fd669733e
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

7 files changed, 12 insertions, 12 deletions

diff --git a/src/multimedia/doc/snippets/multimedia-snippets/media.cpp b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
index f2ed71cf7..82f6ba6a6 100644
--- a/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
@@ -43,7 +43,7 @@
 #include <QBuffer>
 
 #include "qmediaplaylist.h"
-#include "qmediarecorder.h"
+#include "qmediaencoder.h"
 #include "qplatformmediaplayer_p.h"
 #include "qmediaplayer.h"
 #include "qvideowidget.h"
@@ -71,7 +71,7 @@ private:
     QMediaPlayer *player;
     QMediaPlaylist *playlist;
     QMediaContent video;
-    QMediaRecorder *recorder;
+    QMediaEncoder *recorder;
     QCamera *camera;
     QCameraViewfinder *viewfinder;
     QCameraImageCapture *imageCapture;
@@ -132,7 +132,7 @@ void MediaExample::MediaPlayer()
 void MediaExample::MediaRecorder()
 {
     //! [Media recorder]
-    recorder = new QMediaRecorder(camera);
+    recorder = new QMediaEncoder(camera);
 
     QMediaEncoderSettings audioSettings(QMediaFormat::MP3);
     audioSettings.setQuality(QMediaEncoderSettings::HighQuality);
@@ -147,8 +147,8 @@ void MediaExample::MediaRecorder()
 void MediaExample::AudioRecorder()
 {
     //! [Audio recorder]
-    QMediaRecorder recorder;
-    recorder.setCaptureMode(QMediaRecorder::AudioOnly);
+    QMediaEncoder recorder;
+    recorder.setCaptureMode(QMediaEncoder::AudioOnly);
 
     QMediaEncoderSettings audioSettings(QMediaFormat::MP3);
     audioSettings.setQuality(QMediaEncoderSettings::HighQuality);
diff --git a/src/multimedia/doc/src/audiooverview.qdoc b/src/multimedia/doc/src/audiooverview.qdoc
index ce49e1e98..8adbf8beb 100644
--- a/src/multimedia/doc/src/audiooverview.qdoc
+++ b/src/multimedia/doc/src/audiooverview.qdoc
@@ -53,7 +53,7 @@ You can also put files (even remote URLs) into a playlist:
     \snippet multimedia-snippets/media.cpp Audio playlist
 
 \section2 Recording Audio to a File
-For recording audio to a file, the \l {QMediaRecorder} class allows you
+For recording audio to a file, the \l {QMediaEncoder} class allows you
 to compress audio data from an input device and record it.
 
     \snippet multimedia-snippets/media.cpp Audio recorder
diff --git a/src/multimedia/doc/src/cameraoverview.qdoc b/src/multimedia/doc/src/cameraoverview.qdoc
index 1ade899b0..bd378bcea 100644
--- a/src/multimedia/doc/src/cameraoverview.qdoc
+++ b/src/multimedia/doc/src/cameraoverview.qdoc
@@ -219,7 +219,7 @@ mediaEncoder being called, this causes the signal \l
 recording process can be changed with the \l {QMediaEncoder::record()}{record()},
 \l {QMediaEncoder::stop()}{stop()} slots in \l QMediaEncoder.
 
-On top of the above, QMediaRecorder provides a simple to use, but more limited all-in-one class
+On top of the above, QMediaEncoder provides a simple to use, but more limited all-in-one class
 for recording audio and video content.
 
 \section2 Controlling the Imaging Pipeline
diff --git a/src/multimedia/doc/src/changes.qdoc b/src/multimedia/doc/src/changes.qdoc
index 871dc92b5..62e4c72b4 100644
--- a/src/multimedia/doc/src/changes.qdoc
+++ b/src/multimedia/doc/src/changes.qdoc
@@ -41,7 +41,7 @@ Existing code that uses Qt Multimedia from Qt 5 can be ported with limited effor
 There are a number of new features in Qt Multimedia:
 \list
 \li QMediaCaptureSession class as the central object for media capture
-\li Changed QMediaRecorder class to be a high level class for audio/video recording
+\li Changed QMediaEncoder class to be a high level class for audio/video recording
 \li new QMediaEncoder class to handle encoding of data produced in a capture session
 \li Setting up the desired encodings when recording has changed significantly, see
 QMediaEncoderSettings for details
@@ -67,7 +67,7 @@ QMediaEncoderSettings for details
             and video outputs may be added in a future release.
     \row
         \li QAudioRecorder and the Audio QML type
-        \li QMediaRecorder and the MediaRecorder QML type provide the same functionality
+        \li QMediaEncoder and the MediaRecorder QML type provide the same functionality
     \row
         \li QMediaObject and QMediaBindableInterface
         \li These classes have been removed in favor of a more direct API for setting up connections
diff --git a/src/multimedia/doc/src/multimedia.qdoc b/src/multimedia/doc/src/multimedia.qdoc
index c554d5898..4dbf2f2d8 100644
--- a/src/multimedia/doc/src/multimedia.qdoc
+++ b/src/multimedia/doc/src/multimedia.qdoc
@@ -138,7 +138,7 @@ For some quick recipes, look at the overviews above and consult this table:
         \li \l {Camera Example}{camera},
             \l {QML Camera Example}{declarative-camera}
         \li \l Camera
-        \li QCamera, QMediaRecorder
+        \li QCamera, QMediaEncoder
     \row
         \li 3D sound sources
         \li
diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc
index 5e2f4d98f..86c1dc8c3 100644
--- a/src/multimedia/doc/src/qtmultimedia-index.qdoc
+++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc
@@ -120,7 +120,7 @@
      \li QCameraImageCapture
      \li Capture still images with a camera.
     \row
-     \li QMediaRecorder
+     \li QMediaEncoder
      \li Record media content from a camera source.
     \row
      \li QMediaPlayer
diff --git a/src/multimedia/doc/src/videooverview.qdoc b/src/multimedia/doc/src/videooverview.qdoc
index e3fe0175e..ced829a1e 100644
--- a/src/multimedia/doc/src/videooverview.qdoc
+++ b/src/multimedia/doc/src/videooverview.qdoc
@@ -75,7 +75,7 @@ allows you to receive these frames from \l QMediaPlayer and
 \l QCamera.
 
 \section2 Recording Video
-You can use the \l QMediaRecorder class as a simple way to record video to disk.
+You can use the \l QMediaEncoder class as a simple way to record video to disk.
 For more advances use cases \l QMediaCaptureSession provides a more flexible API.
 
 \section1 Examples