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

volume: Make icon calculation stable

Browse Source 
Calculate an icon based on our current state, not a mess of
signal emissions and callbacks. This is a preliminary basic
cleanup patch in preparation for the next one.

https://bugzilla.gnome.org/show_bug.cgi?id=690539
This commit is contained in:
Jasper St. Pierre 2012-12-19 22:02:04 -05:00
parent 1d136cacfb
commit f60fb954a2
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ const VolumeMenu = new Lang.Class({
this._readInput(); this._readInput();
this._maybeShowInput(); this._maybeShowInput();
} else { } else {
this.emit('icon-changed', null); this.emit('icon-changed');
} }
}, },
@ -125,7 +125,7 @@ const VolumeMenu = new Lang.Class({
} else { } else {
this.hasHeadphones = false; this.hasHeadphones = false;
this._outputSlider.setValue(0); this._outputSlider.setValue(0);
this.emit('icon-changed', 'audio-volume-muted-symbolic'); this.emit('icon-changed');
} }
}, },
@ -169,19 +169,6 @@ const VolumeMenu = new Lang.Class({
this._inputSlider.actor.visible = showInput; this._inputSlider.actor.visible = showInput;
}, },
_volumeToIcon: function(volume) {
if (volume <= 0) {
return 'audio-volume-muted-symbolic';
} else {
let n = Math.floor(3 * volume / this._volumeMax) + 1;
if (n < 2)
return 'audio-volume-low-symbolic';
if (n >= 3)
return 'audio-volume-high-symbolic';
return 'audio-volume-medium-symbolic';
}
},
_sliderChanged: function(slider, value, property) { _sliderChanged: function(slider, value, property) {
if (this[property] == null) { if (this[property] == null) {
log ('Volume slider changed for %s, but %s does not exist'.format(property, property)); log ('Volume slider changed for %s, but %s does not exist'.format(property, property));
@ -206,22 +193,35 @@ const VolumeMenu = new Lang.Class({
global.play_theme_sound(VOLUME_NOTIFY_ID, 'audio-volume-change'); global.play_theme_sound(VOLUME_NOTIFY_ID, 'audio-volume-change');
}, },
getIcon: function() {
if (!this._output)
return null;
let volume = this._output.volume;
if (this._output.is_muted || volume <= 0) {
return 'audio-volume-muted-symbolic';
} else {
let n = Math.floor(3 * volume / this._volumeMax) + 1;
if (n < 2)
return 'audio-volume-low-symbolic';
if (n >= 3)
return 'audio-volume-high-symbolic';
return 'audio-volume-medium-symbolic';
}
},
_mutedChanged: function(object, param_spec, property) { _mutedChanged: function(object, param_spec, property) {
let muted = this[property].is_muted; let muted = this[property].is_muted;
let slider = this[property+'Slider']; let slider = this[property+'Slider'];
slider.setValue(muted ? 0 : (this[property].volume / this._volumeMax)); slider.setValue(muted ? 0 : (this[property].volume / this._volumeMax));
if (property == '_output') { if (property == '_output')
if (muted) this.emit('icon-changed');
this.emit('icon-changed', 'audio-volume-muted-symbolic');
else
this.emit('icon-changed', this._volumeToIcon(this._output.volume));
}
}, },
_volumeChanged: function(object, param_spec, property) { _volumeChanged: function(object, param_spec, property) {
this[property+'Slider'].setValue(this[property].volume / this._volumeMax); this[property+'Slider'].setValue(this[property].volume / this._volumeMax);
if (property == '_output' && !this._output.is_muted) if (property == '_output')
this.emit('icon-changed', this._volumeToIcon(this._output.volume)); this.emit('icon-changed');
} }
}); });
@ -234,8 +234,9 @@ const Indicator = new Lang.Class({
this._control = getMixerControl(); this._control = getMixerControl();
this._volumeMenu = new VolumeMenu(this._control); this._volumeMenu = new VolumeMenu(this._control);
this._volumeMenu.connect('icon-changed', Lang.bind(this, function(menu, icon) { this._volumeMenu.connect('icon-changed', Lang.bind(this, function(menu) {
this._hasPulseAudio = (icon != null); let icon = this._volumeMenu.getIcon();
this._hasPulseAudio = icon != null;
this.setIcon(icon); this.setIcon(icon);
this._syncVisibility(); this._syncVisibility();
})); }));