brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

volume: Put canberra sound events on output streams only

Browse Source 
This seems to be an oversight in the original volume menu code
that slipped in by accident.
This commit is contained in:
Jasper St. Pierre 2012-12-21 13:23:39 -05:00
parent c9d0e82c52
commit 1964b54627
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/ui/status/volume.js
View File

@ -38,7 +38,6 @@ const StreamSlider = new Lang.Class({
this._title = new PopupMenu.PopupMenuItem(title, { reactive: false }); this._title = new PopupMenu.PopupMenuItem(title, { reactive: false });
this._slider = new PopupMenu.PopupSliderMenuItem(0); this._slider = new PopupMenu.PopupSliderMenuItem(0);
this._slider.connect('value-changed', Lang.bind(this, this._sliderChanged)); this._slider.connect('value-changed', Lang.bind(this, this._sliderChanged));
this._slider.connect('drag-end', Lang.bind(this, this._notifyVolumeChange));
this.item.addMenuItem(this._title); this.item.addMenuItem(this._title);
this.item.addMenuItem(this._slider); this.item.addMenuItem(this._slider);
@ -117,11 +116,6 @@ const StreamSlider = new Lang.Class({
this._stream.push_volume(); this._stream.push_volume();
}, },
_notifyVolumeChange: function() {
global.cancel_theme_sound(VOLUME_NOTIFY_ID);
global.play_theme_sound(VOLUME_NOTIFY_ID, 'audio-volume-change');
},
_updateVolume: function() { _updateVolume: function() {
let muted = this._stream.is_muted; let muted = this._stream.is_muted;
this._slider.setValue(muted ? 0 : (this._stream.volume / this._control.get_vol_max_norm())); this._slider.setValue(muted ? 0 : (this._stream.volume / this._control.get_vol_max_norm()));
@ -151,6 +145,11 @@ const OutputStreamSlider = new Lang.Class({
Name: 'OutputStreamSlider', Name: 'OutputStreamSlider',
Extends: StreamSlider, Extends: StreamSlider,
_init: function(control, title) {
this.parent(control, title);
this._slider.connect('drag-end', Lang.bind(this, this._notifyVolumeChange));
},
_connectStream: function(stream) { _connectStream: function(stream) {
this.parent(stream); this.parent(stream);
this._portChangedId = stream.connect('notify::port', Lang.bind(this, this._portChanged)); this._portChangedId = stream.connect('notify::port', Lang.bind(this, this._portChanged));
@ -179,6 +178,11 @@ const OutputStreamSlider = new Lang.Class({
this._portChangedId = 0; this._portChangedId = 0;
}, },
_notifyVolumeChange: function() {
global.cancel_theme_sound(VOLUME_NOTIFY_ID);
global.play_theme_sound(VOLUME_NOTIFY_ID, 'audio-volume-change');
},
_portChanged: function() { _portChanged: function() {
let hasHeadphones = this._findHeadphones(this._stream); let hasHeadphones = this._findHeadphones(this._stream);
if (hasHeadphones != this._hasHeadphones) { if (hasHeadphones != this._hasHeadphones) {