6031385 · unity8 · git.iko.soy

tests/mocks/QtMultimedia/QtMultimedia.qmltypes+10

compare with xenial

unifiedsplit

@@ -20,11 +20,21 @@ Module {

20 "StoppedState": 2

21 }

22 }

23+ Enum {

24+ name: "AudioRole"

25+ values: {

26+ "AlarmRole": 0,

27+ "AlertRole": 1,

28+ "MultimediaRole": 2,

29+ "PhoneRole": 3

30+ }

31+ }

23 Property { name: "source"; type: "QUrl" }

32 Property { name: "source"; type: "QUrl" }

24 Property { name: "playbackState"; type: "PlaybackState"; isReadonly: true }

33 Property { name: "playbackState"; type: "PlaybackState"; isReadonly: true }

25 Property { name: "position"; type: "int"; isReadonly: true }

34 Property { name: "position"; type: "int"; isReadonly: true }

26 Property { name: "duration"; type: "int"; isReadonly: true }

35 Property { name: "duration"; type: "int"; isReadonly: true }

27 Property { name: "errorString"; type: "string"; isReadonly: true }

36 Property { name: "errorString"; type: "string"; isReadonly: true }

37+ Property { name: "audioRole"; type: "AudioRole" }

28 Signal {

38 Signal {

29 name: "sourceChanged"

39 name: "sourceChanged"

30 Parameter { name: "source"; type: "QUrl" }

40 Parameter { name: "source"; type: "QUrl" }

tests/mocks/QtMultimedia/audio.cpp+10

@@ -105,3 +105,13 @@ void Audio::timerEvent()

105 stop();

106 }

107}

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

27{

28 Q_OBJECT

29 Q_ENUMS(PlaybackState)

30+ Q_ENUMS(AudioRole)

30 Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)

31 Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)

31 Q_PROPERTY(PlaybackState playbackState READ playbackState NOTIFY playbackStateChanged)

32 Q_PROPERTY(PlaybackState playbackState READ playbackState NOTIFY playbackStateChanged)

32 Q_PROPERTY(int position READ position NOTIFY positionChanged)

33 Q_PROPERTY(int position READ position NOTIFY positionChanged)

33 Q_PROPERTY(int duration READ duration NOTIFY durationChanged)

34 Q_PROPERTY(int duration READ duration NOTIFY durationChanged)

34 Q_PROPERTY(QString errorString READ errorString NOTIFY errorStringChanged)

35 Q_PROPERTY(QString errorString READ errorString NOTIFY errorStringChanged)

36+ Q_PROPERTY(AudioRole audioRole READ audioRole WRITE setAudioRole)

35public:

37public:

36 enum PlaybackState {

38 enum PlaybackState {

37 PlayingState,

39 PlayingState,

@@ -39,6 +41,13 @@ public:

39 StoppedState

41 StoppedState

40 };

42 };

41

43

44+ enum AudioRole {

45+ AlarmRole,

46+ AlertRole,

47+ MultimediaRole,

48+ PhoneRole

49+ };

50+

42 explicit Audio(QObject *parent = 0);

51 explicit Audio(QObject *parent = 0);

43

52

44 QUrl source() const;

53 QUrl source() const;

@@ -52,6 +61,9 @@ public:

52

61

53 QString errorString() const;

62 QString errorString() const;

54

63

64+ AudioRole audioRole() const;

65+ void setAudioRole(AudioRole audioRole);

66+

55public Q_SLOTS:

67public Q_SLOTS:

56 void pause();

68 void pause();

57 void play();

69 void play();