diff options
94 files changed, 527 insertions, 545 deletions
diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes index 864026be8..3e3298969 100644 --- a/src/imports/multimedia/plugins.qmltypes +++ b/src/imports/multimedia/plugins.qmltypes @@ -307,7 +307,7 @@ Module { } Component { name: "QCamera" - prototype: "QMediaObject" + prototype: "QMediaSource" Enum { name: "Status" values: { @@ -538,7 +538,7 @@ Module { isReadonly: true isPointer: true } - Property { name: "mediaObject"; type: "QObject"; isReadonly: true; isPointer: true } + Property { name: "mediaSource"; type: "QObject"; isReadonly: true; isPointer: true } Property { name: "availability"; type: "Availability"; isReadonly: true } Property { name: "audioRole"; revision: 1; type: "AudioRole" } Property { name: "customAudioRole"; revision: 3; type: "string" } @@ -726,7 +726,7 @@ Module { Property { name: "maximumOpticalZoom"; type: "double"; isReadonly: true } Property { name: "digitalZoom"; type: "double" } Property { name: "maximumDigitalZoom"; type: "double"; isReadonly: true } - Property { name: "mediaObject"; type: "QObject"; isReadonly: true; isPointer: true } + Property { name: "mediaSource"; type: "QObject"; isReadonly: true; isPointer: true } Property { name: "imageCapture" type: "QDeclarativeCameraCapture" @@ -1816,7 +1816,7 @@ Module { } } Component { - name: "QMediaObject" + name: "QMediaSource" prototype: "QObject" Property { name: "notifyInterval"; type: "int" } Signal { diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp index f66a8732f..52755da38 100644 --- a/src/imports/multimedia/qdeclarativeaudio.cpp +++ b/src/imports/multimedia/qdeclarativeaudio.cpp @@ -954,7 +954,7 @@ void QDeclarativeAudio::classBegin() connect(m_player, SIGNAL(metaDataChanged()), m_metaData.data(), SIGNAL(metaDataChanged())); - emit mediaObjectChanged(); + emit mediaSourceChanged(); } void QDeclarativeAudio::componentComplete() @@ -1058,7 +1058,7 @@ void QDeclarativeAudio::_q_mediaChanged(const QMediaContent &media) */ /*! - \qmlproperty variant QtMultimedia::Audio::mediaObject + \qmlproperty variant QtMultimedia::Audio::mediaSource This property holds the native media object. @@ -1066,7 +1066,7 @@ void QDeclarativeAudio::_q_mediaChanged(const QMediaContent &media) \code QObject *qmlAudio; // The QML Audio object - QMediaPlayer *player = qvariant_cast<QMediaPlayer *>(qmlAudio->property("mediaObject")); + QMediaPlayer *player = qvariant_cast<QMediaPlayer *>(qmlAudio->property("mediaSource")); \endcode \note This property is not accessible from QML. @@ -1602,7 +1602,7 @@ void QDeclarativeAudio::_q_mediaChanged(const QMediaContent &media) */ /*! - \qmlproperty variant QtMultimedia::MediaPlayer::mediaObject + \qmlproperty variant QtMultimedia::MediaPlayer::mediaSource This property holds the native media object. @@ -1610,7 +1610,7 @@ void QDeclarativeAudio::_q_mediaChanged(const QMediaContent &media) \code QObject *qmlMediaPlayer; // The QML MediaPlayer object - QMediaPlayer *player = qvariant_cast<QMediaPlayer *>(qmlMediaPlayer->property("mediaObject")); + QMediaPlayer *player = qvariant_cast<QMediaPlayer *>(qmlMediaPlayer->property("mediaSource")); \endcode \note This property is not accessible from QML. diff --git a/src/imports/multimedia/qdeclarativeaudio_p.h b/src/imports/multimedia/qdeclarativeaudio_p.h index df5104624..ff82cb7aa 100644 --- a/src/imports/multimedia/qdeclarativeaudio_p.h +++ b/src/imports/multimedia/qdeclarativeaudio_p.h @@ -91,7 +91,7 @@ class QDeclarativeAudio : public QObject, public QQmlParserStatus Q_PROPERTY(Error error READ error NOTIFY errorChanged) Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged) Q_PROPERTY(QDeclarativeMediaMetaData *metaData READ metaData CONSTANT) - Q_PROPERTY(QObject *mediaObject READ mediaObject NOTIFY mediaObjectChanged SCRIPTABLE false DESIGNABLE false) + Q_PROPERTY(QObject *mediaSource READ mediaSource NOTIFY mediaSourceChanged SCRIPTABLE false DESIGNABLE false) Q_PROPERTY(AudioRole audioRole READ audioRole WRITE setAudioRole NOTIFY audioRoleChanged REVISION 1) Q_PROPERTY(QString customAudioRole READ customAudioRole WRITE setCustomAudioRole NOTIFY customAudioRoleChanged REVISION 3) Q_PROPERTY(int notifyInterval READ notifyInterval WRITE setNotifyInterval NOTIFY notifyIntervalChanged REVISION 2) @@ -174,7 +174,7 @@ public: void classBegin() override; void componentComplete() override; - QObject *mediaObject() { return m_player; } + QObject *mediaSource() { return m_player; } Availability availability() const; @@ -264,7 +264,7 @@ Q_SIGNALS: void errorChanged(); void error(QDeclarativeAudio::Error error, const QString &errorString); - void mediaObjectChanged(); + void mediaSourceChanged(); Q_REVISION(2) void notifyIntervalChanged(); Q_REVISION(15) void videoOutputChanged(); diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index 53a199364..f36c0c6af 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -147,7 +147,7 @@ void QDeclarativeCamera::_q_updateState(QCamera::State state) Basic camera state management, error reporting, and simple zoom properties are available in the Camera itself. For integration with C++ code, the - \l mediaObject property allows you to + \l mediaSource property allows you to access the standard Qt Multimedia camera controls. Many of the camera settings may take some time to apply, and might be limited @@ -715,7 +715,7 @@ void QDeclarativeCamera::setDigitalZoom(qreal value) } /*! - \qmlproperty variant QtMultimedia::Camera::mediaObject + \qmlproperty variant QtMultimedia::Camera::mediaSource This property holds the native media object for the camera. @@ -723,7 +723,7 @@ void QDeclarativeCamera::setDigitalZoom(qreal value) \code QObject *qmlCamera; // The QML Camera object - QCamera *camera = qvariant_cast<QCamera *>(qmlCamera->property("mediaObject")); + QCamera *camera = qvariant_cast<QCamera *>(qmlCamera->property("mediaSource")); \endcode \note This property is not accessible from QML. diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h index 02e0a0b21..62454aeb6 100644 --- a/src/imports/multimedia/qdeclarativecamera_p.h +++ b/src/imports/multimedia/qdeclarativecamera_p.h @@ -96,7 +96,7 @@ class QDeclarativeCamera : public QObject, public QQmlParserStatus Q_PROPERTY(qreal digitalZoom READ digitalZoom WRITE setDigitalZoom NOTIFY digitalZoomChanged) Q_PROPERTY(qreal maximumDigitalZoom READ maximumDigitalZoom NOTIFY maximumDigitalZoomChanged) - Q_PROPERTY(QObject *mediaObject READ mediaObject NOTIFY mediaObjectChanged SCRIPTABLE false DESIGNABLE false) + Q_PROPERTY(QObject *mediaSource READ mediaSource NOTIFY mediaSourceChanged SCRIPTABLE false DESIGNABLE false) Q_PROPERTY(QDeclarativeCameraCapture* imageCapture READ imageCapture CONSTANT) Q_PROPERTY(QDeclarativeCameraRecorder* videoRecorder READ videoRecorder CONSTANT) Q_PROPERTY(QDeclarativeCameraExposure* exposure READ exposure CONSTANT) @@ -240,7 +240,7 @@ public: QDeclarativeCamera(QObject *parent = 0); ~QDeclarativeCamera(); - QObject *mediaObject() { return m_camera; } + QObject *mediaSource() { return m_camera; } QDeclarativeCameraCapture *imageCapture() { return m_imageCapture; } QDeclarativeCameraRecorder *videoRecorder() { return m_videoRecorder; } @@ -317,7 +317,7 @@ Q_SIGNALS: void maximumOpticalZoomChanged(qreal); void maximumDigitalZoomChanged(qreal); - void mediaObjectChanged(); + void mediaSourceChanged(); private Q_SLOTS: void _q_updateState(QCamera::State); diff --git a/src/imports/multimedia/qdeclarativemediametadata_p.h b/src/imports/multimedia/qdeclarativemediametadata_p.h index 06afcffd4..f34eec248 100644 --- a/src/imports/multimedia/qdeclarativemediametadata_p.h +++ b/src/imports/multimedia/qdeclarativemediametadata_p.h @@ -55,7 +55,7 @@ #include <QtMultimedia/qmediametadata.h> #include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qmetadatawritercontrol.h> -#include "qmediaobject.h" +#include "qmediasource.h" QT_BEGIN_NAMESPACE @@ -153,9 +153,9 @@ class QDeclarativeMediaMetaData : public QObject Q_PROPERTY(QVariant gpsAreaInformation READ gpsAreaInformation WRITE setGPSAreaInformation NOTIFY metaDataChanged) public: - QDeclarativeMediaMetaData(QMediaObject *player, QObject *parent = 0) + QDeclarativeMediaMetaData(QMediaSource *player, QObject *parent = 0) : QObject(parent) - , m_mediaObject(player) + , m_mediaSource(player) , m_writerControl(0) , m_requestedWriterControl(false) { @@ -164,261 +164,261 @@ public: ~QDeclarativeMediaMetaData() { if (m_writerControl) { - if (QMediaService *service = m_mediaObject->service()) + if (QMediaService *service = m_mediaSource->service()) service->releaseControl(m_writerControl); } } - QVariant title() const { return m_mediaObject->metaData(QMediaMetaData::Title); } + QVariant title() const { return m_mediaSource->metaData(QMediaMetaData::Title); } void setTitle(const QVariant &title) { setMetaData(QMediaMetaData::Title, title); } - QVariant subTitle() const { return m_mediaObject->metaData(QMediaMetaData::SubTitle); } + QVariant subTitle() const { return m_mediaSource->metaData(QMediaMetaData::SubTitle); } void setSubTitle(const QVariant &title) { setMetaData(QMediaMetaData::SubTitle, title); } - QVariant author() const { return m_mediaObject->metaData(QMediaMetaData::Author); } + QVariant author() const { return m_mediaSource->metaData(QMediaMetaData::Author); } void setAuthor(const QVariant &author) { setMetaData(QMediaMetaData::Author, author); } - QVariant comment() const { return m_mediaObject->metaData(QMediaMetaData::Comment); } + QVariant comment() const { return m_mediaSource->metaData(QMediaMetaData::Comment); } void setComment(const QVariant &comment) { setMetaData(QMediaMetaData::Comment, comment); } - QVariant description() const { return m_mediaObject->metaData(QMediaMetaData::Description); } + QVariant description() const { return m_mediaSource->metaData(QMediaMetaData::Description); } void setDescription(const QVariant &description) { setMetaData(QMediaMetaData::Description, description); } - QVariant category() const { return m_mediaObject->metaData(QMediaMetaData::Category); } + QVariant category() const { return m_mediaSource->metaData(QMediaMetaData::Category); } void setCategory(const QVariant &category) { setMetaData(QMediaMetaData::Category, category); } - QVariant genre() const { return m_mediaObject->metaData(QMediaMetaData::Genre); } + QVariant genre() const { return m_mediaSource->metaData(QMediaMetaData::Genre); } void setGenre(const QVariant &genre) { setMetaData(QMediaMetaData::Genre, genre); } - QVariant year() const { return m_mediaObject->metaData(QMediaMetaData::Year); } + QVariant year() const { return m_mediaSource->metaData(QMediaMetaData::Year); } void setYear(const QVariant &year) { setMetaData(QMediaMetaData::Year, year); } - QVariant date() const { return m_mediaObject->metaData(QMediaMetaData::Date); } + QVariant date() const { return m_mediaSource->metaData(QMediaMetaData::Date); } void setDate(const QVariant &date) { setMetaData(QMediaMetaData::Date, date); } - QVariant userRating() const { return m_mediaObject->metaData(QMediaMetaData::UserRating); } + QVariant userRating() const { return m_mediaSource->metaData(QMediaMetaData::UserRating); } void setUserRating(const QVariant &rating) { setMetaData(QMediaMetaData::UserRating, rating); } - QVariant keywords() const { return m_mediaObject->metaData(QMediaMetaData::Keywords); } + QVariant keywords() const { return m_mediaSource->metaData(QMediaMetaData::Keywords); } void setKeywords(const QVariant &keywords) { setMetaData(QMediaMetaData::Keywords, keywords); } - QVariant language() const { return m_mediaObject->metaData(QMediaMetaData::Language); } + QVariant language() const { return m_mediaSource->metaData(QMediaMetaData::Language); } void setLanguage(const QVariant &language) { setMetaData(QMediaMetaData::Language, language); } - QVariant publisher() const { return m_mediaObject->metaData(QMediaMetaData::Publisher); } + QVariant publisher() const { return m_mediaSource->metaData(QMediaMetaData::Publisher); } void setPublisher(const QVariant &publisher) { setMetaData(QMediaMetaData::Publisher, publisher); } - QVariant copyright() const { return m_mediaObject->metaData(QMediaMetaData::Copyright); } + QVariant copyright() const { return m_mediaSource->metaData(QMediaMetaData::Copyright); } void setCopyright(const QVariant ©right) { setMetaData(QMediaMetaData::Copyright, copyright); } - QVariant parentalRating() const { return m_mediaObject->metaData(QMediaMetaData::ParentalRating); } + QVariant parentalRating() const { return m_mediaSource->metaData(QMediaMetaData::ParentalRating); } void setParentalRating(const QVariant &rating) { setMetaData(QMediaMetaData::ParentalRating, rating); } QVariant ratingOrganization() const { - return m_mediaObject->metaData(QMediaMetaData::RatingOrganization); } + return m_mediaSource->metaData(QMediaMetaData::RatingOrganization); } void setRatingOrganization(const QVariant &organization) { setMetaData(QMediaMetaData::RatingOrganization, organization); } - QVariant size() const { return m_mediaObject->metaData(QMediaMetaData::Size); } + QVariant size() const { return m_mediaSource->metaData(QMediaMetaData::Size); } void setSize(const QVariant &size) { setMetaData(QMediaMetaData::Size, size); } - QVariant mediaType() const { return m_mediaObject->metaData(QMediaMetaData::MediaType); } + QVariant mediaType() const { return m_mediaSource->metaData(QMediaMetaData::MediaType); } void setMediaType(const QVariant &type) { setMetaData(QMediaMetaData::MediaType, type); } - QVariant duration() const { return m_mediaObject->metaData(QMediaMetaData::Duration); } + QVariant duration() const { return m_mediaSource->metaData(QMediaMetaData::Duration); } void setDuration(const QVariant &duration) { setMetaData(QMediaMetaData::Duration, duration); } - QVariant audioBitRate() const { return m_mediaObject->metaData(QMediaMetaData::AudioBitRate); } + QVariant audioBitRate() const { return m_mediaSource->metaData(QMediaMetaData::AudioBitRate); } void setAudioBitRate(const QVariant &rate) { setMetaData(QMediaMetaData::AudioBitRate, rate); } - QVariant audioCodec() const { return m_mediaObject->metaData(QMediaMetaData::AudioCodec); } + QVariant audioCodec() const { return m_mediaSource->metaData(QMediaMetaData::AudioCodec); } void setAudioCodec(const QVariant &codec) { setMetaData(QMediaMetaData::AudioCodec, codec); } - QVariant averageLevel() const { return m_mediaObject->metaData(QMediaMetaData::AverageLevel); } + QVariant averageLevel() const { return m_mediaSource->metaData(QMediaMetaData::AverageLevel); } void setAverageLevel(const QVariant &level) { setMetaData(QMediaMetaData::AverageLevel, level); } - QVariant channelCount() const { return m_mediaObject->metaData(QMediaMetaData::ChannelCount); } + QVariant channelCount() const { return m_mediaSource->metaData(QMediaMetaData::ChannelCount); } void setChannelCount(const QVariant &count) { setMetaData(QMediaMetaData::ChannelCount, count); } - QVariant peakValue() const { return m_mediaObject->metaData(QMediaMetaData::PeakValue); } + QVariant peakValue() const { return m_mediaSource->metaData(QMediaMetaData::PeakValue); } void setPeakValue(const QVariant &value) { setMetaData(QMediaMetaData::PeakValue, value); } - QVariant sampleRate() const { return m_mediaObject->metaData(QMediaMetaData::SampleRate); } + QVariant sampleRate() const { return m_mediaSource->metaData(QMediaMetaData::SampleRate); } void setSampleRate(const QVariant &rate) { setMetaData(QMediaMetaData::SampleRate, rate); } - QVariant albumTitle() const { return m_mediaObject->metaData(QMediaMetaData::AlbumTitle); } + QVariant albumTitle() const { return m_mediaSource->metaData(QMediaMetaData::AlbumTitle); } void setAlbumTitle(const QVariant &title) { setMetaData(QMediaMetaData::AlbumTitle, title); } - QVariant albumArtist() const { return m_mediaObject->metaData(QMediaMetaData::AlbumArtist); } + QVariant albumArtist() const { return m_mediaSource->metaData(QMediaMetaData::AlbumArtist); } void setAlbumArtist(const QVariant &artist) { setMetaData(QMediaMetaData::AlbumArtist, artist); } QVariant contributingArtist() const { - return m_mediaObject->metaData(QMediaMetaData::ContributingArtist); } + return m_mediaSource->metaData(QMediaMetaData::ContributingArtist); } void setContributingArtist(const QVariant &artist) { setMetaData(QMediaMetaData::ContributingArtist, artist); } - QVariant composer() const { return m_mediaObject->metaData(QMediaMetaData::Composer); } + QVariant composer() const { return m_mediaSource->metaData(QMediaMetaData::Composer); } void setComposer(const QVariant &composer) { setMetaData(QMediaMetaData::Composer, composer); } - QVariant conductor() const { return m_mediaObject->metaData(QMediaMetaData::Conductor); } + QVariant conductor() const { return m_mediaSource->metaData(QMediaMetaData::Conductor); } void setConductor(const QVariant &conductor) { setMetaData(QMediaMetaData::Conductor, conductor); } - QVariant lyrics() const { return m_mediaObject->metaData(QMediaMetaData::Lyrics); } + QVariant lyrics() const { return m_mediaSource->metaData(QMediaMetaData::Lyrics); } void setLyrics(const QVariant &lyrics) { setMetaData(QMediaMetaData::Lyrics, lyrics); } - QVariant mood() const { return m_mediaObject->metaData(QMediaMetaData::Mood); } + QVariant mood() const { return m_mediaSource->metaData(QMediaMetaData::Mood); } void setMood(const QVariant &mood) { setMetaData(QMediaMetaData::Mood, mood); } - QVariant trackNumber() const { return m_mediaObject->metaData(QMediaMetaData::TrackNumber); } + QVariant trackNumber() const { return m_mediaSource->metaData(QMediaMetaData::TrackNumber); } void setTrackNumber(const QVariant &track) { setMetaData(QMediaMetaData::TrackNumber, track); } - QVariant trackCount() const { return m_mediaObject->metaData(QMediaMetaData::TrackCount); } + QVariant trackCount() const { return m_mediaSource->metaData(QMediaMetaData::TrackCount); } void setTrackCount(const QVariant &count) { setMetaData(QMediaMetaData::TrackCount, count); } QVariant coverArtUrlSmall() const { - return m_mediaObject->metaData(QMediaMetaData::CoverArtUrlSmall); } + return m_mediaSource->metaData(QMediaMetaData::CoverArtUrlSmall); } void setCoverArtUrlSmall(const QVariant &url) { setMetaData(QMediaMetaData::CoverArtUrlSmall, url); } QVariant coverArtUrlLarge() const { - return m_mediaObject->metaData(QMediaMetaData::CoverArtUrlLarge); } + return m_mediaSource->metaData(QMediaMetaData::CoverArtUrlLarge); } void setCoverArtUrlLarge(const QVariant &url) { setMetaData(QMediaMetaData::CoverArtUrlLarge, url); } - QVariant resolution() const { return m_mediaObject->metaData(QMediaMetaData::Resolution); } + QVariant resolution() const { return m_mediaSource->metaData(QMediaMetaData::Resolution); } void setResolution(const QVariant &resolution) { setMetaData(QMediaMetaData::Resolution, resolution); } QVariant pixelAspectRatio() const { - return m_mediaObject->metaData(QMediaMetaData::PixelAspectRatio); } + return m_mediaSource->metaData(QMediaMetaData::PixelAspectRatio); } void setPixelAspectRatio(const QVariant &ratio) { setMetaData(QMediaMetaData::PixelAspectRatio, ratio); } - QVariant videoFrameRate() const { return m_mediaObject->metaData(QMediaMetaData::VideoFrameRate); } + QVariant videoFrameRate() const { return m_mediaSource->metaData(QMediaMetaData::VideoFrameRate); } void setVideoFrameRate(const QVariant &rate) { setMetaData(QMediaMetaData::VideoFrameRate, rate); } - QVariant videoBitRate() const { return m_mediaObject->metaData(QMediaMetaData::VideoBitRate); } + QVariant videoBitRate() const { return m_mediaSource->metaData(QMediaMetaData::VideoBitRate); } void setVideoBitRate(const QVariant &rate) { setMetaData(QMediaMetaData::VideoBitRate, rate); } - QVariant videoCodec() const { return m_mediaObject->metaData(QMediaMetaData::VideoCodec); } + QVariant videoCodec() const { return m_mediaSource->metaData(QMediaMetaData::VideoCodec); } void setVideoCodec(const QVariant &codec) { setMetaData(QMediaMetaData::VideoCodec, codec); } - QVariant posterUrl() const { return m_mediaObject->metaData(QMediaMetaData::PosterUrl); } + QVariant posterUrl() const { return m_mediaSource->metaData(QMediaMetaData::PosterUrl); } void setPosterUrl(const QVariant &url) { setMetaData(QMediaMetaData::PosterUrl, url); } - QVariant chapterNumber() const { return m_mediaObject->metaData(QMediaMetaData::ChapterNumber); } + QVariant chapterNumber() const { return m_mediaSource->metaData(QMediaMetaData::ChapterNumber); } void setChapterNumber(const QVariant &chapter) { setMetaData(QMediaMetaData::ChapterNumber, chapter); } - QVariant director() const { return m_mediaObject->metaData(QMediaMetaData::Director); } + QVariant director() const { return m_mediaSource->metaData(QMediaMetaData::Director); } void setDirector(const QVariant &director) { setMetaData(QMediaMetaData::Director, director); } - QVariant leadPerformer() const { return m_mediaObject->metaData(QMediaMetaData::LeadPerformer); } + QVariant leadPerformer() const { return m_mediaSource->metaData(QMediaMetaData::LeadPerformer); } void setLeadPerformer(const QVariant &performer) { setMetaData(QMediaMetaData::LeadPerformer, performer); } - QVariant writer() const { return m_mediaObject->metaData(QMediaMetaData::Writer); } + QVariant writer() const { return m_mediaSource->metaData(QMediaMetaData::Writer); } void setWriter(const QVariant &writer) { setMetaData(QMediaMetaData::Writer, writer); } QVariant cameraManufacturer() const { - return m_mediaObject->metaData(QMediaMetaData::CameraManufacturer); } + return m_mediaSource->metaData(QMediaMetaData::CameraManufacturer); } void setCameraManufacturer(const QVariant &manufacturer) { setMetaData(QMediaMetaData::CameraManufacturer, manufacturer); } - QVariant cameraModel() const { return m_mediaObject->metaData(QMediaMetaData::CameraModel); } + QVariant cameraModel() const { return m_mediaSource->metaData(QMediaMetaData::CameraModel); } void setCameraModel(const QVariant &model) { setMetaData(QMediaMetaData::CameraModel, model); } QT_WARNING_PUSH QT_WARNING_DISABLE_GCC("-Woverloaded-virtual") QT_WARNING_DISABLE_CLANG("-Woverloaded-virtual") - QVariant event() const { return m_mediaObject->metaData(QMediaMetaData::Event); } + QVariant event() const { return m_mediaSource->metaData(QMediaMetaData::Event); } QT_WARNING_POP void setEvent(const QVariant &event) { setMetaData(QMediaMetaData::Event, event); } - QVariant subject() const { return m_mediaObject->metaData(QMediaMetaData::Subject); } + QVariant subject() const { return m_mediaSource->metaData(QMediaMetaData::Subject); } void setSubject(const QVariant &subject) { setMetaData(QMediaMetaData::Subject, subject); } - QVariant orientation() const { return m_mediaObject->metaData(QMediaMetaData::Orientation); } + QVariant orientation() const { return m_mediaSource->metaData(QMediaMetaData::Orientation); } void setOrientation(const QVariant &orientation) { setMetaData(QMediaMetaData::Orientation, orientation); } - QVariant exposureTime() const { return m_mediaObject->metaData(QMediaMetaData::ExposureTime); } + QVariant exposureTime() const { return m_mediaSource->metaData(QMediaMetaData::ExposureTime); } void setExposureTime(const QVariant &time) { setMetaData(QMediaMetaData::ExposureTime, time); } - QVariant fNumber() const { return m_mediaObject->metaData(QMediaMetaData::FNumber); } + QVariant fNumber() const { return m_mediaSource->metaData(QMediaMetaData::FNumber); } void setFNumber(const QVariant &number) { setMetaData(QMediaMetaData::FNumber, number); } QVariant exposureProgram() const { - return m_mediaObject->metaData(QMediaMetaData::ExposureProgram); } + return m_mediaSource->metaData(QMediaMetaData::ExposureProgram); } void setExposureProgram(const QVariant &program) { setMetaData(QMediaMetaData::ExposureProgram, program); } QVariant isoSpeedRatings() const { - return m_mediaObject->metaData(QMediaMetaData::ISOSpeedRatings); } + return m_mediaSource->metaData(QMediaMetaData::ISOSpeedRatings); } void setISOSpeedRatings(const QVariant &ratings) { setMetaData(QMediaMetaData::ISOSpeedRatings, ratings); } QVariant exposureBiasValue() const { - return m_mediaObject->metaData(QMediaMetaData::ExposureBiasValue); } + return m_mediaSource->metaData(QMediaMetaData::ExposureBiasValue); } void setExposureBiasValue(const QVariant &bias) { setMetaData(QMediaMetaData::ExposureBiasValue, bias); } QVariant dateTimeOriginal() const { - return m_mediaObject->metaData(QMediaMetaData::DateTimeOriginal); } + return m_mediaSource->metaData(QMediaMetaData::DateTimeOriginal); } void setDateTimeOriginal(const QVariant &dateTime) { setMetaData(QMediaMetaData::DateTimeOriginal, dateTime); } QVariant dateTimeDigitized() const { - return m_mediaObject->metaData(QMediaMetaData::DateTimeDigitized); } + return m_mediaSource->metaData(QMediaMetaData::DateTimeDigitized); } void setDateTimeDigitized(const QVariant &dateTime) { setMetaData(QMediaMetaData::DateTimeDigitized, dateTime); } QVariant subjectDistance() const { - return m_mediaObject->metaData(QMediaMetaData::SubjectDistance); } + return m_mediaSource->metaData(QMediaMetaData::SubjectDistance); } void setSubjectDistance(const QVariant &distance) { setMetaData(QMediaMetaData::SubjectDistance, distance); } - QVariant lightSource() const { return m_mediaObject->metaData(QMediaMetaData::LightSource); } + QVariant lightSource() const { return m_mediaSource->metaData(QMediaMetaData::LightSource); } void setLightSource(const QVariant &source) { setMetaData(QMediaMetaData::LightSource, source); } - QVariant flash() const { return m_mediaObject->metaData(QMediaMetaData::Flash); } + QVariant flash() const { return m_mediaSource->metaData(QMediaMetaData::Flash); } void setFlash(const QVariant &flash) { setMetaData(QMediaMetaData::Flash, flash); } - QVariant focalLength() const { return m_mediaObject->metaData(QMediaMetaData::FocalLength); } + QVariant focalLength() const { return m_mediaSource->metaData(QMediaMetaData::FocalLength); } void setFocalLength(const QVariant &length) { setMetaData(QMediaMetaData::FocalLength, length); } - QVariant exposureMode() const { return m_mediaObject->metaData(QMediaMetaData::ExposureMode); } + QVariant exposureMode() const { return m_mediaSource->metaData(QMediaMetaData::ExposureMode); } void setExposureMode(const QVariant &mode) { setMetaData(QMediaMetaData::ExposureMode, mode); } - QVariant whiteBalance() const { return m_mediaObject->metaData(QMediaMetaData::WhiteBalance); } + QVariant whiteBalance() const { return m_mediaSource->metaData(QMediaMetaData::WhiteBalance); } void setWhiteBalance(const QVariant &balance) { setMetaData(QMediaMetaData::WhiteBalance, balance); } QVariant digitalZoomRatio() const { - return m_mediaObject->metaData(QMediaMetaData::DigitalZoomRatio); } + return m_mediaSource->metaData(QMediaMetaData::DigitalZoomRatio); } void setDigitalZoomRatio(const QVariant &ratio) { setMetaData(QMediaMetaData::DigitalZoomRatio, ratio); } QVariant focalLengthIn35mmFilm() const { - return m_mediaObject->metaData(QMediaMetaData::FocalLengthIn35mmFilm); } + return m_mediaSource->metaData(QMediaMetaData::FocalLengthIn35mmFilm); } void setFocalLengthIn35mmFilm(const QVariant &length) { setMetaData(QMediaMetaData::FocalLengthIn35mmFilm, length); } QVariant sceneCaptureType() const { - return m_mediaObject->metaData(QMediaMetaData::SceneCaptureType); } + return m_mediaSource->metaData(QMediaMetaData::SceneCaptureType); } void setSceneCaptureType(const QVariant &type) { setMetaData(QMediaMetaData::SceneCaptureType, type); } - QVariant gainControl() const { return m_mediaObject->metaData(QMediaMetaData::GainControl); } + QVariant gainControl() const { return m_mediaSource->metaData(QMediaMetaData::GainControl); } void setGainControl(const QVariant &gain) { setMetaData(QMediaMetaData::GainControl, gain); } - QVariant contrast() const { return m_mediaObject->metaData(QMediaMetaData::Contrast); } + QVariant contrast() const { return m_mediaSource->metaData(QMediaMetaData::Contrast); } void setContrast(const QVariant &contrast) { setMetaData(QMediaMetaData::Contrast, contrast); } - QVariant saturation() const { return m_mediaObject->metaData(QMediaMetaData::Saturation); } + QVariant saturation() const { return m_mediaSource->metaData(QMediaMetaData::Saturation); } void setSaturation(const QVariant &saturation) { setMetaData(QMediaMetaData::Saturation, saturation); } - QVariant sharpness() const { return m_mediaObject->metaData(QMediaMetaData::Sharpness); } + QVariant sharpness() const { return m_mediaSource->metaData(QMediaMetaData::Sharpness); } void setSharpness(const QVariant &sharpness) { setMetaData(QMediaMetaData::Sharpness, sharpness); } QVariant deviceSettingDescription() const { - return m_mediaObject->metaData(QMediaMetaData::DeviceSettingDescription); } + return m_mediaSource->metaData(QMediaMetaData::DeviceSettingDescription); } void setDeviceSettingDescription(const QVariant &description) { setMetaData(QMediaMetaData::DeviceSettingDescription, description); } - QVariant gpsLatitude() const { return m_mediaObject->metaData(QMediaMetaData::GPSLatitude); } + QVariant gpsLatitude() const { return m_mediaSource->metaData(QMediaMetaData::GPSLatitude); } void setGPSLatitude(const QVariant &latitude) { setMetaData(QMediaMetaData::GPSLatitude, latitude); } - QVariant gpsLongitude() const { return m_mediaObject->metaData(QMediaMetaData::GPSLongitude); } + QVariant gpsLongitude() const { return m_mediaSource->metaData(QMediaMetaData::GPSLongitude); } void setGPSLongitude(const QVariant &longitude) { setMetaData(QMediaMetaData::GPSLongitude, longitude); } - QVariant gpsAltitude() const { return m_mediaObject->metaData(QMediaMetaData::GPSAltitude); } + QVariant gpsAltitude() const { return m_mediaSource->metaData(QMediaMetaData::GPSAltitude); } void setGPSAltitude(const QVariant &altitude) { setMetaData(QMediaMetaData::GPSAltitude, altitude); } - QVariant gpsTimeStamp() const { return m_mediaObject->metaData(QMediaMetaData::GPSTimeStamp); } + QVariant gpsTimeStamp() const { return m_mediaSource->metaData(QMediaMetaData::GPSTimeStamp); } void setGPSTimeStamp(const QVariant ×tamp) { setMetaData(QMediaMetaData::GPSTimeStamp, timestamp); } QVariant gpsSatellites() const { - return m_mediaObject->metaData(QMediaMetaData::GPSSatellites); } + return m_mediaSource->metaData(QMediaMetaData::GPSSatellites); } void setGPSSatellites(const QVariant &satellites) { setMetaData(QMediaMetaData::GPSSatellites, satellites); } - QVariant gpsStatus() const { return m_mediaObject->metaData(QMediaMetaData::GPSStatus); } + QVariant gpsStatus() const { return m_mediaSource->metaData(QMediaMetaData::GPSStatus); } void setGPSStatus(const QVariant &status) { setMetaData(QMediaMetaData::GPSStatus, status); } - QVariant gpsDOP() const { return m_mediaObject->metaData(QMediaMetaData::GPSDOP); } + QVariant gpsDOP() const { return m_mediaSource->metaData(QMediaMetaData::GPSDOP); } void setGPSDOP(const QVariant &dop) { setMetaData(QMediaMetaData::GPSDOP, dop); } - QVariant gpsSpeed() const { return m_mediaObject->metaData(QMediaMetaData::GPSSpeed); } + QVariant gpsSpeed() const { return m_mediaSource->metaData(QMediaMetaData::GPSSpeed); } void setGPSSpeed(const QVariant &speed) { setMetaData(QMediaMetaData::GPSSpeed, speed); } - QVariant gpsTrack() const { return m_mediaObject->metaData(QMediaMetaData::GPSTrack); } + QVariant gpsTrack() const { return m_mediaSource->metaData(QMediaMetaData::GPSTrack); } void setGPSTrack(const QVariant &track) { setMetaData(QMediaMetaData::GPSTrack, track); } - QVariant gpsTrackRef() const { return m_mediaObject->metaData(QMediaMetaData::GPSTrackRef); } + QVariant gpsTrackRef() const { return m_mediaSource->metaData(QMediaMetaData::GPSTrackRef); } void setGPSTrackRef(const QVariant &ref) { setMetaData(QMediaMetaData::GPSTrackRef, ref); } QVariant gpsImgDirection() const { - return m_mediaObject->metaData(QMediaMetaData::GPSImgDirection); } + return m_mediaSource->metaData(QMediaMetaData::GPSImgDirection); } void setGPSImgDirection(const QVariant &direction) { setMetaData(QMediaMetaData::GPSImgDirection, direction); } QVariant gpsImgDirectionRef() const { - return m_mediaObject->metaData(QMediaMetaData::GPSImgDirectionRef); } + return m_mediaSource->metaData(QMediaMetaData::GPSImgDirectionRef); } void setGPSImgDirectionRef(const QVariant &ref) { setMetaData(QMediaMetaData::GPSImgDirectionRef, ref); } - QVariant gpsMapDatum() const { return m_mediaObject->metaData(QMediaMetaData::GPSMapDatum); } + QVariant gpsMapDatum() const { return m_mediaSource->metaData(QMediaMetaData::GPSMapDatum); } void setGPSMapDatum(const QVariant &datum) { setMetaData(QMediaMetaData::GPSMapDatum, datum); } QVariant gpsProcessingMethod() const { - return m_mediaObject->metaData(QMediaMetaData::GPSProcessingMethod); } + return m_mediaSource->metaData(QMediaMetaData::GPSProcessingMethod); } void setGPSProcessingMethod(const QVariant &method) { setMetaData(QMediaMetaData::GPSProcessingMethod, method); } QVariant gpsAreaInformation() const { - return m_mediaObject->metaData(QMediaMetaData::GPSAreaInformation); } + return m_mediaSource->metaData(QMediaMetaData::GPSAreaInformation); } void setGPSAreaInformation(const QVariant &information) { setMetaData(QMediaMetaData::GPSAreaInformation, information); } @@ -430,14 +430,14 @@ private: { if (!m_requestedWriterControl) { m_requestedWriterControl = true; - if (QMediaService *service = m_mediaObject->service()) + if (QMediaService *service = m_mediaSource->service()) m_writerControl = service->requestControl<QMetaDataWriterControl *>(); } if (m_writerControl) m_writerControl->setMetaData(key, value); } - QMediaObject *m_mediaObject; + QMediaSource *m_mediaSource; QMetaDataWriterControl *m_writerControl; bool m_requestedWriterControl; }; diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt index 9a26ebb51..114ac3b6e 100644 --- a/src/multimedia/CMakeLists.txt +++ b/src/multimedia/CMakeLists.txt @@ -58,7 +58,7 @@ qt_add_module(Multimedia qmediasink.cpp qmediasink.h qmediaenumdebug.h qmediametadata.cpp qmediametadata.h - qmediaobject.cpp qmediaobject.h qmediaobject_p.h + qmediasource.cpp qmediasource.h qmediasource_p.h qmediapluginloader.cpp qmediapluginloader_p.h qmediaservice.cpp qmediaservice.h qmediaservice_p.h qmediaserviceprovider.cpp qmediaserviceprovider_p.h diff --git a/src/multimedia/audio/qaudiodecoder.cpp b/src/multimedia/audio/qaudiodecoder.cpp index ce6b8c00c..7a0ebf8ae 100644 --- a/src/multimedia/audio/qaudiodecoder.cpp +++ b/src/multimedia/audio/qaudiodecoder.cpp @@ -39,7 +39,7 @@ #include "qaudiodecoder.h" -#include "qmediaobject_p.h" +#include "qmediasource_p.h" #include <qmediaservice.h> #include "qaudiodecodercontrol.h" #include <private/qmediaserviceprovider_p.h> @@ -78,7 +78,7 @@ static void qRegisterAudioDecoderMetaTypes() Q_CONSTRUCTOR_FUNCTION(qRegisterAudioDecoderMetaTypes) -class QAudioDecoderPrivate : public QMediaObjectPrivate +class QAudioDecoderPrivate : public QMediaSourcePrivate { Q_DECLARE_NON_CONST_PUBLIC(QAudioDecoder) @@ -119,7 +119,7 @@ void QAudioDecoderPrivate::_q_error(int error, const QString &errorString) parented to \a parent. */ QAudioDecoder::QAudioDecoder(QObject *parent) - : QMediaObject(*new QAudioDecoderPrivate, + : QMediaSource(*new QAudioDecoderPrivate, parent, QMediaServiceProvider::defaultServiceProvider()->requestService(Q_MEDIASERVICE_AUDIODECODER)) { @@ -330,7 +330,7 @@ void QAudioDecoder::setAudioFormat(const QAudioFormat &format) bool QAudioDecoder::bind(QObject *obj) { - return QMediaObject::bind(obj); + return QMediaSource::bind(obj); } /*! @@ -339,7 +339,7 @@ bool QAudioDecoder::bind(QObject *obj) void QAudioDecoder::unbind(QObject *obj) { - QMediaObject::unbind(obj); + QMediaSource::unbind(obj); } /*! diff --git a/src/multimedia/audio/qaudiodecoder.h b/src/multimedia/audio/qaudiodecoder.h index 4ba107946..6ada3e2af 100644 --- a/src/multimedia/audio/qaudiodecoder.h +++ b/src/multimedia/audio/qaudiodecoder.h @@ -40,7 +40,7 @@ #ifndef QAUDIODECODER_H #define QAUDIODECODER_H -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qmediaenumdebug.h> #include <QtMultimedia/qaudiobuffer.h> @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE class QAudioDecoderPrivate; -class Q_MULTIMEDIA_EXPORT QAudioDecoder : public QMediaObject +class Q_MULTIMEDIA_EXPORT QAudioDecoder : public QMediaSource { Q_OBJECT Q_PROPERTY(QString sourceFilename READ sourceFilename WRITE setSourceFilename NOTIFY sourceChanged) diff --git a/src/multimedia/audio/qaudioprobe.cpp b/src/multimedia/audio/qaudioprobe.cpp index 7fb57242f..3bf2a90e1 100644 --- a/src/multimedia/audio/qaudioprobe.cpp +++ b/src/multimedia/audio/qaudioprobe.cpp @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE class QAudioProbePrivate { public: - QPointer<QMediaObject> source; + QPointer<QMediaSource> source; QPointer<QMediaAudioProbeControl> probee; }; @@ -107,7 +107,7 @@ QAudioProbe::~QAudioProbe() Passing in the same object will be ignored, but monitoring will continue. */ -bool QAudioProbe::setSource(QMediaObject *source) +bool QAudioProbe::setSource(QMediaSource *source) { // Need to: // 1) disconnect from current source if necessary @@ -153,7 +153,7 @@ bool QAudioProbe::setSource(QMediaObject *source) Returns true on success. - If there is no mediaObject associated with \a mediaRecorder, or if it is + If there is no mediaSource associated with \a mediaRecorder, or if it is zero, this probe will be deactivated and this function wil return true. If the media recorder instance does not support monitoring @@ -165,7 +165,7 @@ bool QAudioProbe::setSource(QMediaObject *source) */ bool QAudioProbe::setSource(QMediaRecorder *mediaRecorder) { - QMediaObject *source = mediaRecorder ? mediaRecorder->mediaObject() : nullptr; + QMediaSource *source = mediaRecorder ? mediaRecorder->mediaSource() : nullptr; bool result = setSource(source); if (!mediaRecorder) diff --git a/src/multimedia/audio/qaudioprobe.h b/src/multimedia/audio/qaudioprobe.h index e0d5619d2..656561fd9 100644 --- a/src/multimedia/audio/qaudioprobe.h +++ b/src/multimedia/audio/qaudioprobe.h @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -class QMediaObject; +class QMediaSource; class QMediaRecorder; class QAudioProbePrivate; @@ -56,7 +56,7 @@ public: explicit QAudioProbe(QObject *parent = nullptr); ~QAudioProbe(); - bool setSource(QMediaObject *source); + bool setSource(QMediaSource *source); bool setSource(QMediaRecorder *source); bool isActive() const; diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp index 47550e803..40da13a96 100644 --- a/src/multimedia/camera/qcamera.cpp +++ b/src/multimedia/camera/qcamera.cpp @@ -291,7 +291,7 @@ void QCameraPrivate::_q_updateLockStatus(QCamera::LockType type, QCamera::LockSt */ QCamera::QCamera(QObject *parent): - QMediaObject(*new QCameraPrivate, + QMediaSource(*new QCameraPrivate, parent, QMediaServiceProvider::defaultServiceProvider()->requestService(Q_MEDIASERVICE_CAMERA)) { @@ -311,7 +311,7 @@ QCamera::QCamera(QObject *parent): */ QCamera::QCamera(const QByteArray& deviceName, QObject *parent): - QMediaObject(*new QCameraPrivate, parent, + QMediaSource(*new QCameraPrivate, parent, QMediaServiceProvider::defaultServiceProvider()->requestService(Q_MEDIASERVICE_CAMERA)) { Q_D(QCamera); @@ -369,7 +369,7 @@ QCamera::QCamera(const QCameraInfo &cameraInfo, QObject *parent) */ QCamera::QCamera(QCamera::Position position, QObject *parent) - : QMediaObject(*new QCameraPrivate, + : QMediaSource(*new QCameraPrivate, parent, QMediaServiceProvider::defaultServiceProvider()->requestService(Q_MEDIASERVICE_CAMERA)) { @@ -419,7 +419,7 @@ QMultimedia::AvailabilityStatus QCamera::availability() const if (d->error != QCamera::NoError) return QMultimedia::ResourceError; - return QMediaObject::availability(); + return QMediaSource::availability(); } diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h index e264d401e..d0328d8a9 100644 --- a/src/multimedia/camera/qcamera.h +++ b/src/multimedia/camera/qcamera.h @@ -46,7 +46,7 @@ #include <QtCore/qpoint.h> #include <QtCore/qrect.h> -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qcameraexposure.h> #include <QtMultimedia/qcamerafocus.h> @@ -64,7 +64,7 @@ class QGraphicsVideoItem; class QCameraInfo; class QCameraPrivate; -class Q_MULTIMEDIA_EXPORT QCamera : public QMediaObject +class Q_MULTIMEDIA_EXPORT QCamera : public QMediaSource { Q_OBJECT Q_PROPERTY(QCamera::State state READ state NOTIFY stateChanged) diff --git a/src/multimedia/camera/qcamera_p.h b/src/multimedia/camera/qcamera_p.h index a7c077124..0427611ef 100644 --- a/src/multimedia/camera/qcamera_p.h +++ b/src/multimedia/camera/qcamera_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include "qmediaobject_p.h" +#include "qmediasource_p.h" #include "qvideosurfaceoutput_p.h" #include "qcamera.h" @@ -61,12 +61,12 @@ class QMediaServiceProvider; class QCameraControl; class QVideoDeviceSelectorControl; -class QCameraPrivate : public QMediaObjectPrivate +class QCameraPrivate : public QMediaSourcePrivate { Q_DECLARE_NON_CONST_PUBLIC(QCamera) public: QCameraPrivate(): - QMediaObjectPrivate(), + QMediaSourcePrivate(), provider(nullptr), control(nullptr), deviceControl(nullptr), diff --git a/src/multimedia/camera/qcameraexposure.cpp b/src/multimedia/camera/qcameraexposure.cpp index 5d2185ed2..693f2bb55 100644 --- a/src/multimedia/camera/qcameraexposure.cpp +++ b/src/multimedia/camera/qcameraexposure.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qcameraexposure.h" -#include "qmediaobject_p.h" +#include "qmediasource_p.h" #include <qcamera.h> #include <qcameraexposurecontrol.h> diff --git a/src/multimedia/camera/qcameraexposure.h b/src/multimedia/camera/qcameraexposure.h index f4522d8c7..78be56e21 100644 --- a/src/multimedia/camera/qcameraexposure.h +++ b/src/multimedia/camera/qcameraexposure.h @@ -40,7 +40,7 @@ #ifndef QCAMERAEXPOSURE_H #define QCAMERAEXPOSURE_H -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qmediaenumdebug.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/camera/qcamerafocus.cpp b/src/multimedia/camera/qcamerafocus.cpp index ffb2427e7..7839c63ce 100644 --- a/src/multimedia/camera/qcamerafocus.cpp +++ b/src/multimedia/camera/qcamerafocus.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qcamerafocus.h" -#include "qmediaobject_p.h" +#include "qmediasource_p.h" #include <qcamera.h> #include <qcameracontrol.h> @@ -288,7 +288,7 @@ void QCameraFocusZone::setStatus(QCameraFocusZone::FocusZoneStatus status) */ -class QCameraFocusPrivate : public QMediaObjectPrivate +class QCameraFocusPrivate : public QMediaSourcePrivate { Q_DECLARE_NON_CONST_PUBLIC(QCameraFocus) public: diff --git a/src/multimedia/camera/qcamerafocus.h b/src/multimedia/camera/qcamerafocus.h index 11639c3da..c8f7ae60d 100644 --- a/src/multimedia/camera/qcamerafocus.h +++ b/src/multimedia/camera/qcamerafocus.h @@ -47,7 +47,7 @@ #include <QtCore/qrect.h> #include <QtCore/qshareddata.h> -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qmediaenumdebug.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp index 39a97ca24..a6da93445 100644 --- a/src/multimedia/camera/qcameraimagecapture.cpp +++ b/src/multimedia/camera/qcameraimagecapture.cpp @@ -41,7 +41,7 @@ #include <qmediaencodersettings.h> #include <qimageencodercontrol.h> -#include "qmediaobject_p.h" +#include "qmediasource_p.h" #include <qmediaservice.h> #include <qcamera.h> #include <qcameracontrol.h> diff --git a/src/multimedia/camera/qcameraimagecapture.h b/src/multimedia/camera/qcameraimagecapture.h index 2915553f4..9b35a0a84 100644 --- a/src/multimedia/camera/qcameraimagecapture.h +++ b/src/multimedia/camera/qcameraimagecapture.h @@ -40,7 +40,7 @@ #ifndef QCAMERAIMAGECAPTURE_H #define QCAMERAIMAGECAPTURE_H -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qmediaencodersettings.h> #include <QtMultimedia/qmediasink.h> #include <QtMultimedia/qvideoframe.h> diff --git a/src/multimedia/camera/qcameraimageprocessing.cpp b/src/multimedia/camera/qcameraimageprocessing.cpp index 21e1cb086..99a874bac 100644 --- a/src/multimedia/camera/qcameraimageprocessing.cpp +++ b/src/multimedia/camera/qcameraimageprocessing.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qcameraimageprocessing.h" -#include "qmediaobject_p.h" +#include "qmediasource_p.h" #include <qcameracontrol.h> #include <qcameraexposurecontrol.h> @@ -106,7 +106,7 @@ public: }; -class QCameraImageProcessingPrivate : public QMediaObjectPrivate +class QCameraImageProcessingPrivate : public QMediaSourcePrivate { Q_DECLARE_NON_CONST_PUBLIC(QCameraImageProcessing) public: diff --git a/src/multimedia/camera/qcameraimageprocessing.h b/src/multimedia/camera/qcameraimageprocessing.h index e99853194..6f26adf5a 100644 --- a/src/multimedia/camera/qcameraimageprocessing.h +++ b/src/multimedia/camera/qcameraimageprocessing.h @@ -47,7 +47,7 @@ #include <QtCore/qrect.h> #include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qmediaenumdebug.h> diff --git a/src/multimedia/controls/qcameracontrol.h b/src/multimedia/controls/qcameracontrol.h index 9490b563b..d29cc9124 100644 --- a/src/multimedia/controls/qcameracontrol.h +++ b/src/multimedia/controls/qcameracontrol.h @@ -41,7 +41,7 @@ #define QCAMERACONTROL_H #include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qcamera.h> diff --git a/src/multimedia/controls/qcameraexposurecontrol.h b/src/multimedia/controls/qcameraexposurecontrol.h index 7331e7392..7fc8ae93b 100644 --- a/src/multimedia/controls/qcameraexposurecontrol.h +++ b/src/multimedia/controls/qcameraexposurecontrol.h @@ -41,7 +41,7 @@ #define QCAMERAEXPOSURECONTROL_H #include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qcameraexposure.h> #include <QtMultimedia/qcamera.h> diff --git a/src/multimedia/controls/qcamerafocuscontrol.h b/src/multimedia/controls/qcamerafocuscontrol.h index 3ff51b9f5..871f240da 100644 --- a/src/multimedia/controls/qcamerafocuscontrol.h +++ b/src/multimedia/controls/qcamerafocuscontrol.h @@ -41,7 +41,7 @@ #define QCAMERAFOCUSCONTROL_H #include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qcamerafocus.h> diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.h b/src/multimedia/controls/qcameraimageprocessingcontrol.h index 1d8a0d23b..ee5aa1c0e 100644 --- a/src/multimedia/controls/qcameraimageprocessingcontrol.h +++ b/src/multimedia/controls/qcameraimageprocessingcontrol.h @@ -41,7 +41,7 @@ #define QCAMERAIMAGEPROCESSINGCONTROL_H #include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qcamera.h> #include <QtMultimedia/qmediaenumdebug.h> diff --git a/src/multimedia/controls/qmetadatareadercontrol.cpp b/src/multimedia/controls/qmetadatareadercontrol.cpp index 1a8fb792c..18b94a795 100644 --- a/src/multimedia/controls/qmetadatareadercontrol.cpp +++ b/src/multimedia/controls/qmetadatareadercontrol.cpp @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE QMediaMetaData namespace. The functionality provided by this control is exposed to application - code by the meta-data members of QMediaObject, and so meta-data access + code by the meta-data members of QMediaSource, and so meta-data access is potentially available in any of the media object classes. Any media service may implement QMetaDataReaderControl. @@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE \c org.qt-project.qt.metadatareadercontrol/5.0 as defined in QMetaDataReaderControl_iid. - \sa QMediaService::requestControl(), QMediaObject + \sa QMediaService::requestControl(), QMediaSource */ /*! diff --git a/src/multimedia/controls/qmetadatareadercontrol.h b/src/multimedia/controls/qmetadatareadercontrol.h index 04729d61b..e45777a15 100644 --- a/src/multimedia/controls/qmetadatareadercontrol.h +++ b/src/multimedia/controls/qmetadatareadercontrol.h @@ -41,7 +41,7 @@ #define QMETADATAREADERCONTROL_H #include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qtmultimediaglobal.h> #include <QtMultimedia/qmultimedia.h> diff --git a/src/multimedia/controls/qmetadatawritercontrol.cpp b/src/multimedia/controls/qmetadatawritercontrol.cpp index 14a22492f..e57a0c873 100644 --- a/src/multimedia/controls/qmetadatawritercontrol.cpp +++ b/src/multimedia/controls/qmetadatawritercontrol.cpp @@ -61,14 +61,14 @@ QT_BEGIN_NAMESPACE QMediaMetaData namespace. The functionality provided by this control is exposed to application code - by the meta-data members of QMediaObject, and so meta-data access is + by the meta-data members of QMediaSource, and so meta-data access is potentially available in any of the media object classes. Any media service may implement QMetaDataControl. The interface name of QMetaDataWriterControl is \c org.qt-project.qt.metadatawritercontrol/5.0 as defined in QMetaDataWriterControl_iid. - \sa QMediaService::requestControl(), QMediaObject + \sa QMediaService::requestControl(), QMediaSource */ /*! diff --git a/src/multimedia/controls/qmetadatawritercontrol.h b/src/multimedia/controls/qmetadatawritercontrol.h index 5181974f0..c10ff1fcd 100644 --- a/src/multimedia/controls/qmetadatawritercontrol.h +++ b/src/multimedia/controls/qmetadatawritercontrol.h @@ -41,7 +41,7 @@ #define QMETADATAWRITERCONTROL_H #include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qtmultimediaglobal.h> #include <QtMultimedia/qmultimedia.h> diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index 5d68d353c..e0874c4aa 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -15,7 +15,7 @@ INCLUDEPATH *= . PRIVATE_HEADERS += \ qtmultimediaglobal_p.h \ - qmediaobject_p.h \ + qmediasource_p.h \ qmediapluginloader_p.h \ qmediaservice_p.h \ qmediaserviceprovider_p.h \ @@ -27,7 +27,7 @@ PUBLIC_HEADERS += \ qmediasink.h \ qmediaenumdebug.h \ qmediametadata.h \ - qmediaobject.h \ + qmediasource.h \ qmediaservice.h \ qmediaserviceproviderplugin.h \ qmediatimerange.h \ @@ -36,10 +36,10 @@ PUBLIC_HEADERS += \ SOURCES += \ qmediasink.cpp \ qmediametadata.cpp \ - qmediaobject.cpp \ qmediapluginloader.cpp \ qmediaservice.cpp \ qmediaserviceprovider.cpp \ + qmediasource.cpp \ qmediatimerange.cpp \ qmediastoragelocation.cpp \ qmultimedia.cpp \ diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 99e721352..07afdae16 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -41,7 +41,7 @@ #include "qvideosurfaces_p.h" #include "qvideosurfaceoutput_p.h" -#include "qmediaobject_p.h" +#include "qmediasource_p.h" #include <qmediaservice.h> #include <qmediaplayercontrol.h> #include <qmediaserviceprovider_p.h> @@ -78,15 +78,15 @@ QT_BEGIN_NAMESPACE \snippet multimedia-snippets/media.cpp Movie playlist - Since QMediaPlayer is a QMediaObject, you can use several of the QMediaObject + Since QMediaPlayer is a QMediaSource, you can use several of the QMediaSource functions for things like: \list - \li Accessing the currently playing media's metadata (\l {QMediaObject::metaData()} and \l {QMediaMetaData}{predefined meta-data keys}) - \li Checking to see if the media playback service is currently available (\l {QMediaObject::availability()}) + \li Accessing the currently playing media's metadata (\l {QMediaSource::metaData()} and \l {QMediaMetaData}{predefined meta-data keys}) + \li Checking to see if the media playback service is currently available (\l {QMediaSource::availability()}) \endlist - \sa QMediaObject, QMediaService, QVideoWidget, QMediaPlaylist + \sa QMediaSource, QMediaService, QVideoWidget, QMediaPlaylist */ static void qRegisterMediaPlayerMetaTypes() @@ -100,7 +100,7 @@ Q_CONSTRUCTOR_FUNCTION(qRegisterMediaPlayerMetaTypes) #define MAX_NESTED_PLAYLISTS 16 -class QMediaPlayerPrivate : public QMediaObjectPrivate +class QMediaPlayerPrivate : public QMediaSourcePrivate { Q_DECLARE_NON_CONST_PUBLIC(QMediaPlayer) @@ -548,7 +548,7 @@ static QMediaService *playerService() */ QMediaPlayer::QMediaPlayer(QObject *parent, QMediaPlayer::Flags flags): - QMediaObject(*new QMediaPlayerPrivate, + QMediaSource(*new QMediaPlayerPrivate, parent, playerService()) { @@ -971,24 +971,6 @@ void QMediaPlayer::setMedia(const QMediaContent &media, QIODevice *stream) } /*! - \internal -*/ - -bool QMediaPlayer::bind(QObject *obj) -{ - return QMediaObject::bind(obj); -} - -/*! - \internal -*/ - -void QMediaPlayer::unbind(QObject *obj) -{ - QMediaObject::unbind(obj); -} - -/*! Returns the level of support a media player has for a \a mimeType and a set of \a codecs. The \a flags argument allows additional requirements such as performance indicators to be @@ -1119,7 +1101,7 @@ QMultimedia::AvailabilityStatus QMediaPlayer::availability() const if (!d->control) return QMultimedia::ServiceMissing; - return QMediaObject::availability(); + return QMediaSource::availability(); } QAudio::Role QMediaPlayer::audioRole() const @@ -1400,7 +1382,7 @@ QStringList QMediaPlayer::supportedCustomAudioRoles() const The value is the current playback position, expressed in milliseconds since the beginning of the media. Periodically changes in the position will be indicated with the signal positionChanged(), the interval between updates - can be set with QMediaObject's method setNotifyInterval(). + can be set with QMediaSource's method setNotifyInterval(). */ /*! diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index 66a60b508..4674f98bf 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.h @@ -41,7 +41,7 @@ #define QMEDIAPLAYER_H #include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qmediacontent.h> #include <QtMultimedia/qmediaenumdebug.h> #include <QtMultimedia/qaudio.h> @@ -55,7 +55,7 @@ class QVideoWidget; class QGraphicsVideoItem; class QMediaPlayerPrivate; -class Q_MULTIMEDIA_EXPORT QMediaPlayer : public QMediaObject +class Q_MULTIMEDIA_EXPORT QMediaPlayer : public QMediaSource { Q_OBJECT Q_PROPERTY(QMediaContent media READ media WRITE setMedia NOTIFY mediaChanged) diff --git a/src/multimedia/playback/qmediaplaylist.h b/src/multimedia/playback/qmediaplaylist.h index cd39fd821..d78dccde0 100644 --- a/src/multimedia/playback/qmediaplaylist.h +++ b/src/multimedia/playback/qmediaplaylist.h @@ -43,7 +43,7 @@ #include <QtCore/qobject.h> #include <QtMultimedia/qmediacontent.h> -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qmediasink.h> #include <QtMultimedia/qmediaenumdebug.h> diff --git a/src/multimedia/playback/qmediaplaylist_p.h b/src/multimedia/playback/qmediaplaylist_p.h index 5258ade12..fbc1f444d 100644 --- a/src/multimedia/playback/qmediaplaylist_p.h +++ b/src/multimedia/playback/qmediaplaylist_p.h @@ -54,7 +54,7 @@ #include "qmediaplaylist.h" #include "qmediaplayer.h" #include "qmediaplayercontrol.h" -#include "qmediaobject_p.h" +#include "qmediasource_p.h" #include "qplaylistfileparser_p.h" #include <QtCore/qdebug.h> diff --git a/src/multimedia/playback/qplaylistfileparser.cpp b/src/multimedia/playback/qplaylistfileparser.cpp index 586a8a46d..1d455a696 100644 --- a/src/multimedia/playback/qplaylistfileparser.cpp +++ b/src/multimedia/playback/qplaylistfileparser.cpp @@ -44,7 +44,7 @@ #include <QtNetwork/QNetworkReply> #include <QtNetwork/QNetworkRequest> #include "qmediaplayer.h" -#include "qmediaobject_p.h" +#include "qmediasource_p.h" #include "qmediametadata.h" #include "qmediacontent.h" diff --git a/src/multimedia/qmediaservice.cpp b/src/multimedia/qmediaservice.cpp index f40c4cea4..1e4d9abd9 100644 --- a/src/multimedia/qmediaservice.cpp +++ b/src/multimedia/qmediaservice.cpp @@ -58,9 +58,9 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia Media services provide implementations of the functionality promised - by media objects, and allow multiple providers to implement a QMediaObject. + by media objects, and allow multiple providers to implement a QMediaSource. - To provide the functionality of a QMediaObject media services implement + To provide the functionality of a QMediaSource media services implement QMediaControl interfaces. Services typically implement one core media control which provides the core feature of a media object, and some number of additional controls which provide either optional features of @@ -79,7 +79,7 @@ QT_BEGIN_NAMESPACE implementing a QMediaService is outside of the scope of this documentation and support on the relevant mailing lists or IRC channels should be sought. - \sa QMediaObject, QMediaControl + \sa QMediaSource, QMediaControl */ /*! diff --git a/src/multimedia/qmediasink.cpp b/src/multimedia/qmediasink.cpp index 0ce2a8ace..89e2c1dca 100644 --- a/src/multimedia/qmediasink.cpp +++ b/src/multimedia/qmediasink.cpp @@ -63,14 +63,14 @@ QMediaSink::~QMediaSink() } /*! - \fn QMediaSink::mediaObject() const; + \fn QMediaSink::mediaSource() const; Return the currently attached media object. */ /*! - \fn QMediaSink::setMediaObject(QMediaObject *object); + \fn QMediaSink::setMediaSource(QMediaSource *object); Attaches to the media \a object. Returns true if attached successfully, otherwise returns false. diff --git a/src/multimedia/qmediasink.h b/src/multimedia/qmediasink.h index e32f56380..e66d71137 100644 --- a/src/multimedia/qmediasink.h +++ b/src/multimedia/qmediasink.h @@ -40,23 +40,23 @@ #ifndef QMEDIASINK_H #define QMEDIASINK_H -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> QT_BEGIN_NAMESPACE -class QMediaObject; +class QMediaSource; class Q_MULTIMEDIA_EXPORT QMediaSink { public: virtual ~QMediaSink(); - virtual QMediaObject *mediaObject() const = 0; + virtual QMediaSource *mediaSource() const = 0; protected: - friend class QMediaObject; - virtual bool setMediaObject(QMediaObject *object) = 0; + friend class QMediaSource; + virtual bool setMediaSource(QMediaSource *object) = 0; }; #define QMediaSink_iid "org.qt-project.qt.mediasink/5.0" diff --git a/src/multimedia/qmediaobject.cpp b/src/multimedia/qmediasource.cpp index 825c64622..fc1f7d221 100644 --- a/src/multimedia/qmediaobject.cpp +++ b/src/multimedia/qmediasource.cpp @@ -40,7 +40,7 @@ #include <QtCore/qmetaobject.h> #include <QtCore/qdebug.h> -#include "qmediaobject_p.h" +#include "qmediasource_p.h" #include <qmediaservice.h> #include <qmetadatareadercontrol.h> @@ -48,9 +48,9 @@ QT_BEGIN_NAMESPACE -void QMediaObjectPrivate::_q_notify() +void QMediaSourcePrivate::_q_notify() { - Q_Q(QMediaObject); + Q_Q(QMediaSource); const QMetaObject* m = q->metaObject(); @@ -68,9 +68,9 @@ void QMediaObjectPrivate::_q_notify() } /*! - \class QMediaObject + \class QMediaSource - \brief The QMediaObject class provides a common base for multimedia objects. + \brief The QMediaSource class provides a common base for multimedia objects. \inmodule QtMultimedia \ingroup multimedia @@ -81,7 +81,7 @@ void QMediaObjectPrivate::_q_notify() and meta-data functionality, as well as functionality to connect media objects with support classes like QMediaPlaylist. - The higher level QMediaObject derived classes provide the actual multimedia + The higher level QMediaSource derived classes provide the actual multimedia functionality, by internally using a QMediaService. Each media object hosts a QMediaService and uses the QMediaControl interfaces implemented by the service to implement its API. These controls can be accessed from the media object if necessary, but in general @@ -98,7 +98,7 @@ void QMediaObjectPrivate::_q_notify() Destroys this media object. */ -QMediaObject::~QMediaObject() +QMediaSource::~QMediaSource() { } @@ -111,7 +111,7 @@ QMediaObject::~QMediaObject() audio playback during a phone call or similar). */ -QMultimedia::AvailabilityStatus QMediaObject::availability() const +QMultimedia::AvailabilityStatus QMediaSource::availability() const { if (d_func()->service == nullptr) return QMultimedia::ServiceMissing; @@ -123,7 +123,7 @@ QMultimedia::AvailabilityStatus QMediaObject::availability() const Returns true if the service is available for use. */ -bool QMediaObject::isAvailable() const +bool QMediaSource::isAvailable() const { return availability() == QMultimedia::Available; } @@ -132,19 +132,19 @@ bool QMediaObject::isAvailable() const Returns the media service that provides the functionality of this multimedia object. */ -QMediaService* QMediaObject::service() const +QMediaService* QMediaSource::service() const { return d_func()->service; } -int QMediaObject::notifyInterval() const +int QMediaSource::notifyInterval() const { return d_func()->notifyTimer->interval(); } -void QMediaObject::setNotifyInterval(int milliSeconds) +void QMediaSource::setNotifyInterval(int milliSeconds) { - Q_D(QMediaObject); + Q_D(QMediaSource); if (d->notifyTimer->interval() != milliSeconds) { d->notifyTimer->setInterval(milliSeconds); @@ -154,13 +154,13 @@ void QMediaObject::setNotifyInterval(int milliSeconds) } /*! - Bind \a object to this QMediaObject instance. + Bind \a object to this QMediaSource instance. This method establishes a relationship between this media object and a helper object. The nature of the relationship depends on both parties. This methods returns true if the helper was successfully bound, false otherwise. - Most subclasses of QMediaObject provide more convenient functions + Most subclasses of QMediaSource provide more convenient functions that wrap this functionality, so this function rarely needs to be called directly. @@ -168,13 +168,13 @@ void QMediaObject::setNotifyInterval(int milliSeconds) \sa QMediaSink */ -bool QMediaObject::bind(QObject *object) +bool QMediaSource::bind(QObject *object) { QMediaSink *helper = qobject_cast<QMediaSink*>(object); if (!helper) return false; - QMediaObject *currentObject = helper->mediaObject(); + QMediaSource *currentObject = helper->mediaSource(); if (currentObject == this) return true; @@ -182,11 +182,11 @@ bool QMediaObject::bind(QObject *object) if (currentObject) currentObject->unbind(object); - return helper->setMediaObject(this); + return helper->setMediaSource(this); } /*! - Detach \a object from the QMediaObject instance. + Detach \a object from the QMediaSource instance. Unbind the helper object from this media object. A warning will be generated if the object was not previously bound to this @@ -194,14 +194,14 @@ bool QMediaObject::bind(QObject *object) \sa QMediaSink */ -void QMediaObject::unbind(QObject *object) +void QMediaSource::unbind(QObject *object) { QMediaSink *helper = qobject_cast<QMediaSink*>(object); - if (helper && helper->mediaObject() == this) - helper->setMediaObject(nullptr); + if (helper && helper->mediaSource() == this) + helper->setMediaSource(nullptr); else - qWarning() << "QMediaObject: Trying to unbind not connected helper object"; + qWarning() << "QMediaSource: Trying to unbind not connected helper object"; } /*! @@ -213,10 +213,10 @@ void QMediaObject::unbind(QObject *object) constructor is protected. */ -QMediaObject::QMediaObject(QObject *parent, QMediaService *service) - : QObject(*new QMediaObjectPrivate, parent) +QMediaSource::QMediaSource(QObject *parent, QMediaService *service) + : QObject(*new QMediaSourcePrivate, parent) { - Q_D(QMediaObject); + Q_D(QMediaSource); d->notifyTimer = new QTimer(this); d->notifyTimer->setInterval(1000); @@ -231,10 +231,10 @@ QMediaObject::QMediaObject(QObject *parent, QMediaService *service) \internal */ -QMediaObject::QMediaObject(QMediaObjectPrivate &dd, QObject *parent, QMediaService *service) +QMediaSource::QMediaSource(QMediaSourcePrivate &dd, QObject *parent, QMediaService *service) : QObject(dd, parent) { - Q_D(QMediaObject); + Q_D(QMediaSource); d->notifyTimer = new QTimer(this); d->notifyTimer->setInterval(1000); @@ -252,9 +252,9 @@ QMediaObject::QMediaObject(QMediaObjectPrivate &dd, QObject *parent, QMediaServi \sa notifyInterval */ -void QMediaObject::addPropertyWatch(QByteArray const &name) +void QMediaSource::addPropertyWatch(QByteArray const &name) { - Q_D(QMediaObject); + Q_D(QMediaSource); const QMetaObject* m = metaObject(); @@ -275,9 +275,9 @@ void QMediaObject::addPropertyWatch(QByteArray const &name) \sa notifyInterval */ -void QMediaObject::removePropertyWatch(QByteArray const &name) +void QMediaSource::removePropertyWatch(QByteArray const &name) { - Q_D(QMediaObject); + Q_D(QMediaSource); int index = metaObject()->indexOfProperty(name.constData()); @@ -290,7 +290,7 @@ void QMediaObject::removePropertyWatch(QByteArray const &name) } /*! - \property QMediaObject::notifyInterval + \property QMediaSource::notifyInterval The interval at which notifiable properties will update. @@ -300,7 +300,7 @@ void QMediaObject::removePropertyWatch(QByteArray const &name) */ /*! - \fn void QMediaObject::notifyIntervalChanged(int milliseconds) + \fn void QMediaSource::notifyIntervalChanged(int milliseconds) Signal a change in the notify interval period to \a milliseconds. */ @@ -309,9 +309,9 @@ void QMediaObject::removePropertyWatch(QByteArray const &name) Returns true if there is meta-data associated with this media object, else false. */ -bool QMediaObject::isMetaDataAvailable() const +bool QMediaSource::isMetaDataAvailable() const { - Q_D(const QMediaObject); + Q_D(const QMediaSource); return d->metaDataControl ? d->metaDataControl->isMetaDataAvailable() @@ -319,7 +319,7 @@ bool QMediaObject::isMetaDataAvailable() const } /*! - \fn QMediaObject::metaDataAvailableChanged(bool available) + \fn QMediaSource::metaDataAvailableChanged(bool available) Signals that the \a available state of a media object's meta-data has changed. */ @@ -329,9 +329,9 @@ bool QMediaObject::isMetaDataAvailable() const See the list of predefined \l {QMediaMetaData}{meta-data keys}. */ -QVariant QMediaObject::metaData(const QString &key) const +QVariant QMediaSource::metaData(const QString &key) const { - Q_D(const QMediaObject); + Q_D(const QMediaSource); return d->metaDataControl ? d->metaDataControl->metaData(key) @@ -341,9 +341,9 @@ QVariant QMediaObject::metaData(const QString &key) const /*! Returns a list of keys there is meta-data available for. */ -QStringList QMediaObject::availableMetaData() const +QStringList QMediaSource::availableMetaData() const { - Q_D(const QMediaObject); + Q_D(const QMediaSource); return d->metaDataControl ? d->metaDataControl->availableMetaData() @@ -351,7 +351,7 @@ QStringList QMediaObject::availableMetaData() const } /*! - \fn QMediaObject::metaDataChanged() + \fn QMediaSource::metaDataChanged() Signals that this media object's meta-data has changed. @@ -361,15 +361,15 @@ QStringList QMediaObject::availableMetaData() const */ /*! - \fn QMediaObject::metaDataChanged(const QString &key, const QVariant &value) + \fn QMediaSource::metaDataChanged(const QString &key, const QVariant &value) Signal the changes of one meta-data element \a value with the given \a key. */ -void QMediaObject::setupControls() +void QMediaSource::setupControls() { - Q_D(QMediaObject); + Q_D(QMediaSource); if (d->service != nullptr) { d->metaDataControl = qobject_cast<QMetaDataReaderControl*>( @@ -389,4 +389,4 @@ void QMediaObject::setupControls() QT_END_NAMESPACE -#include "moc_qmediaobject.cpp" +#include "moc_qmediasource.cpp" diff --git a/src/multimedia/qmediaobject.h b/src/multimedia/qmediasource.h index 790353caf..164cb4594 100644 --- a/src/multimedia/qmediaobject.h +++ b/src/multimedia/qmediasource.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QABSTRACTMEDIAOBJECT_H -#define QABSTRACTMEDIAOBJECT_H +#ifndef QABSTRACTMEDIASOURCE_H +#define QABSTRACTMEDIASOURCE_H #include <QtCore/qobject.h> #include <QtCore/qstringlist.h> @@ -52,13 +52,13 @@ QT_BEGIN_NAMESPACE class QMediaService; class QMediaSink; -class QMediaObjectPrivate; -class Q_MULTIMEDIA_EXPORT QMediaObject : public QObject +class QMediaSourcePrivate; +class Q_MULTIMEDIA_EXPORT QMediaSource : public QObject { Q_OBJECT Q_PROPERTY(int notifyInterval READ notifyInterval WRITE setNotifyInterval NOTIFY notifyIntervalChanged) public: - ~QMediaObject(); + ~QMediaSource(); virtual bool isAvailable() const; virtual QMultimedia::AvailabilityStatus availability() const; @@ -84,8 +84,8 @@ Q_SIGNALS: void metaDataChanged(const QString &key, const QVariant &value); protected: - QMediaObject(QObject *parent, QMediaService *service); - QMediaObject(QMediaObjectPrivate &dd, QObject *parent, QMediaService *service); + QMediaSource(QObject *parent, QMediaService *service); + QMediaSource(QMediaSourcePrivate &dd, QObject *parent, QMediaService *service); void addPropertyWatch(QByteArray const &name); void removePropertyWatch(QByteArray const &name); @@ -93,7 +93,7 @@ protected: private: void setupControls(); - Q_DECLARE_PRIVATE(QMediaObject) + Q_DECLARE_PRIVATE(QMediaSource) Q_PRIVATE_SLOT(d_func(), void _q_notify()) }; @@ -101,4 +101,4 @@ private: QT_END_NAMESPACE -#endif // QABSTRACTMEDIAOBJECT_H +#endif // QABSTRACTMEDIASOURCE_H diff --git a/src/multimedia/qmediaobject_p.h b/src/multimedia/qmediasource_p.h index f47eb7855..73dbfb894 100644 --- a/src/multimedia/qmediaobject_p.h +++ b/src/multimedia/qmediasource_p.h @@ -55,7 +55,7 @@ #include <QtCore/qset.h> #include <QtCore/qtimer.h> -#include "qmediaobject.h" +#include "qmediasource.h" #include "private/qobject_p.h" QT_BEGIN_NAMESPACE @@ -68,13 +68,13 @@ class QMetaDataReaderControl; friend class Class; -class QMediaObjectPrivate : public QObjectPrivate +class QMediaSourcePrivate : public QObjectPrivate { - Q_DECLARE_PUBLIC(QMediaObject) + Q_DECLARE_PUBLIC(QMediaSource) public: - QMediaObjectPrivate() : service(nullptr), metaDataControl(nullptr), notifyTimer(nullptr) {} - virtual ~QMediaObjectPrivate() {} + QMediaSourcePrivate() : service(nullptr), metaDataControl(nullptr), notifyTimer(nullptr) {} + virtual ~QMediaSourcePrivate() {} void _q_notify(); diff --git a/src/multimedia/recording/qaudiorecorder.cpp b/src/multimedia/recording/qaudiorecorder.cpp index e75858236..67833892f 100644 --- a/src/multimedia/recording/qaudiorecorder.cpp +++ b/src/multimedia/recording/qaudiorecorder.cpp @@ -39,7 +39,7 @@ #include "qaudiorecorder.h" #include "qaudioinputselectorcontrol.h" -#include "qmediaobject_p.h" +#include "qmediasource_p.h" #include "qmediarecorder_p.h" #include <qmediaservice.h> #include <qmediaserviceprovider_p.h> @@ -75,11 +75,11 @@ QT_BEGIN_NAMESPACE \sa QMediaRecorder, QAudioInputSelectorControl */ -class QAudioRecorderObject : public QMediaObject +class QAudioRecorderObject : public QMediaSource { public: QAudioRecorderObject(QObject *parent, QMediaService *service) - : QMediaObject(parent, service) + : QMediaSource(parent, service) { } @@ -98,7 +98,7 @@ public: /*! Constructs an audio recorder. - The \a parent is passed to QMediaObject. + The \a parent is passed to QMediaSource. */ QAudioRecorder::QAudioRecorder(QObject *parent): @@ -108,7 +108,7 @@ QAudioRecorder::QAudioRecorder(QObject *parent): d->provider = QMediaServiceProvider::defaultServiceProvider(); QMediaService *service = d->provider->requestService(Q_MEDIASERVICE_AUDIOSOURCE); - setMediaObject(new QAudioRecorderObject(this, service)); + setMediaSource(new QAudioRecorderObject(this, service)); } /*! @@ -118,8 +118,8 @@ QAudioRecorder::QAudioRecorder(QObject *parent): QAudioRecorder::~QAudioRecorder() { Q_D(QAudioRecorder); - QMediaService *service = d->mediaObject ? d->mediaObject->service() : nullptr; - setMediaObject(nullptr); + QMediaService *service = d->mediaSource ? d->mediaSource->service() : nullptr; + setMediaSource(nullptr); if (d->provider && service) d->provider->releaseService(service); diff --git a/src/multimedia/recording/qaudiorecorder.h b/src/multimedia/recording/qaudiorecorder.h index 7e0b7e561..f31f7d672 100644 --- a/src/multimedia/recording/qaudiorecorder.h +++ b/src/multimedia/recording/qaudiorecorder.h @@ -41,7 +41,7 @@ #define QAUDIORECORDER_H #include <QtMultimedia/qmediarecorder.h> -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qmediaencodersettings.h> #include <QtMultimedia/qmediaenumdebug.h> diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp index 93335841d..1fdb1c33b 100644 --- a/src/multimedia/recording/qmediarecorder.cpp +++ b/src/multimedia/recording/qmediarecorder.cpp @@ -41,7 +41,7 @@ #include "qmediarecorder_p.h" #include <qmediarecordercontrol.h> -#include "qmediaobject_p.h" +#include "qmediasource_p.h" #include <qmediaservice.h> #include <qmediaserviceprovider_p.h> #include <qmetadatawritercontrol.h> @@ -118,7 +118,7 @@ void QMediaRecorderPrivate::_q_error(int error, const QString &errorString) void QMediaRecorderPrivate::_q_serviceDestroyed() { - mediaObject = nullptr; + mediaSource = nullptr; control = nullptr; formatControl = nullptr; audioControl = nullptr; @@ -164,7 +164,7 @@ void QMediaRecorderPrivate::_q_applySettings() void QMediaRecorderPrivate::restartCamera() { //restart camera if it can't apply new settings in the Active state - QCamera *camera = qobject_cast<QCamera*>(mediaObject); + QCamera *camera = qobject_cast<QCamera*>(mediaSource); if (camera && camera->captureMode() == QCamera::CaptureVideo) { QMetaObject::invokeMethod(camera, "_q_preparePropertyChange", @@ -175,12 +175,12 @@ void QMediaRecorderPrivate::restartCamera() /*! - Constructs a media recorder which records the media produced by \a mediaObject. + Constructs a media recorder which records the media produced by \a mediaSource. - The \a parent is passed to QMediaObject. + The \a parent is passed to QMediaSource. */ -QMediaRecorder::QMediaRecorder(QMediaObject *mediaObject, QObject *parent): +QMediaRecorder::QMediaRecorder(QMediaSource *mediaSource, QObject *parent): QObject(parent), d_ptr(new QMediaRecorderPrivate) { @@ -190,13 +190,13 @@ QMediaRecorder::QMediaRecorder(QMediaObject *mediaObject, QObject *parent): d->notifyTimer = new QTimer(this); connect(d->notifyTimer, SIGNAL(timeout()), SLOT(_q_notify())); - setMediaObject(mediaObject); + setMediaSource(mediaSource); } /*! \internal */ -QMediaRecorder::QMediaRecorder(QMediaRecorderPrivate &dd, QMediaObject *mediaObject, QObject *parent): +QMediaRecorder::QMediaRecorder(QMediaRecorderPrivate &dd, QMediaSource *mediaSource, QObject *parent): QObject(parent), d_ptr(&dd) { @@ -206,7 +206,7 @@ QMediaRecorder::QMediaRecorder(QMediaRecorderPrivate &dd, QMediaObject *mediaObj d->notifyTimer = new QTimer(this); connect(d->notifyTimer, SIGNAL(timeout()), SLOT(_q_notify())); - setMediaObject(mediaObject); + setMediaSource(mediaSource); } /*! @@ -215,30 +215,30 @@ QMediaRecorder::QMediaRecorder(QMediaRecorderPrivate &dd, QMediaObject *mediaObj QMediaRecorder::~QMediaRecorder() { - setMediaObject(nullptr); + setMediaSource(nullptr); delete d_ptr; } /*! - Returns the QMediaObject instance that this QMediaRecorder is bound too, + Returns the QMediaSource instance that this QMediaRecorder is bound too, or 0 otherwise. */ -QMediaObject *QMediaRecorder::mediaObject() const +QMediaSource *QMediaRecorder::mediaSource() const { - return d_func()->mediaObject; + return d_func()->mediaSource; } /*! \internal */ -bool QMediaRecorder::setMediaObject(QMediaObject *object) +bool QMediaRecorder::setMediaSource(QMediaSource *object) { Q_D(QMediaRecorder); - if (object == d->mediaObject) + if (object == d->mediaSource) return true; - if (d->mediaObject) { + if (d->mediaSource) { if (d->control) { disconnect(d->control, SIGNAL(stateChanged(QMediaRecorder::State)), this, SLOT(_q_stateChanged(QMediaRecorder::State))); @@ -262,9 +262,9 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object) this, SLOT(_q_error(int,QString))); } - disconnect(d->mediaObject, SIGNAL(notifyIntervalChanged(int)), this, SLOT(_q_updateNotifyInterval(int))); + disconnect(d->mediaSource, SIGNAL(notifyIntervalChanged(int)), this, SLOT(_q_updateNotifyInterval(int))); - QMediaService *service = d->mediaObject->service(); + QMediaService *service = d->mediaSource->service(); if (service) { disconnect(service, SIGNAL(destroyed()), this, SLOT(_q_serviceDestroyed())); @@ -301,13 +301,13 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object) d->metaDataControl = nullptr; d->audioInputSelector = nullptr; - d->mediaObject = object; + d->mediaSource = object; - if (d->mediaObject) { - QMediaService *service = d->mediaObject->service(); + if (d->mediaSource) { + QMediaService *service = d->mediaSource->service(); - d->notifyTimer->setInterval(d->mediaObject->notifyInterval()); - connect(d->mediaObject, SIGNAL(notifyIntervalChanged(int)), SLOT(_q_updateNotifyInterval(int))); + d->notifyTimer->setInterval(d->mediaSource->notifyInterval()); + connect(d->mediaSource, SIGNAL(notifyIntervalChanged(int)), SLOT(_q_updateNotifyInterval(int))); if (service) { d->control = qobject_cast<QMediaRecorderControl*>(service->requestControl(QMediaRecorderControl_iid)); @@ -376,7 +376,7 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object) } } - d->mediaObject = nullptr; + d->mediaSource = nullptr; return false; } diff --git a/src/multimedia/recording/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h index 26be71e13..323383360 100644 --- a/src/multimedia/recording/qmediarecorder.h +++ b/src/multimedia/recording/qmediarecorder.h @@ -41,7 +41,7 @@ #define QMEDIARECORDER_H #include <QtMultimedia/qmultimedia.h> -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qmediaencodersettings.h> #include <QtMultimedia/qmediasink.h> #include <QtMultimedia/qmediaenumdebug.h> @@ -107,10 +107,10 @@ public: OutOfSpaceError }; - explicit QMediaRecorder(QMediaObject *mediaObject, QObject *parent = nullptr); + explicit QMediaRecorder(QMediaSource *mediaSource, QObject *parent = nullptr); ~QMediaRecorder(); - QMediaObject *mediaObject() const override; + QMediaSource *mediaSource() const override; bool isAvailable() const; QMultimedia::AvailabilityStatus availability() const; @@ -200,8 +200,8 @@ Q_SIGNALS: void metaDataChanged(const QString &key, const QVariant &value); protected: - QMediaRecorder(QMediaRecorderPrivate &dd, QMediaObject *mediaObject, QObject *parent = nullptr); - bool setMediaObject(QMediaObject *object) override; + QMediaRecorder(QMediaRecorderPrivate &dd, QMediaSource *mediaSource, QObject *parent = nullptr); + bool setMediaSource(QMediaSource *object) override; QMediaRecorderPrivate *d_ptr; private: diff --git a/src/multimedia/recording/qmediarecorder_p.h b/src/multimedia/recording/qmediarecorder_p.h index 5ff7dd18c..2fe9fcd86 100644 --- a/src/multimedia/recording/qmediarecorder_p.h +++ b/src/multimedia/recording/qmediarecorder_p.h @@ -52,7 +52,7 @@ // #include "qmediarecorder.h" -#include "qmediaobject_p.h" +#include "qmediasource_p.h" #include <QtCore/qurl.h> QT_BEGIN_NAMESPACE @@ -75,7 +75,7 @@ public: void applySettingsLater(); void restartCamera(); - QMediaObject *mediaObject = nullptr; + QMediaSource *mediaSource = nullptr; QMediaRecorderControl *control = nullptr; QMediaContainerControl *formatControl = nullptr; diff --git a/src/multimedia/video/qvideoprobe.cpp b/src/multimedia/video/qvideoprobe.cpp index f7995b297..e6b7c4dd7 100644 --- a/src/multimedia/video/qvideoprobe.cpp +++ b/src/multimedia/video/qvideoprobe.cpp @@ -77,7 +77,7 @@ QT_BEGIN_NAMESPACE class QVideoProbePrivate { public: - QPointer<QMediaObject> source; + QPointer<QMediaSource> source; QPointer<QMediaVideoProbeControl> probee; }; @@ -123,7 +123,7 @@ QVideoProbe::~QVideoProbe() Passing in the same object will be ignored, but monitoring will continue. */ -bool QVideoProbe::setSource(QMediaObject *source) +bool QVideoProbe::setSource(QMediaSource *source) { // Need to: // 1) disconnect from current source if necessary @@ -167,7 +167,7 @@ bool QVideoProbe::setSource(QMediaObject *source) /*! Starts monitoring the given \a mediaRecorder. - If there is no mediaObject associated with \a mediaRecorder, or if it is + If there is no mediaSource associated with \a mediaRecorder, or if it is zero, this probe will be deactivated and this function wil return true. If the media recorder instance does not support monitoring @@ -179,7 +179,7 @@ bool QVideoProbe::setSource(QMediaObject *source) */ bool QVideoProbe::setSource(QMediaRecorder *mediaRecorder) { - QMediaObject *source = mediaRecorder ? mediaRecorder->mediaObject() : nullptr; + QMediaSource *source = mediaRecorder ? mediaRecorder->mediaSource() : nullptr; bool result = setSource(source); if (!mediaRecorder) diff --git a/src/multimedia/video/qvideoprobe.h b/src/multimedia/video/qvideoprobe.h index 38f5ca05a..3ccab2326 100644 --- a/src/multimedia/video/qvideoprobe.h +++ b/src/multimedia/video/qvideoprobe.h @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -class QMediaObject; +class QMediaSource; class QMediaRecorder; class QVideoProbePrivate; @@ -56,7 +56,7 @@ public: explicit QVideoProbe(QObject *parent = nullptr); ~QVideoProbe(); - bool setSource(QMediaObject *source); + bool setSource(QMediaSource *source); bool setSource(QMediaRecorder *source); bool isActive() const; diff --git a/src/multimedia/video/qvideosurfaceoutput.cpp b/src/multimedia/video/qvideosurfaceoutput.cpp index 84b2743d3..fca578bb7 100644 --- a/src/multimedia/video/qvideosurfaceoutput.cpp +++ b/src/multimedia/video/qvideosurfaceoutput.cpp @@ -60,7 +60,7 @@ QVideoSurfaceOutput::~QVideoSurfaceOutput() } } -QMediaObject *QVideoSurfaceOutput::mediaObject() const +QMediaSource *QVideoSurfaceOutput::mediaSource() const { return m_object.data(); } @@ -73,7 +73,7 @@ void QVideoSurfaceOutput::setVideoSurface(QAbstractVideoSurface *surface) m_control.data()->setSurface(surface); } -bool QVideoSurfaceOutput::setMediaObject(QMediaObject *object) +bool QVideoSurfaceOutput::setMediaSource(QMediaSource *object) { if (m_control) { m_control.data()->setSurface(nullptr); diff --git a/src/multimedia/video/qvideosurfaceoutput_p.h b/src/multimedia/video/qvideosurfaceoutput_p.h index 9cec4cd60..559203c72 100644 --- a/src/multimedia/video/qvideosurfaceoutput_p.h +++ b/src/multimedia/video/qvideosurfaceoutput_p.h @@ -70,18 +70,18 @@ public: QVideoSurfaceOutput(QObject *parent = nullptr); ~QVideoSurfaceOutput(); - QMediaObject *mediaObject() const override; + QMediaSource *mediaSource() const override; void setVideoSurface(QAbstractVideoSurface *surface); protected: - bool setMediaObject(QMediaObject *object) override; + bool setMediaSource(QMediaSource *object) override; private: QPointer<QAbstractVideoSurface> m_surface; QPointer<QVideoRendererControl> m_control; QPointer<QMediaService> m_service; - QPointer<QMediaObject> m_object; + QPointer<QMediaSource> m_object; }; QT_END_NAMESPACE diff --git a/src/multimediawidgets/qgraphicsvideoitem.cpp b/src/multimediawidgets/qgraphicsvideoitem.cpp index 27836b84b..91c157d62 100644 --- a/src/multimediawidgets/qgraphicsvideoitem.cpp +++ b/src/multimediawidgets/qgraphicsvideoitem.cpp @@ -40,7 +40,7 @@ #include "qgraphicsvideoitem.h" #include "qpaintervideosurface_p.h" -#include <qmediaobject.h> +#include <qmediasource.h> #include <qmediaservice.h> #include <qvideorenderercontrol.h> #include <qvideosurfaceformat.h> @@ -65,7 +65,7 @@ public: QGraphicsVideoItem *q_ptr = nullptr; QPainterVideoSurface *surface = nullptr; - QPointer<QMediaObject> mediaObject; + QPointer<QMediaSource> mediaSource; QMediaService *service = nullptr; QVideoRendererControl *rendererControl = nullptr; Qt::AspectRatioMode aspectRatioMode = Qt::KeepAspectRatio; @@ -162,22 +162,22 @@ void QGraphicsVideoItemPrivate::_q_serviceDestroyed() /*! \class QGraphicsVideoItem - \brief The QGraphicsVideoItem class provides a graphics item which display video produced by a QMediaObject. + \brief The QGraphicsVideoItem class provides a graphics item which display video produced by a QMediaSource. \inmodule QtMultimediaWidgets \ingroup multimedia - Attaching a QGraphicsVideoItem to a QMediaObject allows it to display + Attaching a QGraphicsVideoItem to a QMediaSource allows it to display the video or image output of that media object. A QGraphicsVideoItem - is attached to a media object by passing a pointer to the QMediaObject - to the setMediaObject() function. + is attached to a media object by passing a pointer to the QMediaSource + to the setMediaSource() function. \snippet multimedia-snippets/video.cpp Video graphics item \b {Note}: Only a single display output can be attached to a media object at one time. - \sa QMediaObject, QMediaPlayer, QVideoWidget + \sa QMediaSource, QMediaPlayer, QVideoWidget */ /*! @@ -214,14 +214,14 @@ QGraphicsVideoItem::~QGraphicsVideoItem() } /*! - \property QGraphicsVideoItem::mediaObject + \property QGraphicsVideoItem::mediaSource \brief the media object which provides the video displayed by a graphics item. */ -QMediaObject *QGraphicsVideoItem::mediaObject() const +QMediaSource *QGraphicsVideoItem::mediaSource() const { - return d_func()->mediaObject; + return d_func()->mediaSource; } /*! @@ -243,19 +243,19 @@ QAbstractVideoSurface *QGraphicsVideoItem::videoSurface() const /*! \internal */ -bool QGraphicsVideoItem::setMediaObject(QMediaObject *object) +bool QGraphicsVideoItem::setMediaSource(QMediaSource *object) { Q_D(QGraphicsVideoItem); - if (object == d->mediaObject) + if (object == d->mediaSource) return true; d->clearService(); - d->mediaObject = object; + d->mediaSource = object; - if (d->mediaObject) { - d->service = d->mediaObject->service(); + if (d->mediaSource) { + d->service = d->mediaSource->service(); if (d->service) { QObject *control = d->service->requestControl(QVideoRendererControl_iid); @@ -280,7 +280,7 @@ bool QGraphicsVideoItem::setMediaObject(QMediaObject *object) } } - d->mediaObject = nullptr; + d->mediaSource = nullptr; return false; } diff --git a/src/multimediawidgets/qgraphicsvideoitem.h b/src/multimediawidgets/qgraphicsvideoitem.h index 244c60729..d7be54c07 100644 --- a/src/multimediawidgets/qgraphicsvideoitem.h +++ b/src/multimediawidgets/qgraphicsvideoitem.h @@ -55,7 +55,7 @@ class Q_MULTIMEDIAWIDGETS_EXPORT QGraphicsVideoItem : public QGraphicsObject, pu { Q_OBJECT Q_INTERFACES(QMediaSink) - Q_PROPERTY(QMediaObject* mediaObject READ mediaObject WRITE setMediaObject) + Q_PROPERTY(QMediaSource* mediaSource READ mediaSource WRITE setMediaSource) Q_PROPERTY(Qt::AspectRatioMode aspectRatioMode READ aspectRatioMode WRITE setAspectRatioMode) Q_PROPERTY(QPointF offset READ offset WRITE setOffset) Q_PROPERTY(QSizeF size READ size WRITE setSize) @@ -65,7 +65,7 @@ public: explicit QGraphicsVideoItem(QGraphicsItem *parent = nullptr); ~QGraphicsVideoItem(); - QMediaObject *mediaObject() const override; + QMediaSource *mediaSource() const override; QAbstractVideoSurface *videoSurface() const; Qt::AspectRatioMode aspectRatioMode() const; @@ -97,7 +97,7 @@ protected: void timerEvent(QTimerEvent *event) override; QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; - bool setMediaObject(QMediaObject *object) override; + bool setMediaSource(QMediaSource *object) override; QGraphicsVideoItemPrivate *d_ptr; diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp index c2a594309..742dff6d3 100644 --- a/src/multimediawidgets/qvideowidget.cpp +++ b/src/multimediawidgets/qvideowidget.cpp @@ -40,7 +40,7 @@ #include "qvideowidget_p.h" #include "qpaintervideosurface_p.h" -#include <qmediaobject.h> +#include <qmediasource.h> #include <qmediaservice.h> #include <qvideowindowcontrol.h> #include <qvideowidgetcontrol.h> @@ -596,9 +596,9 @@ void QVideoWidgetPrivate::_q_dimensionsChanged() \ingroup multimedia \inmodule QtMultimediaWidgets - Attaching a QVideoWidget to a QMediaObject allows it to display the + Attaching a QVideoWidget to a QMediaSource allows it to display the video or image output of that media object. A QVideoWidget is attached - to media object by passing a pointer to the QMediaObject in its + to media object by passing a pointer to the QMediaSource in its constructor, and detached by destroying the QVideoWidget. \snippet multimedia-snippets/video.cpp Video widget @@ -606,7 +606,7 @@ void QVideoWidgetPrivate::_q_dimensionsChanged() \b {Note}: Only a single display output can be attached to a media object at one time. - \sa QMediaObject, QMediaPlayer, QGraphicsVideoItem + \sa QMediaSource, QMediaPlayer, QGraphicsVideoItem */ /*! @@ -646,31 +646,31 @@ QVideoWidget::~QVideoWidget() } /*! - \property QVideoWidget::mediaObject + \property QVideoWidget::mediaSource \brief the media object which provides the video displayed by a widget. */ -QMediaObject *QVideoWidget::mediaObject() const +QMediaSource *QVideoWidget::mediaSource() const { - return d_func()->mediaObject; + return d_func()->mediaSource; } /*! \internal */ -bool QVideoWidget::setMediaObject(QMediaObject *object) +bool QVideoWidget::setMediaSource(QMediaSource *object) { Q_D(QVideoWidget); - if (object == d->mediaObject) + if (object == d->mediaSource) return true; d->clearService(); - d->mediaObject = object; + d->mediaSource = object; - if (d->mediaObject) - d->service = d->mediaObject->service(); + if (d->mediaSource) + d->service = d->mediaSource->service(); if (d->service) { if (d->createWidgetBackend()) { @@ -684,14 +684,14 @@ bool QVideoWidget::setMediaObject(QMediaObject *object) d->rendererBackend->showEvent(); } else { d->service = nullptr; - d->mediaObject = nullptr; + d->mediaSource = nullptr; return false; } connect(d->service, SIGNAL(destroyed()), SLOT(_q_serviceDestroyed())); } else { - d->mediaObject = nullptr; + d->mediaSource = nullptr; return false; } diff --git a/src/multimediawidgets/qvideowidget.h b/src/multimediawidgets/qvideowidget.h index 81cee1771..295da0e21 100644 --- a/src/multimediawidgets/qvideowidget.h +++ b/src/multimediawidgets/qvideowidget.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE -class QMediaObject; +class QMediaSource; class QVideoWidgetPrivate; class QAbstractVideoSurface; @@ -56,7 +56,7 @@ class Q_MULTIMEDIAWIDGETS_EXPORT QVideoWidget : public QWidget, public QMediaSin { Q_OBJECT Q_INTERFACES(QMediaSink) - Q_PROPERTY(QMediaObject* mediaObject READ mediaObject WRITE setMediaObject) + Q_PROPERTY(QMediaSource* mediaSource READ mediaSource WRITE setMediaSource) Q_PROPERTY(bool fullScreen READ isFullScreen WRITE setFullScreen NOTIFY fullScreenChanged) Q_PROPERTY(Qt::AspectRatioMode aspectRatioMode READ aspectRatioMode WRITE setAspectRatioMode) Q_PROPERTY(int brightness READ brightness WRITE setBrightness NOTIFY brightnessChanged) @@ -69,7 +69,7 @@ public: explicit QVideoWidget(QWidget *parent = nullptr); ~QVideoWidget(); - QMediaObject *mediaObject() const override; + QMediaSource *mediaSource() const override; QAbstractVideoSurface *videoSurface() const; #ifdef Q_QDOC @@ -111,7 +111,7 @@ protected: void moveEvent(QMoveEvent *event) override; void paintEvent(QPaintEvent *event) override; - bool setMediaObject(QMediaObject *object) override; + bool setMediaSource(QMediaSource *object) override; QVideoWidget(QVideoWidgetPrivate &dd, QWidget *parent); QVideoWidgetPrivate *d_ptr; diff --git a/src/multimediawidgets/qvideowidget_p.h b/src/multimediawidgets/qvideowidget_p.h index a3e687488..1f12ef4da 100644 --- a/src/multimediawidgets/qvideowidget_p.h +++ b/src/multimediawidgets/qvideowidget_p.h @@ -225,7 +225,7 @@ class QVideoWidgetPrivate Q_DECLARE_PUBLIC(QVideoWidget) public: QVideoWidget *q_ptr = nullptr; - QPointer<QMediaObject> mediaObject; + QPointer<QMediaSource> mediaSource; QMediaService *service = nullptr; QVideoWidgetControlBackend *widgetBackend = nullptr; QWindowVideoWidgetBackend *windowBackend = nullptr; diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp index 19153dbac..a64a9e157 100644 --- a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp +++ b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp @@ -42,7 +42,7 @@ #include "qdeclarativevideooutput_render_p.h" #include "qdeclarativevideooutput_window_p.h" #include <private/qvideooutputorientationhandler_p.h> -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qmediaservice.h> #include <private/qfactoryloader_p.h> #include <QtCore/qloggingcategory.h> @@ -145,7 +145,7 @@ QDeclarativeVideoOutput::~QDeclarativeVideoOutput() { m_backend.reset(); m_source.clear(); - _q_updateMediaObject(); + _q_updateMediaSource(); } /*! @@ -171,8 +171,8 @@ QAbstractVideoSurface *QDeclarativeVideoOutput::videoSurface() const This property holds the source item providing the video frames like MediaPlayer or Camera. If you are extending your own C++ classes to interoperate with VideoOutput, you can - either provide a QObject based class with a \c mediaObject property that exposes a - QMediaObject derived class that has a QVideoRendererControl available, or you can + either provide a QObject based class with a \c mediaSource property that exposes a + QMediaSource derived class that has a QVideoRendererControl available, or you can provide a QObject based class with a writable \c videoSurface property that can accept a QAbstractVideoSurface based class and can follow the correct protocol to deliver QVideoFrames to it. @@ -185,8 +185,8 @@ void QDeclarativeVideoOutput::setSource(QObject *source) if (source == m_source.data()) return; - if (m_source && m_sourceType == MediaObjectSource) { - disconnect(m_source.data(), nullptr, this, SLOT(_q_updateMediaObject())); + if (m_source && m_sourceType == MediaSourceSource) { + disconnect(m_source.data(), nullptr, this, SLOT(_q_updateMediaSource())); disconnect(m_source.data(), nullptr, this, SLOT(_q_updateCameraInfo())); } @@ -198,14 +198,14 @@ void QDeclarativeVideoOutput::setSource(QObject *source) if (m_source) { const QMetaObject *metaObject = m_source.data()->metaObject(); - int mediaObjectPropertyIndex = metaObject->indexOfProperty("mediaObject"); - if (mediaObjectPropertyIndex != -1) { - const QMetaProperty mediaObjectProperty = metaObject->property(mediaObjectPropertyIndex); + int mediaSourcePropertyIndex = metaObject->indexOfProperty("mediaSource"); + if (mediaSourcePropertyIndex != -1) { + const QMetaProperty mediaSourceProperty = metaObject->property(mediaSourcePropertyIndex); - if (mediaObjectProperty.hasNotifySignal()) { - QMetaMethod method = mediaObjectProperty.notifySignal(); + if (mediaSourceProperty.hasNotifySignal()) { + QMetaMethod method = mediaSourceProperty.notifySignal(); QMetaObject::connect(m_source.data(), method.methodIndex(), - this, this->metaObject()->indexOfSlot("_q_updateMediaObject()"), + this, this->metaObject()->indexOfSlot("_q_updateMediaSource()"), Qt::DirectConnection, nullptr); } @@ -223,7 +223,7 @@ void QDeclarativeVideoOutput::setSource(QObject *source) } } - m_sourceType = MediaObjectSource; + m_sourceType = MediaSourceSource; } else if (metaObject->indexOfProperty("videoSurface") != -1) { m_source.data()->setProperty("videoSurface", QVariant::fromValue<QAbstractVideoSurface *>(videoSurface())); @@ -235,7 +235,7 @@ void QDeclarativeVideoOutput::setSource(QObject *source) m_sourceType = NoSource; } - _q_updateMediaObject(); + _q_updateMediaSource(); emit sourceChanged(); } @@ -289,26 +289,26 @@ bool QDeclarativeVideoOutput::createBackend(QMediaService *service) return backendAvailable; } -void QDeclarativeVideoOutput::_q_updateMediaObject() +void QDeclarativeVideoOutput::_q_updateMediaSource() { - QMediaObject *mediaObject = nullptr; + QMediaSource *mediaSource = nullptr; if (m_source) - mediaObject = qobject_cast<QMediaObject*>(m_source.data()->property("mediaObject").value<QObject*>()); + mediaSource = qobject_cast<QMediaSource*>(m_source.data()->property("mediaSource").value<QObject*>()); - qCDebug(qLcVideo) << "media object is" << mediaObject; + qCDebug(qLcVideo) << "media object is" << mediaSource; - if (m_mediaObject.data() == mediaObject) + if (m_mediaSource.data() == mediaSource) return; - m_mediaObject.clear(); + m_mediaSource.clear(); m_service.clear(); - if (mediaObject) { - if (QMediaService *service = mediaObject->service()) { + if (mediaSource) { + if (QMediaService *service = mediaSource->service()) { if (createBackend(service)) { m_service = service; - m_mediaObject = mediaObject; + m_mediaSource = mediaSource; } } } @@ -318,8 +318,8 @@ void QDeclarativeVideoOutput::_q_updateMediaObject() void QDeclarativeVideoOutput::_q_updateCameraInfo() { - if (m_mediaObject) { - const QCamera *camera = qobject_cast<const QCamera *>(m_mediaObject); + if (m_mediaSource) { + const QCamera *camera = qobject_cast<const QCamera *>(m_mediaSource); if (camera) { QCameraInfo info(*camera); diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput_p.h b/src/qtmultimediaquicktools/qdeclarativevideooutput_p.h index 4046c2751..194f7fc48 100644 --- a/src/qtmultimediaquicktools/qdeclarativevideooutput_p.h +++ b/src/qtmultimediaquicktools/qdeclarativevideooutput_p.h @@ -65,7 +65,7 @@ Q_MOC_INCLUDE("QtMultimedia/qabstractvideosurface.h") QT_BEGIN_NAMESPACE -class QMediaObject; +class QMediaSource; class QMediaService; class QDeclarativeVideoBackend; class QVideoOutputOrientationHandler; @@ -134,7 +134,7 @@ public: enum SourceType { NoSource, - MediaObjectSource, + MediaSourceSource, VideoSurfaceSource }; SourceType sourceType() const; @@ -160,7 +160,7 @@ protected: void releaseResources() override; private Q_SLOTS: - void _q_updateMediaObject(); + void _q_updateMediaSource(); void _q_updateCameraInfo(); void _q_updateNativeSize(); void _q_updateGeometry(); @@ -178,7 +178,7 @@ private: SourceType m_sourceType; QPointer<QObject> m_source; - QPointer<QMediaObject> m_mediaObject; + QPointer<QMediaSource> m_mediaSource; QPointer<QMediaService> m_service; QCameraInfo m_cameraInfo; diff --git a/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp b/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp index cd5f2cda9..c4e65fcdd 100644 --- a/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp +++ b/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp @@ -40,7 +40,7 @@ #include <qvideorenderercontrol.h> #include <qvideosurfaceformat.h> -#include <qmediaobject.h> +#include <qmediasource.h> class SurfaceHolder : public QObject { diff --git a/tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp b/tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp index bec9a26d8..5fc6c27a6 100644 --- a/tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp +++ b/tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp @@ -36,7 +36,7 @@ #include <QtQml/qqmlcomponent.h> #include <QtQuick/qquickitem.h> #include <QtQuick/qquickview.h> -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qvideowindowcontrol.h> @@ -45,17 +45,17 @@ Q_DECLARE_METATYPE(QDeclarativeVideoOutput::FillMode) class SourceObject : public QObject { Q_OBJECT - Q_PROPERTY(QObject *mediaObject READ mediaObject CONSTANT) + Q_PROPERTY(QObject *mediaSource READ mediaSource CONSTANT) public: - explicit SourceObject(QMediaObject *mediaObject, QObject *parent = nullptr) - : QObject(parent), m_mediaObject(mediaObject) + explicit SourceObject(QMediaSource *mediaSource, QObject *parent = nullptr) + : QObject(parent), m_mediaSource(mediaSource) {} - [[nodiscard]] QObject *mediaObject() const - { return m_mediaObject; } + [[nodiscard]] QObject *mediaSource() const + { return m_mediaSource; } private: - QMediaObject *m_mediaObject; + QMediaSource *m_mediaSource; }; class QtTestWindowControl : public QVideoWindowControl @@ -129,12 +129,12 @@ public: QtTestWindowControl *windowControl; }; -class QtTestVideoObject : public QMediaObject +class QtTestVideoObject : public QMediaSource { Q_OBJECT public: explicit QtTestVideoObject(QtTestVideoService *service): - QMediaObject(nullptr, service) + QMediaSource(nullptr, service) { } }; diff --git a/tests/auto/unit/CMakeLists.txt b/tests/auto/unit/CMakeLists.txt index e4e201356..372573aa5 100644 --- a/tests/auto/unit/CMakeLists.txt +++ b/tests/auto/unit/CMakeLists.txt @@ -12,7 +12,7 @@ add_subdirectory(qcameraimagecapture) add_subdirectory(qmediasink) add_subdirectory(qmediacontainercontrol) add_subdirectory(qmediacontent) -add_subdirectory(qmediaobject) +add_subdirectory(qmediasource) add_subdirectory(qmediaplayer) add_subdirectory(qmediaplaylist) add_subdirectory(qmediapluginloader) diff --git a/tests/auto/unit/multimedia.pro b/tests/auto/unit/multimedia.pro index 48575c37c..458039cc2 100644 --- a/tests/auto/unit/multimedia.pro +++ b/tests/auto/unit/multimedia.pro @@ -12,7 +12,7 @@ SUBDIRS += \ qmediasink \ qmediacontainercontrol \ qmediacontent \ - qmediaobject \ + qmediasource \ qmediaplayer \ qmediaplaylist \ qmediapluginloader \ diff --git a/tests/auto/unit/qaudiodecoder/CMakeLists.txt b/tests/auto/unit/qaudiodecoder/CMakeLists.txt index 91f370ee0..c2969a718 100644 --- a/tests/auto/unit/qaudiodecoder/CMakeLists.txt +++ b/tests/auto/unit/qaudiodecoder/CMakeLists.txt @@ -8,7 +8,7 @@ qt_add_test(tst_qaudiodecoder SOURCES ../qmultimedia_common/mockaudiodecodercontrol.h ../qmultimedia_common/mockaudiodecoderservice.h - ../qmultimedia_common/mockmediaobject.h + ../qmultimedia_common/mockmediasource.h ../qmultimedia_common/mockmediaservice.h ../qmultimedia_common/mockmediaserviceprovider.h tst_qaudiodecoder.cpp diff --git a/tests/auto/unit/qaudioprobe/CMakeLists.txt b/tests/auto/unit/qaudioprobe/CMakeLists.txt index c18489a82..cb33bcbea 100644 --- a/tests/auto/unit/qaudioprobe/CMakeLists.txt +++ b/tests/auto/unit/qaudioprobe/CMakeLists.txt @@ -10,7 +10,7 @@ qt_add_test(tst_qaudioprobe ../qmultimedia_common/mockaudioinputselector.h ../qmultimedia_common/mockaudioprobecontrol.h ../qmultimedia_common/mockmediacontainercontrol.h - ../qmultimedia_common/mockmediaobject.h + ../qmultimedia_common/mockmediasource.h ../qmultimedia_common/mockmediarecordercontrol.h ../qmultimedia_common/mockmediarecorderservice.h ../qmultimedia_common/mockmediaservice.h diff --git a/tests/auto/unit/qaudioprobe/tst_qaudioprobe.cpp b/tests/auto/unit/qaudioprobe/tst_qaudioprobe.cpp index 67112615f..2eed9e09c 100644 --- a/tests/auto/unit/qaudioprobe/tst_qaudioprobe.cpp +++ b/tests/auto/unit/qaudioprobe/tst_qaudioprobe.cpp @@ -36,7 +36,7 @@ #include "mockmediaserviceprovider.h" #include "mockmediarecorderservice.h" -#include "mockmediaobject.h" +#include "mockmediasource.h" QT_USE_NAMESPACE @@ -54,7 +54,7 @@ private slots: void testRecorder(); void testRecorderDeleteRecorder(); void testRecorderDeleteProbe(); - void testMediaObject(); + void testMediaSource(); private: QAudioRecorder *recorder; @@ -164,16 +164,16 @@ void tst_QAudioProbe::testRecorderDeleteProbe() QVERIFY(recorder->isAvailable()); } -void tst_QAudioProbe::testMediaObject() +void tst_QAudioProbe::testMediaSource() { - QMediaObject *object = new MockMediaObject(nullptr, mockMediaRecorderService); + QMediaSource *object = new MockMediaSource(nullptr, mockMediaRecorderService); QVERIFY(object->isAvailable()); QAudioProbe probe; QVERIFY(!probe.isActive()); QVERIFY(probe.setSource(object)); QVERIFY(probe.isActive()); - probe.setSource((QMediaObject*)nullptr); + probe.setSource((QMediaSource*)nullptr); QVERIFY(!probe.isActive()); delete object; } diff --git a/tests/auto/unit/qaudiorecorder/CMakeLists.txt b/tests/auto/unit/qaudiorecorder/CMakeLists.txt index a06458693..a2d2fd115 100644 --- a/tests/auto/unit/qaudiorecorder/CMakeLists.txt +++ b/tests/auto/unit/qaudiorecorder/CMakeLists.txt @@ -10,7 +10,7 @@ qt_add_test(tst_qaudiorecorder ../qmultimedia_common/mockaudioinputselector.h ../qmultimedia_common/mockaudioprobecontrol.h ../qmultimedia_common/mockmediacontainercontrol.h - ../qmultimedia_common/mockmediaobject.h + ../qmultimedia_common/mockmediasource.h ../qmultimedia_common/mockmediarecordercontrol.h ../qmultimedia_common/mockmediarecorderservice.h ../qmultimedia_common/mockmediaservice.h diff --git a/tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp b/tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp index 7c0b69ad9..e1d9c1bcf 100644 --- a/tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp +++ b/tests/auto/unit/qaudiorecorder/tst_qaudiorecorder.cpp @@ -37,7 +37,7 @@ #include <qaudioinputselectorcontrol.h> #include <qaudiodeviceinfo.h> #include <qaudioinput.h> -#include <qmediaobject.h> +#include <qmediasource.h> //TESTED_COMPONENT=src/multimedia @@ -125,7 +125,7 @@ void tst_QAudioRecorder::testAudioSource() { audiosource = new QAudioRecorder; - QCOMPARE(audiosource->mediaObject()->service(),(QMediaService *) mockMediaRecorderService); + QCOMPARE(audiosource->mediaSource()->service(),(QMediaService *) mockMediaRecorderService); } void tst_QAudioRecorder::testDevices() diff --git a/tests/auto/unit/qcamera/CMakeLists.txt b/tests/auto/unit/qcamera/CMakeLists.txt index bc347e697..af9ce876b 100644 --- a/tests/auto/unit/qcamera/CMakeLists.txt +++ b/tests/auto/unit/qcamera/CMakeLists.txt @@ -13,7 +13,7 @@ qt_add_test(tst_qcamera ../qmultimedia_common/mockcameraimageprocessingcontrol.h ../qmultimedia_common/mockcameraservice.h ../qmultimedia_common/mockimageencodercontrol.h - ../qmultimedia_common/mockmediaobject.h + ../qmultimedia_common/mockmediasource.h ../qmultimedia_common/mockmediaservice.h ../qmultimedia_common/mockmediaserviceprovider.h ../qmultimedia_common/mockvideodeviceselectorcontrol.h diff --git a/tests/auto/unit/qcameraimagecapture/CMakeLists.txt b/tests/auto/unit/qcameraimagecapture/CMakeLists.txt index fa2d810bc..10451aa33 100644 --- a/tests/auto/unit/qcameraimagecapture/CMakeLists.txt +++ b/tests/auto/unit/qcameraimagecapture/CMakeLists.txt @@ -13,7 +13,7 @@ qt_add_test(tst_qcameraimagecapture ../qmultimedia_common/mockcameraimageprocessingcontrol.h ../qmultimedia_common/mockcameraservice.h ../qmultimedia_common/mockimageencodercontrol.h - ../qmultimedia_common/mockmediaobject.h + ../qmultimedia_common/mockmediasource.h ../qmultimedia_common/mockmediaservice.h ../qmultimedia_common/mockmediaserviceprovider.h ../qmultimedia_common/mockvideodeviceselectorcontrol.h diff --git a/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp b/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp index de2c5fd86..f2a5e5fa4 100644 --- a/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp +++ b/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp @@ -91,8 +91,8 @@ public slots: private slots: void constructor(); - void mediaObject(); - void deleteMediaObject(); + void mediaSource(); + void deleteMediaSource(); void isReadyForCapture(); void capture(); void cancelCapture(); @@ -144,8 +144,8 @@ void tst_QCameraImageCapture::constructor() QVERIFY(imageCapture.isAvailable() == true); } -//MaemoAPI-1824:test mediaObject -void tst_QCameraImageCapture::mediaObject() +//MaemoAPI-1824:test mediaSource +void tst_QCameraImageCapture::mediaSource() { NullService mymockcameraservice ; provider->service = &mymockcameraservice; @@ -156,11 +156,11 @@ void tst_QCameraImageCapture::mediaObject() provider->service = mockcameraservice; QCamera camera1; QCameraImageCapture imageCapture1(&camera1); - QMediaObject *medobj1 = imageCapture1.camera(); + QMediaSource *medobj1 = imageCapture1.camera(); QCOMPARE(medobj1, &camera1); } -void tst_QCameraImageCapture::deleteMediaObject() +void tst_QCameraImageCapture::deleteMediaSource() { provider->service = new MockCameraService; diff --git a/tests/auto/unit/qcamerainfo/CMakeLists.txt b/tests/auto/unit/qcamerainfo/CMakeLists.txt index fee3561ea..2b5f37dce 100644 --- a/tests/auto/unit/qcamerainfo/CMakeLists.txt +++ b/tests/auto/unit/qcamerainfo/CMakeLists.txt @@ -13,7 +13,7 @@ qt_add_test(tst_qcamerainfo ../qmultimedia_common/mockcameraimageprocessingcontrol.h ../qmultimedia_common/mockcameraservice.h ../qmultimedia_common/mockimageencodercontrol.h - ../qmultimedia_common/mockmediaobject.h + ../qmultimedia_common/mockmediasource.h ../qmultimedia_common/mockmediaservice.h ../qmultimedia_common/mockmediaserviceprovider.h ../qmultimedia_common/mockvideodeviceselectorcontrol.h diff --git a/tests/auto/unit/qcamerawidgets/CMakeLists.txt b/tests/auto/unit/qcamerawidgets/CMakeLists.txt index e4b0c3e6c..e087d6274 100644 --- a/tests/auto/unit/qcamerawidgets/CMakeLists.txt +++ b/tests/auto/unit/qcamerawidgets/CMakeLists.txt @@ -13,7 +13,7 @@ qt_add_test(tst_qcamerawidgets ../qmultimedia_common/mockcameraimageprocessingcontrol.h ../qmultimedia_common/mockcameraservice.h ../qmultimedia_common/mockimageencodercontrol.h - ../qmultimedia_common/mockmediaobject.h + ../qmultimedia_common/mockmediasource.h ../qmultimedia_common/mockmediaservice.h ../qmultimedia_common/mockmediaserviceprovider.h ../qmultimedia_common/mockvideodeviceselectorcontrol.h diff --git a/tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp b/tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp index 7ab1999eb..5b5b47ac3 100644 --- a/tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp +++ b/tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp @@ -220,21 +220,21 @@ void tst_QCameraWidgets::testSetVideoOutput() QCamera camera; camera.setViewfinder(&widget); - qDebug() << widget.mediaObject(); - QVERIFY(widget.mediaObject() == &camera); + qDebug() << widget.mediaSource(); + QVERIFY(widget.mediaSource() == &camera); camera.setViewfinder(&item); - QVERIFY(widget.mediaObject() == nullptr); - QVERIFY(item.mediaObject() == &camera); + QVERIFY(widget.mediaSource() == nullptr); + QVERIFY(item.mediaSource() == &camera); camera.setViewfinder(reinterpret_cast<QVideoWidget *>(0)); - QVERIFY(item.mediaObject() == nullptr); + QVERIFY(item.mediaSource() == nullptr); camera.setViewfinder(&widget); - QVERIFY(widget.mediaObject() == &camera); + QVERIFY(widget.mediaSource() == &camera); camera.setViewfinder(reinterpret_cast<QGraphicsVideoItem *>(0)); - QVERIFY(widget.mediaObject() == nullptr); + QVERIFY(widget.mediaSource() == nullptr); camera.setViewfinder(&surface); QVERIFY(mockCameraService->rendererControl->surface() == &surface); @@ -247,11 +247,11 @@ void tst_QCameraWidgets::testSetVideoOutput() camera.setViewfinder(&widget); QVERIFY(mockCameraService->rendererControl->surface() == nullptr); - QVERIFY(widget.mediaObject() == &camera); + QVERIFY(widget.mediaSource() == &camera); camera.setViewfinder(&surface); QVERIFY(mockCameraService->rendererControl->surface() == &surface); - QVERIFY(widget.mediaObject() == nullptr); + QVERIFY(widget.mediaSource() == nullptr); } @@ -265,10 +265,10 @@ void tst_QCameraWidgets::testSetVideoOutputNoService() QCamera camera; camera.setViewfinder(&widget); - QVERIFY(widget.mediaObject() == nullptr); + QVERIFY(widget.mediaSource() == nullptr); camera.setViewfinder(&item); - QVERIFY(item.mediaObject() == nullptr); + QVERIFY(item.mediaSource() == nullptr); camera.setViewfinder(&surface); // Nothing we can verify here other than it doesn't assert. @@ -286,10 +286,10 @@ void tst_QCameraWidgets::testSetVideoOutputNoControl() QCamera camera; camera.setViewfinder(&widget); - QVERIFY(widget.mediaObject() == nullptr); + QVERIFY(widget.mediaSource() == nullptr); camera.setViewfinder(&item); - QVERIFY(item.mediaObject() == nullptr); + QVERIFY(item.mediaSource() == nullptr); camera.setViewfinder(&surface); QVERIFY(mockCameraService->rendererControl->surface() == nullptr); diff --git a/tests/auto/unit/qdeclarativeaudio/CMakeLists.txt b/tests/auto/unit/qdeclarativeaudio/CMakeLists.txt index a018adc5d..a7f54285d 100644 --- a/tests/auto/unit/qdeclarativeaudio/CMakeLists.txt +++ b/tests/auto/unit/qdeclarativeaudio/CMakeLists.txt @@ -9,7 +9,7 @@ qt_add_test(tst_qdeclarativeaudio ../../../../src/imports/multimedia/qdeclarativeaudio.cpp ../../../../src/imports/multimedia/qdeclarativeaudio_p.h ../../../../src/imports/multimedia/qdeclarativemediametadata_p.h ../../../../src/imports/multimedia/qdeclarativeplaylist.cpp ../../../../src/imports/multimedia/qdeclarativeplaylist_p.h - ../qmultimedia_common/mockmediaobject.h + ../qmultimedia_common/mockmediasource.h ../qmultimedia_common/mockmediaplayercontrol.h ../qmultimedia_common/mockmediaplayerservice.h ../qmultimedia_common/mockmediaservice.h diff --git a/tests/auto/unit/qdeclarativecamera/CMakeLists.txt b/tests/auto/unit/qdeclarativecamera/CMakeLists.txt index a93f9b228..0e852affe 100644 --- a/tests/auto/unit/qdeclarativecamera/CMakeLists.txt +++ b/tests/auto/unit/qdeclarativecamera/CMakeLists.txt @@ -15,7 +15,7 @@ qt_add_test(tst_qdeclarativecamera ../qmultimedia_common/mockcameraimageprocessingcontrol.h ../qmultimedia_common/mockcameraservice.h ../qmultimedia_common/mockimageencodercontrol.h - ../qmultimedia_common/mockmediaobject.h + ../qmultimedia_common/mockmediasource.h ../qmultimedia_common/mockmediaservice.h ../qmultimedia_common/mockmediaserviceprovider.h ../qmultimedia_common/mockvideodeviceselectorcontrol.h diff --git a/tests/auto/unit/qdeclarativemultimediaglobal/CMakeLists.txt b/tests/auto/unit/qdeclarativemultimediaglobal/CMakeLists.txt index acdc392e2..b8030d904 100644 --- a/tests/auto/unit/qdeclarativemultimediaglobal/CMakeLists.txt +++ b/tests/auto/unit/qdeclarativemultimediaglobal/CMakeLists.txt @@ -15,7 +15,7 @@ qt_add_test(tst_qdeclarativemultimediaglobal ../qmultimedia_common/mockcameraimageprocessingcontrol.h ../qmultimedia_common/mockcameraservice.h ../qmultimedia_common/mockimageencodercontrol.h - ../qmultimedia_common/mockmediaobject.h + ../qmultimedia_common/mockmediasource.h ../qmultimedia_common/mockmediaservice.h ../qmultimedia_common/mockmediaserviceprovider.h ../qmultimedia_common/mockvideodeviceselectorcontrol.h diff --git a/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp b/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp index bba7a139a..48d821ab5 100644 --- a/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp +++ b/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp @@ -31,7 +31,7 @@ #include <qtmultimediaglobal.h> #include "qgraphicsvideoitem.h" #include <QtTest/QtTest> -#include "qmediaobject.h" +#include "qmediasource.h" #include "qmediaservice.h" #include <private/qpaintervideosurface_p.h> #include "qvideorenderercontrol.h" @@ -55,8 +55,8 @@ private slots: void nullService(); void noOutputs(); void serviceDestroyed(); - void mediaObjectDestroyed(); - void setMediaObject(); + void mediaSourceDestroyed(); + void setMediaSource(); void show(); @@ -129,18 +129,18 @@ public: QtTestRendererControl *rendererControl; }; -class QtTestVideoObject : public QMediaObject +class QtTestVideoObject : public QMediaSource { Q_OBJECT public: QtTestVideoObject(QtTestRendererControl *renderer) - : QMediaObject(nullptr, new QtTestVideoService(renderer)) + : QMediaSource(nullptr, new QtTestVideoService(renderer)) { testService = qobject_cast<QtTestVideoService*>(service()); } QtTestVideoObject(QtTestVideoService *service): - QMediaObject(nullptr, service), + QMediaSource(nullptr, service), testService(service) { } @@ -253,11 +253,11 @@ void tst_QGraphicsVideoItem::serviceDestroyed() delete service; - QCOMPARE(item.mediaObject(), static_cast<QMediaObject *>(&object)); + QCOMPARE(item.mediaSource(), static_cast<QMediaSource *>(&object)); QVERIFY(item.boundingRect().isEmpty()); } -void tst_QGraphicsVideoItem::mediaObjectDestroyed() +void tst_QGraphicsVideoItem::mediaSourceDestroyed() { QtTestVideoObject *object = new QtTestVideoObject(new QtTestRendererControl); @@ -269,22 +269,22 @@ void tst_QGraphicsVideoItem::mediaObjectDestroyed() delete object; object = nullptr; - QCOMPARE(item.mediaObject(), static_cast<QMediaObject *>(object)); + QCOMPARE(item.mediaSource(), static_cast<QMediaSource *>(object)); QVERIFY(item.boundingRect().isEmpty()); } -void tst_QGraphicsVideoItem::setMediaObject() +void tst_QGraphicsVideoItem::setMediaSource() { - QMediaObject *nullObject = nullptr; + QMediaSource *nullObject = nullptr; QtTestVideoObject object(new QtTestRendererControl); QGraphicsVideoItem item; - QCOMPARE(item.mediaObject(), nullObject); + QCOMPARE(item.mediaSource(), nullObject); QCOMPARE(object.testService->rendererRef, 0); object.bind(&item); - QCOMPARE(item.mediaObject(), static_cast<QMediaObject *>(&object)); + QCOMPARE(item.mediaSource(), static_cast<QMediaSource *>(&object)); QCOMPARE(object.testService->rendererRef, 1); QVERIFY(object.testService->rendererControl->surface() == nullptr); @@ -297,7 +297,7 @@ void tst_QGraphicsVideoItem::setMediaObject() QVERIFY(object.testService->rendererControl->surface() != nullptr); object.unbind(&item); - QCOMPARE(item.mediaObject(), nullObject); + QCOMPARE(item.mediaSource(), nullObject); QCOMPARE(object.testService->rendererRef, 0); QVERIFY(object.testService->rendererControl->surface() == nullptr); @@ -305,7 +305,7 @@ void tst_QGraphicsVideoItem::setMediaObject() item.setVisible(false); object.bind(&item); - QCOMPARE(item.mediaObject(), static_cast<QMediaObject *>(&object)); + QCOMPARE(item.mediaSource(), static_cast<QMediaSource *>(&object)); QCOMPARE(object.testService->rendererRef, 1); QVERIFY(object.testService->rendererControl->surface() != nullptr); } diff --git a/tests/auto/unit/qmediaplayer/CMakeLists.txt b/tests/auto/unit/qmediaplayer/CMakeLists.txt index bbc458f73..ce0562768 100644 --- a/tests/auto/unit/qmediaplayer/CMakeLists.txt +++ b/tests/auto/unit/qmediaplayer/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_test(tst_qmediaplayer SOURCES - ../qmultimedia_common/mockmediaobject.h + ../qmultimedia_common/mockmediasource.h ../qmultimedia_common/mockmediaplayercontrol.h ../qmultimedia_common/mockmediaplayerservice.h ../qmultimedia_common/mockmediaservice.h diff --git a/tests/auto/unit/qmediaplayerwidgets/CMakeLists.txt b/tests/auto/unit/qmediaplayerwidgets/CMakeLists.txt index ecc220080..89a4bdfee 100644 --- a/tests/auto/unit/qmediaplayerwidgets/CMakeLists.txt +++ b/tests/auto/unit/qmediaplayerwidgets/CMakeLists.txt @@ -6,7 +6,7 @@ qt_add_test(tst_qmediaplayerwidgets SOURCES - ../qmultimedia_common/mockmediaobject.h + ../qmultimedia_common/mockmediasource.h ../qmultimedia_common/mockmediaplayercontrol.h ../qmultimedia_common/mockmediaplayerservice.h ../qmultimedia_common/mockmediaservice.h diff --git a/tests/auto/unit/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp b/tests/auto/unit/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp index 38607ca99..bb58c1184 100644 --- a/tests/auto/unit/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp +++ b/tests/auto/unit/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp @@ -93,20 +93,20 @@ void tst_QMediaPlayerWidgets::testSetVideoOutput() QMediaPlayer player; player.setVideoOutput(&widget); - QVERIFY(widget.mediaObject() == &player); + QVERIFY(widget.mediaSource() == &player); player.setVideoOutput(&item); - QVERIFY(widget.mediaObject() == nullptr); - QVERIFY(item.mediaObject() == &player); + QVERIFY(widget.mediaSource() == nullptr); + QVERIFY(item.mediaSource() == &player); player.setVideoOutput(reinterpret_cast<QVideoWidget *>(0)); - QVERIFY(item.mediaObject() == nullptr); + QVERIFY(item.mediaSource() == nullptr); player.setVideoOutput(&widget); - QVERIFY(widget.mediaObject() == &player); + QVERIFY(widget.mediaSource() == &player); player.setVideoOutput(reinterpret_cast<QGraphicsVideoItem *>(0)); - QVERIFY(widget.mediaObject() == nullptr); + QVERIFY(widget.mediaSource() == nullptr); player.setVideoOutput(&surface); QVERIFY(mockService->rendererControl->surface() == &surface); @@ -119,11 +119,11 @@ void tst_QMediaPlayerWidgets::testSetVideoOutput() player.setVideoOutput(&widget); QVERIFY(mockService->rendererControl->surface() == nullptr); - QVERIFY(widget.mediaObject() == &player); + QVERIFY(widget.mediaSource() == &player); player.setVideoOutput(&surface); QVERIFY(mockService->rendererControl->surface() == &surface); - QVERIFY(widget.mediaObject() == nullptr); + QVERIFY(widget.mediaSource() == nullptr); } @@ -137,10 +137,10 @@ void tst_QMediaPlayerWidgets::testSetVideoOutputNoService() QMediaPlayer player; player.setVideoOutput(&widget); - QVERIFY(widget.mediaObject() == nullptr); + QVERIFY(widget.mediaSource() == nullptr); player.setVideoOutput(&item); - QVERIFY(item.mediaObject() == nullptr); + QVERIFY(item.mediaSource() == nullptr); player.setVideoOutput(&surface); // Nothing we can verify here other than it doesn't assert. @@ -161,10 +161,10 @@ void tst_QMediaPlayerWidgets::testSetVideoOutputNoControl() QMediaPlayer player; player.setVideoOutput(&widget); - QVERIFY(widget.mediaObject() == nullptr); + QVERIFY(widget.mediaSource() == nullptr); player.setVideoOutput(&item); - QVERIFY(item.mediaObject() == nullptr); + QVERIFY(item.mediaSource() == nullptr); player.setVideoOutput(&surface); QVERIFY(service.rendererControl->surface() == nullptr); diff --git a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp index 072e24d07..e7a0d5030 100644 --- a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp +++ b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp @@ -56,7 +56,7 @@ private slots: void playbackMode(); void playbackMode_data(); void shuffle(); - void setMediaObject(); + void setMediaSource(); void testCurrentIndexChanged_signal(); void testCurrentMediaChanged_signal(); @@ -678,7 +678,7 @@ void tst_QMediaPlaylist::shuffle() } -void tst_QMediaPlaylist::setMediaObject() +void tst_QMediaPlaylist::setMediaSource() { QMediaContent content0(QUrl(QLatin1String("test://audio/song1.mp3"))); QMediaContent content1(QUrl(QLatin1String("test://audio/song2.mp3"))); diff --git a/tests/auto/unit/qmediarecorder/CMakeLists.txt b/tests/auto/unit/qmediarecorder/CMakeLists.txt index 09c57cf41..82bb5022a 100644 --- a/tests/auto/unit/qmediarecorder/CMakeLists.txt +++ b/tests/auto/unit/qmediarecorder/CMakeLists.txt @@ -10,7 +10,7 @@ qt_add_test(tst_qmediarecorder ../qmultimedia_common/mockaudioinputselector.h ../qmultimedia_common/mockaudioprobecontrol.h ../qmultimedia_common/mockmediacontainercontrol.h - ../qmultimedia_common/mockmediaobject.h + ../qmultimedia_common/mockmediasource.h ../qmultimedia_common/mockmediarecordercontrol.h ../qmultimedia_common/mockmediarecorderservice.h ../qmultimedia_common/mockmediaservice.h diff --git a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp index 6134238dc..be39d8333 100644 --- a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp +++ b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp @@ -31,7 +31,7 @@ #include <QtTest/QtTest> #include <QDebug> #include <QtMultimedia/qmediametadata.h> -#include <qmediaobject.h> +#include <qmediasource.h> #include <qmediaservice.h> #include <qmediaservice.h> #include <qmediarecordercontrol.h> @@ -44,7 +44,7 @@ #include <qaudioformat.h> #include "mockmediarecorderservice.h" -#include "mockmediaobject.h" +#include "mockmediasource.h" QT_USE_NAMESPACE @@ -59,7 +59,7 @@ public slots: private slots: void testNullService(); void testNullControls(); - void testDeleteMediaObject(); + void testDeleteMediaSource(); void testError(); void testSink(); void testRecord(); @@ -91,7 +91,7 @@ private slots: void testAvailabilityStatus(); void testIsAvailable(); - void testMediaObject(); + void testMediaSource(); void testEnum(); void testVideoSettingsQuality(); @@ -105,7 +105,7 @@ private slots: private: QAudioEncoderSettingsControl* encode; QAudioInputSelectorControl* audio; - MockMediaObject *object; + MockMediaSource *object; MockMediaRecorderService*service; MockMediaRecorderControl *mock; QMediaRecorder *capture; @@ -119,7 +119,7 @@ void tst_QMediaRecorder::initTestCase() mock = new MockMediaRecorderControl(this); service = new MockMediaRecorderService(this, mock); - object = new MockMediaObject(this, service); + object = new MockMediaSource(this, service); capture = new QMediaRecorder(object); audio = qobject_cast<QAudioInputSelectorControl*>(service->requestControl(QAudioInputSelectorControl_iid)); @@ -139,7 +139,7 @@ void tst_QMediaRecorder::testNullService() { const QString id(QLatin1String("application/x-format")); - MockMediaObject object(nullptr, nullptr); + MockMediaSource object(nullptr, nullptr); QMediaRecorder recorder(&object); QCOMPARE(recorder.outputLocation(), QUrl()); @@ -173,7 +173,7 @@ void tst_QMediaRecorder::testNullControls() MockMediaRecorderService service(nullptr, nullptr); service.hasControls = false; - MockMediaObject object(nullptr, &service); + MockMediaSource object(nullptr, &service); QMediaRecorder recorder(&object); QCOMPARE(recorder.outputLocation(), QUrl()); @@ -233,21 +233,21 @@ void tst_QMediaRecorder::testNullControls() QCOMPARE(spy.count(), 0); } -void tst_QMediaRecorder::testDeleteMediaObject() +void tst_QMediaRecorder::testDeleteMediaSource() { MockMediaRecorderControl *mock = new MockMediaRecorderControl(this); MockMediaRecorderService *service = new MockMediaRecorderService(this, mock); - MockMediaObject *object = new MockMediaObject(this, service); + MockMediaSource *object = new MockMediaSource(this, service); QMediaRecorder *capture = new QMediaRecorder(object); - QVERIFY(capture->mediaObject() == object); + QVERIFY(capture->mediaSource() == object); QVERIFY(capture->isAvailable()); delete object; delete service; delete mock; - QVERIFY(capture->mediaObject() == nullptr); + QVERIFY(capture->mediaSource() == nullptr); QVERIFY(!capture->isAvailable()); delete capture; @@ -778,7 +778,7 @@ void tst_QMediaRecorder::testSettingsApplied() { MockMediaRecorderControl recorderControl(nullptr); MockMediaRecorderService service(nullptr, &recorderControl); - MockMediaObject object(nullptr, &service); + MockMediaSource object(nullptr, &service); //if the media recorder is not configured after construction //the settings are applied in the next event loop @@ -822,7 +822,7 @@ void tst_QMediaRecorder::nullMetaDataControl() MockMediaRecorderControl recorderControl(nullptr); MockMediaRecorderService service(nullptr, &recorderControl); service.hasControls = false; - MockMediaObject object(nullptr, &service); + MockMediaSource object(nullptr, &service); QMediaRecorder recorder(&object); @@ -843,7 +843,7 @@ void tst_QMediaRecorder::isMetaDataAvailable() MockMediaRecorderControl recorderControl(nullptr); MockMediaRecorderService service(nullptr, &recorderControl); service.mockMetaDataControl->setMetaDataAvailable(false); - MockMediaObject object(nullptr, &service); + MockMediaSource object(nullptr, &service); QMediaRecorder recorder(&object); QCOMPARE(recorder.isMetaDataAvailable(), false); @@ -868,7 +868,7 @@ void tst_QMediaRecorder::isWritable() MockMediaRecorderService service(nullptr, &recorderControl); service.mockMetaDataControl->setWritable(false); - MockMediaObject object(nullptr, &service); + MockMediaSource object(nullptr, &service); QMediaRecorder recorder(&object); @@ -893,7 +893,7 @@ void tst_QMediaRecorder::metaDataChanged() { MockMediaRecorderControl recorderControl(nullptr); MockMediaRecorderService service(nullptr, &recorderControl); - MockMediaObject object(nullptr, &service); + MockMediaSource object(nullptr, &service); QMediaRecorder recorder(&object); @@ -942,7 +942,7 @@ void tst_QMediaRecorder::metaData() MockMediaRecorderService service(nullptr, &recorderControl); service.mockMetaDataControl->populateMetaData(); - MockMediaObject object(nullptr, &service); + MockMediaSource object(nullptr, &service); QMediaRecorder recorder(&object); QVERIFY(object.availableMetaData().isEmpty()); @@ -979,7 +979,7 @@ void tst_QMediaRecorder::setMetaData() MockMediaRecorderService service(nullptr, &recorderControl); service.mockMetaDataControl->populateMetaData(); - MockMediaObject object(nullptr, &service); + MockMediaSource object(nullptr, &service); QMediaRecorder recorder(&object); @@ -1127,7 +1127,7 @@ void tst_QMediaRecorder::testAvailabilityStatus() { { MockMediaRecorderService service(nullptr, nullptr); - MockMediaObject object(nullptr, &service); + MockMediaSource object(nullptr, &service); QMediaRecorder recorder(&object); QCOMPARE(recorder.availability(), QMultimedia::ServiceMissing); QCOMPARE(recorder.isAvailable(), false); @@ -1136,7 +1136,7 @@ void tst_QMediaRecorder::testAvailabilityStatus() MockMediaRecorderControl recorderControl(nullptr); MockMediaRecorderService service1(nullptr, &recorderControl); service1.mockMetaDataControl->populateMetaData(); - MockMediaObject object1(nullptr, &service1); + MockMediaSource object1(nullptr, &service1); QMediaRecorder recorder1(&object1); QCOMPARE(recorder1.availability(), QMultimedia::Available); QCOMPARE(recorder1.isAvailable(), true); @@ -1145,7 +1145,7 @@ void tst_QMediaRecorder::testAvailabilityStatus() MockMediaRecorderControl recorderControl(nullptr); MockMediaRecorderService service1(nullptr, &recorderControl); service1.mockMetaDataControl->populateMetaData(); - MockMediaObject object1(nullptr, &service1); + MockMediaSource object1(nullptr, &service1); QMediaRecorder recorder1(&object1); QCOMPARE(recorder1.availability(), QMultimedia::Available); @@ -1157,30 +1157,30 @@ void tst_QMediaRecorder::testAvailabilityStatus() void tst_QMediaRecorder::testIsAvailable() { MockMediaRecorderService service(nullptr, nullptr); - MockMediaObject object(nullptr, &service); + MockMediaSource object(nullptr, &service); QMediaRecorder recorder(&object); QCOMPARE(recorder.isAvailable(), false); MockMediaRecorderControl recorderControl(nullptr); MockMediaRecorderService service1(nullptr, &recorderControl); service1.mockMetaDataControl->populateMetaData(); - MockMediaObject object1(nullptr, &service1); + MockMediaSource object1(nullptr, &service1); QMediaRecorder recorder1(&object1); QCOMPARE(recorder1.isAvailable(), true); } -/* mediaObject() API test. */ -void tst_QMediaRecorder::testMediaObject() +/* mediaSource() API test. */ +void tst_QMediaRecorder::testMediaSource() { MockMediaRecorderService service(nullptr, nullptr); service.hasControls = false; - MockMediaObject object(nullptr, &service); + MockMediaSource object(nullptr, &service); QMediaRecorder recorder(&object); - QMediaObject *medobj = recorder.mediaObject(); + QMediaSource *medobj = recorder.mediaSource(); QVERIFY(medobj == nullptr); - QMediaObject *medobj1 = capture->mediaObject(); + QMediaSource *medobj1 = capture->mediaSource(); QVERIFY(medobj1 != nullptr); } diff --git a/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp b/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp index 074ead67d..e94a9d7b1 100644 --- a/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp +++ b/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp @@ -34,7 +34,7 @@ #include <private/qmediaserviceprovider_p.h> #include <qmediaserviceproviderplugin.h> -#include <qmediaobject.h> +#include <qmediasource.h> #include <qmediaservice.h> #include <qmediaplayer.h> #include <qaudiorecorder.h> diff --git a/tests/auto/unit/qmediasink/CMakeLists.txt b/tests/auto/unit/qmediasink/CMakeLists.txt index 08e917a9c..ff500121d 100644 --- a/tests/auto/unit/qmediasink/CMakeLists.txt +++ b/tests/auto/unit/qmediasink/CMakeLists.txt @@ -10,7 +10,7 @@ qt_add_test(tst_qmediasink ../qmultimedia_common/mockaudioinputselector.h ../qmultimedia_common/mockaudioprobecontrol.h ../qmultimedia_common/mockmediacontainercontrol.h - ../qmultimedia_common/mockmediaobject.h + ../qmultimedia_common/mockmediasource.h ../qmultimedia_common/mockmediarecordercontrol.h ../qmultimedia_common/mockmediarecorderservice.h ../qmultimedia_common/mockmediaservice.h diff --git a/tests/auto/unit/qmediasink/tst_qmediasink.cpp b/tests/auto/unit/qmediasink/tst_qmediasink.cpp index 035af42e6..e2917b95f 100644 --- a/tests/auto/unit/qmediasink/tst_qmediasink.cpp +++ b/tests/auto/unit/qmediasink/tst_qmediasink.cpp @@ -29,7 +29,7 @@ //TESTED_COMPONENT=src/multimedia #include <QtTest/QtTest> -#include <qmediaobject.h> +#include <qmediasource.h> #include <qmediaservice.h> #include <qmediaservice.h> #include <qmediarecordercontrol.h> @@ -44,7 +44,7 @@ #include "mockmediacontainercontrol.h" #include "mockmetadatawritercontrol.h" #include "mockmediarecordercontrol.h" -#include "mockmediaobject.h" +#include "mockmediasource.h" QT_USE_NAMESPACE @@ -95,14 +95,14 @@ private slots: } - void testMediaObject() //Verifying the mediaobject api + void testMediaSource() //Verifying the mediasource api { MockMediaRecorderControl recorderControl(nullptr); TestBindableService service(nullptr, &recorderControl); service.mockMetaDataControl->populateMetaData(); - MockMediaObject object(nullptr, &service); + MockMediaSource object(nullptr, &service); QMediaRecorder recorder(&object); - QMediaObject *obj = recorder.mediaObject(); + QMediaSource *obj = recorder.mediaSource(); QVERIFY(obj != nullptr); QVERIFY(obj->isAvailable()); } @@ -112,7 +112,7 @@ private slots: MockMediaRecorderControl recorderControl(nullptr); TestBindableService service(nullptr, &recorderControl); service.mockMetaDataControl->populateMetaData(); - MockMediaObject object(nullptr, &service); + MockMediaSource object(nullptr, &service); QMediaRecorder *recorder = new QMediaRecorder(&object); QVERIFY(recorder->isAvailable()); delete recorder; diff --git a/tests/auto/unit/qmediaobject/CMakeLists.txt b/tests/auto/unit/qmediasource/CMakeLists.txt index d6538d1ee..75f218d2e 100644 --- a/tests/auto/unit/qmediaobject/CMakeLists.txt +++ b/tests/auto/unit/qmediasource/CMakeLists.txt @@ -1,16 +1,16 @@ -# Generated from qmediaobject.pro. +# Generated from qmediasource.pro. ##################################################################### -## tst_qmediaobject Test: +## tst_qmediasource Test: ##################################################################### -qt_add_test(tst_qmediaobject +qt_add_test(tst_qmediasource SOURCES ../qmultimedia_common/mockaudioencodercontrol.h ../qmultimedia_common/mockaudioinputselector.h ../qmultimedia_common/mockaudioprobecontrol.h ../qmultimedia_common/mockmediacontainercontrol.h - ../qmultimedia_common/mockmediaobject.h + ../qmultimedia_common/mockmediasource.h ../qmultimedia_common/mockmediarecordercontrol.h ../qmultimedia_common/mockmediarecorderservice.h ../qmultimedia_common/mockmediaservice.h @@ -18,7 +18,7 @@ qt_add_test(tst_qmediaobject ../qmultimedia_common/mockmetadatareadercontrol.h ../qmultimedia_common/mockmetadatawritercontrol.h ../qmultimedia_common/mockvideoencodercontrol.h - tst_qmediaobject.cpp + tst_qmediasource.cpp INCLUDE_DIRECTORIES ../../../../src/multimedia ../../../src/multimedia diff --git a/tests/auto/unit/qmediaobject/qmediaobject.pro b/tests/auto/unit/qmediasource/qmediasource.pro index 26c9f1223..475d81f19 100644 --- a/tests/auto/unit/qmediaobject/qmediaobject.pro +++ b/tests/auto/unit/qmediasource/qmediasource.pro @@ -1,8 +1,8 @@ CONFIG += testcase -TARGET = tst_qmediaobject +TARGET = tst_qmediasource QT += multimedia-private testlib include (../qmultimedia_common/mockrecorder.pri) include (../qmultimedia_common/mock.pri) -SOURCES += tst_qmediaobject.cpp +SOURCES += tst_qmediasource.cpp diff --git a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp b/tests/auto/unit/qmediasource/tst_qmediasource.cpp index d2101cc8e..d1a35bfce 100644 --- a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp +++ b/tests/auto/unit/qmediasource/tst_qmediasource.cpp @@ -33,7 +33,7 @@ #include <QtCore/qtimer.h> #include <QtMultimedia/qmediametadata.h> -#include <qmediaobject.h> +#include <qmediasource.h> #include <qmediaservice.h> #include <qmetadatareadercontrol.h> #include <qaudioinputselectorcontrol.h> @@ -70,7 +70,7 @@ public: QT_USE_NAMESPACE -class tst_QMediaObject : public QObject +class tst_QMediaSource : public QObject { Q_OBJECT @@ -94,7 +94,7 @@ private: void setupNotifyTests(); }; -class QtTestMediaObject : public QMediaObject +class QtTestMediaObject : public QMediaSource { Q_OBJECT Q_PROPERTY(int a READ a WRITE setA NOTIFY aChanged) @@ -102,10 +102,10 @@ class QtTestMediaObject : public QMediaObject Q_PROPERTY(int c READ c WRITE setC NOTIFY cChanged) Q_PROPERTY(int d READ d WRITE setD) public: - QtTestMediaObject(QMediaService *service = nullptr): QMediaObject(nullptr, service) {} + QtTestMediaObject(QMediaService *service = nullptr): QMediaSource(nullptr, service) {} - using QMediaObject::addPropertyWatch; - using QMediaObject::removePropertyWatch; + using QMediaSource::addPropertyWatch; + using QMediaSource::removePropertyWatch; [[nodiscard]] int a() const { return m_a; } void setA(int a) { m_a = a; } @@ -131,7 +131,7 @@ private: int m_d = 0; }; -void tst_QMediaObject::propertyWatch() +void tst_QMediaSource::propertyWatch() { QtTestMediaObject object; object.setNotifyInterval(0); @@ -251,7 +251,7 @@ void tst_QMediaObject::propertyWatch() QCOMPARE(cSpy.count(), cCount); } -void tst_QMediaObject::setupNotifyTests() +void tst_QMediaSource::setupNotifyTests() { QTest::addColumn<int>("interval"); QTest::addColumn<int>("count"); @@ -270,12 +270,12 @@ void tst_QMediaObject::setupNotifyTests() << 5; } -void tst_QMediaObject::notifySignals_data() +void tst_QMediaSource::notifySignals_data() { setupNotifyTests(); } -void tst_QMediaObject::notifySignals() +void tst_QMediaSource::notifySignals() { QFETCH(int, interval); QFETCH(int, count); @@ -292,12 +292,12 @@ void tst_QMediaObject::notifySignals() QTRY_COMPARE(spy.count(), count); } -void tst_QMediaObject::notifyInterval_data() +void tst_QMediaSource::notifyInterval_data() { setupNotifyTests(); } -void tst_QMediaObject::notifyInterval() +void tst_QMediaSource::notifyInterval() { QFETCH(int, interval); @@ -314,7 +314,7 @@ void tst_QMediaObject::notifyInterval() QCOMPARE(spy.count(), 1); } -void tst_QMediaObject::nullMetaDataControl() +void tst_QMediaSource::nullMetaDataControl() { const QString titleKey(QLatin1String("Title")); const QString title(QLatin1String("Host of Seraphim")); @@ -333,7 +333,7 @@ void tst_QMediaObject::nullMetaDataControl() QCOMPARE(spy.count(), 0); } -void tst_QMediaObject::isMetaDataAvailable() +void tst_QMediaSource::isMetaDataAvailable() { QtTestMediaObjectService service; service.metaData.setMetaDataAvailable(false); @@ -355,7 +355,7 @@ void tst_QMediaObject::isMetaDataAvailable() QCOMPARE(spy.at(1).at(0).toBool(), false); } -void tst_QMediaObject::metaDataChanged() +void tst_QMediaSource::metaDataChanged() { QtTestMediaObjectService service; QtTestMediaObject object(&service); @@ -380,7 +380,7 @@ void tst_QMediaObject::metaDataChanged() QCOMPARE(changedWithValueSpy.last()[1].value<QVariant>(), QVariant("Value")); } -void tst_QMediaObject::metaData_data() +void tst_QMediaSource::metaData_data() { QTest::addColumn<QString>("artist"); QTest::addColumn<QString>("title"); @@ -392,7 +392,7 @@ void tst_QMediaObject::metaData_data() << QString::fromLatin1("Awesome"); } -void tst_QMediaObject::metaData() +void tst_QMediaSource::metaData() { QFETCH(QString, artist); QFETCH(QString, title); @@ -418,7 +418,7 @@ void tst_QMediaObject::metaData() QVERIFY(metaDataKeys.contains(QMediaMetaData::Genre)); } -void tst_QMediaObject::availability() +void tst_QMediaSource::availability() { { QtTestMediaObject nullObject(nullptr); @@ -434,7 +434,7 @@ void tst_QMediaObject::availability() } } - void tst_QMediaObject::service() + void tst_QMediaSource::service() { // Create the mediaobject with service. QtTestMediaObjectService service; @@ -451,5 +451,5 @@ void tst_QMediaObject::availability() QVERIFY(service2 == nullptr); } -QTEST_GUILESS_MAIN(tst_QMediaObject) -#include "tst_qmediaobject.moc" +QTEST_GUILESS_MAIN(tst_QMediaSource) +#include "tst_qmediasource.moc" diff --git a/tests/auto/unit/qmultimedia_common/mock.pri b/tests/auto/unit/qmultimedia_common/mock.pri index 65a9a8b3a..0fc02e184 100644 --- a/tests/auto/unit/qmultimedia_common/mock.pri +++ b/tests/auto/unit/qmultimedia_common/mock.pri @@ -4,4 +4,4 @@ INCLUDEPATH += $$PWD \ HEADERS *= \ ../qmultimedia_common/mockmediaserviceprovider.h \ ../qmultimedia_common/mockmediaservice.h \ - ../qmultimedia_common/mockmediaobject.h \ + ../qmultimedia_common/mockmediasource.h \ diff --git a/tests/auto/unit/qmultimedia_common/mockmediaobject.h b/tests/auto/unit/qmultimedia_common/mockmediasource.h index 021cf9be8..5417027a6 100644 --- a/tests/auto/unit/qmultimedia_common/mockmediaobject.h +++ b/tests/auto/unit/qmultimedia_common/mockmediasource.h @@ -26,19 +26,19 @@ ** ****************************************************************************/ -#ifndef MOCKMEDIAOBJECT_H -#define MOCKMEDIAOBJECT_H +#ifndef MOCKMEDIASOURCE_H +#define MOCKMEDIASOURCE_H -#include "qmediaobject.h" +#include "qmediasource.h" -class MockMediaObject : public QMediaObject +class MockMediaSource : public QMediaSource { Q_OBJECT public: - MockMediaObject(QObject *parent, QMediaService *service): - QMediaObject(parent, service) + MockMediaSource(QObject *parent, QMediaService *service): + QMediaSource(parent, service) { } }; -#endif // MOCKMEDIAOBJECT_H +#endif // MOCKMEDIASOURCE_H diff --git a/tests/auto/unit/qvideoprobe/CMakeLists.txt b/tests/auto/unit/qvideoprobe/CMakeLists.txt index b1fa091da..ebf2062db 100644 --- a/tests/auto/unit/qvideoprobe/CMakeLists.txt +++ b/tests/auto/unit/qvideoprobe/CMakeLists.txt @@ -10,7 +10,7 @@ qt_add_test(tst_qvideoprobe ../qmultimedia_common/mockaudioinputselector.h ../qmultimedia_common/mockaudioprobecontrol.h ../qmultimedia_common/mockmediacontainercontrol.h - ../qmultimedia_common/mockmediaobject.h + ../qmultimedia_common/mockmediasource.h ../qmultimedia_common/mockmediaplayercontrol.h ../qmultimedia_common/mockmediaplayerservice.h ../qmultimedia_common/mockmediarecordercontrol.h diff --git a/tests/auto/unit/qvideoprobe/tst_qvideoprobe.cpp b/tests/auto/unit/qvideoprobe/tst_qvideoprobe.cpp index 26d6ed0ad..4e4f612b9 100644 --- a/tests/auto/unit/qvideoprobe/tst_qvideoprobe.cpp +++ b/tests/auto/unit/qvideoprobe/tst_qvideoprobe.cpp @@ -38,7 +38,7 @@ #include "mockmediaserviceprovider.h" #include "mockmediarecorderservice.h" #include "mockmediaplayerservice.h" -#include "mockmediaobject.h" +#include "mockmediasource.h" QT_USE_NAMESPACE diff --git a/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp b/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp index 731243008..b0a81fbc2 100644 --- a/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp +++ b/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp @@ -33,7 +33,7 @@ #include "qvideowidget.h" -#include "qmediaobject.h" +#include "qmediasource.h" #include "qmediaservice.h" #include <private/qpaintervideosurface_p.h> #include "qvideowindowcontrol.h" @@ -55,7 +55,7 @@ private slots: void noOutputs(); void serviceDestroyed(); void objectDestroyed(); - void setMediaObject(); + void setMediaSource(); void showWindowControl(); void fullScreenWindowControl(); @@ -291,7 +291,7 @@ public: QtTestRendererControl *rendererControl; }; -class QtTestVideoObject : public QMediaObject +class QtTestVideoObject : public QMediaSource { Q_OBJECT public: @@ -299,13 +299,13 @@ public: QtTestWindowControl *window, QtTestWidgetControl *widget, QtTestRendererControl *renderer): - QMediaObject(nullptr, new QtTestVideoService(window, widget, renderer)) + QMediaSource(nullptr, new QtTestVideoService(window, widget, renderer)) { testService = qobject_cast<QtTestVideoService*>(service()); } QtTestVideoObject(QtTestVideoService *service): - QMediaObject(nullptr, service), + QMediaSource(nullptr, service), testService(service) { } @@ -480,7 +480,7 @@ void tst_QVideoWidget::serviceDestroyed() delete object.testService; object.testService = nullptr; - QCOMPARE(widget.mediaObject(), static_cast<QMediaObject *>(&object)); + QCOMPARE(widget.mediaSource(), static_cast<QMediaSource *>(&object)); QCOMPARE(widget.brightness(), 100); QCOMPARE(widget.contrast(), 100); @@ -523,7 +523,7 @@ void tst_QVideoWidget::objectDestroyed() delete object; object = nullptr; - QCOMPARE(widget.mediaObject(), static_cast<QMediaObject *>(object)); + QCOMPARE(widget.mediaSource(), static_cast<QMediaSource *>(object)); QCOMPARE(widget.brightness(), 100); QCOMPARE(widget.contrast(), 100); @@ -536,9 +536,9 @@ void tst_QVideoWidget::objectDestroyed() delete service; } -void tst_QVideoWidget::setMediaObject() +void tst_QVideoWidget::setMediaSource() { - QMediaObject *nullObject = nullptr; + QMediaSource *nullObject = nullptr; QtTestVideoObject windowObject(new QtTestWindowControl, nullptr, nullptr); QtTestVideoObject widgetObject(nullptr, new QtTestWidgetControl, nullptr); QtTestVideoObject rendererObject(nullptr, nullptr, new QtTestRendererControl); @@ -548,13 +548,13 @@ void tst_QVideoWidget::setMediaObject() widget.show(); QVERIFY(QTest::qWaitForWindowExposed(&widget)); - QCOMPARE(widget.mediaObject(), nullObject); + QCOMPARE(widget.mediaSource(), nullObject); QCOMPARE(windowObject.testService->windowRef, 0); QCOMPARE(widgetObject.testService->widgetRef, 0); QCOMPARE(rendererObject.testService->rendererRef, 0); windowObject.bind(&widget); - QCOMPARE(widget.mediaObject(), static_cast<QMediaObject *>(&windowObject)); + QCOMPARE(widget.mediaSource(), static_cast<QMediaSource *>(&windowObject)); QCOMPARE(windowObject.testService->windowRef, 1); QCOMPARE(widgetObject.testService->widgetRef, 0); QCOMPARE(rendererObject.testService->rendererRef, 0); @@ -562,7 +562,7 @@ void tst_QVideoWidget::setMediaObject() widgetObject.bind(&widget); - QCOMPARE(widget.mediaObject(), static_cast<QMediaObject *>(&widgetObject)); + QCOMPARE(widget.mediaSource(), static_cast<QMediaSource *>(&widgetObject)); QCOMPARE(windowObject.testService->windowRef, 0); QCOMPARE(widgetObject.testService->widgetRef, 1); QCOMPARE(rendererObject.testService->rendererRef, 0); @@ -575,7 +575,7 @@ void tst_QVideoWidget::setMediaObject() QCOMPARE(rendererObject.testService->rendererRef, 0); rendererObject.bind(&widget); - QCOMPARE(widget.mediaObject(), static_cast<QMediaObject *>(&rendererObject)); + QCOMPARE(widget.mediaSource(), static_cast<QMediaSource *>(&rendererObject)); QCOMPARE(windowObject.testService->windowRef, 0); QCOMPARE(widgetObject.testService->widgetRef, 0); @@ -583,7 +583,7 @@ void tst_QVideoWidget::setMediaObject() QVERIFY(rendererObject.testService->rendererControl->surface() != nullptr); rendererObject.unbind(&widget); - QCOMPARE(widget.mediaObject(), nullObject); + QCOMPARE(widget.mediaSource(), nullObject); QCOMPARE(windowObject.testService->windowRef, 0); QCOMPARE(widgetObject.testService->widgetRef, 0); |