Differential D29279 Diff 81523 applet/contents/ui/main.qml

Changeset View

Standalone View

View Options

applet/contents/ui/main.qml

Show First 20 Lines • Show All 93 Lines • ▼ Show 20 Line(s)34Item {
94 } 94​ }
95 95​
96 function increaseVolume() { 96​ function increaseVolume() {
97 if (!paSinkModel.preferredSink || isDummyOutput(paSinkModel.preferredSink)) { 97​ if (!paSinkModel.preferredSink || isDummyOutput(paSinkModel.preferredSink)) {
98 return; 98​ return;
99 } 99​ }
100 var volume = boundVolume(paSinkModel.preferredSink.volume + volumeStep); 100​ var volume = boundVolume(paSinkModel.preferredSink.volume + volumeStep);
101 var percent = volumePercent(volume, currentMaxVolumeValue); 101​ var percent = volumePercent(volume, currentMaxVolumeValue);
102​
103​ // Don't play feedback soundif the volume is already maximized
104​ // We cannot use percent here because it already includes the step
105​ // We only want to omit the feedback if the volume is already at maximum, not about to be set to maximum
106​ if (paSinkModel.preferredSink.volume < currentMaxVolumeValue) {
107​ playFeedback();
108​ }
109​
102 paSinkModel.preferredSink.muted = percent == 0; 110​ paSinkModel.preferredSink.muted = percent == 0;
103 paSinkModel.preferredSink.volume = volume; 111​ paSinkModel.preferredSink.volume = volume;
104 osd.showVolume(percent); 112​ osd.showVolume(percent);
105 playFeedback(); 113​
106 } 114​ }
107 115​
108 function decreaseVolume() { 116​ function decreaseVolume() {
109 if (!paSinkModel.preferredSink || isDummyOutput(paSinkModel.preferredSink)) { 117​ if (!paSinkModel.preferredSink || isDummyOutput(paSinkModel.preferredSink)) {
110 return; 118​ return;
111 } 119​ }
112 var volume = boundVolume(paSinkModel.preferredSink.volume - volumeStep); 120​ var volume = boundVolume(paSinkModel.preferredSink.volume - volumeStep);
113 var percent = volumePercent(volume, currentMaxVolumeValue); 121​ var percent = volumePercent(volume, currentMaxVolumeValue);
▲ Show 20 Lines • Show All 562 Lines • Show Last 20 Lines