git.iko.soy/unity8
on xenial help sign in
Add audioRole to QtMultimedia mock

Approved by: Mirco Müller

commit262de1a8c987afe7474a66bfd759aa162f0ddfb1 authorAlberto Aguirre <alberto.aguirre@canonical.com> dateTue 4 Nov 2014, 12:50 (12 years ago) parentf830686219c88f
3 files changed+32
compare with xenial
unifiedsplit
tests/mocks/QtMultimedia/QtMultimedia.qmltypes+10 tests/mocks/QtMultimedia/audio.cpp+10 tests/mocks/QtMultimedia/audio.h+12
tests/mocks/QtMultimedia/QtMultimedia.qmltypes+10
@@ -20,11 +20,21 @@ Module {
2020 "StoppedState": 2
2121 }
2222 }
23+ Enum {
24+ name: "AudioRole"
25+ values: {
26+ "AlarmRole": 0,
27+ "AlertRole": 1,
28+ "MultimediaRole": 2,
29+ "PhoneRole": 3
30+ }
31+ }
2332 Property { name: "source"; type: "QUrl" }
2433 Property { name: "playbackState"; type: "PlaybackState"; isReadonly: true }
2534 Property { name: "position"; type: "int"; isReadonly: true }
2635 Property { name: "duration"; type: "int"; isReadonly: true }
2736 Property { name: "errorString"; type: "string"; isReadonly: true }
37+ Property { name: "audioRole"; type: "AudioRole" }
2838 Signal {
2939 name: "sourceChanged"
3040 Parameter { name: "source"; type: "QUrl" }
tests/mocks/QtMultimedia/audio.cpp+10
@@ -105,3 +105,13 @@ void Audio::timerEvent()
105105 stop();
106106 }
107107}
108+
109+Audio::AudioRole Audio::audioRole() const
110+{
111+ return Audio::MultimediaRole;
112+}
113+
114+void Audio::setAudioRole(Audio::AudioRole audioRole)
115+{
116+ Q_UNUSED(audioRole);
117+}
tests/mocks/QtMultimedia/audio.h+12
@@ -27,11 +27,13 @@ class Audio: public QObject
2727{
2828 Q_OBJECT
2929 Q_ENUMS(PlaybackState)
30+ Q_ENUMS(AudioRole)
3031 Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
3132 Q_PROPERTY(PlaybackState playbackState READ playbackState NOTIFY playbackStateChanged)
3233 Q_PROPERTY(int position READ position NOTIFY positionChanged)
3334 Q_PROPERTY(int duration READ duration NOTIFY durationChanged)
3435 Q_PROPERTY(QString errorString READ errorString NOTIFY errorStringChanged)
36+ Q_PROPERTY(AudioRole audioRole READ audioRole WRITE setAudioRole)
3537public:
3638 enum PlaybackState {
3739 PlayingState,
@@ -39,6 +41,13 @@ public:
3941 StoppedState
4042 };
4143
44+ enum AudioRole {
45+ AlarmRole,
46+ AlertRole,
47+ MultimediaRole,
48+ PhoneRole
49+ };
50+
4251 explicit Audio(QObject *parent = 0);
4352
4453 QUrl source() const;
@@ -52,6 +61,9 @@ public:
5261
5362 QString errorString() const;
5463
64+ AudioRole audioRole() const;
65+ void setAudioRole(AudioRole audioRole);
66+
5567public Q_SLOTS:
5668 void pause();
5769 void play();