diff options
| author | James McDonnell <jmcdonnell@blackberry.com> | 2017-03-28 17:23:25 -0400 |
|---|---|---|
| committer | James McDonnell <jmcdonnell@blackberry.com> | 2017-10-23 14:10:43 +0000 |
| commit | 82694e41b1d37e04ecc911f420ad4317220f8180 (patch) | |
| tree | 831804b09c5fc36be0e103444c596149771d4a78 /src/imports/multimedia/qdeclarativeaudio_p.h | |
| parent | 66c0334a3c4cb8deb63c67aa70da3f4ed94f89a4 (diff) | |
Propagate customAudioRole into the QML classes
Propagate customAudioRole into the Audio, MediaPlayer and Video
classes.
[ChangeLog][Audio/Video/MediaPlayer] Added customAudioRole string
property to enable use of audio roles beyond those available via the
audioRole enum property.
Change-Id: If3c4ec20f014653d31d1fa0d1ad925084f446478
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'src/imports/multimedia/qdeclarativeaudio_p.h')
| -rw-r--r-- | src/imports/multimedia/qdeclarativeaudio_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/imports/multimedia/qdeclarativeaudio_p.h b/src/imports/multimedia/qdeclarativeaudio_p.h index 4e2b94300..043b36042 100644 --- a/src/imports/multimedia/qdeclarativeaudio_p.h +++ b/src/imports/multimedia/qdeclarativeaudio_p.h @@ -95,6 +95,7 @@ class QDeclarativeAudio : public QObject, public QQmlParserStatus Q_PROPERTY(QObject *mediaObject READ mediaObject NOTIFY mediaObjectChanged SCRIPTABLE false DESIGNABLE false) Q_PROPERTY(Availability availability READ availability NOTIFY availabilityChanged) 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) Q_ENUMS(Status) Q_ENUMS(Error) @@ -150,6 +151,7 @@ public: UnknownRole = QAudio::UnknownRole, AccessibilityRole = QAudio::AccessibilityRole, AlarmRole = QAudio::AlarmRole, + CustomRole = QAudio::CustomRole, GameRole = QAudio::GameRole, MusicRole = QAudio::MusicRole, NotificationRole = QAudio::NotificationRole, @@ -179,6 +181,8 @@ public: AudioRole audioRole() const; void setAudioRole(AudioRole audioRole); + QString customAudioRole() const; + void setCustomAudioRole(const QString &audioRole); QUrl source() const; void setSource(const QUrl &url); @@ -256,6 +260,7 @@ Q_SIGNALS: void playbackRateChanged(); Q_REVISION(1) void audioRoleChanged(); + Q_REVISION(3) void customAudioRoleChanged(); void availabilityChanged(Availability availability); @@ -287,6 +292,7 @@ private: qreal m_vol; qreal m_playbackRate; AudioRole m_audioRole; + QString m_customAudioRole; QMediaPlayer::State m_playbackState; QMediaPlayer::MediaStatus m_status; |